fix CCE

Signed-off-by: Devan-Kerman <devan@cleverpath.com>

.editorconfig

@@ -11,12 +11,5 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.sexp]
-indent_size = 2
-
-[*.yml]
-indent_size = 2
-
-
 [*.properties]
 insert_final_newline = false

.gitattributes

@@ -1,2 +0,0 @@
-# Ignore changes in generated files
-src/generated/resources/data/** linguist-generated

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,5 +12,4 @@ labels: bug
 ## Useful information to include:
  - Minecraft version
  - CC: Tweaked version
- - Logs: These will be located in the `logs/` directory of your Minecraft instance. Please upload them as a gist or directly into this editor.
  - Detailed reproduction steps: sometimes I can spot a bug pretty easily, but often it's much more obscure. The more information I have to help reproduce it, the quicker it'll get fixed.

.github/workflows/main-ci.yml

@@ -1,49 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Java 8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-
-    - name: Cache gradle dependencies
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Build with Gradle
-      run: ./gradlew build --no-daemon || ./gradlew build --no-daemon
-
-    - name: Upload Jar
-      uses: actions/upload-artifact@v1
-      with:
-        name: CC-Tweaked
-        path: build/libs
-
-    - name: Upload Coverage
-      run: bash <(curl -s https://codecov.io/bash)
-
-    - name: Generate Java documentation stubs
-      run: ./gradlew luaJavadoc --no-daemon
-
-    - name: Lint Lua code
-      run: |
-        test -d bin || mkdir bin
-        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
-        chmod +x bin/illuaminate
-        bin/illuaminate lint
-
-    - name: Check whitespace
-      run: python3 tools/check-lines.py

.github/workflows/make-doc.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-DEST="${GITHUB_REF#refs/*/}"
-echo "Uploading docs to https://tweaked.cc/$DEST"
-
-# Setup ssh key
-mkdir -p "$HOME/.ssh/"
-echo "$SSH_KEY" > "$HOME/.ssh/key"
-chmod 600 "$HOME/.ssh/key"
-
-# And upload
-rsync -avc -e "ssh -i $HOME/.ssh/key -o StrictHostKeyChecking=no -p $SSH_PORT" \
-      "$GITHUB_WORKSPACE/doc/" \
-      "$SSH_USER@$SSH_HOST:/var/www/tweaked.cc/$DEST"

.github/workflows/make-doc.yml

@@ -1,52 +0,0 @@
-name: Build documentation
-
-on:
-  push:
-    branches:
-    - master
-    - mc-1.15.x
-    tags:
-  release:
-    types: [ published ]
-
-jobs:
-  make_doc:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up Java 8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 8
-
-    - name: Cache gradle dependencies
-      uses: actions/cache@v1
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Build with Gradle
-      run: ./gradlew compileJava --no-daemon || ./gradlew compileJava --no-daemon
-
-    - name: Generate Java documentation stubs
-      run: ./gradlew luaJavadoc --no-daemon
-
-    - name: Build documentation
-      run: |
-        test -d bin || mkdir bin
-        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
-        chmod +x bin/illuaminate
-        bin/illuaminate doc-gen
-
-    - name: Upload documentation
-      run: .github/workflows/make-doc.sh 2> /dev/null
-      env:
-        SSH_KEY:  ${{ secrets.SSH_KEY  }}
-        SSH_USER: ${{ secrets.SSH_USER }}
-        SSH_HOST: ${{ secrets.SSH_HOST }}
-        SSH_PORT: ${{ secrets.SSH_PORT }}

.gitignore

@@ -3,9 +3,6 @@
 /logs
 /build
 /out
-/doc/**/*.html
-/doc/javadoc/
-/doc/index.json
 
 # Runtime directories
 /run
@@ -18,11 +15,3 @@
 .idea
 .gradle
 *.DS_Store
-
-.classpath
-.project
-.settings/
-bin/
-*.launch
-
-/src/generated/resources/.cache

.luacheckrc

@@ -0,0 +1,34 @@
+std = "max"
+
+ignore = {
+    -- Allow access to undefined globals or their fields. In the future we'll
+    -- define all of CC's globals within this file
+    '113', '143',
+
+    -- FIXME: Ignore unused arguments and loop variables
+    '212', '213',
+
+    -- Disable line is too long for now. It would be possible to clean
+    -- this up in the future.
+    '631',
+}
+
+-- Only run the linter on ROM and bios for now, as the treasure disks
+-- are largely unsupported.
+include_files = {
+    'src/main/resources/assets/computercraft/lua/rom',
+    'src/main/resources/assets/computercraft/lua/bios.lua'
+}
+
+files['src/main/resources/assets/computercraft/lua/bios.lua'] = {
+    -- Allow declaring and mutating globals
+    allow_defined_top = true,
+    ignore = { '112', '121', '122', '131', '142' },
+}
+
+files['src/main/resources/assets/computercraft/lua/rom/apis'] = {
+    -- APIs may define globals on the top level. We'll ignore unused globals,
+    -- as obviously they may be used outside that API.
+    allow_defined_top = true,
+    ignore = { '131' },
+}

.travis.yml

@@ -0,0 +1,14 @@
+language: java
+
+script: ./gradlew build --no-daemon
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/s
+
+jdk:
+    - oraclejdk8

CONTRIBUTING.md

@@ -1,41 +0,0 @@
-# Contributing to CC: Tweaked
-As with many open source projects, CC: Tweaked thrives on contributions from other people! This document (hopefully)
-provides an introduction as to how to get started in helping out.
-
-If you've any other questions, [just ask the community][community] or [open an issue][new-issue].
-
-## Reporting issues
-If you have a bug, suggestion, or other feedback, the best thing to do is [file an issue][new-issue]. When doing so,
-do use the issue templates - they provide a useful hint on what information to provide.
-
-## Developing
-In order to develop CC: Tweaked, you'll need to download the source code and then run it. This is a pretty simple
-process. When building on Windows, Use `gradlew.bat` instead of `./gradlew`.
-
- - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
- - **Setup Forge:** `./gradlew build`
- - **Run Minecraft:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
-
-If you want to run CC:T in a normal Minecraft instance, run `./gradlew build` and copy the `.jar` from `build/libs`.
-These commands may take a few minutes to run the first time, as the environment is set up, but should be much faster
-afterwards.
-
-### Code linters
-CC: Tweaked uses a couple of "linters" on its source code, to enforce a consistent style across the project. While these
-are run whenever you submit a PR, it's often useful to run this before committing.
-
- - **[Checkstyle]:** Checks Java code to ensure it is consistently formatted. This can be run with `./gradlew build` or
-   `./gradle check`.
- - **[illuaminate]:** Checks Lua code for semantic and styleistic issues. See [the usage section][illuaminate-usage] for
-   how to download and run it.
-
-## Translations
-Translations are managed through [Weblate], an online interface for managing language strings. This is synced
-automatically with GitHub, so please don't submit PRs adding/changing translations!
-
-[new-issue]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose "Create a new issue"
-[community]: README.md#Community "Get in touch with the community."
-[checkstyle]: https://checkstyle.org/
-[illuaminate]: https://github.com/SquidDev/illuaminate/
-[illuaminate-usage]: https://github.com/SquidDev/illuaminate/blob/master/README.md#usage
-[weblate]: https://i18n.tweaked.cc/projects/cc-tweaked/minecraft/

README.md

@@ -1,69 +1,7 @@
-# ![CC: Tweaked](doc/logo.png)
-[![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
+# CC:T for Fabric
 
-CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
-turtles and more to Minecraft.
+* [Download on CurseForge](https://www.curseforge.com/minecraft/mc-mods/cc-restitched)
 
-## What?
-ComputerCraft has always held a fond place in my heart: it's the mod which really got me into Minecraft, and it's the
-mod which has kept me playing it for many years. However, development of the original mod has slowed, as the original
-developers have had less time to work on the mod, and moved onto other projects and commitments.
+A fork of [CC: Tweaked](https://github.com/SquidDev-CC/CC-Tweaked) for use with the latest Fabric.
 
-CC: Tweaked (or CC:T for short) is an attempt to continue ComputerCraft's legacy. It's not intended to be a competitor
-to CC, nor do I want to take it in a vastly different direction to the original mod. Instead, CC:T focuses on making the
-ComputerCraft experience as _solid_ as possible, ironing out any wrinkles that may have developed over time.
-
-## Features
-CC: Tweaked contains all the features of the latest version of ComputerCraft, as well as numerous fixes, performance
-improvements and several nifty additions. I'd recommend checking out [the releases page](https://github.com/SquidDev-CC/CC-Tweaked/releases)
-to see the full set of changes, but here's a couple of the more interesting additions:
-
- - Improvements to the `http` library, including websockets, support for other HTTP methods (`PUT`, `DELETE`, etc...)
-   and configurable limits on HTTP usage.
- - Full-block wired modems, allowing one to wrap non-solid peripherals (such as turtles, or chests if Plethora is
-   installed).
- - Pocket computers can be held like maps, allowing you to view the screen without entering a GUI.
- - Printed pages and books can be placed in item frames and held like maps.
- - Several profiling and administration tools for server owners, via the `/computercraft` command. This allows operators
-   to track which computers are hogging resources, turn on and shutdown multiple computers at once and interact with
-   computers remotely.
- - Closer emulation of standard Lua, adding the `debug` and `io` libraries. This also enables seeking within binary
-   files, meaning you don't need to read large files into memory.
- - Allow running multiple computers on multiple threads, reducing latency on worlds with many computers.
-
-## Relation to CCTweaks?
-This mod has nothing to do with CCTweaks, though there is no denying the name is a throwback to it. That being said,
-several features have been included, such as full block modems, the Cobalt runtime and map-like rendering for pocket
-computers.
-
-## Contributing
-Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
-developing the mod, [check out the instructions here](CONTRIBUTING.md#developing).
-
-## Community
-If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord guild](https://discord.computercraft.cc)!
-There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=computercraft), if that's
-more your cup of tea.
-
-I'd generally recommend you don't contact me directly (email, DM, etc...) unless absolutely necessary (i.e. in order to
-report exploits). You'll get a far quicker response if you ask the whole community!
-
-## Using
-If you want to depend on CC: Tweaked, we have a maven repo. However, you should be wary that some functionality is only
-exposed by CC:T's API and not vanilla ComputerCraft. If you wish to support all variations of ComputerCraft, I recommend
-using [cc.crzd.me's maven](https://cc.crzd.me/maven/) instead.
-
-```groovy
-dependencies {
-  maven { url 'https://squiddev.cc/maven/' }
-}
-
-dependencies {
-  implementation fg.deobf("org.squiddev:cc-tweaked-${mc_version}:${cct_version}")
-}
-```
-
-You should also be careful to only use classes within the `dan200.computercraft.api` package. Non-API classes are
-subject to change at any point. If you depend on functionality outside the API, file an issue, and we can look into
-exposing more features.
+NOTE: This project is currently in alpha stage. It may not be well-tested and stable, so use it at your own peril!

build.gradle

@@ -1,90 +1,15 @@
-buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "https://files.minecraftforge.net/maven"
-        }
-    }
-    dependencies {
-        classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.179'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
-        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
-    }
-}
-
 plugins {
-    id "checkstyle"
-    id "jacoco"
-    id "com.github.hierynomus.license" version "0.15.0"
-    id "com.matthewprenger.cursegradle" version "1.3.0"
-    id "com.github.breadmoirai.github-release" version "2.2.4"
+    id 'fabric-loom' version '0.5-SNAPSHOT'
+    id 'maven-publish'
 }
 
-apply plugin: 'net.minecraftforge.gradle'
-apply plugin: 'org.ajoberstar.grgit'
-apply plugin: 'maven-publish'
-apply plugin: 'maven'
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 version = mod_version
 
-group = "org.squiddev"
-archivesBaseName = "cc-tweaked-${mc_version}"
-
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
-
-minecraft {
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file("run/server-${mc_version}")
-            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-
-    mappings channel: 'snapshot', version: "${mappings_version}".toString()
-
-    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
-}
-
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
-}
+group = "dan200.computercraft"
+archivesBaseName = "cc-tweaked-fabric-${mc_version}"
 
 repositories {
     mavenCentral()
@@ -95,405 +20,98 @@ repositories {
 }
 
 configurations {
-    shade
     compile.extendsFrom shade
-    deployerJars
-    cctJavadoc
 }
 
 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.25"
+    minecraft "com.mojang:minecraft:${mc_version}"
+    mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}:v2"
+    modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
 
-    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+    modImplementation "me.shedaniel.cloth:config-2:${cloth_config_version}"
+    modImplementation "io.github.prospector:modmenu:${modmenu_version}"
 
-    compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.2:6.0.0.9")
+    modApi "me.shedaniel.cloth.api:cloth-utils-v1:${project.cloth_api_version}"
+    include "me.shedaniel.cloth.api:cloth-utils-v1:${project.cloth_api_version}"
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")
+    implementation "blue.endless:jankson:${jankson_version}"
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
+    include "me.shedaniel.cloth:config-2:${cloth_config_version}"
+    include "blue.endless:jankson:${jankson_version}"
+    include 'javax.vecmath:vecmath:1.5.2'
+
+    compile 'javax.vecmath:vecmath:1.5.2'
 
     shade 'org.squiddev:Cobalt:0.5.1-SNAPSHOT'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
-    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
 
-    deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
-
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.1.0'
+    modRuntime "me.shedaniel:RoughlyEnoughItems-api:5.2.10"
+    modRuntime "me.shedaniel:RoughlyEnoughItems:5.2.10"
 }
 
-// Compile tasks
-
-javadoc {
-    include "dan200/computercraft/api/**/*.java"
-}
-
-task luaJavadoc(type: Javadoc) {
-    description "Generates documentation for Java-side Lua functions."
-    group "documentation"
-
-    source = sourceSets.main.allJava
-    destinationDir = file("doc/javadoc")
-    classpath = sourceSets.main.compileClasspath
-
-    options.docletpath = configurations.cctJavadoc.files as List
-    options.doclet = "cc.tweaked.javadoc.LuaDoclet"
-
-    // Attempt to run under Java 11 (any Java >= 9 will work though).
-    if(System.getProperty("java.version").startsWith("1.")
-        && (System.getenv("JAVA_HOME_11_X64") != null || project.hasProperty("java11Home"))) {
-        executable = "${System.getenv("JAVA_HOME_11_X64") ?: project.property("java11Home")}/bin/javadoc"
-    }
-}
-
-jar {
-    dependsOn javadoc
-
-    manifest {
-        attributes(["Specification-Title": "computercraft",
-                    "Specification-Vendor": "SquidDev",
-                    "Specification-Version": "1",
-                    "Implementation-Title": "CC: Tweaked",
-                    "Implementation-Version": "${mod_version}",
-                    "Implementation-Vendor" :"SquidDev",
-                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
-    }
-
-    from (sourceSets.main.allSource) {
-        include "dan200/computercraft/api/**/*.java"
-    }
-
-    from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
-}
-
-[compileJava, compileTestJava].forEach {
-    it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
-    }
-}
-
-import java.nio.charset.StandardCharsets
-import java.nio.file.*
-import java.util.zip.*
-
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonElement
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
-import org.ajoberstar.grgit.Grgit
-import proguard.gradle.ProGuardTask
-
-task proguard(type: ProGuardTask, dependsOn: jar) {
-    description "Removes unused shadowed classes from the jar"
-    group "compact"
-
-    injars jar.archivePath
-    outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
-
-    // Add the main runtime jar and all non-shadowed dependencies
-    libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
-    libraryjars "${System.getProperty('java.home')}/lib/jce.jar"
-    doFirst {
-        sourceSets.main.compileClasspath
-            .filter { !it.name.contains("Cobalt") }
-            .each { libraryjars it }
-    }
-
-    // We want to avoid as much obfuscation as possible. We're only doing this to shrink code size.
-    dontobfuscate; dontoptimize; keepattributes; keepparameternames
-
-    // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'data/computercraft/lua**'
-
-    // Preserve ComputerCraft classes - we only want to strip shadowed files.
-    keep 'class dan200.computercraft.** { *; }'
-
-    // LWJGL and Apache bundle Java 9 versions, which is great, but rather breaks Proguard
-    dontwarn 'module-info'
-    dontwarn 'org.apache.**,org.lwjgl.**'
-}
-
-task proguardMove(dependsOn: proguard) {
-    description "Replace the original jar with the minified version"
-    group "compact"
-
-    doLast {
-        Files.move(
-            file("${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar").toPath(),
-            file(jar.archivePath).toPath(),
-            StandardCopyOption.REPLACE_EXISTING
-        )
+sourceSets {
+    main {
+        java {
+            exclude 'dan200/computercraft/shared/integration'
+        }
     }
 }
 
 processResources {
-    inputs.property "version", mod_version
-    inputs.property "mcversion", mc_version
-
-    def hash = 'none'
-    Set<String> contributors = []
-    try {
-        def grgit = Grgit.open(dir: '.')
-        hash = grgit.head().id
-
-        def blacklist = ['GitHub', 'dan200', 'Daniel Ratcliffe']
-        grgit.log().each {
-            if (!blacklist.contains(it.author.name)) contributors.add(it.author.name)
-            if (!blacklist.contains(it.committer.name)) contributors.add(it.committer.name)
-        }
-    } catch(Exception ignored) { }
-
-    inputs.property "commithash", hash
+    inputs.property "version", project.version
 
     from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-        include 'data/computercraft/lua/rom/help/credits.txt'
-
-        expand 'version': mod_version,
-               'mcversion': mc_version,
-               'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
+        include "fabric.mod.json"
+        expand "version": project.version
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-        exclude 'data/computercraft/lua/rom/help/credits.txt'
+        exclude "fabric.mod.json"
     }
 }
 
-task compressJson(dependsOn: jar) {
-    group "compact"
-    description "Minifies all JSON files, stripping whitespace"
-
-    def jarPath = file(jar.archivePath)
-
-    def tempPath = File.createTempFile("input", ".jar", temporaryDir)
-    tempPath.deleteOnExit()
-
-    def gson = new GsonBuilder().create()
-
-    doLast {
-        // Copy over all files in the current jar to the new one, running json files from GSON. As pretty printing
-        // is turned off, they should be minified.
-        new ZipFile(jarPath).withCloseable { inJar ->
-            tempPath.getParentFile().mkdirs()
-            new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(tempPath))).withCloseable { outJar ->
-                inJar.entries().each { entry ->
-                    if(entry.directory) {
-                        outJar.putNextEntry(entry)
-                    } else if(!entry.name.endsWith(".json")) {
-                        outJar.putNextEntry(entry)
-                        inJar.getInputStream(entry).withCloseable { outJar << it }
-                    } else {
-                        ZipEntry newEntry = new ZipEntry(entry.name)
-                        newEntry.setTime(entry.time)
-                        outJar.putNextEntry(newEntry)
-
-                        def element = inJar.getInputStream(entry).withCloseable { gson.fromJson(it.newReader("UTF8"), JsonElement.class) }
-                        outJar.write(gson.toJson(element).getBytes(StandardCharsets.UTF_8))
-                    }
-                }
-
-            }
-        }
-
-        // And replace the original jar again
-        Files.move(tempPath.toPath(), jarPath.toPath(), StandardCopyOption.REPLACE_EXISTING)
-    }
+// ensure that the encoding is set to UTF-8, no matter what the system default is
+// this fixes some edge cases with special characters not displaying correctly
+// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
 }
 
-assemble.dependsOn compressJson
-
-// Check tasks
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "skipped", "failed"
-    }
+// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+// if it is present.
+// If you remove this task, sources will not be generated.
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = "sources"
+    from sourceSets.main.allSource
 }
 
-jacocoTestReport {
-    reports {
-        xml.enabled true
-        html.enabled true
-    }
-}
-
-check.dependsOn jacocoTestReport
-
-license {
-    mapping("java", "SLASHSTAR_STYLE")
-    strictCheck true
-
-    ext.year = Calendar.getInstance().get(Calendar.YEAR)
-}
-
-[licenseMain, licenseFormatMain].forEach {
-    it.configure {
-        include("**/*.java")
-        exclude("dan200/computercraft/api/**")
-        header rootProject.file('config/license/main.txt')
-    }
-}
-
-[licenseTest, licenseFormatTest].forEach {
-    it.configure {
-        include("**/*.java")
-        header rootProject.file('config/license/main.txt')
-    }
-}
-
-gradle.projectsEvaluated {
-    tasks.withType(LicenseFormat) {
-        outputs.upToDateWhen { false }
-    }
-}
-
-
-task licenseAPI(type: LicenseCheck);
-task licenseFormatAPI(type: LicenseFormat);
-[licenseAPI, licenseFormatAPI].forEach {
-    it.configure {
-        source = sourceSets.main.java
-        include("dan200/computercraft/api/**")
-        header rootProject.file('config/license/api.txt')
-    }
-}
-
-// Upload tasks
-
-task checkRelease {
-    group "upload"
-    description "Verifies that everything is ready for a release"
-
-    inputs.property "version", mod_version
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.txt")
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
-
-    doLast {
-        def ok = true
-
-        // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
-        if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
-            ok = false
-            project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
-        }
-
-        // Check "read more" exists and trim it
-        def idx = whatsnew.findIndexOf { it == 'Type "help changelog" to see the full version history.' }
-        if (idx == -1) {
-            ok = false
-            project.logger.error("Must mention the changelog in whatsnew.txt")
-        } else {
-            whatsnew = whatsnew.getAt(0 ..< idx)
-        }
-
-        // Check whatsnew and changelog match.
-        def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
-        if (!changelog.startsWith(versionChangelog)) {
-            ok = false
-            project.logger.error("whatsnew and changelog are not in sync")
-        }
-
-        if (!ok) throw new IllegalStateException("Could not check release")
-    }
-}
-check.dependsOn checkRelease
-
-curseforge {
-    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
-    project {
-        id = '282001'
-        releaseType = 'release'
-        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
-
-        relations {
-            incompatible "computercraft"
-        }
-    }
+jar {
+    from "LICENSE"
+
+    from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
+// configure the maven publication
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            from components.java
-            // artifact sourceJar
-        }
-    }
-}
-
-uploadArchives {
-    repositories {
-        if(project.hasProperty('mavenUploadUrl')) {
-            mavenDeployer {
-                configuration = configurations.deployerJars
-
-                repository(url: project.property('mavenUploadUrl')) {
-                    authentication(
-                        userName: project.property('mavenUploadUser'),
-                        privateKey: project.property('mavenUploadKey'))
-                }
-
-                pom.project {
-                    name 'CC: Tweaked'
-                    packaging 'jar'
-                    description 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
-                    url 'https://github.com/SquidDev-CC/CC-Tweaked'
-
-                    scm {
-                        url 'https://github.com/SquidDev-CC/CC-Tweaked.git'
-                    }
-
-                    issueManagement {
-                        system 'github'
-                        url 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
-                    }
-
-                    licenses {
-                        license {
-                            name 'ComputerCraft Public License, Version 1.0'
-                            url 'https://github.com/SquidDev-CC/CC-Tweaked/blob/master/LICENSE'
-                            distribution 'repo'
-                        }
-                    }
-                }
-
-                pom.whenConfigured { pom ->
-                    pom.dependencies.clear()
-                }
+            // add all the jars that should be included when publishing to maven
+            artifact(remapJar) {
+                builtBy remapJar
+            }
+            artifact(sourcesJar) {
+                builtBy remapSourcesJar
             }
         }
     }
-}
 
-githubRelease {
-    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
-    owner 'SquidDev-CC'
-    repo 'CC-Tweaked'
-    try {
-        targetCommitish = Grgit.open(dir: '.').branch.current().name
-    } catch(Exception ignored) { }
-
-    tagName "v${mc_version}-${mod_version}"
-    releaseName "[${mc_version}] ${mod_version}"
-    body {
-        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
-            .readLines()
-            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
-            .join("\n").trim()
+    // select the repositories you want to publish to
+    repositories {
+        // uncomment to publish to the local maven
+        // mavenLocal()
     }
-    prerelease false
-}
-
-def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
-uploadTasks.forEach { tasks.getByName(it).dependsOn checkRelease }
-
-task uploadAll(dependsOn: uploadTasks) {
-    group "upload"
-    description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }

config/checkstyle/checkstyle.xml

@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC
-    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-    "https://checkstyle.org/dtds/configuration_1_3.dtd">
-<module name="Checker">
-    <property name="tabWidth" value="4"/>
-    <property name="charset" value="UTF-8" />
-
-    <module name="SuppressionFilter">
-        <property name="file" value="config/checkstyle/suppressions.xml" />
-    </module>
-
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="render_old"/>
-    </module>
-
-    <module name="TreeWalker">
-        <!-- Annotations -->
-        <module name="AnnotationLocation" />
-        <module name="AnnotationUseStyle" />
-        <module name="MissingDeprecated" />
-        <module name="MissingOverride" />
-
-        <!-- Blocks -->
-        <module name="EmptyBlock" />
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="ignored" />
-        </module>
-        <module name="LeftCurly">
-            <property name="option" value="nl" />
-            <!-- The defaults, minus lambdas. -->
-            <property name="tokens" value="ANNOTATION_DEF,CLASS_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,LITERAL_CASE,LITERAL_CATCH,LITERAL_DEFAULT,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF,OBJBLOCK,STATIC_INIT" />
-        </module>
-        <module name="NeedBraces">
-            <property name="allowSingleLineStatement" value="true"/>
-        </module>
-        <module name="RightCurly">
-            <property name="option" value="alone" />
-        </module>
-
-        <!-- Class design. As if we've ever followed good practice here. -->
-        <module name="FinalClass" />
-        <module name="InterfaceIsType" />
-        <module name="MutableException" />
-        <module name="OneTopLevelClass" />
-
-        <!-- Coding -->
-        <module name="ArrayTrailingComma" />
-        <module name="EqualsHashCode" />
-        <!-- FallThrough does not handle unreachable code well -->
-        <module name="IllegalInstantiation" />
-        <module name="IllegalThrows" />
-        <module name="ModifiedControlVariable" />
-        <module name="NoClone" />
-        <module name="NoFinalizer" />
-        <module name="OneStatementPerLine" />
-        <module name="PackageDeclaration" />
-        <module name="SimplifyBooleanExpression" />
-        <module name="SimplifyBooleanReturn" />
-        <module name="StringLiteralEquality" />
-        <module name="UnnecessaryParentheses" />
-        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
-        <module name="UnnecessarySemicolonInTryWithResources" />
-        <module name="UnnecessarySemicolonInEnumeration" />
-
-        <!-- Imports -->
-        <module name="CustomImportOrder" />
-        <module name="IllegalImport" />
-        <module name="RedundantImport" />
-        <module name="UnusedImports" />
-
-        <!-- Javadoc -->
-        <!-- TODO: Missing* checks for the dan200.computercraft.api package? -->
-        <module name="AtclauseOrder" />
-        <module name="InvalidJavadocPosition" />
-        <module name="JavadocBlockTagLocation" />
-        <module name="JavadocMethod"/>
-        <module name="JavadocType"/>
-        <module name="JavadocStyle" />
-        <module name="NonEmptyAtclauseDescription" />
-        <module name="SingleLineJavadoc" />
-        <module name="SummaryJavadocCheck"/>
-
-        <!-- Misc -->
-        <module name="ArrayTypeStyle" />
-        <module name="CommentsIndentation" />
-        <module name="Indentation" />
-        <module name="OuterTypeFilename" />
-
-        <!-- Modifiers -->
-        <module name="ModifierOrder" />
-        <module name="RedundantModifier" />
-
-        <!-- Naming -->
-        <module name="ClassTypeParameterName" />
-        <module name="InterfaceTypeParameterName" />
-        <module name="LambdaParameterName" />
-        <module name="LocalFinalVariableName" />
-        <module name="LocalVariableName" />
-        <!-- Allow an optional m_ on private members -->
-        <module name="MemberName">
-            <property name="applyToPrivate" value="false" />
-            <property name="applyToPackage" value="false" />
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^(m_)?[a-z][a-zA-Z0-9]*$" />
-            <property name="applyToPrivate" value="true" />
-            <property name="applyToPackage" value="true" />
-        </module>
-        <module name="MethodName" />
-        <module name="MethodTypeParameterName" />
-        <module name="PackageName">
-            <property name="format" value="^dan200\.computercraf(\.[a-z][a-z0-9]*)*" />
-        </module>
-        <module name="ParameterName" />
-        <module name="StaticVariableName">
-            <property name="format" value="^[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
-            <property name="applyToPrivate" value="false" />
-        </module>
-        <module name="StaticVariableName">
-            <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
-            <property name="applyToPrivate" value="true" />
-        </module>
-        <module name="TypeName" />
-
-        <!-- Whitespace -->
-        <module name="EmptyForInitializerPad"/>
-        <module name="EmptyForIteratorPad">
-            <property name="option" value="space"/>
-        </module>
-        <module name="GenericWhitespace" />
-        <module name="MethodParamPad" />
-        <module name="NoLineWrap" />
-        <module name="NoWhitespaceAfter">
-            <property name="tokens" value="AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP" />
-        </module>
-        <module name="NoWhitespaceBefore" />
-        <!-- TODO: Decide on an OperatorWrap style. -->
-        <module name="ParenPad">
-            <property name="option" value="space" />
-            <property name="tokens" value="ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA" />
-        </module>
-        <module name="ParenPad">
-            <property name="option" value="nospace" />
-            <property name="tokens" value="DOT,EXPR,QUESTION" />
-        </module>
-        <module name="SeparatorWrap">
-            <property name="option" value="eol" />
-            <property name="tokens" value="COMMA,SEMI,ELLIPSIS,ARRAY_DECLARATOR,RBRACK,METHOD_REF" />
-        </module>
-        <module name="SeparatorWrap">
-            <property name="option" value="nl" />
-            <property name="tokens" value="DOT,AT" />
-        </module>
-        <module name="SingleSpaceSeparator" />
-        <module name="TypecastParenPad" />
-        <module name="WhitespaceAfter">
-            <property name="tokens" value="COMMA" />
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true" />
-            <property name="ignoreEnhancedForColon" value="false" />
-            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
-        </module>
-    </module>
-
-    <module name="FileTabCharacter" />
-    <module name="NewlineAtEndOfFile" />
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="message" value="Trailing whitespace"/>
-    </module>
-</module>

config/checkstyle/suppressions.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suppressions PUBLIC
-    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-<suppressions>
-    <!-- All the config options and method fields. -->
-    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
-    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />
-
-    <!-- Do not check for missing package Javadoc. -->
-    <suppress checks="JavadocStyle" files=".*[\\/]package-info.java" />
-
-    <!-- The commands API is documented in Lua. -->
-    <suppress checks="SummaryJavadocCheck" files=".*[\\/]CommandAPI.java" />
-</suppressions>

config/license/api.txt

@@ -1,3 +0,0 @@
-This file is part of the public ComputerCraft API - http://www.computercraft.info
-Copyright Daniel Ratcliffe, 2011-${year}. This API may be redistributed unmodified and in full only.
-For help using the API, and posting your mods, visit the forums at computercraft.info.

config/license/main.txt

@@ -1,3 +0,0 @@
-This file is part of ComputerCraft - http://www.computercraft.info
-Copyright Daniel Ratcliffe, 2011-${year}. Do not distribute without permission.
-Send enquiries to dratcliffe@gmail.com

doc/index.md

@@ -1,11 +0,0 @@
-# ![CC: Tweaked](logo.png) [![Download CC: Tweaked on CurseForge](https://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
-
-CC: Tweaked is a fork of [ComputerCraft], adding programmable computers, turtles and more to Minecraft.
-
-This website contains documentation for all Lua libraries and APIs from the latest version of CC: Tweaked. This
-documentation is still in development, so will most likely be incomplete. If you've found something you think is wrong,
-or would like to help out [please get in touch on GitHub][gh].
-
-[bug]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose
-[computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[gh]: https://github.com/SquidDev-CC/CC-Tweaked "CC:Tweaked on GitHub"

doc/stub/fs.lua

@@ -1,34 +0,0 @@
----  The FS API allows you to manipulate files and the filesystem.
---
--- @module fs
-
---- Returns true if a path is mounted to the parent filesystem.
---
--- The root filesystem "/" is considered a mount, along with disk folders and
--- the rom folder. Other programs (such as network shares) can exstend this to
--- make other mount types by correctly assigning their return value for getDrive.
---
--- @tparam string path The path to check.
--- @treturn boolean If the path is mounted, rather than a normal file/folder.
--- @throws If the path does not exist.
--- @see getDrive
-function isDriveRoot(path) end
-
---[[- Provides completion for a file or directory name, suitable for use with
-@{read}.
-
-When a directory is a possible candidate for completion, two entries are
-included - one with a trailing slash (indicating that entries within this
-directory exist) and one without it (meaning this entry is an immediate
-completion candidate). `include_dirs` can be set to @{false} to only include
-those with a trailing slash.
-
-@tparam string path The path to complete.
-@tparam string location The location where paths are resolved from.
-@tparam[opt] boolean include_files When @{false}, only directories will be
-included in the returned list.
-@tparam[opt] boolean include_dirs When @{false}, "raw" directories will not be
-included in the returned list.
-@treturn { string... } A list of possible completion candidates.
-]]
-function complete(path, location, include_files, include_dirs) end

doc/stub/http.lua

@@ -1,159 +0,0 @@
---- The http library allows communicating with web servers, sending and
--- receiving data from them.
---
--- #### `http_check` event
---
--- @module http
-
---- Asynchronously make a HTTP request to the given url.
---
--- This returns immediately, a [`http_success`](#http-success-event) or
--- [`http_failure`](#http-failure-event) will be queued once the request has
--- completed.
---
--- @tparam      string url   The url to request
--- @tparam[opt] string body  An optional string containing the body of the
--- request. If specified, a `POST` request will be made instead.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of this request.
--- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
--- the body will not be UTF-8 encoded, and the received response will not be
--- decoded.
---
--- @tparam[2] {
---   url = string, body? = string, headers? = { [string] = string },
---   binary? = boolean, method? = string, redirect? = boolean,
--- } request Options for the request.
---
--- This table form is an expanded version of the previous syntax. All arguments
--- from above are passed in as fields instead (for instance,
--- `http.request("https://example.com")` becomes `http.request { url =
--- "https://example.com" }`).
---
--- This table also accepts several additional options:
---
---  - `method`: Which HTTP method to use, for instance `"PATCH"` or `"DELETE"`.
---  - `redirect`: Whether to follow HTTP redirects. Defaults to true.
---
--- @see http.get  For a synchronous way to make GET requests.
--- @see http.post For a synchronous way to make POST requests.
-function request(...) end
-
---- Make a HTTP GET request to the given url.
---
--- @tparam string url   The url to request
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of this request.
--- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
--- the body will not be UTF-8 encoded, and the received response will not be
--- decoded.
---
--- @tparam[2] {
---   url = string, headers? = { [string] = string },
---   binary? = boolean, method? = string, redirect? = boolean,
--- } request Options for the request. See @{http.request} for details on how
--- these options behave.
---
--- @treturn Response The resulting http response, which can be read from.
--- @treturn[2] nil When the http request failed, such as in the event of a 404
--- error or connection timeout.
--- @treturn string A message detailing why the request failed.
--- @treturn Response|nil The failing http response, if available.
---
--- @usage Make a request to [example.computercraft.cc](https://example.computercraft.cc),
--- and print the returned page.
--- ```lua
--- local request = http.get("https://example.computercraft.cc")
--- print(request.readAll())
--- -- => HTTP is working!
--- request.close()
--- ```
-function get(...) end
-
---- Make a HTTP POST request to the given url.
---
--- @tparam string url   The url to request
--- @tparam string body  The body of the POST request.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of this request.
--- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
--- the body will not be UTF-8 encoded, and the received response will not be
--- decoded.
---
--- @tparam[2] {
---   url = string, body? = string, headers? = { [string] = string },
---   binary? = boolean, method? = string, redirect? = boolean,
--- } request Options for the request. See @{http.request} for details on how
--- these options behave.
---
--- @treturn Response The resulting http response, which can be read from.
--- @treturn[2] nil When the http request failed, such as in the event of a 404
--- error or connection timeout.
--- @treturn string A message detailing why the request failed.
--- @treturn Response|nil The failing http response, if available.
-function post(...) end
-
---- Asynchronously determine whether a URL can be requested.
---
--- If this returns `true`, one should also listen for [`http_check`
--- events](#http-check-event) which will container further information about
--- whether the URL is allowed or not.
---
--- @tparam string url The URL to check.
--- @treturn true When this url is not invalid. This does not imply that it is
--- allowed - see the comment above.
--- @treturn[2] false When this url is invalid.
--- @treturn string A reason why this URL is not valid (for instance, if it is
--- malformed, or blocked).
---
--- @see http.checkURL For a synchronous version.
-function checkURLAsync(url) end
-
---- Determine whether a URL can be requested.
---
--- If this returns `true`, one should also listen for [`http_check`
--- events](#http-check-event) which will container further information about
--- whether the URL is allowed or not.
---
--- @tparam string url The URL to check.
--- @treturn true When this url is valid and can be requested via @{http.request}.
--- @treturn[2] false When this url is invalid.
--- @treturn string A reason why this URL is not valid (for instance, if it is
--- malformed, or blocked).
---
--- @see http.checkURLAsync For an asynchronous version.
---
--- @usage
--- ```lua
--- print(http.checkURL("https://example.computercraft.cc/"))
--- -- => true
--- print(http.checkURL("http://localhost/"))
--- -- => false Domain not permitted
--- print(http.checkURL("not a url"))
--- -- => false URL malformed
--- ```
-function checkURL(url) end
-
---- Open a websocket.
---
--- @tparam string url The websocket url to connect to. This should have the
--- `ws://` or `wss://` protocol.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of the initial websocket connection.
---
--- @treturn Websocket The websocket connection.
--- @treturn[2] false If the websocket connection failed.
--- @treturn string An error message describing why the connection failed.
-function websocket(url, headers) end
-
---- Asynchronously open a websocket.
---
--- This returns immediately, a [`websocket_success`](#websocket-success-event)
--- or [`websocket_failure`](#websocket-failure-event) will be queued once the
--- request has completed.
---
--- @tparam string url The websocket url to connect to. This should have the
--- `ws://` or `wss://` protocol.
--- @tparam[opt] { [string] = string } headers Additional headers to send as part
--- of the initial websocket connection.
-function websocketAsync(url, headers) end

doc/stub/os.lua

@@ -1,6 +0,0 @@
--- Defined in bios.lua
-function loadAPI(path) end
-function pullEvent(filter) end
-function pullEventRaw(filter) end
-function version() end
-function run(env, path, ...) end

doc/stub/turtle.lua

@@ -1 +0,0 @@
-function craft(limit) end

doc/styles.css

@@ -1,191 +0,0 @@
-/* Basic reset on elements */
-h1, h2, h3, h4, p, table, div, body {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    font-size: 100%;
-    font: inherit;
-    vertical-align: baseline;
-}
-/* Make the page a little more airy */
-body {
-    margin: 20px auto;
-    max-width: 1200px;
-    padding: 0 10px;
-    line-height: 1.6;
-    color: #222;
-    background: #fff;
-}
-
-/* Try to use system default fonts. */
-body {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans",
-                 "Droid Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-}
-
-code, pre, .parameter, .type, .definition-name, .reference-code {
-    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
-}
-
-/* Some definitions of basic tags */
-code {
-    color: #c7254e;
-    background-color: #f9f2f4;
-}
-
-p {
-    margin: 0.9em 0;
-}
-
-h1 {
-    font-size: 1.5em;
-    font-weight: lighter;
-    border-bottom: solid 1px #aaa;
-}
-
-h2, h3, h4 { margin: 1.4em 0 0.3em;}
-h2 { font-size: 1.25em; }
-h3 { font-size: 1.15em; font-weight: bold; }
-h4 { font-size: 1.06em; }
-
-a, a:visited, a:active { font-weight: bold; color: #004080; text-decoration: none; }
-a:hover { text-decoration: underline; }
-
-blockquote {
-    padding: 0.3em;
-    margin: 1em 0;
-    background: #f0f0f0;
-    border-left: solid 0.5em #ccc;
-}
-
-/* Stop sublists from having initial vertical space */
-ul ul { margin-top: 0px; }
-ol ul { margin-top: 0px; }
-ol ol { margin-top: 0px; }
-ul ol { margin-top: 0px; }
-
-/* Make the target distinct; helps when we're navigating to a function */
-a:target + * { background-color: #FFFF99; }
-
-/* Allow linking to any subsection */
-a[name]::before { content: "#"; }
-
-/* Layout */
-#main {
-    display: flex;
-    flex-wrap: nowrap;
-    justify-content: space-between;
-    min-height: calc(100vh - 100px);
-}
-
-#main > nav {
-    flex-basis: 30%;
-    min-width: 150px;
-    max-width: 250px;
-    background-color: #f0f0f0;
-}
-
-nav h1, nav ul { padding: 0em 10px; }
-
-nav h2 {
-    background-color:#e7e7e7;
-    font-size: 1.1em;
-    color:#000000;
-    padding: 5px 10px;
-}
-
-nav ul {
-    list-style-type: none;
-    margin: 0;
-}
-
-#content {
-    flex-shrink: 1;
-    flex-basis: 80%;
-    padding: 0px 10px;
-}
-
-footer {
-    text-align: right;
-    font-size: 0.8em;
-}
-
-/* The definition lists at the top of each page */
-table.definition-list {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-table.definition-list td, table.definition-list th {
-    border: 1px solid #cccccc;
-    padding: 5px;
-}
-
-table.definition-list th {
-    background-color: #f0f0f0;
-    min-width: 200px;
-    white-space: nowrap;
-    text-align: right;
-}
-
-table.definition-list td { width: 100%; }
-
-dl.definition dt {
-    border-top: 1px solid #ccc;
-    padding-top: 1em;
-    display: flex;
-}
-
-dl.definition dt .definition-name {
-    padding: 0 0.1em;
-    margin: 0 0.1em;
-    flex-grow: 1;
-}
-
-
-dl.definition dd {
-    padding-bottom: 1em;
-    margin: 10px 0 0 20px;
-}
-
-dl.definition h3 {
-    font-size: .95em;
-}
-
-/* Links to source-code */
-.source-link { font-size: 0.8em; }
-.source-link::before { content: '[' }
-.source-link::after  { content: ']' }
-a.source-link, a.source-link:visited, a.source-link:active { color: #505050; }
-
-/* Method definitions */
-span.parameter:after { content:":"; padding-left: 0.3em; }
-.optional { text-decoration: underline dotted; }
-
-/** Fancy colour display. */
-.colour-ref {
-    display: inline-block;
-    width: 0.8em;
-    height: 0.8em;
-    margin: 0.1em 0.1em 0.3em 0.1em; /* Terrrible hack to force vertical alignment. */
-    border: solid 1px black;
-    box-sizing: border-box;
-    vertical-align: middle;
-}
-
-/* styles for prettification of source */
-.highlight .comment { color: #558817; }
-.highlight .constant { color: #a8660d; }
-.highlight .escape { color: #844631; }
-.highlight .keyword { color: #aa5050; font-weight: bold; }
-.highlight .library { color: #0e7c6b; }
-.highlight .marker { color: #512b1e; background: #fedc56; font-weight: bold; }
-.highlight .string { color: #8080ff; }
-.highlight .literal-kw { color: #8080ff; }
-.highlight .number { color: #f8660d; }
-.highlight .operator { color: #2239a8; font-weight: bold; }
-.highlight .preprocessor, pre .prepro { color: #a33243; }
-.highlight .global { color: #800080; }
-.highlight .user-keyword { color: #800080; }
-.highlight .prompt { color: #558817; }
-.highlight .url { color: #272fc2; text-decoration: underline; }

gradle.properties

@@ -1,7 +1,17 @@
-# Mod properties
-mod_version=1.91.0
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
 
-# Minecraft properties (update mods.toml when changing)
-mc_version=1.15.2
-forge_version=31.1.41
-mappings_version=20200429-1.15.1
+# Mod properties
+mod_version=1.91.1
+
+# Minecraft properties
+mc_version=1.16.2
+mappings_version=31
+
+# Dependencies
+cloth_config_version=4.8.1
+fabric_api_version=0.19.0+build.398-1.16
+fabric_loader_version=0.9.2+build.206
+jankson_version=1.2.0
+modmenu_version=1.14.6+
+cloth_api_version=1.4.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Tue Jul 07 13:15:43 EDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

illuaminate.sexp

@@ -1,110 +0,0 @@
-; -*- mode: Lisp;-*-
-
-(sources
-  /doc/stub/
-  /doc/javadoc/
-  /src/main/resources/*/computercraft/lua/bios.lua
-  /src/main/resources/*/computercraft/lua/rom/
-  /src/test/resources/test-rom)
-
-
-(doc
-  (title "CC: Tweaked")
-  (index doc/index.md)
-  (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
-
-  (module-kinds
-    (peripheral Peripherals))
-
-  (library-path
-    /doc/stub/
-    /doc/javadoc/
-
-    /src/main/resources/*/computercraft/lua/rom/apis
-    /src/main/resources/*/computercraft/lua/rom/apis/command
-    /src/main/resources/*/computercraft/lua/rom/apis/turtle
-
-    /src/main/resources/*/computercraft/lua/rom/modules/main
-    /src/main/resources/*/computercraft/lua/rom/modules/command
-    /src/main/resources/*/computercraft/lua/rom/modules/turtle))
-
-(at /
-  (linters
-    syntax:string-index
-
-    ;; It'd be nice to avoid this, but right now there's a lot of instances of
-    ;; it.
-    -var:set-loop
-
-    ;; It's useful to name arguments for documentation, so we allow this. It'd
-    ;; be good to find a compromise in the future, but this works for now.
-    -var:unused-arg)
-
-  (lint
-    (bracket-spaces
-      (call no-space)
-      (function-args no-space)
-      (parens no-space)
-      (table space)
-      (index no-space))
-
-    ;; colours imports from colors, and we don't handle that right now.
-    ;; keys is entirely dynamic, so we skip it.
-    (dynamic-modules colours keys)
-
-    (globals
-      :max
-      _CC_DEFAULT_SETTINGS
-      _CC_DISABLE_LUA51_FEATURES
-      ;; Ideally we'd pick these up from bios.lua, but illuaminate currently
-      ;; isn't smart enough.
-      sleep write printError read rs)))
-
-;; We disable the unused global linter in bios.lua and the APIs. In the future
-;; hopefully we'll get illuaminate to handle this.
-(at
-  (/src/main/resources/*/computercraft/lua/bios.lua
-   /src/main/resources/*/computercraft/lua/rom/apis/)
-  (linters -var:unused-global)
-  (lint (allow-toplevel-global true)))
-
-;; Silence some variable warnings in documentation stubs.
-(at (/doc/stub/ /doc/javadoc/)
-  (linters -var:unused-global)
-  (lint (allow-toplevel-global true)))
-
-;; Suppress warnings for currently undocumented modules.
-(at
-  (; Java APIs
-   /doc/stub/http.lua
-   /doc/stub/os.lua
-   /doc/stub/turtle.lua
-   ; Java generated APIs
-   /doc/javadoc/turtle.lua
-   ; Peripherals
-   /doc/javadoc/drive.lua
-   /doc/javadoc/speaker.lua
-   /doc/javadoc/printer.lua
-   ; Lua APIs
-   /src/main/resources/*/computercraft/lua/rom/apis/io.lua
-   /src/main/resources/*/computercraft/lua/rom/apis/window.lua)
-
-  (linters -doc:undocumented -doc:undocumented-arg -doc:undocumented-return))
-
-;; These currently rely on unknown references.
-(at
-  (/src/main/resources/*/computercraft/lua/rom/apis/textutils.lua
-   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/completion.lua
-   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/shell/completion.lua
-   /src/main/resources/*/computercraft/lua/rom/programs/shell.lua
-   /doc/stub/fs.lua)
-  (linters -doc:unresolved-reference))
-
-(at /src/test/resources/test-rom
-  ; We should still be able to test deprecated members.
-  (linters -var:deprecated)
-
-  (lint
-    (globals
-      :max sleep write
-      cct_test describe expect howlci fail it pending stub)))

settings.gradle

@@ -1 +1,12 @@
-rootProject.name = "cc-tweaked-${mc_version}"
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "cc-tweaked-fabric-${mc_version}"

src/generated/resources/data/computercraft/recipes/printer.json

@@ -1,22 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###",
-    "#R#",
-    "#D#"
-  ],
-  "key": {
-    "#": {
-      "tag": "forge:stone"
-    },
-    "R": {
-      "tag": "forge:dusts/redstone"
-    },
-    "D": {
-      "tag": "forge:dyes"
-    }
-  },
-  "result": {
-    "item": "computercraft:printer"
-  }
-}

src/main/java/dan200/computercraft/ComputerCraft.java

@@ -3,25 +3,13 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft;
 
-import dan200.computercraft.api.turtle.event.TurtleAction;
-import dan200.computercraft.core.apis.http.options.Action;
-import dan200.computercraft.core.apis.http.options.AddressRule;
-import dan200.computercraft.core.asm.GenericSource;
-import dan200.computercraft.shared.Config;
-import dan200.computercraft.shared.Registry;
-import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
-import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
-import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
-import dan200.computercraft.shared.pocket.peripherals.PocketModem;
-import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
-import dan200.computercraft.shared.turtle.upgrades.*;
-import dan200.computercraft.shared.util.ServiceUtil;
-import net.minecraftforge.fml.common.Mod;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import static dan200.computercraft.shared.ComputerCraftRegistry.ModBlocks;
+import static dan200.computercraft.shared.ComputerCraftRegistry.init;
 
+import java.nio.file.Paths;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
@@ -30,111 +18,140 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@Mod( ComputerCraft.MOD_ID )
-public final class ComputerCraft
-{
-    public static final String MOD_ID = "computercraft";
+import dan200.computercraft.api.turtle.event.TurtleAction;
+import dan200.computercraft.core.apis.AddressPredicate;
+import dan200.computercraft.core.apis.http.options.Action;
+import dan200.computercraft.core.apis.http.options.AddressRule;
+import dan200.computercraft.core.apis.http.websocket.Websocket;
+import dan200.computercraft.shared.common.ColourableRecipe;
+import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
+import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
+import dan200.computercraft.shared.computer.recipe.ComputerUpgradeRecipe;
+import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
+import dan200.computercraft.shared.data.HasComputerIdLootCondition;
+import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
+import dan200.computercraft.shared.media.recipes.DiskRecipe;
+import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
+import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
+import dan200.computercraft.shared.pocket.peripherals.PocketModem;
+import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
+import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
+import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
+import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
+import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
+import dan200.computercraft.shared.turtle.upgrades.TurtleAxe;
+import dan200.computercraft.shared.turtle.upgrades.TurtleCraftingTable;
+import dan200.computercraft.shared.turtle.upgrades.TurtleHoe;
+import dan200.computercraft.shared.turtle.upgrades.TurtleModem;
+import dan200.computercraft.shared.turtle.upgrades.TurtleShovel;
+import dan200.computercraft.shared.turtle.upgrades.TurtleSpeaker;
+import dan200.computercraft.shared.turtle.upgrades.TurtleSword;
+import dan200.computercraft.shared.turtle.upgrades.TurtleTool;
+import dan200.computercraft.shared.util.Config;
+import dan200.computercraft.shared.util.ImpostorRecipe;
+import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
+import net.fabricmc.loader.api.FabricLoader;
+
+public final class ComputerCraft implements ModInitializer {
+    public static final String MOD_ID = "computercraft";
     // Configuration options
-    public static final String[] DEFAULT_HTTP_ALLOW = new String[] { "*" };
-    public static final String[] DEFAULT_HTTP_DENY = new String[] {
+    public static final String[] DEFAULT_HTTP_WHITELIST = new String[] {"*"};
+    public static final String[] DEFAULT_HTTP_BLACKLIST = new String[] {
         "127.0.0.0/8",
         "10.0.0.0/8",
         "172.16.0.0/12",
         "192.168.0.0/16",
         "fd00::/8",
-    };
-
+        };
+    public static final int terminalWidth_computer = 51;
+    public static final int terminalHeight_computer = 19;
+    public static final int terminalWidth_turtle = 39;
+    public static final int terminalHeight_turtle = 13;
+    public static final int terminalWidth_pocketComputer = 26;
+    public static final int terminalHeight_pocketComputer = 20;
+    // Registries
+    public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
+    public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
+    // Logging
+    public static final Logger log = LogManager.getLogger(MOD_ID);
+    public static ItemGroup MAIN_GROUP = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "main"), () -> new ItemStack(ModBlocks.COMPUTER_NORMAL));
+    public static List<AddressRule> httpRules = Collections.unmodifiableList(Stream.concat(Stream.of(DEFAULT_HTTP_BLACKLIST)
+                                                                                                 .map(x -> AddressRule.parse(x, Action.DENY.toPartial()))
+                                                                                                 .filter(Objects::nonNull),
+                                                                                           Stream.of(DEFAULT_HTTP_WHITELIST)
+                                                                                                 .map(x -> AddressRule.parse(x, Action.ALLOW.toPartial()))
+                                                                                                 .filter(Objects::nonNull))
+                                                                                   .collect(Collectors.toList()));
+    public static boolean commandRequireCreative = false;
+    public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
     public static int computerSpaceLimit = 1000 * 1000;
     public static int floppySpaceLimit = 125 * 1000;
     public static int maximumFilesOpen = 128;
-    public static boolean disableLua51Features = false;
-    public static String defaultComputerSettings = "";
-    public static boolean debugEnable = true;
-    public static boolean logComputerErrors = true;
-    public static boolean commandRequireCreative = true;
-
-    public static int computerThreads = 1;
-    public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
-    public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
-
-    public static boolean httpEnabled = true;
-    public static boolean httpWebsocketEnabled = true;
-    public static List<AddressRule> httpRules = Collections.unmodifiableList( Stream.concat(
-        Stream.of( DEFAULT_HTTP_DENY )
-            .map( x -> AddressRule.parse( x, Action.DENY.toPartial() ) )
-            .filter( Objects::nonNull ),
-        Stream.of( DEFAULT_HTTP_ALLOW )
-            .map( x -> AddressRule.parse( x, Action.ALLOW.toPartial() ) )
-            .filter( Objects::nonNull )
-    ).collect( Collectors.toList() ) );
-
+    public static boolean disable_lua51_features = false;
+    public static String default_computer_settings = "";
+    public static boolean debug_enable = true;
+    public static boolean logPeripheralErrors = false;
+    public static int computer_threads = 1;
+    public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos(10);
+    public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos(5);
+    public static boolean http_enable = true;
+    public static boolean http_websocket_enable = true;
+    public static AddressPredicate http_whitelist = new AddressPredicate(DEFAULT_HTTP_WHITELIST);
+    public static AddressPredicate http_blacklist = new AddressPredicate(DEFAULT_HTTP_BLACKLIST);
+    public static int httpTimeout = 30000;
     public static int httpMaxRequests = 16;
+    public static long httpMaxDownload = 16 * 1024 * 1024;
+    public static long httpMaxUpload = 4 * 1024 * 1024;
     public static int httpMaxWebsockets = 4;
-
+    public static int httpMaxWebsocketMessage = Websocket.MAX_MESSAGE_SIZE;
     public static boolean enableCommandBlock = false;
-    public static int modemRange = 64;
-    public static int modemHighAltitudeRange = 384;
-    public static int modemRangeDuringStorm = 64;
-    public static int modemHighAltitudeRangeDuringStorm = 384;
+    public static int modem_range = 64;
+    public static int modem_highAltitudeRange = 384;
+    public static int modem_rangeDuringStorm = 64;
+    public static int modem_highAltitudeRangeDuringStorm = 384;
     public static int maxNotesPerTick = 8;
-    public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
-    public static double monitorDistanceSq = 4096;
-    public static long monitorBandwidth = 1_000_000;
-
     public static boolean turtlesNeedFuel = true;
     public static int turtleFuelLimit = 20000;
     public static int advancedTurtleFuelLimit = 100000;
     public static boolean turtlesObeyBlockProtection = true;
     public static boolean turtlesCanPush = true;
-    public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf( TurtleAction.class );
-
-    public static boolean genericPeripheral = false;
-
-    public static int computerTermWidth = 51;
-    public static int computerTermHeight = 19;
-
-    public static final int turtleTermWidth = 39;
-    public static final int turtleTermHeight = 13;
-
-    public static int pocketTermWidth = 26;
-    public static int pocketTermHeight = 20;
-
+    public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf(TurtleAction.class);
     public static int monitorWidth = 8;
     public static int monitorHeight = 6;
+    public static double monitorDistanceSq = 4096;
 
-    public static final class TurtleUpgrades
-    {
-        public static TurtleModem wirelessModemNormal;
-        public static TurtleModem wirelessModemAdvanced;
-        public static TurtleSpeaker speaker;
-
-        public static TurtleCraftingTable craftingTable;
-        public static TurtleSword diamondSword;
-        public static TurtleShovel diamondShovel;
-        public static TurtleTool diamondPickaxe;
-        public static TurtleAxe diamondAxe;
-        public static TurtleHoe diamondHoe;
+    @Override
+    public void onInitialize() {
+        Config.load(Paths.get(FabricLoader.getInstance()
+                                          .getConfigDir()
+                                          .toFile()
+                                          .getPath(), MOD_ID + ".json5"));
+        ComputerCraftProxyCommon.init();
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "colour"), ColourableRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "computer_upgrade"), ComputerUpgradeRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER,
+                          new Identifier(ComputerCraft.MOD_ID, "pocket_computer_upgrade"),
+                          PocketComputerUpgradeRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "disk"), DiskRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "printout"), PrintoutRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "turtle"), TurtleRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "turtle_upgrade"), TurtleUpgradeRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "impostor_shaped"), ImpostorRecipe.SERIALIZER);
+        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "impostor_shapeless"), ImpostorShapelessRecipe.SERIALIZER);
+        Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "block_named"), BlockNamedEntityLootCondition.TYPE);
+        Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "player_creative"), PlayerCreativeLootCondition.TYPE);
+        Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "has_id"), HasComputerIdLootCondition.TYPE);
+        init();
     }
 
-    public static final class PocketUpgrades
-    {
-        public static PocketModem wirelessModemNormal;
-        public static PocketModem wirelessModemAdvanced;
-        public static PocketSpeaker speaker;
-    }
-
-    // Registries
-    public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
-    public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
-
-    // Logging
-    public static final Logger log = LogManager.getLogger( MOD_ID );
-
-    public ComputerCraft()
-    {
-        Config.setup();
-        Registry.setup();
-        GenericSource.setup( () -> ServiceUtil.loadServicesForge( GenericSource.class ) );
-    }
 }

src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java

@@ -3,8 +3,16 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
@@ -20,149 +28,147 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.core.apis.ApiFactories;
 import dan200.computercraft.core.filesystem.FileMount;
 import dan200.computercraft.core.filesystem.ResourceMount;
-import dan200.computercraft.shared.*;
+import dan200.computercraft.mixin.MinecraftServerAccess;
+import dan200.computercraft.shared.BundledRedstone;
+import dan200.computercraft.shared.MediaProviders;
+import dan200.computercraft.shared.Peripherals;
+import dan200.computercraft.shared.PocketUpgrades;
+import dan200.computercraft.shared.TurtleUpgrades;
+import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
+import dan200.computercraft.shared.peripheral.modem.wired.TileWiredModemFull;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
-import net.minecraft.resources.IReloadableResourceManager;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
+import me.shedaniel.cloth.api.utils.v1.GameInstanceUtils;
+
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.resource.ReloadableResourceManager;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockReader;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
 
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import net.fabricmc.loader.api.FabricLoader;
 
-import static dan200.computercraft.shared.Capabilities.CAPABILITY_WIRED_ELEMENT;
-
-public final class ComputerCraftAPIImpl implements IComputerCraftAPI
-{
+public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
     public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
 
     private String version;
 
-    private ComputerCraftAPIImpl()
-    {
+    private ComputerCraftAPIImpl() {
     }
 
-    public static InputStream getResourceFile( String domain, String subPath )
-    {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
-        try
-        {
-            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
-        }
-        catch( IOException ignored )
-        {
-            return null;
+    public static InputStream getResourceFile(String domain, String subPath) {
+        MinecraftServer server = GameInstanceUtils.getServer();
+        if (server != null) {
+            ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess)server).getServerResourceManager().getResourceManager();
+            try {
+                return manager.getResource(new Identifier(domain, subPath))
+                              .getInputStream();
+            } catch (IOException ignored) {
+                return null;
+            }
         }
+        return null;
     }
 
     @Nonnull
     @Override
-    public String getInstalledVersion()
-    {
-        if( version != null ) return version;
-        return version = ModList.get().getModContainerById( ComputerCraft.MOD_ID )
-            .map( x -> x.getModInfo().getVersion().toString() )
-            .orElse( "unknown" );
-    }
-
-    @Override
-    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
-    {
-        return IDAssigner.getNextId( parentSubPath );
-    }
-
-    @Override
-    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
-    {
-        try
-        {
-            return new FileMount( new File( IDAssigner.getDir(), subPath ), capacity );
+    public String getInstalledVersion() {
+        if (this.version != null) {
+            return this.version;
         }
-        catch( Exception e )
-        {
+        return this.version = FabricLoader.getInstance()
+                                          .getModContainer(ComputerCraft.MOD_ID)
+                                          .map(x -> x.getMetadata()
+                                                .getVersion()
+                                                .toString())
+                                          .orElse("unknown");
+    }
+
+    @Override
+    public int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath) {
+        return IDAssigner.getNextId(parentSubPath);
+    }
+
+    @Override
+    public IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity) {
+        try {
+            return new FileMount(new File(IDAssigner.getDir(), subPath), capacity);
+        } catch (Exception e) {
             return null;
         }
     }
 
     @Override
-    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
-    {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
-        ResourceMount mount = ResourceMount.get( domain, subPath, manager );
-        return mount.exists( "" ) ? mount : null;
+    public IMount createResourceMount(@Nonnull String domain, @Nonnull String subPath) {
+        MinecraftServer server = GameInstanceUtils.getServer();
+        if (server != null) {
+            ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess)server).getServerResourceManager().getResourceManager();
+            ResourceMount mount = ResourceMount.get(domain, subPath, manager);
+            return mount.exists("") ? mount : null;
+        }
+        return null;
     }
 
     @Override
-    public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
-    {
-        Peripherals.register( provider );
+    public void registerPeripheralProvider(@Nonnull IPeripheralProvider provider) {
+        Peripherals.register(provider);
     }
 
     @Override
-    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
-    {
-        TurtleUpgrades.register( upgrade );
+    public void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade) {
+        TurtleUpgrades.register(upgrade);
     }
 
     @Override
-    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
-    {
-        BundledRedstone.register( provider );
+    public void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider) {
+        BundledRedstone.register(provider);
     }
 
     @Override
-    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        return BundledRedstone.getDefaultOutput( world, pos, side );
+    public int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+        return BundledRedstone.getDefaultOutput(world, pos, side);
     }
 
     @Override
-    public void registerMediaProvider( @Nonnull IMediaProvider provider )
-    {
-        MediaProviders.register( provider );
+    public void registerMediaProvider(@Nonnull IMediaProvider provider) {
+        MediaProviders.register(provider);
     }
 
     @Override
-    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-    {
-        PocketUpgrades.register( upgrade );
+    public void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade) {
+        PocketUpgrades.register(upgrade);
     }
 
     @Nonnull
     @Override
-    public IPacketNetwork getWirelessNetwork()
-    {
+    public IPacketNetwork getWirelessNetwork() {
         return WirelessNetwork.getUniversal();
     }
 
     @Override
-    public void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
-    {
-        ApiFactories.register( factory );
+    public void registerAPIFactory(@Nonnull ILuaAPIFactory factory) {
+        ApiFactories.register(factory);
     }
 
     @Nonnull
     @Override
-    public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
-    {
-        return new WiredNode( element );
+    public IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element) {
+        return new WiredNode(element);
     }
 
-    @Nonnull
+    @Nullable
     @Override
-    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        TileEntity tile = world.getTileEntity( pos );
-        return tile == null ? LazyOptional.empty() : tile.getCapability( CAPABILITY_WIRED_ELEMENT, side );
+    public IWiredElement getWiredElementAt(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+        BlockEntity tile = world.getBlockEntity(pos);
+        if (tile instanceof TileCable) {
+            return ((TileCable) tile).getElement(side);
+        } else if (tile instanceof TileWiredModemFull) {
+            return ((TileWiredModemFull) tile).getElement();
+        }
+        return null;
     }
 }

src/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -3,8 +3,12 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
@@ -19,34 +23,44 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockReader;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.LazyOptional;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
 
 /**
  * The static entry point to the ComputerCraft API.
  *
- * Members in this class must be called after mod_ComputerCraft has been initialised, but may be called before it is
- * fully loaded.
+ * Members in this class must be called after mod_ComputerCraft has been initialised, but may be called before it is fully loaded.
  */
-public final class ComputerCraftAPI
-{
+public final class ComputerCraftAPI {
+    private static IComputerCraftAPI instance;
+
     @Nonnull
-    public static String getInstalledVersion()
-    {
+    @Deprecated
+    public static String getAPIVersion() {
+        return getInstalledVersion();
+    }
+
+    @Nonnull
+    public static String getInstalledVersion() {
         return getInstance().getInstalledVersion();
     }
 
     @Nonnull
-    @Deprecated
-    public static String getAPIVersion()
-    {
-        return getInstalledVersion();
+    private static IComputerCraftAPI getInstance() {
+        if (instance != null) {
+            return instance;
+        }
+
+        try {
+            return instance = (IComputerCraftAPI) Class.forName("dan200.computercraft.ComputerCraftAPIImpl")
+                                                       .getField("INSTANCE")
+                                                       .get(null);
+        } catch (ReflectiveOperationException e) {
+            throw new IllegalStateException("Cannot find ComputerCraft API", e);
+        }
     }
 
     /**
@@ -54,31 +68,29 @@ public final class ComputerCraftAPI
      *
      * Use in conjunction with createSaveDirMount() to create a unique place for your peripherals or media items to store files.
      *
-     * @param world         The world for which the save dir should be created. This should be the server side world object.
+     * @param world The world for which the save dir should be created. This should be the server side world object.
      * @param parentSubPath The folder path within the save directory where the new directory should be created. eg: "computercraft/disk"
      * @return The numerical value of the name of the new folder, or -1 if the folder could not be created for some reason.
      *
-     * eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now
-     * available for writing.
+     *     eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now available for writing.
      * @see #createSaveDirMount(World, String, long)
      */
-    public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
-    {
-        return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
+    public static int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath) {
+        return getInstance().createUniqueNumberedSaveDir(world, parentSubPath);
     }
 
     /**
      * Creates a file system mount that maps to a subfolder of the save directory for a given world, and returns it.
      *
-     * Use in conjunction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a folder from the
-     * users save directory onto a computers file system.
+     * Use in conjunction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a folder from the users save directory onto a computers
+     * file system.
      *
-     * @param world    The world for which the save dir can be found. This should be the server side world object.
-     * @param subPath  The folder path within the save directory that the mount should map to. eg: "computer/disk/42".
-     *                 Use createUniqueNumberedSaveDir() to create a new numbered folder to use.
+     * @param world The world for which the save dir can be found. This should be the server side world object.
+     * @param subPath The folder path within the save directory that the mount should map to. eg: "computer/disk/42". Use createUniqueNumberedSaveDir()
+     *     to create a new numbered folder to use.
      * @param capacity The amount of data that can be stored in the directory before it fills up, in bytes.
-     * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable()
-     * to mount this on a Computers' file system.
+     * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable() to mount this on a
+     *     Computers' file system.
      * @see #createUniqueNumberedSaveDir(World, String)
      * @see IComputerAccess#mount(String, IMount)
      * @see IComputerAccess#mountWritable(String, IWritableMount)
@@ -86,21 +98,19 @@ public final class ComputerCraftAPI
      * @see IWritableMount
      */
     @Nullable
-    public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
-    {
-        return getInstance().createSaveDirMount( world, subPath, capacity );
+    public static IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity) {
+        return getInstance().createSaveDirMount(world, subPath, capacity);
     }
 
     /**
      * Creates a file system mount to a resource folder, and returns it.
      *
-     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a
-     * resource folder onto a computer's file system.
+     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a resource folder onto a computer's file
+     * system.
      *
-     * The files in this mount will be a combination of files in all mod jar, and data packs that contain
-     * resources with the same domain and path.
+     * The files in this mount will be a combination of files in all mod jar, and data packs that contain resources with the same domain and path.
      *
-     * @param domain  The domain under which to look for resources. eg: "mymod".
+     * @param domain The domain under which to look for resources. eg: "mymod".
      * @param subPath The subPath under which to look for resources. eg: "lua/myfiles".
      * @return The mount, or {@code null} if it could be created for some reason.
      * @see IComputerAccess#mount(String, IMount)
@@ -108,9 +118,8 @@ public final class ComputerCraftAPI
      * @see IMount
      */
     @Nullable
-    public static IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
-    {
-        return getInstance().createResourceMount( domain, subPath );
+    public static IMount createResourceMount(@Nonnull String domain, @Nonnull String subPath) {
+        return getInstance().createResourceMount(domain, subPath);
     }
 
     /**
@@ -120,22 +129,19 @@ public final class ComputerCraftAPI
      * @see IPeripheral
      * @see IPeripheralProvider
      */
-    public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
-    {
-        getInstance().registerPeripheralProvider( provider );
+    public static void registerPeripheralProvider(@Nonnull IPeripheralProvider provider) {
+        getInstance().registerPeripheralProvider(provider);
     }
 
     /**
-     * Registers a new turtle turtle for use in ComputerCraft. After calling this,
-     * users should be able to craft Turtles with your new turtle. It is recommended to call
-     * this during the load() method of your mod.
+     * Registers a new turtle turtle for use in ComputerCraft. After calling this, users should be able to craft Turtles with your new turtle. It is
+     * recommended to call this during the load() method of your mod.
      *
      * @param upgrade The turtle upgrade to register.
      * @see ITurtleUpgrade
      */
-    public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
-    {
-        getInstance().registerTurtleUpgrade( upgrade );
+    public static void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade) {
+        getInstance().registerTurtleUpgrade(upgrade);
     }
 
     /**
@@ -144,24 +150,22 @@ public final class ComputerCraftAPI
      * @param provider The bundled redstone provider to register.
      * @see IBundledRedstoneProvider
      */
-    public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
-    {
-        getInstance().registerBundledRedstoneProvider( provider );
+    public static void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider) {
+        getInstance().registerBundledRedstoneProvider(provider);
     }
 
     /**
      * If there is a Computer or Turtle at a certain position in the world, get it's bundled redstone output.
      *
      * @param world The world this block is in.
-     * @param pos   The position this block is at.
-     * @param side  The side to extract the bundled redstone output from.
-     * @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned.
-     * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
+     * @param pos The position this block is at.
+     * @param side The side to extract the bundled redstone output from.
+     * @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned. If there is no block
+     *     capable of emitting bundled redstone at the location, -1 will be returned.
      * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        return getInstance().getBundledRedstoneOutput( world, pos, side );
+    public static int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+        return getInstance().getBundledRedstoneOutput(world, pos, side);
     }
 
     /**
@@ -170,14 +174,12 @@ public final class ComputerCraftAPI
      * @param provider The media provider to register.
      * @see IMediaProvider
      */
-    public static void registerMediaProvider( @Nonnull IMediaProvider provider )
-    {
-        getInstance().registerMediaProvider( provider );
+    public static void registerMediaProvider(@Nonnull IMediaProvider provider) {
+        getInstance().registerMediaProvider(provider);
     }
 
-    public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-    {
-        getInstance().registerPocketUpgrade( upgrade );
+    public static void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade) {
+        getInstance().registerPocketUpgrade(upgrade);
     }
 
     /**
@@ -185,14 +187,12 @@ public final class ComputerCraftAPI
      *
      * @return The global wireless network, or {@code null} if it could not be fetched.
      */
-    public static IPacketNetwork getWirelessNetwork()
-    {
+    public static IPacketNetwork getWirelessNetwork() {
         return getInstance().getWirelessNetwork();
     }
 
-    public static void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
-    {
-        getInstance().registerAPIFactory( factory );
+    public static void registerAPIFactory(@Nonnull ILuaAPIFactory factory) {
+        getInstance().registerAPIFactory(factory);
     }
 
     /**
@@ -203,78 +203,57 @@ public final class ComputerCraftAPI
      * @see IWiredElement#getNode()
      */
     @Nonnull
-    public static IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
-    {
-        return getInstance().createWiredNodeForElement( element );
+    public static IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element) {
+        return getInstance().createWiredNodeForElement(element);
     }
 
     /**
      * Get the wired network element for a block in world.
      *
      * @param world The world the block exists in
-     * @param pos   The position the block exists in
-     * @param side  The side to extract the network element from
+     * @param pos The position the block exists in
+     * @param side The side to extract the network element from
      * @return The element's node
      * @see IWiredElement#getNode()
      */
-    @Nonnull
-    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        return getInstance().getWiredElementAt( world, pos, side );
+    @Nullable
+    public static IWiredElement getWiredElementAt(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+        return getInstance().getWiredElementAt(world, pos, side);
     }
 
-    private static IComputerCraftAPI instance;
-
-    @Nonnull
-    private static IComputerCraftAPI getInstance()
-    {
-        if( instance != null ) return instance;
-
-        try
-        {
-            return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
-                .getField( "INSTANCE" ).get( null );
-        }
-        catch( ReflectiveOperationException e )
-        {
-            throw new IllegalStateException( "Cannot find ComputerCraft API", e );
-        }
-    }
-
-    public interface IComputerCraftAPI
-    {
+    public interface IComputerCraftAPI {
         @Nonnull
         String getInstalledVersion();
 
-        int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
+        int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath);
 
         @Nullable
-        IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
+        IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity);
 
         @Nullable
-        IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
+        IMount createResourceMount(@Nonnull String domain, @Nonnull String subPath);
 
-        void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
+        void registerPeripheralProvider(@Nonnull IPeripheralProvider provider);
 
-        void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
+        void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade);
 
-        void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
+        void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider);
 
-        int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+        int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side);
 
-        void registerMediaProvider( @Nonnull IMediaProvider provider );
+        void registerMediaProvider(@Nonnull IMediaProvider provider);
 
-        void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade );
+        void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade);
 
         @Nonnull
         IPacketNetwork getWirelessNetwork();
 
-        void registerAPIFactory( @Nonnull ILuaAPIFactory factory );
+        void registerAPIFactory(@Nonnull ILuaAPIFactory factory);
 
         @Nonnull
-        IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
+        IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element);
 
-        @Nonnull
-        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side );
+        @Nullable
+        IWiredElement getWiredElementAt(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side);
     }
 }

src/main/java/dan200/computercraft/api/client/TransformedModel.java

@@ -3,59 +3,81 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.client;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.TransformationMatrix;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ModelManager;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
-import java.util.Objects;
+
+import dan200.computercraft.mixin.AffineTransformationAccess;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.BakedModelManager;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.client.util.math.AffineTransformation;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.item.ItemStack;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 
 /**
  * A model to render, combined with a transformation matrix to apply.
  */
-public final class TransformedModel
-{
-    private final IBakedModel model;
-    private final TransformationMatrix matrix;
+@Environment (EnvType.CLIENT)
+public final class TransformedModel {
+    private final BakedModel model;
+    private final AffineTransformation matrix;
 
-    public TransformedModel( @Nonnull IBakedModel model, @Nonnull TransformationMatrix matrix )
-    {
-        this.model = Objects.requireNonNull( model );
-        this.matrix = Objects.requireNonNull( matrix );
+    public TransformedModel(@Nonnull BakedModel model, @Nonnull AffineTransformation matrix) {
+        this.model = Objects.requireNonNull(model);
+        this.matrix = Objects.requireNonNull(matrix);
     }
 
-    public TransformedModel( @Nonnull IBakedModel model )
-    {
-        this.model = Objects.requireNonNull( model );
-        this.matrix = TransformationMatrix.identity();
+    public TransformedModel(@Nonnull BakedModel model) {
+        this.model = Objects.requireNonNull(model);
+        this.matrix = AffineTransformation.identity();
     }
 
-    public static TransformedModel of( @Nonnull ModelResourceLocation location )
-    {
-        ModelManager modelManager = Minecraft.getInstance().getModelManager();
-        return new TransformedModel( modelManager.getModel( location ) );
+    public static TransformedModel of(@Nonnull ModelIdentifier location) {
+        BakedModelManager modelManager = MinecraftClient.getInstance()
+                                                        .getBakedModelManager();
+        return new TransformedModel(modelManager.getModel(location));
     }
 
-    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull TransformationMatrix transform )
-    {
-        IBakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel( item );
-        return new TransformedModel( model, transform );
+    public static TransformedModel of(@Nonnull ItemStack item, @Nonnull AffineTransformation transform) {
+        BakedModel model = MinecraftClient.getInstance()
+                                          .getItemRenderer()
+                                          .getModels()
+                                          .getModel(item);
+        return new TransformedModel(model, transform);
     }
 
     @Nonnull
-    public IBakedModel getModel()
-    {
-        return model;
+    public BakedModel getModel() {
+        return this.model;
     }
 
     @Nonnull
-    public TransformationMatrix getMatrix()
-    {
-        return matrix;
+    public AffineTransformation getMatrix() {
+        return this.matrix;
+    }
+
+    public void push(MatrixStack matrixStack) {
+        matrixStack.push();
+
+        AffineTransformationAccess access = (AffineTransformationAccess) (Object) this.matrix;
+        if (access.getTranslation() != null)
+            matrixStack.translate(access.getTranslation().getX(), access.getTranslation().getY(), access.getTranslation().getZ());
+
+        matrixStack.multiply(this.matrix.getRotation2());
+
+        if (access.getScale() != null)
+            matrixStack.scale(access.getScale().getX(), access.getScale().getY(), access.getScale().getZ());
+
+        if (access.getRotation1() != null)
+            matrixStack.multiply(access.getRotation1());
     }
 }

src/main/java/dan200/computercraft/api/filesystem/FileAttributes.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.filesystem;
 
 import java.nio.file.attribute.BasicFileAttributes;
@@ -12,70 +13,59 @@ import java.time.Instant;
 /**
  * A simple version of {@link BasicFileAttributes}, which provides what information a {@link IMount} already exposes.
  */
-final class FileAttributes implements BasicFileAttributes
-{
-    private static final FileTime EPOCH = FileTime.from( Instant.EPOCH );
+final class FileAttributes implements BasicFileAttributes {
+    private static final FileTime EPOCH = FileTime.from(Instant.EPOCH);
 
     private final boolean isDirectory;
     private final long size;
 
-    FileAttributes( boolean isDirectory, long size )
-    {
+    FileAttributes(boolean isDirectory, long size) {
         this.isDirectory = isDirectory;
         this.size = size;
     }
 
     @Override
-    public FileTime lastModifiedTime()
-    {
+    public FileTime lastModifiedTime() {
         return EPOCH;
     }
 
     @Override
-    public FileTime lastAccessTime()
-    {
+    public FileTime lastAccessTime() {
         return EPOCH;
     }
 
     @Override
-    public FileTime creationTime()
-    {
+    public FileTime creationTime() {
         return EPOCH;
     }
 
     @Override
-    public boolean isRegularFile()
-    {
-        return !isDirectory;
+    public boolean isRegularFile() {
+        return !this.isDirectory;
     }
 
     @Override
-    public boolean isDirectory()
-    {
-        return isDirectory;
+    public boolean isDirectory() {
+        return this.isDirectory;
     }
 
     @Override
-    public boolean isSymbolicLink()
-    {
+    public boolean isSymbolicLink() {
         return false;
     }
 
     @Override
-    public boolean isOther()
-    {
+    public boolean isOther() {
         return false;
     }
 
     @Override
-    public long size()
-    {
-        return size;
+    public long size() {
+        return this.size;
     }
 
     @Override
-    public Object fileKey()
-    {
+    public Object fileKey() {
         return null;
     }
 }

src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java

@@ -3,39 +3,37 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.filesystem;
 
+import java.io.IOException;
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.io.IOException;
-import java.util.Objects;
 
 /**
  * An {@link IOException} which occurred on a specific file.
  *
  * This may be thrown from a {@link IMount} or {@link IWritableMount} to give more information about a failure.
  */
-public class FileOperationException extends IOException
-{
+public class FileOperationException extends IOException {
     private static final long serialVersionUID = -8809108200853029849L;
 
     private final String filename;
 
-    public FileOperationException( @Nullable String filename, @Nonnull String message )
-    {
-        super( Objects.requireNonNull( message, "message cannot be null" ) );
+    public FileOperationException(@Nullable String filename, @Nonnull String message) {
+        super(Objects.requireNonNull(message, "message cannot be null"));
         this.filename = filename;
     }
 
-    public FileOperationException( @Nonnull String message )
-    {
-        super( Objects.requireNonNull( message, "message cannot be null" ) );
+    public FileOperationException(@Nonnull String message) {
+        super(Objects.requireNonNull(message, "message cannot be null"));
         this.filename = null;
     }
 
     @Nullable
-    public String getFilename()
-    {
-        return filename;
+    public String getFilename() {
+        return this.filename;
     }
 }

src/main/java/dan200/computercraft/api/filesystem/IFileSystem.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.filesystem;
 
 import java.io.IOException;
@@ -12,32 +13,31 @@ import java.io.IOException;
  *
  * This exists for use by various APIs - one should not attempt to mount it.
  */
-public interface IFileSystem extends IWritableMount
-{
+public interface IFileSystem extends IWritableMount {
     /**
      * Combine two paths together, reducing them into a normalised form.
      *
-     * @param path  The main path.
+     * @param path The main path.
      * @param child The path to append.
      * @return The combined, normalised path.
      */
-    String combine( String path, String child );
+    String combine(String path, String child);
 
     /**
      * Copy files from one location to another.
      *
      * @param from The location to copy from.
-     * @param to   The location to copy to. This should not exist.
+     * @param to The location to copy to. This should not exist.
      * @throws IOException If the copy failed.
      */
-    void copy( String from, String to ) throws IOException;
+    void copy(String from, String to) throws IOException;
 
     /**
      * Move files from one location to another.
      *
      * @param from The location to move from.
-     * @param to   The location to move to. This should not exist.
+     * @param to The location to move to. This should not exist.
      * @throws IOException If the move failed.
      */
-    void move( String from, String to ) throws IOException;
+    void move(String from, String to) throws IOException;
 }

src/main/java/dan200/computercraft/api/filesystem/IMount.java

@@ -3,80 +3,52 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.filesystem;
 
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.world.World;
-
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+
+import net.minecraft.world.World;
+
 /**
- * Represents a read only part of a virtual filesystem that can be mounted onto a computer using
- * {@link IComputerAccess#mount(String, IMount)}.
+ * Represents a read only part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)}.
  *
- * Ready made implementations of this interface can be created using
- * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or
- * {@link ComputerCraftAPI#createResourceMount(String, String)}, or you're free to implement it yourselves!
+ * Ready made implementations of this interface can be created using {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or {@link
+ * ComputerCraftAPI#createResourceMount(String, String)}, or you're free to implement it yourselves!
  *
  * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
  * @see ComputerCraftAPI#createResourceMount(String, String)
  * @see IComputerAccess#mount(String, IMount)
  * @see IWritableMount
  */
-public interface IMount
-{
-    /**
-     * Returns whether a file with a given path exists or not.
-     *
-     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram"
-     * @return If the file exists.
-     * @throws IOException If an error occurs when checking the existence of the file.
-     */
-    boolean exists( @Nonnull String path ) throws IOException;
-
-    /**
-     * Returns whether a file with a given path is a directory or not.
-     *
-     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
-     * @return If the file exists and is a directory
-     * @throws IOException If an error occurs when checking whether the file is a directory.
-     */
-    boolean isDirectory( @Nonnull String path ) throws IOException;
-
+public interface IMount {
     /**
      * Returns the file names of all the files in a directory.
      *
-     * @param path     A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
      * @param contents A list of strings. Add all the file names to this list.
      * @throws IOException If the file was not a directory, or could not be listed.
      */
-    void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException;
-
-    /**
-     * Returns the size of a file with a given path, in bytes.
-     *
-     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
-     * @return The size of the file, in bytes.
-     * @throws IOException If the file does not exist, or its size could not be determined.
-     */
-    long getSize( @Nonnull String path ) throws IOException;
+    void list(@Nonnull String path, @Nonnull List<String> contents) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link ReadableByteChannel} representing its contents.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
-     * @return A channel representing the contents of the file. If the channel implements
-     * {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary positions when using binary
-     * mode.
+     * @return A channel representing the contents of the file. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to
+     *     seek to arbitrary positions when using binary mode.
      * @throws IOException If the file does not exist, or could not be opened.
      */
     @Nonnull
-    ReadableByteChannel openForRead( @Nonnull String path ) throws IOException;
+    ReadableByteChannel openForRead(@Nonnull String path) throws IOException;
 
     /**
      * Get attributes about the given file.
@@ -86,9 +58,37 @@ public interface IMount
      * @throws IOException If the file does not exist, or attributes could not be fetched.
      */
     @Nonnull
-    default BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
-    {
-        if( !exists( path ) ) throw new FileOperationException( path, "No such file" );
-        return new FileAttributes( isDirectory( path ), getSize( path ) );
+    default BasicFileAttributes getAttributes(@Nonnull String path) throws IOException {
+        if (!this.exists(path)) {
+            throw new FileOperationException(path, "No such file");
+        }
+        return new FileAttributes(this.isDirectory(path), this.getSize(path));
     }
+
+    /**
+     * Returns whether a file with a given path exists or not.
+     *
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram"
+     * @return If the file exists.
+     * @throws IOException If an error occurs when checking the existence of the file.
+     */
+    boolean exists(@Nonnull String path) throws IOException;
+
+    /**
+     * Returns whether a file with a given path is a directory or not.
+     *
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
+     * @return If the file exists and is a directory
+     * @throws IOException If an error occurs when checking whether the file is a directory.
+     */
+    boolean isDirectory(@Nonnull String path) throws IOException;
+
+    /**
+     * Returns the size of a file with a given path, in bytes.
+     *
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
+     * @return The size of the file, in bytes.
+     * @throws IOException If the file does not exist, or its size could not be determined.
+     */
+    long getSize(@Nonnull String path) throws IOException;
 }

src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java

@@ -3,39 +3,41 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.filesystem;
 
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.world.World;
-
-import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.channels.WritableByteChannel;
 import java.util.OptionalLong;
 
+import javax.annotation.Nonnull;
+
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+
+import net.minecraft.world.World;
+
 /**
- * Represents a part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)}
- * or {@link IComputerAccess#mountWritable(String, IWritableMount)}, that can also be written to.
+ * Represents a part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)} or {@link
+ * IComputerAccess#mountWritable(String, IWritableMount)}, that can also be written to.
  *
- * Ready made implementations of this interface can be created using
- * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)}, or you're free to implement it yourselves!
+ * Ready made implementations of this interface can be created using {@link ComputerCraftAPI#createSaveDirMount(World, String, long)}, or you're free to
+ * implement it yourselves!
  *
  * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
  * @see IComputerAccess#mount(String, IMount)
  * @see IComputerAccess#mountWritable(String, IWritableMount)
  * @see IMount
  */
-public interface IWritableMount extends IMount
-{
+public interface IWritableMount extends IMount {
     /**
      * Creates a directory at a given path inside the virtual file system.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/mynewprograms".
      * @throws IOException If the directory already exists or could not be created.
      */
-    void makeDirectory( @Nonnull String path ) throws IOException;
+    void makeDirectory(@Nonnull String path) throws IOException;
 
     /**
      * Deletes a directory at a given path inside the virtual file system.
@@ -43,33 +45,33 @@ public interface IWritableMount extends IMount
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myoldprograms".
      * @throws IOException If the file does not exist or could not be deleted.
      */
-    void delete( @Nonnull String path ) throws IOException;
+    void delete(@Nonnull String path) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link OutputStream} for writing to it.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
-     * @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one
-     * will be able to seek to arbitrary positions when using binary mode.
+     * @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary
+     *     positions when using binary mode.
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    WritableByteChannel openForWrite( @Nonnull String path ) throws IOException;
+    WritableByteChannel openForWrite(@Nonnull String path) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link OutputStream} for appending to it.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
-     * @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one
-     * will be able to seek to arbitrary positions when using binary mode.
+     * @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary
+     *     positions when using binary mode.
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    WritableByteChannel openForAppend( @Nonnull String path ) throws IOException;
+    WritableByteChannel openForAppend(@Nonnull String path) throws IOException;
 
     /**
-     * Get the amount of free space on the mount, in bytes. You should decrease this value as the user writes to the
-     * mount, and write operations should fail once it reaches zero.
+     * Get the amount of free space on the mount, in bytes. You should decrease this value as the user writes to the mount, and write operations should fail
+     * once it reaches zero.
      *
      * @return The amount of free space, in bytes.
      * @throws IOException If the remaining space could not be computed.
@@ -77,14 +79,12 @@ public interface IWritableMount extends IMount
     long getRemainingSpace() throws IOException;
 
     /**
-     * Get the capacity of this mount. This should be equal to the size of all files/directories on this mount, minus
-     * the {@link #getRemainingSpace()}.
+     * Get the capacity of this mount. This should be equal to the size of all files/directories on this mount, minus the {@link #getRemainingSpace()}.
      *
      * @return The capacity of this mount, in bytes.
      */
     @Nonnull
-    default OptionalLong getCapacity()
-    {
+    default OptionalLong getCapacity() {
         return OptionalLong.empty();
     }
 }

src/main/java/dan200/computercraft/api/lua/IArguments.java

@@ -3,21 +3,39 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import static dan200.computercraft.api.lua.LuaValues.checkFinite;
+
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Optional;
 
-import static dan200.computercraft.api.lua.LuaValues.checkFinite;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * The arguments passed to a function.
  */
-public interface IArguments
-{
+public interface IArguments {
+    /**
+     * Drop a number of arguments. The returned arguments instance will access arguments at position {@code i + count}, rather than {@code i}. However,
+     * errors will still use the given argument index.
+     *
+     * @param count The number of arguments to drop.
+     * @return The new {@link IArguments} instance.
+     */
+    IArguments drop(int count);
+
+    default Object[] getAll() {
+        Object[] result = new Object[this.count()];
+        for (int i = 0; i < result.length; i++) {
+            result[i] = this.get(i);
+        }
+        return result;
+    }
+
     /**
      * Get the number of arguments passed to this function.
      *
@@ -40,22 +58,44 @@ public interface IArguments
      * @return The argument's value, or {@code null} if not present.
      */
     @Nullable
-    Object get( int index );
+    Object get(int index);
 
     /**
-     * Drop a number of arguments. The returned arguments instance will access arguments at position {@code i + count},
-     * rather than {@code i}. However, errors will still use the given argument index.
+     * Get an argument as an integer.
      *
-     * @param count The number of arguments to drop.
-     * @return The new {@link IArguments} instance.
+     * @param index The argument number.
+     * @return The argument's value.
+     * @throws LuaException If the value is not an integer.
      */
-    IArguments drop( int count );
+    default int getInt(int index) throws LuaException {
+        return (int) this.getLong(index);
+    }
 
-    default Object[] getAll()
-    {
-        Object[] result = new Object[count()];
-        for( int i = 0; i < result.length; i++ ) result[i] = get( i );
-        return result;
+    /**
+     * Get an argument as a long.
+     *
+     * @param index The argument number.
+     * @return The argument's value.
+     * @throws LuaException If the value is not a long.
+     */
+    default long getLong(int index) throws LuaException {
+        Object value = this.get(index);
+        if (!(value instanceof Number)) {
+            throw LuaValues.badArgumentOf(index, "number", value);
+        }
+        return LuaValues.checkFiniteNum(index, (Number) value)
+                        .longValue();
+    }
+
+    /**
+     * Get an argument as a finite number (not infinite or NaN).
+     *
+     * @param index The argument number.
+     * @return The argument's value.
+     * @throws LuaException If the value is not finite.
+     */
+    default double getFiniteDouble(int index) throws LuaException {
+        return checkFinite(index, this.getDouble(index));
     }
 
     /**
@@ -66,51 +106,14 @@ public interface IArguments
      * @throws LuaException If the value is not a number.
      * @see #getFiniteDouble(int) if you require this to be finite (i.e. not infinite or NaN).
      */
-    default double getDouble( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( !(value instanceof Number) ) throw LuaValues.badArgumentOf( index, "number", value );
+    default double getDouble(int index) throws LuaException {
+        Object value = this.get(index);
+        if (!(value instanceof Number)) {
+            throw LuaValues.badArgumentOf(index, "number", value);
+        }
         return ((Number) value).doubleValue();
     }
 
-    /**
-     * Get an argument as an integer.
-     *
-     * @param index The argument number.
-     * @return The argument's value.
-     * @throws LuaException If the value is not an integer.
-     */
-    default int getInt( int index ) throws LuaException
-    {
-        return (int) getLong( index );
-    }
-
-    /**
-     * Get an argument as a long.
-     *
-     * @param index The argument number.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a long.
-     */
-    default long getLong( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( !(value instanceof Number) ) throw LuaValues.badArgumentOf( index, "number", value );
-        return LuaValues.checkFiniteNum( index, (Number) value ).longValue();
-    }
-
-    /**
-     * Get an argument as a finite number (not infinite or NaN).
-     *
-     * @param index The argument number.
-     * @return The argument's value.
-     * @throws LuaException If the value is not finite.
-     */
-    default double getFiniteDouble( int index ) throws LuaException
-    {
-        return checkFinite( index, getDouble( index ) );
-    }
-
     /**
      * Get an argument as a boolean.
      *
@@ -118,28 +121,14 @@ public interface IArguments
      * @return The argument's value.
      * @throws LuaException If the value is not a boolean.
      */
-    default boolean getBoolean( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( !(value instanceof Boolean) ) throw LuaValues.badArgumentOf( index, "boolean", value );
+    default boolean getBoolean(int index) throws LuaException {
+        Object value = this.get(index);
+        if (!(value instanceof Boolean)) {
+            throw LuaValues.badArgumentOf(index, "boolean", value);
+        }
         return (Boolean) value;
     }
 
-    /**
-     * Get an argument as a string.
-     *
-     * @param index The argument number.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a string.
-     */
-    @Nonnull
-    default String getString( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( !(value instanceof String) ) throw LuaValues.badArgumentOf( index, "string", value );
-        return (String) value;
-    }
-
     /**
      * Get a string argument as a byte array.
      *
@@ -148,9 +137,24 @@ public interface IArguments
      * @throws LuaException If the value is not a string.
      */
     @Nonnull
-    default ByteBuffer getBytes( int index ) throws LuaException
-    {
-        return LuaValues.encode( getString( index ) );
+    default ByteBuffer getBytes(int index) throws LuaException {
+        return LuaValues.encode(this.getString(index));
+    }
+
+    /**
+     * Get an argument as a string.
+     *
+     * @param index The argument number.
+     * @return The argument's value.
+     * @throws LuaException If the value is not a string.
+     */
+    @Nonnull
+    default String getString(int index) throws LuaException {
+        Object value = this.get(index);
+        if (!(value instanceof String)) {
+            throw LuaValues.badArgumentOf(index, "string", value);
+        }
+        return (String) value;
     }
 
     /**
@@ -158,14 +162,13 @@ public interface IArguments
      *
      * @param index The argument number.
      * @param klass The type of enum to parse.
-     * @param <T>   The type of enum to parse.
+     * @param <T> The type of enum to parse.
      * @return The argument's value.
      * @throws LuaException If the value is not a string or not a valid option for this enum.
      */
     @Nonnull
-    default <T extends Enum<T>> T getEnum( int index, Class<T> klass ) throws LuaException
-    {
-        return LuaValues.checkEnum( index, klass, getString( index ) );
+    default <T extends Enum<T>> T getEnum(int index, Class<T> klass) throws LuaException {
+        return LuaValues.checkEnum(index, klass, this.getString(index));
     }
 
     /**
@@ -176,101 +179,14 @@ public interface IArguments
      * @throws LuaException If the value is not a table.
      */
     @Nonnull
-    default Map<?, ?> getTable( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( !(value instanceof Map) ) throw LuaValues.badArgumentOf( index, "table", value );
+    default Map<?, ?> getTable(int index) throws LuaException {
+        Object value = this.get(index);
+        if (!(value instanceof Map)) {
+            throw LuaValues.badArgumentOf(index, "table", value);
+        }
         return (Map<?, ?>) value;
     }
 
-    /**
-     * Get an argument as a double.
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not a number.
-     */
-    @Nonnull
-    default Optional<Double> optDouble( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( value == null ) return Optional.empty();
-        if( !(value instanceof Number) ) throw LuaValues.badArgumentOf( index, "number", value );
-        return Optional.of( ((Number) value).doubleValue() );
-    }
-
-    /**
-     * Get an argument as an int.
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not a number.
-     */
-    @Nonnull
-    default Optional<Integer> optInt( int index ) throws LuaException
-    {
-        return optLong( index ).map( Long::intValue );
-    }
-
-    /**
-     * Get an argument as a long.
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not a number.
-     */
-    default Optional<Long> optLong( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( value == null ) return Optional.empty();
-        if( !(value instanceof Number) ) throw LuaValues.badArgumentOf( index, "number", value );
-        return Optional.of( LuaValues.checkFiniteNum( index, (Number) value ).longValue() );
-    }
-
-    /**
-     * Get an argument as a finite number (not infinite or NaN).
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not finite.
-     */
-    default Optional<Double> optFiniteDouble( int index ) throws LuaException
-    {
-        Optional<Double> value = optDouble( index );
-        if( value.isPresent() ) LuaValues.checkFiniteNum( index, value.get() );
-        return value;
-    }
-
-    /**
-     * Get an argument as a boolean.
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not a boolean.
-     */
-    default Optional<Boolean> optBoolean( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( value == null ) return Optional.empty();
-        if( !(value instanceof Boolean) ) throw LuaValues.badArgumentOf( index, "boolean", value );
-        return Optional.of( (Boolean) value );
-    }
-
-    /**
-     * Get an argument as a string.
-     *
-     * @param index The argument number.
-     * @return The argument's value, or {@link Optional#empty()} if not present.
-     * @throws LuaException If the value is not a string.
-     */
-    default Optional<String> optString( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( value == null ) return Optional.empty();
-        if( !(value instanceof String) ) throw LuaValues.badArgumentOf( index, "string", value );
-        return Optional.of( (String) value );
-    }
-
     /**
      * Get a string argument as a byte array.
      *
@@ -278,9 +194,26 @@ public interface IArguments
      * @return The argument's value, or {@link Optional#empty()} if not present. This is a <em>read only</em> buffer.
      * @throws LuaException If the value is not a string.
      */
-    default Optional<ByteBuffer> optBytes( int index ) throws LuaException
-    {
-        return optString( index ).map( LuaValues::encode );
+    default Optional<ByteBuffer> optBytes(int index) throws LuaException {
+        return this.optString(index).map(LuaValues::encode);
+    }
+
+    /**
+     * Get an argument as a string.
+     *
+     * @param index The argument number.
+     * @return The argument's value, or {@link Optional#empty()} if not present.
+     * @throws LuaException If the value is not a string.
+     */
+    default Optional<String> optString(int index) throws LuaException {
+        Object value = this.get(index);
+        if (value == null) {
+            return Optional.empty();
+        }
+        if (!(value instanceof String)) {
+            throw LuaValues.badArgumentOf(index, "string", value);
+        }
+        return Optional.of((String) value);
     }
 
     /**
@@ -288,15 +221,181 @@ public interface IArguments
      *
      * @param index The argument number.
      * @param klass The type of enum to parse.
-     * @param <T>   The type of enum to parse.
+     * @param <T> The type of enum to parse.
      * @return The argument's value.
      * @throws LuaException If the value is not a string or not a valid option for this enum.
      */
     @Nonnull
-    default <T extends Enum<T>> Optional<T> optEnum( int index, Class<T> klass ) throws LuaException
-    {
-        Optional<String> str = optString( index );
-        return str.isPresent() ? Optional.of( LuaValues.checkEnum( index, klass, str.get() ) ) : Optional.empty();
+    default <T extends Enum<T>> Optional<T> optEnum(int index, Class<T> klass) throws LuaException {
+        Optional<String> str = this.optString(index);
+        return str.isPresent() ? Optional.of(LuaValues.checkEnum(index, klass, str.get())) : Optional.empty();
+    }
+
+    /**
+     * Get an argument as a double.
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not a number.
+     */
+    default double optDouble(int index, double def) throws LuaException {
+        return this.optDouble(index).orElse(def);
+    }
+
+    /**
+     * Get an argument as a double.
+     *
+     * @param index The argument number.
+     * @return The argument's value, or {@link Optional#empty()} if not present.
+     * @throws LuaException If the value is not a number.
+     */
+    @Nonnull
+    default Optional<Double> optDouble(int index) throws LuaException {
+        Object value = this.get(index);
+        if (value == null) {
+            return Optional.empty();
+        }
+        if (!(value instanceof Number)) {
+            throw LuaValues.badArgumentOf(index, "number", value);
+        }
+        return Optional.of(((Number) value).doubleValue());
+    }
+
+    /**
+     * Get an argument as an int.
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not a number.
+     */
+    default int optInt(int index, int def) throws LuaException {
+        return this.optInt(index).orElse(def);
+    }
+
+    /**
+     * Get an argument as an int.
+     *
+     * @param index The argument number.
+     * @return The argument's value, or {@link Optional#empty()} if not present.
+     * @throws LuaException If the value is not a number.
+     */
+    @Nonnull
+    default Optional<Integer> optInt(int index) throws LuaException {
+        return this.optLong(index).map(Long::intValue);
+    }
+
+    /**
+     * Get an argument as a long.
+     *
+     * @param index The argument number.
+     * @return The argument's value, or {@link Optional#empty()} if not present.
+     * @throws LuaException If the value is not a number.
+     */
+    default Optional<Long> optLong(int index) throws LuaException {
+        Object value = this.get(index);
+        if (value == null) {
+            return Optional.empty();
+        }
+        if (!(value instanceof Number)) {
+            throw LuaValues.badArgumentOf(index, "number", value);
+        }
+        return Optional.of(LuaValues.checkFiniteNum(index, (Number) value)
+                                    .longValue());
+    }
+
+    /**
+     * Get an argument as a long.
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not a number.
+     */
+    default long optLong(int index, long def) throws LuaException {
+        return this.optLong(index).orElse(def);
+    }
+
+    /**
+     * Get an argument as a finite number (not infinite or NaN).
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not finite.
+     */
+    default double optFiniteDouble(int index, double def) throws LuaException {
+        return this.optFiniteDouble(index).orElse(def);
+    }
+
+    /**
+     * Get an argument as a finite number (not infinite or NaN).
+     *
+     * @param index The argument number.
+     * @return The argument's value, or {@link Optional#empty()} if not present.
+     * @throws LuaException If the value is not finite.
+     */
+    default Optional<Double> optFiniteDouble(int index) throws LuaException {
+        Optional<Double> value = this.optDouble(index);
+        if (value.isPresent()) {
+            LuaValues.checkFiniteNum(index, value.get());
+        }
+        return value;
+    }
+
+    /**
+     * Get an argument as a boolean.
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not a boolean.
+     */
+    default boolean optBoolean(int index, boolean def) throws LuaException {
+        return this.optBoolean(index).orElse(def);
+    }
+
+    /**
+     * Get an argument as a boolean.
+     *
+     * @param index The argument number.
+     * @return The argument's value, or {@link Optional#empty()} if not present.
+     * @throws LuaException If the value is not a boolean.
+     */
+    default Optional<Boolean> optBoolean(int index) throws LuaException {
+        Object value = this.get(index);
+        if (value == null) {
+            return Optional.empty();
+        }
+        if (!(value instanceof Boolean)) {
+            throw LuaValues.badArgumentOf(index, "boolean", value);
+        }
+        return Optional.of((Boolean) value);
+    }
+
+    /**
+     * Get an argument as a string.
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not a string.
+     */
+    default String optString(int index, String def) throws LuaException {
+        return this.optString(index).orElse(def);
+    }
+
+    /**
+     * Get an argument as a table.
+     *
+     * @param index The argument number.
+     * @param def The default value, if this argument is not given.
+     * @return The argument's value, or {@code def} if none was provided.
+     * @throws LuaException If the value is not a table.
+     */
+    default Map<?, ?> optTable(int index, Map<Object, Object> def) throws LuaException {
+        return this.optTable(index).orElse(def);
     }
 
     /**
@@ -306,102 +405,14 @@ public interface IArguments
      * @return The argument's value, or {@link Optional#empty()} if not present.
      * @throws LuaException If the value is not a table.
      */
-    default Optional<Map<?, ?>> optTable( int index ) throws LuaException
-    {
-        Object value = get( index );
-        if( value == null ) return Optional.empty();
-        if( !(value instanceof Map) ) throw LuaValues.badArgumentOf( index, "map", value );
-        return Optional.of( (Map<?, ?>) value );
-    }
-
-    /**
-     * Get an argument as a double.
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a number.
-     */
-    default double optDouble( int index, double def ) throws LuaException
-    {
-        return optDouble( index ).orElse( def );
-    }
-
-    /**
-     * Get an argument as an int.
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a number.
-     */
-    default int optInt( int index, int def ) throws LuaException
-    {
-        return optInt( index ).orElse( def );
-    }
-
-    /**
-     * Get an argument as a long.
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a number.
-     */
-    default long optLong( int index, long def ) throws LuaException
-    {
-        return optLong( index ).orElse( def );
-    }
-
-    /**
-     * Get an argument as a finite number (not infinite or NaN).
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not finite.
-     */
-    default double optFiniteDouble( int index, double def ) throws LuaException
-    {
-        return optFiniteDouble( index ).orElse( def );
-    }
-
-    /**
-     * Get an argument as a boolean.
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a boolean.
-     */
-    default boolean optBoolean( int index, boolean def ) throws LuaException
-    {
-        return optBoolean( index ).orElse( def );
-    }
-
-    /**
-     * Get an argument as a string.
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a string.
-     */
-    default String optString( int index, String def ) throws LuaException
-    {
-        return optString( index ).orElse( def );
-    }
-
-    /**
-     * Get an argument as a table.
-     *
-     * @param index The argument number.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a table.
-     */
-    default Map<?, ?> optTable( int index, Map<Object, Object> def ) throws LuaException
-    {
-        return optTable( index ).orElse( def );
+    default Optional<Map<?, ?>> optTable(int index) throws LuaException {
+        Object value = this.get(index);
+        if (value == null) {
+            return Optional.empty();
+        }
+        if (!(value instanceof Map)) {
+            throw LuaValues.badArgumentOf(index, "map", value);
+        }
+        return Optional.of((Map<?, ?>) value);
     }
 }

src/main/java/dan200/computercraft/api/lua/IComputerSystem.java

@@ -3,19 +3,18 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
+import javax.annotation.Nullable;
+
 import dan200.computercraft.api.filesystem.IFileSystem;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
-import javax.annotation.Nullable;
-
 /**
- * An interface passed to {@link ILuaAPIFactory} in order to provide additional information
- * about a computer.
+ * An interface passed to {@link ILuaAPIFactory} in order to provide additional information about a computer.
  */
-public interface IComputerSystem extends IComputerAccess
-{
+public interface IComputerSystem extends IComputerAccess {
     /**
      * Get the file system for this computer.
      *

src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java

@@ -3,24 +3,22 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
-import dan200.computercraft.api.peripheral.IDynamicPeripheral;
-
 import javax.annotation.Nonnull;
 
+import dan200.computercraft.api.peripheral.IDynamicPeripheral;
+
 /**
  * An interface for representing custom objects returned by peripherals or other Lua objects.
  *
- * Generally, one does not need to implement this type - it is sufficient to return an object with some methods
- * annotated with {@link LuaFunction}. {@link IDynamicLuaObject} is useful when you wish your available methods to
- * change at runtime.
+ * Generally, one does not need to implement this type - it is sufficient to return an object with some methods annotated with {@link LuaFunction}. {@link
+ * IDynamicLuaObject} is useful when you wish your available methods to change at runtime.
  */
-public interface IDynamicLuaObject
-{
+public interface IDynamicLuaObject {
     /**
-     * Get the names of the methods that this object implements. This should not change over the course of the object's
-     * lifetime.
+     * Get the names of the methods that this object implements. This should not change over the course of the object's lifetime.
      *
      * @return The method names this object provides.
      * @see IDynamicPeripheral#getMethodNames()
@@ -31,15 +29,12 @@ public interface IDynamicLuaObject
     /**
      * Called when a user calls one of the methods that this object implements.
      *
-     * @param context   The context of the currently running lua thread. This can be used to wait for events
-     *                  or otherwise yield.
-     * @param method    An integer identifying which method index from {@link #getMethodNames()} the computer wishes
-     *                  to call.
+     * @param context The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
+     * @param method An integer identifying which method index from {@link #getMethodNames()} the computer wishes to call.
      * @param arguments The arguments for this method.
-     * @return The result of this function. Either an immediate value ({@link MethodResult#of(Object...)} or an
-     * instruction to yield.
+     * @return The result of this function. Either an immediate value ({@link MethodResult#of(Object...)} or an instruction to yield.
      * @throws LuaException If the function threw an exception.
      */
     @Nonnull
-    MethodResult callMethod( @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments ) throws LuaException;
+    MethodResult callMethod(@Nonnull ILuaContext context, int method, @Nonnull IArguments arguments) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaAPI.java

@@ -3,22 +3,22 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
 import dan200.computercraft.api.ComputerCraftAPI;
 
 /**
- * Represents a Lua object which is stored as a global variable on computer startup. This must either provide
- * {@link LuaFunction} annotated functions or implement {@link IDynamicLuaObject}.
+ * Represents a Lua object which is stored as a global variable on computer startup. This must either provide {@link LuaFunction} annotated functions or
+ * implement {@link IDynamicLuaObject}.
  *
- * Before implementing this interface, consider alternative methods of providing methods. It is generally preferred
- * to use peripherals to provide functionality to users.
+ * Before implementing this interface, consider alternative methods of providing methods. It is generally preferred to use peripherals to provide
+ * functionality to users.
  *
  * @see ILuaAPIFactory
  * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
-public interface ILuaAPI
-{
+public interface ILuaAPI {
     /**
      * Get the globals this API will be assigned to. This will override any other global, so you should
      *
@@ -31,15 +31,13 @@ public interface ILuaAPI
      *
      * One should only interact with the file system.
      */
-    default void startup()
-    {
+    default void startup() {
     }
 
     /**
      * Called every time the computer is ticked. This can be used to process various.
      */
-    default void update()
-    {
+    default void update() {
     }
 
     /**
@@ -47,7 +45,6 @@ public interface ILuaAPI
      *
      * This should reset the state of the object, disposing any remaining file handles, or other resources.
      */
-    default void shutdown()
-    {
+    default void shutdown() {
     }
 }

src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java

@@ -3,13 +3,14 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-package dan200.computercraft.api.lua;
 
-import dan200.computercraft.api.ComputerCraftAPI;
+package dan200.computercraft.api.lua;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+
 /**
  * Construct an {@link ILuaAPI} for a specific computer.
  *
@@ -17,8 +18,7 @@ import javax.annotation.Nullable;
  * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
 @FunctionalInterface
-public interface ILuaAPIFactory
-{
+public interface ILuaAPIFactory {
     /**
      * Create a new API instance for a given computer.
      *
@@ -26,5 +26,5 @@ public interface ILuaAPIFactory
      * @return The created API, or {@code null} if one should not be injected.
      */
     @Nullable
-    ILuaAPI create( @Nonnull IComputerSystem computer );
+    ILuaAPI create(@Nonnull IComputerSystem computer);
 }

src/main/java/dan200/computercraft/api/lua/ILuaCallback.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
 import javax.annotation.Nonnull;
@@ -12,16 +13,14 @@ import javax.annotation.Nonnull;
  *
  * @see MethodResult#yield(Object[], ILuaCallback)
  */
-public interface ILuaCallback
-{
+public interface ILuaCallback {
     /**
      * Resume this coroutine.
      *
-     * @param args The result of resuming this coroutine. These will have the same form as described in
-     *             {@link LuaFunction}.
+     * @param args The result of resuming this coroutine. These will have the same form as described in {@link LuaFunction}.
      * @return The result of this continuation. Either the result to return to the callee, or another yield.
      * @throws LuaException On an error.
      */
     @Nonnull
-    MethodResult resume( Object[] args ) throws LuaException;
+    MethodResult resume(Object[] args) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaContext.java

@@ -3,28 +3,27 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
 import javax.annotation.Nonnull;
 
 /**
- * An interface passed to peripherals and {@link IDynamicLuaObject}s by computers or turtles, providing methods
- * that allow the peripheral call to interface with the computer.
+ * An interface passed to peripherals and {@link IDynamicLuaObject}s by computers or turtles, providing methods that allow the peripheral call to interface
+ * with the computer.
  */
-public interface ILuaContext
-{
+public interface ILuaContext {
     /**
-     * Queue a task to be executed on the main server thread at the beginning of next tick, but do not wait for it to
-     * complete. This should be used when you need to interact with the world in a thread-safe manner but do not care
-     * about the result or you wish to run asynchronously.
+     * Queue a task to be executed on the main server thread at the beginning of next tick, but do not wait for it to complete. This should be used when you
+     * need to interact with the world in a thread-safe manner but do not care about the result or you wish to run asynchronously.
      *
-     * When the task has finished, it will enqueue a {@code task_completed} event, which takes the task id, a success
-     * value and the return values, or an error message if it failed.
+     * When the task has finished, it will enqueue a {@code task_completed} event, which takes the task id, a success value and the return values, or an
+     * error message if it failed.
      *
      * @param task The task to execute on the main thread.
      * @return The "id" of the task. This will be the first argument to the {@code task_completed} event.
      * @throws LuaException If the task could not be queued.
      * @see LuaFunction#mainThread() To run functions on the main thread and return their results synchronously.
      */
-    long issueMainThreadTask( @Nonnull ILuaTask task ) throws LuaException;
+    long issueMainThreadTask(@Nonnull ILuaTask task) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaFunction.java

@@ -3,27 +3,27 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
 import javax.annotation.Nonnull;
 
 /**
- * A function, which can be called from Lua. If you need to return a table of functions, it is recommended to use
- * an object with {@link LuaFunction} methods, or implement {@link IDynamicLuaObject}.
+ * A function, which can be called from Lua. If you need to return a table of functions, it is recommended to use an object with {@link LuaFunction}
+ * methods, or implement {@link IDynamicLuaObject}.
  *
  * @see MethodResult#of(Object)
  */
 @FunctionalInterface
-public interface ILuaFunction
-{
+public interface ILuaFunction {
     /**
-     * Call this function with a series of arguments. Note, this will <em>always</em> be called on the computer thread,
-     * and so its implementation must be thread-safe.
+     * Call this function with a series of arguments. Note, this will <em>always</em> be called on the computer thread, and so its implementation must be
+     * thread-safe.
      *
      * @param arguments The arguments for this function
      * @return The result of calling this function.
      * @throws LuaException Upon Lua errors.
      */
     @Nonnull
-    MethodResult call( @Nonnull IArguments arguments ) throws LuaException;
+    MethodResult call(@Nonnull IArguments arguments) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaObject.java

@@ -0,0 +1,18 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+
+package dan200.computercraft.api.lua;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public interface ILuaObject {
+    @Nonnull
+    String[] getMethodNames();
+
+    @Nullable
+    Object[] callMethod(@Nonnull ILuaContext context, int method, @Nonnull Object[] arguments) throws LuaException, InterruptedException;
+}

src/main/java/dan200/computercraft/api/lua/ILuaTask.java

@@ -3,27 +3,25 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
 import javax.annotation.Nullable;
 
 /**
- * A task which can be executed via {@link ILuaContext#issueMainThreadTask(ILuaTask)} This will be run on the main
- * thread, at the beginning of the
- * next tick.
+ * A task which can be executed via {@link ILuaContext#issueMainThreadTask(ILuaTask)} This will be run on the main thread, at the beginning of the next
+ * tick.
  *
  * @see ILuaContext#issueMainThreadTask(ILuaTask)
  */
 @FunctionalInterface
-public interface ILuaTask
-{
+public interface ILuaTask {
     /**
      * Execute this task.
      *
      * @return The arguments to add to the {@code task_completed} event.
-     * @throws LuaException If you throw any exception from this function, a lua error will be raised with the
-     *                      same message as your exception. Use this to throw appropriate errors if the wrong
-     *                      arguments are supplied to your method.
+     * @throws LuaException If you throw any exception from this function, a lua error will be raised with the same message as your exception. Use this
+     *     to throw appropriate errors if the wrong arguments are supplied to your method.
      */
     @Nullable
     Object[] execute() throws LuaException;

src/main/java/dan200/computercraft/api/lua/LuaException.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
 import javax.annotation.Nullable;
@@ -10,22 +11,19 @@ import javax.annotation.Nullable;
 /**
  * An exception representing an error in Lua, like that raised by the {@code error()} function.
  */
-public class LuaException extends Exception
-{
+public class LuaException extends Exception {
     private static final long serialVersionUID = -6136063076818512651L;
     private final boolean hasLevel;
     private final int level;
 
-    public LuaException( @Nullable String message )
-    {
-        super( message );
+    public LuaException(@Nullable String message) {
+        super(message);
         this.hasLevel = false;
         this.level = 1;
     }
 
-    public LuaException( @Nullable String message, int level )
-    {
-        super( message );
+    public LuaException(@Nullable String message, int level) {
+        super(message);
         this.hasLevel = true;
         this.level = level;
     }
@@ -35,19 +33,16 @@ public class LuaException extends Exception
      *
      * @return Whether this has an explicit level.
      */
-    public boolean hasLevel()
-    {
-        return hasLevel;
+    public boolean hasLevel() {
+        return this.hasLevel;
     }
 
     /**
-     * The level this error is raised at. Level 1 is the function's caller, level 2 is that function's caller, and so
-     * on.
+     * The level this error is raised at. Level 1 is the function's caller, level 2 is that function's caller, and so on.
      *
      * @return The level to raise the error at.
      */
-    public int getLevel()
-    {
-        return level;
+    public int getLevel() {
+        return this.level;
     }
 }

src/main/java/dan200/computercraft/api/lua/LuaFunction.java

@@ -3,20 +3,25 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.Map;
+import java.util.Optional;
+
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 
-import java.lang.annotation.*;
-import java.util.Map;
-import java.util.Optional;
-
 /**
  * Used to mark a Java function which is callable from Lua.
  *
- * Methods annotated with {@link LuaFunction} must be public final instance methods. They can have any number of
- * parameters, but they must be of the following types:
+ * Methods annotated with {@link LuaFunction} must be public final instance methods. They can have any number of parameters, but they must be of the
+ * following types:
  *
  * <ul>
  *   <li>{@link ILuaContext} (and {@link IComputerAccess} if on a {@link IPeripheral})</li>
@@ -36,10 +41,9 @@ import java.util.Optional;
  * {@link MethodResult#of(Object...)}.
  */
 @Documented
-@Retention( RetentionPolicy.RUNTIME )
-@Target( ElementType.METHOD )
-public @interface LuaFunction
-{
+@Retention (RetentionPolicy.RUNTIME)
+@Target (ElementType.METHOD)
+public @interface LuaFunction {
     /**
      * Explicitly specify the method names of this function. If not given, it uses the name of the annotated method.
      *
@@ -48,8 +52,7 @@ public @interface LuaFunction
     String[] value() default {};
 
     /**
-     * Run this function on the main server thread. This should be specified for any method which interacts with
-     * Minecraft in a thread-unsafe manner.
+     * Run this function on the main server thread. This should be specified for any method which interacts with Minecraft in a thread-unsafe manner.
      *
      * @return Whether this functi
      * @see ILuaContext#issueMainThreadTask(ILuaTask)

src/main/java/dan200/computercraft/api/lua/LuaValues.java

@@ -3,22 +3,22 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
+import java.nio.ByteBuffer;
+import java.util.Map;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.nio.ByteBuffer;
-import java.util.Map;
 
 /**
  * Various utility functions for operating with Lua values.
  *
  * @see IArguments
  */
-public final class LuaValues
-{
-    private LuaValues()
-    {
+public final class LuaValues {
+    private LuaValues() {
     }
 
     /**
@@ -28,80 +28,69 @@ public final class LuaValues
      * @return The encoded string.
      */
     @Nonnull
-    public static ByteBuffer encode( @Nonnull String string )
-    {
+    public static ByteBuffer encode(@Nonnull String string) {
         byte[] chars = new byte[string.length()];
-        for( int i = 0; i < chars.length; i++ )
-        {
-            char c = string.charAt( i );
+        for (int i = 0; i < chars.length; i++) {
+            char c = string.charAt(i);
             chars[i] = c < 256 ? (byte) c : 63;
         }
 
-        return ByteBuffer.wrap( chars ).asReadOnlyBuffer();
+        return ByteBuffer.wrap(chars)
+                         .asReadOnlyBuffer();
     }
 
     /**
-     * Returns a more detailed representation of this number's type. If this is finite, it will just return "number",
-     * otherwise it returns whether it is infinite or NaN.
+     * Construct a "bad argument" exception, from an expected type and the actual value provided.
      *
-     * @param value The value to extract the type for.
-     * @return This value's numeric type.
+     * @param index The argument number, starting from 0.
+     * @param expected The expected type for this argument.
+     * @param actual The actual value provided for this argument.
+     * @return The constructed exception, which should be thrown immediately.
      */
     @Nonnull
-    public static String getNumericType( double value )
-    {
-        if( Double.isNaN( value ) ) return "nan";
-        if( value == Double.POSITIVE_INFINITY ) return "inf";
-        if( value == Double.NEGATIVE_INFINITY ) return "-inf";
-        return "number";
+    public static LuaException badArgumentOf(int index, @Nonnull String expected, @Nullable Object actual) {
+        return badArgument(index, expected, getType(actual));
+    }
+
+    /**
+     * Construct a "bad argument" exception, from an expected and actual type.
+     *
+     * @param index The argument number, starting from 0.
+     * @param expected The expected type for this argument.
+     * @param actual The provided type for this argument.
+     * @return The constructed exception, which should be thrown immediately.
+     */
+    @Nonnull
+    public static LuaException badArgument(int index, @Nonnull String expected, @Nonnull String actual) {
+        return new LuaException("bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")");
     }
 
     /**
      * Get a string representation of the given value's type.
      *
      * @param value The value whose type we are trying to compute.
-     * @return A string representation of the given value's type, in a similar format to that provided by Lua's
-     * {@code type} function.
+     * @return A string representation of the given value's type, in a similar format to that provided by Lua's {@code type} function.
      */
     @Nonnull
-    public static String getType( @Nullable Object value )
-    {
-        if( value == null ) return "nil";
-        if( value instanceof String ) return "string";
-        if( value instanceof Boolean ) return "boolean";
-        if( value instanceof Number ) return "number";
-        if( value instanceof Map ) return "table";
+    public static String getType(@Nullable Object value) {
+        if (value == null) {
+            return "nil";
+        }
+        if (value instanceof String) {
+            return "string";
+        }
+        if (value instanceof Boolean) {
+            return "boolean";
+        }
+        if (value instanceof Number) {
+            return "number";
+        }
+        if (value instanceof Map) {
+            return "table";
+        }
         return "userdata";
     }
 
-    /**
-     * Construct a "bad argument" exception, from an expected type and the actual value provided.
-     *
-     * @param index    The argument number, starting from 0.
-     * @param expected The expected type for this argument.
-     * @param actual   The actual value provided for this argument.
-     * @return The constructed exception, which should be thrown immediately.
-     */
-    @Nonnull
-    public static LuaException badArgumentOf( int index, @Nonnull String expected, @Nullable Object actual )
-    {
-        return badArgument( index, expected, getType( actual ) );
-    }
-
-    /**
-     * Construct a "bad argument" exception, from an expected and actual type.
-     *
-     * @param index    The argument number, starting from 0.
-     * @param expected The expected type for this argument.
-     * @param actual   The provided type for this argument.
-     * @return The constructed exception, which should be thrown immediately.
-     */
-    @Nonnull
-    public static LuaException badArgument( int index, @Nonnull String expected, @Nonnull String actual )
-    {
-        return new LuaException( "bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")" );
-    }
-
     /**
      * Ensure a numeric argument is finite (i.e. not infinite or {@link Double#NaN}.
      *
@@ -110,9 +99,8 @@ public final class LuaValues
      * @return The input {@code value}.
      * @throws LuaException If this is not a finite number.
      */
-    public static Number checkFiniteNum( int index, Number value ) throws LuaException
-    {
-        checkFinite( index, value.doubleValue() );
+    public static Number checkFiniteNum(int index, Number value) throws LuaException {
+        checkFinite(index, value.doubleValue());
         return value;
     }
 
@@ -124,29 +112,52 @@ public final class LuaValues
      * @return The input {@code value}.
      * @throws LuaException If this is not a finite number.
      */
-    public static double checkFinite( int index, double value ) throws LuaException
-    {
-        if( !Double.isFinite( value ) ) throw badArgument( index, "number", getNumericType( value ) );
+    public static double checkFinite(int index, double value) throws LuaException {
+        if (!Double.isFinite(value)) {
+            throw badArgument(index, "number", getNumericType(value));
+        }
         return value;
     }
 
+    /**
+     * Returns a more detailed representation of this number's type. If this is finite, it will just return "number", otherwise it returns whether it is
+     * infinite or NaN.
+     *
+     * @param value The value to extract the type for.
+     * @return This value's numeric type.
+     */
+    @Nonnull
+    public static String getNumericType(double value) {
+        if (Double.isNaN(value)) {
+            return "nan";
+        }
+        if (value == Double.POSITIVE_INFINITY) {
+            return "inf";
+        }
+        if (value == Double.NEGATIVE_INFINITY) {
+            return "-inf";
+        }
+        return "number";
+    }
+
     /**
      * Ensure a string is a valid enum value.
      *
      * @param index The argument index to check.
      * @param klass The class of the enum instance.
      * @param value The value to extract.
-     * @param <T>   The type of enum we are extracting.
+     * @param <T> The type of enum we are extracting.
      * @return The parsed enum value.
      * @throws LuaException If this is not a known enum value.
      */
-    public static <T extends Enum<T>> T checkEnum( int index, Class<T> klass, String value ) throws LuaException
-    {
-        for( T possibility : klass.getEnumConstants() )
-        {
-            if( possibility.name().equalsIgnoreCase( value ) ) return possibility;
+    public static <T extends Enum<T>> T checkEnum(int index, Class<T> klass, String value) throws LuaException {
+        for (T possibility : klass.getEnumConstants()) {
+            if (possibility.name()
+                           .equalsIgnoreCase(value)) {
+                return possibility;
+            }
         }
 
-        throw new LuaException( "bad argument #" + (index + 1) + " (unknown option " + value + ")" );
+        throw new LuaException("bad argument #" + (index + 1) + " (unknown option " + value + ")");
     }
 }

src/main/java/dan200/computercraft/api/lua/MethodResult.java

@@ -3,40 +3,39 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
-import dan200.computercraft.api.peripheral.IComputerAccess;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import dan200.computercraft.api.peripheral.IComputerAccess;
+
 /**
  * The result of invoking a Lua method.
  *
- * Method results either return a value immediately ({@link #of(Object...)} or yield control to the parent coroutine.
- * When the current coroutine is resumed, we invoke the provided {@link ILuaCallback#resume(Object[])} callback.
+ * Method results either return a value immediately ({@link #of(Object...)} or yield control to the parent coroutine. When the current coroutine is resumed,
+ * we invoke the provided {@link ILuaCallback#resume(Object[])} callback.
  */
-public final class MethodResult
-{
-    private static final MethodResult empty = new MethodResult( null, null );
+public final class MethodResult {
+    private static final MethodResult empty = new MethodResult(null, null);
 
     private final Object[] result;
     private final ILuaCallback callback;
     private final int adjust;
 
-    private MethodResult( Object[] arguments, ILuaCallback callback )
-    {
+    private MethodResult(Object[] arguments, ILuaCallback callback) {
         this.result = arguments;
         this.callback = callback;
         this.adjust = 0;
     }
 
-    private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
-    {
+    private MethodResult(Object[] arguments, ILuaCallback callback, int adjust) {
         this.result = arguments;
         this.callback = callback;
         this.adjust = adjust;
@@ -48,28 +47,25 @@ public final class MethodResult
      * @return A method result which returns immediately with no values.
      */
     @Nonnull
-    public static MethodResult of()
-    {
+    public static MethodResult of() {
         return empty;
     }
 
     /**
      * Return a single value immediately.
      *
-     * Integers, doubles, floats, strings, booleans, {@link Map}, {@link Collection}s, arrays and {@code null} will be
-     * converted to their corresponding Lua type. {@code byte[]} and {@link ByteBuffer} will be treated as binary
-     * strings. {@link ILuaFunction} will be treated as a function.
+     * Integers, doubles, floats, strings, booleans, {@link Map}, {@link Collection}s, arrays and {@code null} will be converted to their corresponding Lua
+     * type. {@code byte[]} and {@link ByteBuffer} will be treated as binary strings. {@link ILuaFunction} will be treated as a function.
      *
-     * In order to provide a custom object with methods, one may return a {@link IDynamicLuaObject}, or an arbitrary
-     * class with {@link LuaFunction} annotations. Anything else will be converted to {@code nil}.
+     * In order to provide a custom object with methods, one may return a {@link IDynamicLuaObject}, or an arbitrary class with {@link LuaFunction}
+     * annotations. Anything else will be converted to {@code nil}.
      *
      * @param value The value to return to the calling Lua function.
      * @return A method result which returns immediately with the given value.
      */
     @Nonnull
-    public static MethodResult of( @Nullable Object value )
-    {
-        return new MethodResult( new Object[] { value }, null );
+    public static MethodResult of(@Nullable Object value) {
+        return new MethodResult(new Object[] {value}, null);
     }
 
     /**
@@ -79,92 +75,88 @@ public final class MethodResult
      * @return A method result which returns immediately with the given values.
      */
     @Nonnull
-    public static MethodResult of( @Nullable Object... values )
-    {
-        return values == null || values.length == 0 ? empty : new MethodResult( values, null );
+    public static MethodResult of(@Nullable Object... values) {
+        return values == null || values.length == 0 ? empty : new MethodResult(values, null);
     }
 
     /**
-     * Wait for an event to occur on the computer, suspending the thread until it arises. This method is exactly
-     * equivalent to {@code os.pullEvent()} in lua.
+     * Wait for an event to occur on the computer, suspending the thread until it arises. This method is exactly equivalent to {@code os.pullEvent()} in
+     * lua.
      *
-     * @param filter   A specific event to wait for, or null to wait for any event.
+     * @param filter A specific event to wait for, or null to wait for any event.
      * @param callback The callback to resume with the name of the event that occurred, and any event parameters.
      * @return The method result which represents this yield.
      * @see IComputerAccess#queueEvent(String, Object[])
      */
     @Nonnull
-    public static MethodResult pullEvent( @Nullable String filter, @Nonnull ILuaCallback callback )
-    {
-        Objects.requireNonNull( callback, "callback cannot be null" );
-        return new MethodResult( new Object[] { filter }, results -> {
-            if( results.length >= 1 && results[0].equals( "terminate" ) ) throw new LuaException( "Terminated", 0 );
-            return callback.resume( results );
-        } );
+    public static MethodResult pullEvent(@Nullable String filter, @Nonnull ILuaCallback callback) {
+        Objects.requireNonNull(callback, "callback cannot be null");
+        return new MethodResult(new Object[] {filter}, results -> {
+            if (results.length >= 1 && results[0].equals("terminate")) {
+                throw new LuaException("Terminated", 0);
+            }
+            return callback.resume(results);
+        });
     }
 
     /**
-     * The same as {@link #pullEvent(String, ILuaCallback)}, except "terminated" events are ignored. Only use this if
-     * you want to prevent program termination, which is not recommended. This method is exactly equivalent to
-     * {@code os.pullEventRaw()} in Lua.
+     * The same as {@link #pullEvent(String, ILuaCallback)}, except "terminated" events are ignored. Only use this if you want to prevent program
+     * termination, which is not recommended. This method is exactly equivalent to {@code os.pullEventRaw()} in Lua.
      *
-     * @param filter   A specific event to wait for, or null to wait for any event.
+     * @param filter A specific event to wait for, or null to wait for any event.
      * @param callback The callback to resume with the name of the event that occurred, and any event parameters.
      * @return The method result which represents this yield.
      * @see #pullEvent(String, ILuaCallback)
      */
     @Nonnull
-    public static MethodResult pullEventRaw( @Nullable String filter, @Nonnull ILuaCallback callback )
-    {
-        Objects.requireNonNull( callback, "callback cannot be null" );
-        return new MethodResult( new Object[] { filter }, callback );
+    public static MethodResult pullEventRaw(@Nullable String filter, @Nonnull ILuaCallback callback) {
+        Objects.requireNonNull(callback, "callback cannot be null");
+        return new MethodResult(new Object[] {filter}, callback);
     }
 
     /**
-     * Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to
-     * {@code coroutine.yield()} in lua. Use {@code pullEvent()} if you wish to wait for events.
+     * Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to {@code coroutine.yield()} in lua. Use
+     * {@code pullEvent()} if you wish to wait for events.
      *
      * @param arguments An object array containing the arguments to pass to coroutine.yield()
-     * @param callback  The callback to resume with an array containing the return values from coroutine.yield()
+     * @param callback The callback to resume with an array containing the return values from coroutine.yield()
      * @return The method result which represents this yield.
      * @see #pullEvent(String, ILuaCallback)
      */
     @Nonnull
-    public static MethodResult yield( @Nullable Object[] arguments, @Nonnull ILuaCallback callback )
-    {
-        Objects.requireNonNull( callback, "callback cannot be null" );
-        return new MethodResult( arguments, callback );
+    public static MethodResult yield(@Nullable Object[] arguments, @Nonnull ILuaCallback callback) {
+        Objects.requireNonNull(callback, "callback cannot be null");
+        return new MethodResult(arguments, callback);
     }
 
     @Nullable
-    public Object[] getResult()
-    {
-        return result;
+    public Object[] getResult() {
+        return this.result;
     }
 
     @Nullable
-    public ILuaCallback getCallback()
-    {
-        return callback;
+    public ILuaCallback getCallback() {
+        return this.callback;
     }
 
-    public int getErrorAdjust()
-    {
-        return adjust;
+    public int getErrorAdjust() {
+        return this.adjust;
     }
 
     /**
-     * Increase the Lua error by a specific amount. One should never need to use this function - it largely exists for
-     * some CC internal code.
+     * Increase the Lua error by a specific amount. One should never need to use this function - it largely exists for some CC internal code.
      *
      * @param adjust The amount to increase the level by.
      * @return The new {@link MethodResult} with an adjusted error. This has no effect on immediate results.
      */
     @Nonnull
-    public MethodResult adjustError( int adjust )
-    {
-        if( adjust < 0 ) throw new IllegalArgumentException( "cannot adjust by a negative amount" );
-        if( adjust == 0 || callback == null ) return this;
-        return new MethodResult( result, callback, this.adjust + adjust );
+    public MethodResult adjustError(int adjust) {
+        if (adjust < 0) {
+            throw new IllegalArgumentException("cannot adjust by a negative amount");
+        }
+        if (adjust == 0 || this.callback == null) {
+            return this;
+        }
+        return new MethodResult(this.result, this.callback, this.adjust + adjust);
     }
 }

src/main/java/dan200/computercraft/api/lua/ObjectArguments.java

@@ -3,64 +3,64 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.lua;
 
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
+import javax.annotation.Nullable;
+
 /**
  * An implementation of {@link IArguments} which wraps an array of {@link Object}.
  */
-public final class ObjectArguments implements IArguments
-{
+public final class ObjectArguments implements IArguments {
     private static final IArguments EMPTY = new ObjectArguments();
     private final List<Object> args;
 
     @Deprecated
-    @SuppressWarnings( "unused" )
-    public ObjectArguments( IArguments arguments )
-    {
+    @SuppressWarnings ("unused")
+    public ObjectArguments(IArguments arguments) {
         throw new IllegalStateException();
     }
 
-    public ObjectArguments( Object... args )
-    {
-        this.args = Arrays.asList( args );
+    public ObjectArguments(Object... args) {
+        this.args = Arrays.asList(args);
     }
 
-    public ObjectArguments( List<Object> args )
-    {
-        this.args = Objects.requireNonNull( args );
+    public ObjectArguments(List<Object> args) {
+        this.args = Objects.requireNonNull(args);
     }
 
     @Override
-    public int count()
-    {
-        return args.size();
+    public IArguments drop(int count) {
+        if (count < 0) {
+            throw new IllegalStateException("count cannot be negative");
+        }
+        if (count == 0) {
+            return this;
+        }
+        if (count >= this.args.size()) {
+            return EMPTY;
+        }
+
+        return new ObjectArguments(this.args.subList(count, this.args.size()));
     }
 
     @Override
-    public IArguments drop( int count )
-    {
-        if( count < 0 ) throw new IllegalStateException( "count cannot be negative" );
-        if( count == 0 ) return this;
-        if( count >= args.size() ) return EMPTY;
+    public Object[] getAll() {
+        return this.args.toArray();
+    }
 
-        return new ObjectArguments( args.subList( count, args.size() ) );
+    @Override
+    public int count() {
+        return this.args.size();
     }
 
     @Nullable
     @Override
-    public Object get( int index )
-    {
-        return index >= args.size() ? null : args.get( index );
-    }
-
-    @Override
-    public Object[] getAll()
-    {
-        return args.toArray();
+    public Object get(int index) {
+        return index >= this.args.size() ? null : this.args.get(index);
     }
 }

src/main/java/dan200/computercraft/api/media/IMedia.java

@@ -3,25 +3,25 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-package dan200.computercraft.api.media;
 
-import dan200.computercraft.api.filesystem.IMount;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.world.World;
+package dan200.computercraft.api.media;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import dan200.computercraft.api.filesystem.IMount;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.world.World;
+
 /**
  * Represents an item that can be placed in a disk drive and used by a Computer.
  *
- * Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register
- * a {@link IMediaProvider}.
+ * Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register a {@link IMediaProvider}.
  */
-public interface IMedia
-{
+public interface IMedia {
     /**
      * Get a string representing the label of this item. Will be called via {@code disk.getLabel()} in lua.
      *
@@ -29,7 +29,7 @@ public interface IMedia
      * @return The label. ie: "Dan's Programs".
      */
     @Nullable
-    String getLabel( @Nonnull ItemStack stack );
+    String getLabel(@Nonnull ItemStack stack);
 
     /**
      * Set a string representing the label of this item. Will be called vi {@code disk.setLabel()} in lua.
@@ -38,21 +38,18 @@ public interface IMedia
      * @param label The string to set the label to.
      * @return true if the label was updated, false if the label may not be modified.
      */
-    default boolean setLabel( @Nonnull ItemStack stack, @Nullable String label )
-    {
+    default boolean setLabel(@Nonnull ItemStack stack, @Nullable String label) {
         return false;
     }
 
     /**
-     * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie:
-     * "Jonathan Coulton - Still Alive"
+     * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie: "Jonathan Coulton - Still Alive"
      *
      * @param stack The {@link ItemStack} to modify.
      * @return The name, or null if this item does not represent an item with audio.
      */
     @Nullable
-    default String getAudioTitle( @Nonnull ItemStack stack )
-    {
+    default String getAudioTitle(@Nonnull ItemStack stack) {
         return null;
     }
 
@@ -63,27 +60,25 @@ public interface IMedia
      * @return The name, or null if this item does not represent an item with audio.
      */
     @Nullable
-    default SoundEvent getAudio( @Nonnull ItemStack stack )
-    {
+    default SoundEvent getAudio(@Nonnull ItemStack stack) {
         return null;
     }
 
     /**
-     * If this disk represents an item with data (like a floppy disk), get a mount representing it's contents. This will
-     * be mounted onto the filesystem of the computer while the media is in the disk drive.
+     * If this disk represents an item with data (like a floppy disk), get a mount representing it's contents. This will be mounted onto the filesystem of
+     * the computer while the media is in the disk drive.
      *
      * @param stack The {@link ItemStack} to modify.
      * @param world The world in which the item and disk drive reside.
-     * @return The mount, or null if this item does not represent an item with data. If the mount returned also
-     * implements {@link dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
+     * @return The mount, or null if this item does not represent an item with data. If the mount returned also implements {@link
+     *     dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
      * @see IMount
      * @see dan200.computercraft.api.filesystem.IWritableMount
      * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(String, String)
      */
     @Nullable
-    default IMount createDataMount( @Nonnull ItemStack stack, @Nonnull World world )
-    {
+    default IMount createDataMount(@Nonnull ItemStack stack, @Nonnull World world) {
         return null;
     }
 }

src/main/java/dan200/computercraft/api/media/IMediaProvider.java

@@ -3,21 +3,21 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-package dan200.computercraft.api.media;
 
-import net.minecraft.item.ItemStack;
+package dan200.computercraft.api.media;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import net.minecraft.item.ItemStack;
+
 /**
  * This interface is used to provide {@link IMedia} implementations for {@link ItemStack}.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
  */
 @FunctionalInterface
-public interface IMediaProvider
-{
+public interface IMediaProvider {
     /**
      * Produce an IMedia implementation from an ItemStack.
      *
@@ -26,5 +26,5 @@ public interface IMediaProvider
      * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
      */
     @Nullable
-    IMedia getMedia( @Nonnull ItemStack stack );
+    IMedia getMedia(@Nonnull ItemStack stack);
 }

src/main/java/dan200/computercraft/api/network/IPacketNetwork.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network;
 
 import javax.annotation.Nonnull;
@@ -13,21 +14,20 @@ import javax.annotation.Nonnull;
  * @see Packet
  * @see IPacketReceiver
  */
-public interface IPacketNetwork
-{
+public interface IPacketNetwork {
     /**
      * Add a receiver to the network.
      *
      * @param receiver The receiver to register to the network.
      */
-    void addReceiver( @Nonnull IPacketReceiver receiver );
+    void addReceiver(@Nonnull IPacketReceiver receiver);
 
     /**
      * Remove a receiver from the network.
      *
      * @param receiver The device to remove from the network.
      */
-    void removeReceiver( @Nonnull IPacketReceiver receiver );
+    void removeReceiver(@Nonnull IPacketReceiver receiver);
 
     /**
      * Determine whether this network is wireless.
@@ -37,23 +37,23 @@ public interface IPacketNetwork
     boolean isWireless();
 
     /**
-     * Submit a packet for transmitting across the network. This will route the packet through the network, sending it
-     * to all receivers within range (or any interdimensional ones).
+     * Submit a packet for transmitting across the network. This will route the packet through the network, sending it to all receivers within range (or any
+     * interdimensional ones).
      *
      * @param packet The packet to send.
-     * @param range  The maximum distance this packet will be sent.
+     * @param range The maximum distance this packet will be sent.
      * @see #transmitInterdimensional(Packet)
      * @see IPacketReceiver#receiveSameDimension(Packet, double)
      */
-    void transmitSameDimension( @Nonnull Packet packet, double range );
+    void transmitSameDimension(@Nonnull Packet packet, double range);
 
     /**
-     * Submit a packet for transmitting across the network. This will route the packet through the network, sending it
-     * to all receivers across all dimensions.
+     * Submit a packet for transmitting across the network. This will route the packet through the network, sending it to all receivers across all
+     * dimensions.
      *
      * @param packet The packet to send.
      * @see #transmitSameDimension(Packet, double)
      * @see IPacketReceiver#receiveDifferentDimension(Packet)
      */
-    void transmitInterdimensional( @Nonnull Packet packet );
+    void transmitInterdimensional(@Nonnull Packet packet);
 }

src/main/java/dan200/computercraft/api/network/IPacketReceiver.java

@@ -3,18 +3,18 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 /**
  * An object on an {@link IPacketNetwork}, capable of receiving packets.
  */
-public interface IPacketReceiver
-{
+public interface IPacketReceiver {
     /**
      * Get the world in which this packet receiver exists.
      *
@@ -34,9 +34,8 @@ public interface IPacketReceiver
     /**
      * Get the maximum distance this receiver can send and receive messages.
      *
-     * When determining whether a receiver can receive a message, the largest distance of the packet and receiver is
-     * used - ensuring it is within range. If the packet or receiver is inter-dimensional, then the packet will always
-     * be received.
+     * When determining whether a receiver can receive a message, the largest distance of the packet and receiver is used - ensuring it is within range. If
+     * the packet or receiver is inter-dimensional, then the packet will always be received.
      *
      * @return The maximum distance this device can send and receive messages.
      * @see #isInterdimensional()
@@ -60,25 +59,25 @@ public interface IPacketReceiver
     /**
      * Receive a network packet from the same dimension.
      *
-     * @param packet   The packet to receive. Generally you should check that you are listening on the given channel and,
-     *                 if so, queue the appropriate modem event.
+     * @param packet The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
+     *     modem event.
      * @param distance The distance this packet has travelled from the source.
      * @see Packet
      * @see #getRange()
      * @see IPacketNetwork#transmitSameDimension(Packet, double)
      * @see IPacketNetwork#transmitInterdimensional(Packet)
      */
-    void receiveSameDimension( @Nonnull Packet packet, double distance );
+    void receiveSameDimension(@Nonnull Packet packet, double distance);
 
     /**
      * Receive a network packet from a different dimension.
      *
-     * @param packet The packet to receive. Generally you should check that you are listening on the given channel and,
-     *               if so, queue the appropriate modem event.
+     * @param packet The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
+     *     modem event.
      * @see Packet
      * @see IPacketNetwork#transmitInterdimensional(Packet)
      * @see IPacketNetwork#transmitSameDimension(Packet, double)
      * @see #isInterdimensional()
      */
-    void receiveDifferentDimension( @Nonnull Packet packet );
+    void receiveDifferentDimension(@Nonnull Packet packet);
 }

src/main/java/dan200/computercraft/api/network/IPacketSender.java

@@ -3,18 +3,18 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-
 /**
  * An object on a {@link IPacketNetwork}, capable of sending packets.
  */
-public interface IPacketSender
-{
+public interface IPacketSender {
     /**
      * Get the world in which this packet sender exists.
      *
@@ -32,8 +32,8 @@ public interface IPacketSender
     Vec3d getPosition();
 
     /**
-     * Get some sort of identification string for this sender. This does not strictly need to be unique, but you
-     * should be able to extract some identifiable information from it.
+     * Get some sort of identification string for this sender. This does not strictly need to be unique, but you should be able to extract some identifiable
+     * information from it.
      *
      * @return This device's id.
      */

src/main/java/dan200/computercraft/api/network/Packet.java

@@ -3,11 +3,13 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network;
 
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Objects;
 
 /**
  * Represents a packet which may be sent across a {@link IPacketNetwork}.
@@ -18,8 +20,7 @@ import java.util.Objects;
  * @see IPacketReceiver#receiveDifferentDimension(Packet)
  * @see IPacketReceiver#receiveSameDimension(Packet, double)
  */
-public class Packet
-{
+public class Packet {
     private final int channel;
     private final int replyChannel;
     private final Object payload;
@@ -29,16 +30,14 @@ public class Packet
     /**
      * Create a new packet, ready for transmitting across the network.
      *
-     * @param channel      The channel to send the packet along. Receiving devices should only process packets from on
-     *                     channels they are listening to.
+     * @param channel The channel to send the packet along. Receiving devices should only process packets from on channels they are listening to.
      * @param replyChannel The channel to reply on.
-     * @param payload      The contents of this packet. This should be a "valid" Lua object, safe for queuing as an
-     *                     event or returning from a peripheral call.
-     * @param sender       The object which sent this packet.
+     * @param payload The contents of this packet. This should be a "valid" Lua object, safe for queuing as an event or returning from a peripheral
+     *     call.
+     * @param sender The object which sent this packet.
      */
-    public Packet( int channel, int replyChannel, @Nullable Object payload, @Nonnull IPacketSender sender )
-    {
-        Objects.requireNonNull( sender, "sender cannot be null" );
+    public Packet(int channel, int replyChannel, @Nullable Object payload, @Nonnull IPacketSender sender) {
+        Objects.requireNonNull(sender, "sender cannot be null");
 
         this.channel = channel;
         this.replyChannel = replyChannel;
@@ -47,14 +46,12 @@ public class Packet
     }
 
     /**
-     * Get the channel this packet is sent along. Receivers should generally only process packets from on channels they
-     * are listening to.
+     * Get the channel this packet is sent along. Receivers should generally only process packets from on channels they are listening to.
      *
      * @return This packet's channel.
      */
-    public int getChannel()
-    {
-        return channel;
+    public int getChannel() {
+        return this.channel;
     }
 
     /**
@@ -62,21 +59,18 @@ public class Packet
      *
      * @return This channel to reply on.
      */
-    public int getReplyChannel()
-    {
-        return replyChannel;
+    public int getReplyChannel() {
+        return this.replyChannel;
     }
 
     /**
-     * The actual data of this packet. This should be a "valid" Lua object, safe for queuing as an
-     * event or returning from a peripheral call.
+     * The actual data of this packet. This should be a "valid" Lua object, safe for queuing as an event or returning from a peripheral call.
      *
      * @return The packet's payload
      */
     @Nullable
-    public Object getPayload()
-    {
-        return payload;
+    public Object getPayload() {
+        return this.payload;
     }
 
     /**
@@ -85,33 +79,40 @@ public class Packet
      * @return The sending object.
      */
     @Nonnull
-    public IPacketSender getSender()
-    {
-        return sender;
+    public IPacketSender getSender() {
+        return this.sender;
     }
 
     @Override
-    public boolean equals( Object o )
-    {
-        if( this == o ) return true;
-        if( o == null || getClass() != o.getClass() ) return false;
+    public int hashCode() {
+        int result;
+        result = this.channel;
+        result = 31 * result + this.replyChannel;
+        result = 31 * result + (this.payload != null ? this.payload.hashCode() : 0);
+        result = 31 * result + this.sender.hashCode();
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || this.getClass() != o.getClass()) {
+            return false;
+        }
 
         Packet packet = (Packet) o;
 
-        if( channel != packet.channel ) return false;
-        if( replyChannel != packet.replyChannel ) return false;
-        if( !Objects.equals( payload, packet.payload ) ) return false;
-        return sender.equals( packet.sender );
-    }
-
-    @Override
-    public int hashCode()
-    {
-        int result;
-        result = channel;
-        result = 31 * result + replyChannel;
-        result = 31 * result + (payload != null ? payload.hashCode() : 0);
-        result = 31 * result + sender.hashCode();
-        return result;
+        if (this.channel != packet.channel) {
+            return false;
+        }
+        if (this.replyChannel != packet.replyChannel) {
+            return false;
+        }
+        if (!Objects.equals(this.payload, packet.payload)) {
+            return false;
+        }
+        return this.sender.equals(packet.sender);
     }
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredElement.java

@@ -3,32 +3,29 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network.wired;
 
-import dan200.computercraft.api.ComputerCraftAPI;
-
 import javax.annotation.Nonnull;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+
 /**
  * An object which may be part of a wired network.
  *
- * Elements should construct a node using {@link ComputerCraftAPI#createWiredNodeForElement(IWiredElement)}. This acts
- * as a proxy for all network objects. Whilst the node may change networks, an element's node should remain constant
- * for its lifespan.
+ * Elements should construct a node using {@link ComputerCraftAPI#createWiredNodeForElement(IWiredElement)}. This acts as a proxy for all network objects.
+ * Whilst the node may change networks, an element's node should remain constant for its lifespan.
  *
- * Elements are generally tied to a block or tile entity in world. In such as case, one should provide the
- * {@link IWiredElement} capability for the appropriate sides.
+ * Elements are generally tied to a block or tile entity in world. In such as case, one should provide the {@link IWiredElement} capability for the
+ * appropriate sides.
  */
-public interface IWiredElement extends IWiredSender
-{
+public interface IWiredElement extends IWiredSender {
     /**
-     * Called when objects on the network change. This may occur when network nodes are added or removed, or when
-     * peripherals change.
+     * Called when objects on the network change. This may occur when network nodes are added or removed, or when peripherals change.
      *
      * @param change The change which occurred.
      * @see IWiredNetworkChange
      */
-    default void networkChanged( @Nonnull IWiredNetworkChange change )
-    {
+    default void networkChanged(@Nonnull IWiredNetworkChange change) {
     }
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredNetwork.java

@@ -3,50 +3,49 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network.wired;
 
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+
 import dan200.computercraft.api.peripheral.IPeripheral;
 
-import javax.annotation.Nonnull;
-import java.util.Map;
-
 /**
- * A wired network is composed of one of more {@link IWiredNode}s, a set of connections between them, and a series
- * of peripherals.
+ * A wired network is composed of one of more {@link IWiredNode}s, a set of connections between them, and a series of peripherals.
  *
- * Networks from a connected graph. This means there is some path between all nodes on the network. Further more, if
- * there is some path between two nodes then they must be on the same network. {@link IWiredNetwork} will automatically
- * handle the merging and splitting of networks (and thus changing of available nodes and peripherals) as connections
- * change.
+ * Networks from a connected graph. This means there is some path between all nodes on the network. Further more, if there is some path between two nodes
+ * then they must be on the same network. {@link IWiredNetwork} will automatically handle the merging and splitting of networks (and thus changing of
+ * available nodes and peripherals) as connections change.
  *
- * This does mean one can not rely on the network remaining consistent between subsequent operations. Consequently,
- * it is generally preferred to use the methods provided by {@link IWiredNode}.
+ * This does mean one can not rely on the network remaining consistent between subsequent operations. Consequently, it is generally preferred to use the
+ * methods provided by {@link IWiredNode}.
  *
  * @see IWiredNode#getNetwork()
  */
-public interface IWiredNetwork
-{
+public interface IWiredNetwork {
     /**
      * Create a connection between two nodes.
      *
      * This should only be used on the server thread.
      *
-     * @param left  The first node to connect
+     * @param left The first node to connect
      * @param right The second node to connect
      * @return {@code true} if a connection was created or {@code false} if the connection already exists.
-     * @throws IllegalStateException    If neither node is on the network.
+     * @throws IllegalStateException If neither node is on the network.
      * @throws IllegalArgumentException If {@code left} and {@code right} are equal.
      * @see IWiredNode#connectTo(IWiredNode)
      * @see IWiredNetwork#connect(IWiredNode, IWiredNode)
      */
-    boolean connect( @Nonnull IWiredNode left, @Nonnull IWiredNode right );
+    boolean connect(@Nonnull IWiredNode left, @Nonnull IWiredNode right);
 
     /**
      * Destroy a connection between this node and another.
      *
      * This should only be used on the server thread.
      *
-     * @param left  The first node in the connection.
+     * @param left The first node in the connection.
      * @param right The second node in the connection.
      * @return {@code true} if a connection was destroyed or {@code false} if no connection exists.
      * @throws IllegalArgumentException If either node is not on the network.
@@ -54,32 +53,29 @@ public interface IWiredNetwork
      * @see IWiredNode#disconnectFrom(IWiredNode)
      * @see IWiredNetwork#connect(IWiredNode, IWiredNode)
      */
-    boolean disconnect( @Nonnull IWiredNode left, @Nonnull IWiredNode right );
+    boolean disconnect(@Nonnull IWiredNode left, @Nonnull IWiredNode right);
 
     /**
      * Sever all connections this node has, removing it from this network.
      *
-     * This should only be used on the server thread. You should only call this on nodes
-     * that your network element owns.
+     * This should only be used on the server thread. You should only call this on nodes that your network element owns.
      *
      * @param node The node to remove
-     * @return Whether this node was removed from the network. One cannot remove a node from a network where it is the
-     * only element.
+     * @return Whether this node was removed from the network. One cannot remove a node from a network where it is the only element.
      * @throws IllegalArgumentException If the node is not in the network.
      * @see IWiredNode#remove()
      */
-    boolean remove( @Nonnull IWiredNode node );
+    boolean remove(@Nonnull IWiredNode node);
 
     /**
      * Update the peripherals a node provides.
      *
-     * This should only be used on the server thread. You should only call this on nodes
-     * that your network element owns.
+     * This should only be used on the server thread. You should only call this on nodes that your network element owns.
      *
-     * @param node        The node to attach peripherals for.
+     * @param node The node to attach peripherals for.
      * @param peripherals The new peripherals for this node.
      * @throws IllegalArgumentException If the node is not in the network.
      * @see IWiredNode#updatePeripherals(Map)
      */
-    void updatePeripherals( @Nonnull IWiredNode node, @Nonnull Map<String, IPeripheral> peripherals );
+    void updatePeripherals(@Nonnull IWiredNode node, @Nonnull Map<String, IPeripheral> peripherals);
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredNetworkChange.java

@@ -3,23 +3,24 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network.wired;
 
-import dan200.computercraft.api.peripheral.IPeripheral;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
-import java.util.Map;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
 
 /**
  * Represents a change to the objects on a wired network.
  *
  * @see IWiredElement#networkChanged(IWiredNetworkChange)
  */
-public interface IWiredNetworkChange
-{
+public interface IWiredNetworkChange {
     /**
-     * A set of peripherals which have been removed. Note that there may be entries with the same name
-     * in the added and removed set, but with a different peripheral.
+     * A set of peripherals which have been removed. Note that there may be entries with the same name in the added and removed set, but with a different
+     * peripheral.
      *
      * @return The set of removed peripherals.
      */
@@ -27,8 +28,8 @@ public interface IWiredNetworkChange
     Map<String, IPeripheral> peripheralsRemoved();
 
     /**
-     * A set of peripherals which have been added. Note that there may be entries with the same name
-     * in the added and removed set, but with a different peripheral.
+     * A set of peripherals which have been added. Note that there may be entries with the same name in the added and removed set, but with a different
+     * peripheral.
      *
      * @return The set of added peripherals.
      */

src/main/java/dan200/computercraft/api/network/wired/IWiredNode.java

@@ -3,29 +3,29 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network.wired;
 
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+
 import dan200.computercraft.api.network.IPacketNetwork;
 import dan200.computercraft.api.peripheral.IPeripheral;
 
-import javax.annotation.Nonnull;
-import java.util.Map;
-
 /**
  * Wired nodes act as a layer between {@link IWiredElement}s and {@link IWiredNetwork}s.
  *
- * Firstly, a node acts as a packet network, capable of sending and receiving modem messages to connected nodes. These
- * methods may be safely used on any thread.
+ * Firstly, a node acts as a packet network, capable of sending and receiving modem messages to connected nodes. These methods may be safely used on any
+ * thread.
  *
- * When sending a packet, the system will attempt to find the shortest path between the two nodes based on their
- * element's position. Note that packet senders and receivers can have different locations from their associated
- * element: the distance between the two will be added to the total packet's distance.
+ * When sending a packet, the system will attempt to find the shortest path between the two nodes based on their element's position. Note that packet
+ * senders and receivers can have different locations from their associated element: the distance between the two will be added to the total packet's
+ * distance.
  *
- * Wired nodes also provide several convenience methods for interacting with a wired network. These should only ever
- * be used on the main server thread.
+ * Wired nodes also provide several convenience methods for interacting with a wired network. These should only ever be used on the main server thread.
  */
-public interface IWiredNode extends IPacketNetwork
-{
+public interface IWiredNode extends IPacketNetwork {
     /**
      * The associated element for this network node.
      *
@@ -34,17 +34,6 @@ public interface IWiredNode extends IPacketNetwork
     @Nonnull
     IWiredElement getElement();
 
-    /**
-     * The network this node is currently connected to. Note that this may change
-     * after any network operation, so it should not be cached.
-     *
-     * This should only be used on the server thread.
-     *
-     * @return This node's network.
-     */
-    @Nonnull
-    IWiredNetwork getNetwork();
-
     /**
      * Create a connection from this node to another.
      *
@@ -55,11 +44,20 @@ public interface IWiredNode extends IPacketNetwork
      * @see IWiredNetwork#connect(IWiredNode, IWiredNode)
      * @see IWiredNode#disconnectFrom(IWiredNode)
      */
-    default boolean connectTo( @Nonnull IWiredNode node )
-    {
-        return getNetwork().connect( this, node );
+    default boolean connectTo(@Nonnull IWiredNode node) {
+        return this.getNetwork().connect(this, node);
     }
 
+    /**
+     * The network this node is currently connected to. Note that this may change after any network operation, so it should not be cached.
+     *
+     * This should only be used on the server thread.
+     *
+     * @return This node's network.
+     */
+    @Nonnull
+    IWiredNetwork getNetwork();
+
     /**
      * Destroy a connection between this node and another.
      *
@@ -71,38 +69,32 @@ public interface IWiredNode extends IPacketNetwork
      * @see IWiredNetwork#disconnect(IWiredNode, IWiredNode)
      * @see IWiredNode#connectTo(IWiredNode)
      */
-    default boolean disconnectFrom( @Nonnull IWiredNode node )
-    {
-        return getNetwork().disconnect( this, node );
+    default boolean disconnectFrom(@Nonnull IWiredNode node) {
+        return this.getNetwork().disconnect(this, node);
     }
 
     /**
      * Sever all connections this node has, removing it from this network.
      *
-     * This should only be used on the server thread. You should only call this on nodes
-     * that your network element owns.
+     * This should only be used on the server thread. You should only call this on nodes that your network element owns.
      *
-     * @return Whether this node was removed from the network. One cannot remove a node from a network where it is the
-     * only element.
+     * @return Whether this node was removed from the network. One cannot remove a node from a network where it is the only element.
      * @throws IllegalArgumentException If the node is not in the network.
      * @see IWiredNetwork#remove(IWiredNode)
      */
-    default boolean remove()
-    {
-        return getNetwork().remove( this );
+    default boolean remove() {
+        return this.getNetwork().remove(this);
     }
 
     /**
      * Mark this node's peripherals as having changed.
      *
-     * This should only be used on the server thread. You should only call this on nodes
-     * that your network element owns.
+     * This should only be used on the server thread. You should only call this on nodes that your network element owns.
      *
      * @param peripherals The new peripherals for this node.
      * @see IWiredNetwork#updatePeripherals(IWiredNode, Map)
      */
-    default void updatePeripherals( @Nonnull Map<String, IPeripheral> peripherals )
-    {
-        getNetwork().updatePeripherals( this, peripherals );
+    default void updatePeripherals(@Nonnull Map<String, IPeripheral> peripherals) {
+        this.getNetwork().updatePeripherals(this, peripherals);
     }
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredSender.java

@@ -3,25 +3,23 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.network.wired;
 
-import dan200.computercraft.api.network.IPacketSender;
-
 import javax.annotation.Nonnull;
 
+import dan200.computercraft.api.network.IPacketSender;
+
 /**
  * An object on a {@link IWiredNetwork} capable of sending packets.
  *
- * Unlike a regular {@link IPacketSender}, this must be associated with the node you are attempting to
- * to send the packet from.
+ * Unlike a regular {@link IPacketSender}, this must be associated with the node you are attempting to to send the packet from.
  */
-public interface IWiredSender extends IPacketSender
-{
+public interface IWiredSender extends IPacketSender {
     /**
      * The node in the network representing this object.
      *
-     * This should be used as a proxy for the main network. One should send packets
-     * and register receivers through this object.
+     * This should be used as a proxy for the main network. One should send packets and register receivers through this object.
      *
      * @return The node for this element.
      */

src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java

@@ -3,8 +3,14 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.peripheral;
 
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
@@ -12,26 +18,21 @@ import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.ILuaTask;
 import dan200.computercraft.api.lua.MethodResult;
+
 import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Map;
-
 /**
- * The interface passed to peripherals by computers or turtles, providing methods
- * that they can call. This should not be implemented by your classes. Do not interact
- * with computers except via this interface.
+ * The interface passed to peripherals by computers or turtles, providing methods that they can call. This should not be implemented by your classes. Do not
+ * interact with computers except via this interface.
  */
-public interface IComputerAccess
-{
+public interface IComputerAccess {
     /**
      * Mount a mount onto the computer's file system in a read only mode.
      *
      * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount           The mount object to mount on the computer.
-     * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a
-     * file in the desired location. Store this value if you wish to unmount the mount later.
+     * @param mount The mount object to mount on the computer.
+     * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a file in the desired location.
+     *     Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
@@ -41,19 +42,18 @@ public interface IComputerAccess
      * @see IMount
      */
     @Nullable
-    default String mount( @Nonnull String desiredLocation, @Nonnull IMount mount )
-    {
-        return mount( desiredLocation, mount, getAttachmentName() );
+    default String mount(@Nonnull String desiredLocation, @Nonnull IMount mount) {
+        return this.mount(desiredLocation, mount, this.getAttachmentName());
     }
 
     /**
      * Mount a mount onto the computer's file system in a read only mode.
      *
      * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount           The mount object to mount on the computer.
-     * @param driveName       A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
-     * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a
-     * file in the desired location. Store this value if you wish to unmount the mount later.
+     * @param mount The mount object to mount on the computer.
+     * @param driveName A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
+     * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a file in the desired location.
+     *     Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
@@ -63,101 +63,12 @@ public interface IComputerAccess
      * @see IMount
      */
     @Nullable
-    String mount( @Nonnull String desiredLocation, @Nonnull IMount mount, @Nonnull String driveName );
+    String mount(@Nonnull String desiredLocation, @Nonnull IMount mount, @Nonnull String driveName);
 
     /**
-     * Mount a mount onto the computer's file system in a writable mode.
-     *
-     * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount           The mount object to mount on the computer.
-     * @return The location on the computer's file system where you the mount mounted, or null if there was already a
-     * file in the desired location. Store this value if you wish to unmount the mount later.
-     * @throws NotAttachedException If the peripheral has been detached.
-     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
-     * @see ComputerCraftAPI#createResourceMount(String, String)
-     * @see #mount(String, IMount)
-     * @see #unmount(String)
-     * @see IMount
-     */
-    @Nullable
-    default String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount )
-    {
-        return mountWritable( desiredLocation, mount, getAttachmentName() );
-    }
-
-    /**
-     * Mount a mount onto the computer's file system in a writable mode.
-     *
-     * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount           The mount object to mount on the computer.
-     * @param driveName       A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
-     * @return The location on the computer's file system where you the mount mounted, or null if there was already a
-     * file in the desired location. Store this value if you wish to unmount the mount later.
-     * @throws NotAttachedException If the peripheral has been detached.
-     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
-     * @see ComputerCraftAPI#createResourceMount(String, String)
-     * @see #mount(String, IMount)
-     * @see #unmount(String)
-     * @see IMount
-     */
-    String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount, @Nonnull String driveName );
-
-    /**
-     * Unmounts a directory previously mounted onto the computers file system by {@link #mount(String, IMount)}
-     * or {@link #mountWritable(String, IWritableMount)}.
-     *
-     * When a directory is unmounted, it will disappear from the computers file system, and the user will no longer be
-     * able to access it. All directories mounted by a mount or mountWritable are automatically unmounted when the
-     * peripheral is attached if they have not been explicitly unmounted.
-     *
-     * Note that you cannot unmount another peripheral's mounts.
-     *
-     * @param location The desired location in the computers file system of the directory to unmount.
-     *                 This must be the location of a directory previously mounted by {@link #mount(String, IMount)} or
-     *                 {@link #mountWritable(String, IWritableMount)}, as indicated by their return value.
-     * @throws NotAttachedException  If the peripheral has been detached.
-     * @throws IllegalStateException If the mount does not exist, or was mounted by another peripheral.
-     * @see #mount(String, IMount)
-     * @see #mountWritable(String, IWritableMount)
-     */
-    void unmount( @Nullable String location );
-
-    /**
-     * Returns the numerical ID of this computer.
-     *
-     * This is the same number obtained by calling {@code os.getComputerID()} or running the "id" program from lua,
-     * and is guaranteed unique. This number will be positive.
-     *
-     * @return The identifier.
-     */
-    int getID();
-
-    /**
-     * Causes an event to be raised on this computer, which the computer can respond to by calling
-     * {@code os.pullEvent()}. This can be used to notify the computer when things happen in the world or to
-     * this peripheral.
-     *
-     * @param event     A string identifying the type of event that has occurred, this will be
-     *                  returned as the first value from {@code os.pullEvent()}. It is recommended that you
-     *                  you choose a name that is unique, and recognisable as originating from your
-     *                  peripheral. eg: If your peripheral type is "button", a suitable event would be
-     *                  "button_pressed".
-     * @param arguments In addition to a name, you may pass an array of extra arguments to the event, that will
-     *                  be supplied as extra return values to os.pullEvent(). Objects in the array will be converted
-     *                  to lua data types in the same fashion as the return values of IPeripheral.callMethod().
-     *
-     *                  You may supply {@code null} to indicate that no arguments are to be supplied.
-     * @throws NotAttachedException If the peripheral has been detached.
-     * @see MethodResult#pullEvent(String, ILuaCallback)
-     */
-    void queueEvent( @Nonnull String event, @Nullable Object... arguments );
-
-    /**
-     * Get a string, unique to the computer, by which the computer refers to this peripheral.
-     * For directly attached peripherals this will be "left","right","front","back",etc, but
-     * for peripherals attached remotely it will be different. It is good practice to supply
-     * this string when raising events to the computer, so that the computer knows from
-     * which peripheral the event came.
+     * Get a string, unique to the computer, by which the computer refers to this peripheral. For directly attached peripherals this will be
+     * "left","right","front","back",etc, but for peripherals attached remotely it will be different. It is good practice to supply this string when raising
+     * events to the computer, so that the computer knows from which peripheral the event came.
      *
      * @return A string unique to the computer, but not globally.
      * @throws NotAttachedException If the peripheral has been detached.
@@ -165,6 +76,86 @@ public interface IComputerAccess
     @Nonnull
     String getAttachmentName();
 
+    /**
+     * Mount a mount onto the computer's file system in a writable mode.
+     *
+     * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
+     * @param mount The mount object to mount on the computer.
+     * @return The location on the computer's file system where you the mount mounted, or null if there was already a file in the desired location. Store
+     *     this value if you wish to unmount the mount later.
+     * @throws NotAttachedException If the peripheral has been detached.
+     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see ComputerCraftAPI#createResourceMount(String, String)
+     * @see #mount(String, IMount)
+     * @see #unmount(String)
+     * @see IMount
+     */
+    @Nullable
+    default String mountWritable(@Nonnull String desiredLocation, @Nonnull IWritableMount mount) {
+        return this.mountWritable(desiredLocation, mount, this.getAttachmentName());
+    }
+
+    /**
+     * Mount a mount onto the computer's file system in a writable mode.
+     *
+     * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
+     * @param mount The mount object to mount on the computer.
+     * @param driveName A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
+     * @return The location on the computer's file system where you the mount mounted, or null if there was already a file in the desired location. Store
+     *     this value if you wish to unmount the mount later.
+     * @throws NotAttachedException If the peripheral has been detached.
+     * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+     * @see ComputerCraftAPI#createResourceMount(String, String)
+     * @see #mount(String, IMount)
+     * @see #unmount(String)
+     * @see IMount
+     */
+    String mountWritable(@Nonnull String desiredLocation, @Nonnull IWritableMount mount, @Nonnull String driveName);
+
+    /**
+     * Unmounts a directory previously mounted onto the computers file system by {@link #mount(String, IMount)} or {@link #mountWritable(String,
+     * IWritableMount)}.
+     *
+     * When a directory is unmounted, it will disappear from the computers file system, and the user will no longer be able to access it. All directories
+     * mounted by a mount or mountWritable are automatically unmounted when the peripheral is attached if they have not been explicitly unmounted.
+     *
+     * Note that you cannot unmount another peripheral's mounts.
+     *
+     * @param location The desired location in the computers file system of the directory to unmount. This must be the location of a directory
+     *     previously mounted by {@link #mount(String, IMount)} or {@link #mountWritable(String, IWritableMount)}, as indicated by their return value.
+     * @throws NotAttachedException If the peripheral has been detached.
+     * @throws IllegalStateException If the mount does not exist, or was mounted by another peripheral.
+     * @see #mount(String, IMount)
+     * @see #mountWritable(String, IWritableMount)
+     */
+    void unmount(@Nullable String location);
+
+    /**
+     * Returns the numerical ID of this computer.
+     *
+     * This is the same number obtained by calling {@code os.getComputerID()} or running the "id" program from lua, and is guaranteed unique. This number
+     * will be positive.
+     *
+     * @return The identifier.
+     */
+    int getID();
+
+    /**
+     * Causes an event to be raised on this computer, which the computer can respond to by calling {@code os.pullEvent()}. This can be used to notify the
+     * computer when things happen in the world or to this peripheral.
+     *
+     * @param event A string identifying the type of event that has occurred, this will be returned as the first value from {@code os.pullEvent()}. It
+     *     is recommended that you you choose a name that is unique, and recognisable as originating from your peripheral. eg: If your peripheral type is
+     *     "button", a suitable event would be "button_pressed".
+     * @param arguments In addition to a name, you may pass an array of extra arguments to the event, that will be supplied as extra return values to
+     *     os.pullEvent(). Objects in the array will be converted to lua data types in the same fashion as the return values of IPeripheral.callMethod().
+     *
+     *     You may supply {@code null} to indicate that no arguments are to be supplied.
+     * @throws NotAttachedException If the peripheral has been detached.
+     * @see MethodResult#pullEvent(String, ILuaCallback)
+     */
+    void queueEvent(@Nonnull String event, @Nullable Object... arguments);
+
     /**
      * Get a set of peripherals that this computer access can "see", along with their attachment name.
      *
@@ -179,26 +170,24 @@ public interface IComputerAccess
     Map<String, IPeripheral> getAvailablePeripherals();
 
     /**
-     * Get a reachable peripheral with the given attachment name. This is a equivalent to
-     * {@link #getAvailablePeripherals()}{@code .get(name)}, though may be more efficient.
+     * Get a reachable peripheral with the given attachment name. This is a equivalent to {@link #getAvailablePeripherals()}{@code .get(name)}, though may
+     * be more efficient.
      *
      * @param name The peripheral's attached name
      * @return The reachable peripheral, or {@code null} if none can be found.
      * @see #getAvailablePeripherals()
      */
     @Nullable
-    IPeripheral getAvailablePeripheral( @Nonnull String name );
+    IPeripheral getAvailablePeripheral(@Nonnull String name);
 
     /**
      * Get a {@link IWorkMonitor} for tasks your peripheral might execute on the main (server) thread.
      *
-     * This should be used to ensure your peripheral integrates with ComputerCraft's monitoring and limiting of how much
-     * server time each computer consumes. You should not need to use this if you use
-     * {@link ILuaContext#issueMainThreadTask(ILuaTask)} - this is intended for mods with their own system for running
-     * work on the main thread.
+     * This should be used to ensure your peripheral integrates with ComputerCraft's monitoring and limiting of how much server time each computer consumes.
+     * You should not need to use this if you use {@link ILuaContext#issueMainThreadTask(ILuaTask)} - this is intended for mods with their own system for
+     * running work on the main thread.
      *
-     * Please note that the returned implementation is <em>not</em> thread-safe, and should only be used from the main
-     * thread.
+     * Please note that the returned implementation is <em>not</em> thread-safe, and should only be used from the main thread.
      *
      * @return The work monitor for the main thread, or {@code null} if this computer does not have one.
      * @throws NotAttachedException If the peripheral has been detached.

src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java

@@ -3,23 +3,28 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.peripheral;
 
-import dan200.computercraft.api.lua.*;
-
 import javax.annotation.Nonnull;
 
+import dan200.computercraft.api.lua.IArguments;
+import dan200.computercraft.api.lua.IDynamicLuaObject;
+import dan200.computercraft.api.lua.ILuaContext;
+import dan200.computercraft.api.lua.LuaException;
+import dan200.computercraft.api.lua.LuaFunction;
+import dan200.computercraft.api.lua.MethodResult;
+
 /**
  * A peripheral whose methods are not known at runtime.
  *
- * This behaves similarly to {@link IDynamicLuaObject}, though also accepting the current {@link IComputerAccess}.
- * Generally one may use {@link LuaFunction} instead of implementing this interface.
+ * This behaves similarly to {@link IDynamicLuaObject}, though also accepting the current {@link IComputerAccess}. Generally one may use {@link LuaFunction}
+ * instead of implementing this interface.
  */
-public interface IDynamicPeripheral extends IPeripheral
-{
+public interface IDynamicPeripheral extends IPeripheral {
     /**
-     * Should return an array of strings that identify the methods that this peripheral exposes to Lua. This will be
-     * called once before each attachment, and should not change when called multiple times.
+     * Should return an array of strings that identify the methods that this peripheral exposes to Lua. This will be called once before each attachment, and
+     * should not change when called multiple times.
      *
      * @return An array of strings representing method names.
      * @see #callMethod
@@ -28,26 +33,21 @@ public interface IDynamicPeripheral extends IPeripheral
     String[] getMethodNames();
 
     /**
-     * This is called when a lua program on an attached computer calls {@code peripheral.call()} with
-     * one of the methods exposed by {@link #getMethodNames()}.
+     * This is called when a lua program on an attached computer calls {@code peripheral.call()} with one of the methods exposed by {@link
+     * #getMethodNames()}.
      *
-     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe when interacting
-     * with Minecraft objects.
+     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe when interacting with Minecraft objects.
      *
-     * @param computer  The interface to the computer that is making the call. Remember that multiple
-     *                  computers can be attached to a peripheral at once.
-     * @param context   The context of the currently running lua thread. This can be used to wait for events
-     *                  or otherwise yield.
-     * @param method    An integer identifying which of the methods from getMethodNames() the computercraft
-     *                  wishes to call. The integer indicates the index into the getMethodNames() table
-     *                  that corresponds to the string passed into peripheral.call()
+     * @param computer The interface to the computer that is making the call. Remember that multiple computers can be attached to a peripheral at once.
+     * @param context The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
+     * @param method An integer identifying which of the methods from getMethodNames() the computercraft wishes to call. The integer indicates the index
+     *     into the getMethodNames() table that corresponds to the string passed into peripheral.call()
      * @param arguments The arguments for this method.
      * @return A {@link MethodResult} containing the values to return or the action to perform.
-     * @throws LuaException If you throw any exception from this function, a lua error will be raised with the
-     *                      same message as your exception. Use this to throw appropriate errors if the wrong
-     *                      arguments are supplied to your method.
+     * @throws LuaException If you throw any exception from this function, a lua error will be raised with the same message as your exception. Use this
+     *     to throw appropriate errors if the wrong arguments are supplied to your method.
      * @see #getMethodNames()
      */
     @Nonnull
-    MethodResult callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments ) throws LuaException;
+    MethodResult callMethod(@Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments) throws LuaException;
 }

src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java

@@ -3,28 +3,25 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-package dan200.computercraft.api.peripheral;
 
-import dan200.computercraft.api.lua.LuaFunction;
-import net.minecraftforge.common.capabilities.Capability;
+package dan200.computercraft.api.peripheral;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import dan200.computercraft.api.lua.LuaFunction;
+
 /**
  * The interface that defines a peripheral.
  *
- * In order to expose a peripheral for your block or tile entity, you may either attach a {@link Capability}, or
- * register a {@link IPeripheralProvider}. This <em>cannot</em> be implemented {@link IPeripheral} directly on the tile.
+ * In order to expose a peripheral for your block or tile entity, you register a {@link IPeripheralProvider}. This <em>cannot</em> be implemented {@link
+ * IPeripheral} directly on the tile.
  *
- * Peripherals should provide a series of methods to the user, either using {@link LuaFunction} or by implementing
- * {@link IDynamicPeripheral}.
+ * Peripherals should provide a series of methods to the user, either using {@link LuaFunction} or by implementing {@link IDynamicPeripheral}.
  */
-public interface IPeripheral
-{
+public interface IPeripheral {
     /**
-     * Should return a string that uniquely identifies this type of peripheral.
-     * This can be queried from lua by calling {@code peripheral.getType()}
+     * Should return a string that uniquely identifies this type of peripheral. This can be queried from lua by calling {@code peripheral.getType()}
      *
      * @return A string identifying the type of peripheral.
      */
@@ -34,66 +31,54 @@ public interface IPeripheral
     /**
      * Is called when when a computer is attaching to the peripheral.
      *
-     * This will occur when a peripheral is placed next to an active computer, when a computer is turned on next to a
-     * peripheral, when a turtle travels into a square next to a peripheral, or when a wired modem adjacent to this
-     * peripheral is does any of the above.
+     * This will occur when a peripheral is placed next to an active computer, when a computer is turned on next to a peripheral, when a turtle travels into
+     * a square next to a peripheral, or when a wired modem adjacent to this peripheral is does any of the above.
      *
-     * Between calls to attach and {@link #detach}, the attached computer can make method calls on the peripheral using
-     * {@code peripheral.call()}. This method can be used to keep track of which computers are attached to the
-     * peripheral, or to take action when attachment occurs.
+     * Between calls to attach and {@link #detach}, the attached computer can make method calls on the peripheral using {@code peripheral.call()}. This
+     * method can be used to keep track of which computers are attached to the peripheral, or to take action when attachment occurs.
      *
-     * Be aware that will be called from both the server thread and ComputerCraft Lua thread, and so must be thread-safe
-     * and reentrant.
+     * Be aware that will be called from both the server thread and ComputerCraft Lua thread, and so must be thread-safe and reentrant.
      *
-     * @param computer The interface to the computer that is being attached. Remember that multiple computers can be
-     *                 attached to a peripheral at once.
+     * @param computer The interface to the computer that is being attached. Remember that multiple computers can be attached to a peripheral at once.
      * @see #detach
      */
-    default void attach( @Nonnull IComputerAccess computer )
-    {
+    default void attach(@Nonnull IComputerAccess computer) {
     }
 
     /**
      * Called when a computer is detaching from the peripheral.
      *
-     * This will occur when a computer shuts down, when the peripheral is removed while attached to computers, when a
-     * turtle moves away from a block attached to a peripheral, or when a wired modem adjacent to this peripheral is
-     * detached.
+     * This will occur when a computer shuts down, when the peripheral is removed while attached to computers, when a turtle moves away from a block
+     * attached to a peripheral, or when a wired modem adjacent to this peripheral is detached.
      *
-     * This method can be used to keep track of which computers are attached to the peripheral, or to take action when
-     * detachment occurs.
+     * This method can be used to keep track of which computers are attached to the peripheral, or to take action when detachment occurs.
      *
-     * Be aware that this will be called from both the server and ComputerCraft Lua thread, and must be thread-safe
-     * and reentrant.
+     * Be aware that this will be called from both the server and ComputerCraft Lua thread, and must be thread-safe and reentrant.
      *
-     * @param computer The interface to the computer that is being detached. Remember that multiple computers can be
-     *                 attached to a peripheral at once.
+     * @param computer The interface to the computer that is being detached. Remember that multiple computers can be attached to a peripheral at once.
      * @see #attach
      */
-    default void detach( @Nonnull IComputerAccess computer )
-    {
+    default void detach(@Nonnull IComputerAccess computer) {
     }
 
     /**
-     * Get the object that this peripheral provides methods for. This will generally be the tile entity
-     * or block, but may be an inventory, entity, etc...
+     * Get the object that this peripheral provides methods for. This will generally be the tile entity or block, but may be an inventory, entity, etc...
      *
      * @return The object this peripheral targets
      */
     @Nullable
-    default Object getTarget()
-    {
+    default Object getTarget() {
         return null;
     }
 
     /**
      * Determine whether this peripheral is equivalent to another one.
      *
-     * The minimal example should at least check whether they are the same object. However, you may wish to check if
-     * they point to the same block or tile entity.
+     * The minimal example should at least check whether they are the same object. However, you may wish to check if they point to the same block or tile
+     * entity.
      *
      * @param other The peripheral to compare against. This may be {@code null}.
      * @return Whether these peripherals are equivalent.
      */
-    boolean equals( @Nullable IPeripheral other );
+    boolean equals(@Nullable IPeripheral other);
 }

src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java

@@ -3,36 +3,36 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.peripheral;
 
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.LazyOptional;
+import java.util.Optional;
 
 import javax.annotation.Nonnull;
 
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
 /**
  * This interface is used to create peripheral implementations for blocks.
  *
- * If you have a {@link TileEntity} which acts as a peripheral, you may alternatively expose the {@link IPeripheral}
- * capability.
+ * If you have a {@link BlockEntity} which acts as a peripheral, you may alternatively expose the {@link IPeripheral} capability.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
  */
 @FunctionalInterface
-public interface IPeripheralProvider
-{
+public interface IPeripheralProvider {
     /**
      * Produce an peripheral implementation from a block location.
      *
      * @param world The world the block is in.
-     * @param pos   The position the block is at.
-     * @param side  The side to get the peripheral from.
-     * @return A peripheral, or {@link LazyOptional#empty()} if there is not a peripheral here you'd like to handle.
+     * @param pos The position the block is at.
+     * @param side The side to get the peripheral from.
+     * @return A peripheral, or {@link Optional#empty()} if there is not a peripheral here you'd like to handle.
      * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
      */
     @Nonnull
-    LazyOptional<IPeripheral> getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+    IPeripheral getPeripheral(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side);
 }

src/main/java/dan200/computercraft/api/peripheral/IPeripheralTile.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+
+package dan200.computercraft.api.peripheral;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+/**
+ * A {@link net.minecraft.block.entity.BlockEntity} which may act as a peripheral.
+ *
+ * If you need more complex capabilities (such as handling TEs not belonging to your mod), you should use {@link IPeripheralProvider}.
+ */
+public interface IPeripheralTile {
+    /**
+     * Get the peripheral on the given {@code side}.
+     *
+     * @param side The side to get the peripheral from.
+     * @return A peripheral, or {@code null} if there is not a peripheral here.
+     * @see IPeripheralProvider#getPeripheral(World, BlockPos, Direction)
+     */
+    @Nullable
+    IPeripheral getPeripheral(@Nonnull Direction side);
+}

src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java

@@ -3,29 +3,61 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.peripheral;
 
-import javax.annotation.Nonnull;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
+import javax.annotation.Nonnull;
+
 /**
- * Monitors "work" associated with a computer, keeping track of how much a computer has done, and ensuring every
- * computer receives a fair share of any processing time.
+ * Monitors "work" associated with a computer, keeping track of how much a computer has done, and ensuring every computer receives a fair share of any
+ * processing time.
  *
- * This is primarily intended for work done by peripherals on the main thread (such as on a tile entity's tick), but
- * could be used for other purposes (such as complex computations done on another thread).
+ * This is primarily intended for work done by peripherals on the main thread (such as on a tile entity's tick), but could be used for other purposes (such
+ * as complex computations done on another thread).
  *
- * Before running a task, one should call {@link #canWork()} to determine if the computer is currently allowed to
- * execute work. If that returns true, you should execute the task and use {@link #trackWork(long, TimeUnit)} to inform
- * the monitor how long that task took.
+ * Before running a task, one should call {@link #canWork()} to determine if the computer is currently allowed to execute work. If that returns true, you
+ * should execute the task and use {@link #trackWork(long, TimeUnit)} to inform the monitor how long that task took.
  *
  * Alternatively, use {@link #runWork(Runnable)} to run and keep track of work.
  *
  * @see IComputerAccess#getMainThreadMonitor()
  */
-public interface IWorkMonitor
-{
+public interface IWorkMonitor {
+    /**
+     * If the owning computer is currently allowed to execute work, and has ample time to do so.
+     *
+     * This is effectively a more restrictive form of {@link #canWork()}. One should use that in order to determine if you may do an initial piece of work,
+     * and shouldWork to determine if any additional task may be performed.
+     *
+     * @return If we should execute work right now.
+     */
+    boolean shouldWork();
+
+    /**
+     * Run a task if possible, and inform the monitor of how long it took.
+     *
+     * @param runnable The task to run.
+     * @return If the task was actually run (namely, {@link #canWork()} returned {@code true}).
+     */
+    default boolean runWork(@Nonnull Runnable runnable) {
+        Objects.requireNonNull(runnable, "runnable should not be null");
+        if (!this.canWork()) {
+            return false;
+        }
+
+        long start = System.nanoTime();
+        try {
+            runnable.run();
+        } finally {
+            this.trackWork(System.nanoTime() - start, TimeUnit.NANOSECONDS);
+        }
+
+        return true;
+    }
+
     /**
      * If the owning computer is currently allowed to execute work.
      *
@@ -33,45 +65,11 @@ public interface IWorkMonitor
      */
     boolean canWork();
 
-    /**
-     * If the owning computer is currently allowed to execute work, and has ample time to do so.
-     *
-     * This is effectively a more restrictive form of {@link #canWork()}. One should use that in order to determine if
-     * you may do an initial piece of work, and shouldWork to determine if any additional task may be performed.
-     *
-     * @return If we should execute work right now.
-     */
-    boolean shouldWork();
-
     /**
      * Inform the monitor how long some piece of work took to execute.
      *
      * @param time The time some task took to run
      * @param unit The unit that {@code time} was measured in.
      */
-    void trackWork( long time, @Nonnull TimeUnit unit );
-
-    /**
-     * Run a task if possible, and inform the monitor of how long it took.
-     *
-     * @param runnable The task to run.
-     * @return If the task was actually run (namely, {@link #canWork()} returned {@code true}).
-     */
-    default boolean runWork( @Nonnull Runnable runnable )
-    {
-        Objects.requireNonNull( runnable, "runnable should not be null" );
-        if( !canWork() ) return false;
-
-        long start = System.nanoTime();
-        try
-        {
-            runnable.run();
-        }
-        finally
-        {
-            trackWork( System.nanoTime() - start, TimeUnit.NANOSECONDS );
-        }
-
-        return true;
-    }
+    void trackWork(long time, @Nonnull TimeUnit unit);
 }

src/main/java/dan200/computercraft/api/peripheral/NotAttachedException.java

@@ -3,23 +3,20 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.peripheral;
 
 /**
- * Thrown when performing operations on {@link IComputerAccess} when the current peripheral is no longer attached to
- * the computer.
+ * Thrown when performing operations on {@link IComputerAccess} when the current peripheral is no longer attached to the computer.
  */
-public class NotAttachedException extends IllegalStateException
-{
+public class NotAttachedException extends IllegalStateException {
     private static final long serialVersionUID = 1221244785535553536L;
 
-    public NotAttachedException()
-    {
-        super( "You are not attached to this computer" );
+    public NotAttachedException() {
+        super("You are not attached to this computer");
     }
 
-    public NotAttachedException( String s )
-    {
-        super( s );
+    public NotAttachedException(String s) {
+        super(s);
     }
 }

src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java

@@ -3,115 +3,58 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.pocket;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
-import net.minecraftforge.common.util.NonNullSupplier;
-
 import javax.annotation.Nonnull;
-import java.util.function.Supplier;
+
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
 
 /**
  * A base class for {@link IPocketUpgrade}s.
  *
  * One does not have to use this, but it does provide a convenient template.
  */
-public abstract class AbstractPocketUpgrade implements IPocketUpgrade
-{
-    private final ResourceLocation id;
+public abstract class AbstractPocketUpgrade implements IPocketUpgrade {
+    private final Identifier id;
     private final String adjective;
-    private final NonNullSupplier<ItemStack> stack;
+    private final ItemStack stack;
 
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, NonNullSupplier<ItemStack> stack )
-    {
+    protected AbstractPocketUpgrade(Identifier id, ItemConvertible item) {
+        this(id, Util.createTranslationKey("upgrade", id) + ".adjective", item);
+    }
+
+    protected AbstractPocketUpgrade(Identifier id, String adjective, ItemConvertible item) {
+        this.id = id;
+        this.adjective = adjective;
+        this.stack = new ItemStack(item);
+    }
+
+    protected AbstractPocketUpgrade(Identifier id, String adjective, ItemStack stack) {
         this.id = id;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, NonNullSupplier<ItemStack> item )
-    {
-        this( id, Util.makeTranslationKey( "upgrade", id ) + ".adjective", item );
-    }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, ItemStack stack )
-    {
-        this( id, adjective, () -> stack );
-    }
-
-    protected AbstractPocketUpgrade( ResourceLocation id, ItemStack stack )
-    {
-        this( id, () -> stack );
-    }
-
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, IItemProvider item )
-    {
-        this( id, adjective, new CachedStack( () -> item ) );
-    }
-
-    protected AbstractPocketUpgrade( ResourceLocation id, IItemProvider item )
-    {
-        this( id, new CachedStack( () -> item ) );
-    }
-
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, Supplier<? extends IItemProvider> item )
-    {
-        this( id, adjective, new CachedStack( item ) );
-    }
-
-    protected AbstractPocketUpgrade( ResourceLocation id, Supplier<? extends IItemProvider> item )
-    {
-        this( id, new CachedStack( item ) );
+    @Nonnull
+    @Override
+    public final Identifier getUpgradeID() {
+        return this.id;
     }
 
     @Nonnull
     @Override
-    public final ResourceLocation getUpgradeID()
-    {
-        return id;
+    public final String getUnlocalisedAdjective() {
+        return this.adjective;
     }
 
     @Nonnull
     @Override
-    public final String getUnlocalisedAdjective()
-    {
-        return adjective;
-    }
-
-    @Nonnull
-    @Override
-    public final ItemStack getCraftingItem()
-    {
-        return stack.get();
-    }
-
-    /**
-     * Caches the construction of an item stack.
-     *
-     * @see dan200.computercraft.api.turtle.AbstractTurtleUpgrade For explanation of this class.
-     */
-    private static final class CachedStack implements NonNullSupplier<ItemStack>
-    {
-        private final Supplier<? extends IItemProvider> provider;
-        private Item item;
-        private ItemStack stack;
-
-        CachedStack( Supplier<? extends IItemProvider> provider )
-        {
-            this.provider = provider;
-        }
-
-        @Nonnull
-        @Override
-        public ItemStack get()
-        {
-            Item item = provider.get().asItem();
-            if( item == this.item && stack != null ) return stack;
-            return stack = new ItemStack( this.item = item );
-        }
+    public final ItemStack getCraftingItem() {
+        return this.stack;
     }
 }

src/main/java/dan200/computercraft/api/pocket/IPocketAccess.java

@@ -3,22 +3,24 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.pocket;
 
-import dan200.computercraft.api.peripheral.IPeripheral;
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ResourceLocation;
+import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Map;
+
+import dan200.computercraft.api.peripheral.IPeripheral;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.util.Identifier;
 
 /**
  * Wrapper class for pocket computers.
  */
-public interface IPocketAccess
-{
+public interface IPocketAccess {
     /**
      * Gets the entity holding this item.
      *
@@ -32,8 +34,7 @@ public interface IPocketAccess
     /**
      * Get the colour of this pocket computer as a RGB number.
      *
-     * @return The colour this pocket computer is. This will be a RGB colour between {@code 0x000000} and
-     * {@code 0xFFFFFF} or -1 if it has no colour.
+     * @return The colour this pocket computer is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 if it has no colour.
      * @see #setColour(int)
      */
     int getColour();
@@ -41,17 +42,16 @@ public interface IPocketAccess
     /**
      * Set the colour of the pocket computer to a RGB number.
      *
-     * @param colour The colour this pocket computer should be changed to. This should be a RGB colour between
-     *               {@code 0x000000} and {@code 0xFFFFFF} or -1 to reset to the default colour.
+     * @param colour The colour this pocket computer should be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or
+     *     -1 to reset to the default colour.
      * @see #getColour()
      */
-    void setColour( int colour );
+    void setColour(int colour);
 
     /**
      * Get the colour of this pocket computer's light as a RGB number.
      *
-     * @return The colour this light is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or
-     * -1 if it has no colour.
+     * @return The colour this light is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 if it has no colour.
      * @see #setLight(int)
      */
     int getLight();
@@ -59,11 +59,11 @@ public interface IPocketAccess
     /**
      * Set the colour of the pocket computer's light to a RGB number.
      *
-     * @param colour The colour this modem's light will be changed to. This should be a RGB colour between
-     *               {@code 0x000000} and {@code 0xFFFFFF} or -1 to reset to the default colour.
+     * @param colour The colour this modem's light will be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1
+     *     to reset to the default colour.
      * @see #getLight()
      */
-    void setLight( int colour );
+    void setLight(int colour);
 
     /**
      * Get the upgrade-specific NBT.
@@ -74,7 +74,7 @@ public interface IPocketAccess
      * @see #updateUpgradeNBTData()
      */
     @Nonnull
-    CompoundNBT getUpgradeNBTData();
+    CompoundTag getUpgradeNBTData();
 
     /**
      * Mark the upgrade-specific NBT as dirty.
@@ -94,5 +94,5 @@ public interface IPocketAccess
      * @return A collection of all upgrade names.
      */
     @Nonnull
-    Map<ResourceLocation, IPeripheral> getUpgrades();
+    Map<Identifier, IPeripheral> getUpgrades();
 }

src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java

@@ -3,39 +3,39 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.pocket;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.world.World;
 
 /**
  * Additional peripherals for pocket computers.
  *
  * This is similar to {@link ITurtleUpgrade}.
  */
-public interface IPocketUpgrade
-{
+public interface IPocketUpgrade {
 
     /**
-     * Gets a unique identifier representing this type of turtle upgrade. eg: "computercraft:wireless_modem" or
-     * "my_mod:my_upgrade".
+     * Gets a unique identifier representing this type of turtle upgrade. eg: "computercraft:wireless_modem" or "my_mod:my_upgrade".
      *
-     * You should use a unique resource domain to ensure this upgrade is uniquely identified. The upgrade will fail
-     * registration if an already used ID is specified.
+     * You should use a unique resource domain to ensure this upgrade is uniquely identified. The upgrade will fail registration if an already used ID is
+     * specified.
      *
      * @return The upgrade's id.
      * @see IPocketUpgrade#getUpgradeID()
      * @see ComputerCraftAPI#registerPocketUpgrade(IPocketUpgrade)
      */
     @Nonnull
-    ResourceLocation getUpgradeID();
+    Identifier getUpgradeID();
 
     /**
      * Return an unlocalised string to describe the type of pocket computer this upgrade provides.
@@ -49,12 +49,11 @@ public interface IPocketUpgrade
     String getUnlocalisedAdjective();
 
     /**
-     * Return an item stack representing the type of item that a pocket computer must be crafted with to create a
-     * pocket computer which holds this upgrade. This item stack is also used to determine the upgrade given by
-     * {@code pocket.equip()}/{@code pocket.unequip()}.
+     * Return an item stack representing the type of item that a pocket computer must be crafted with to create a pocket computer which holds this upgrade.
+     * This item stack is also used to determine the upgrade given by {@code pocket.equip()}/{@code pocket.unequip()}.
      *
-     * Ideally this should be constant over a session. It is recommended that you cache
-     * the item too, in order to prevent constructing it every time the method is called.
+     * Ideally this should be constant over a session. It is recommended that you cache the item too, in order to prevent constructing it every time the
+     * method is called.
      *
      * @return The item stack used for crafting. This can be {@link ItemStack#EMPTY} if crafting is disabled.
      */
@@ -64,41 +63,37 @@ public interface IPocketUpgrade
     /**
      * Creates a peripheral for the pocket computer.
      *
-     * The peripheral created will be stored for the lifetime of the upgrade, will be passed an argument to
-     * {@link #update(IPocketAccess, IPeripheral)} and will be attached, detached and have methods called in the same
-     * manner as an ordinary peripheral.
+     * The peripheral created will be stored for the lifetime of the upgrade, will be passed an argument to {@link #update(IPocketAccess, IPeripheral)} and
+     * will be attached, detached and have methods called in the same manner as an ordinary peripheral.
      *
      * @param access The access object for the pocket item stack.
      * @return The newly created peripheral.
      * @see #update(IPocketAccess, IPeripheral)
      */
     @Nullable
-    IPeripheral createPeripheral( @Nonnull IPocketAccess access );
+    IPeripheral createPeripheral(@Nonnull IPocketAccess access);
 
     /**
      * Called when the pocket computer item stack updates.
      *
-     * @param access     The access object for the pocket item stack.
+     * @param access The access object for the pocket item stack.
      * @param peripheral The peripheral for this upgrade.
      * @see #createPeripheral(IPocketAccess)
      */
-    default void update( @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
-    {
+    default void update(@Nonnull IPocketAccess access, @Nullable IPeripheral peripheral) {
     }
 
     /**
      * Called when the pocket computer is right clicked.
      *
-     * @param world      The world the computer is in.
-     * @param access     The access object for the pocket item stack.
+     * @param world The world the computer is in.
+     * @param access The access object for the pocket item stack.
      * @param peripheral The peripheral for this upgrade.
-     * @return {@code true} to stop the GUI from opening, otherwise false. You should always provide some code path
-     * which returns {@code false}, such as requiring the player to be sneaking - otherwise they will be unable to
-     * access the GUI.
+     * @return {@code true} to stop the GUI from opening, otherwise false. You should always provide some code path which returns {@code false}, such as
+     *     requiring the player to be sneaking - otherwise they will be unable to access the GUI.
      * @see #createPeripheral(IPocketAccess)
      */
-    default boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
-    {
+    default boolean onRightClick(@Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral) {
         return false;
     }
 }

src/main/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java

@@ -3,31 +3,30 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.redstone;
 
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
 import javax.annotation.Nonnull;
 
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
 /**
  * This interface is used to provide bundled redstone output for blocks.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
  */
 @FunctionalInterface
-public interface IBundledRedstoneProvider
-{
+public interface IBundledRedstoneProvider {
     /**
      * Produce an bundled redstone output from a block location.
      *
      * @param world The world this block is in.
-     * @param pos   The position this block is at.
-     * @param side  The side to extract the bundled redstone output from.
-     * @return A number in the range 0-65535 to indicate this block is providing output, or -1 if you do not wish to
-     * handle this block.
+     * @param pos The position this block is at.
+     * @param side The side to extract the bundled redstone output from.
+     * @return A number in the range 0-65535 to indicate this block is providing output, or -1 if you do not wish to handle this block.
      * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
      */
-    int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+    int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side);
 }

src/main/java/dan200/computercraft/api/turtle/AbstractTurtleUpgrade.java

@@ -3,124 +3,68 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
-import net.minecraftforge.common.util.NonNullSupplier;
-
 import javax.annotation.Nonnull;
-import java.util.function.Supplier;
+
+import net.minecraft.item.ItemConvertible;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
 
 /**
  * A base class for {@link ITurtleUpgrade}s.
  *
  * One does not have to use this, but it does provide a convenient template.
  */
-public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
-{
-    private final ResourceLocation id;
+public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade {
+    private final Identifier id;
     private final TurtleUpgradeType type;
     private final String adjective;
-    private final NonNullSupplier<ItemStack> stack;
+    private final ItemStack stack;
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, NonNullSupplier<ItemStack> stack )
-    {
+    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, String adjective, ItemConvertible item) {
+        this(id, type, adjective, new ItemStack(item));
+    }
+
+    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, String adjective, ItemStack stack) {
         this.id = id;
         this.type = type;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, NonNullSupplier<ItemStack> stack )
-    {
-        this( id, type, Util.makeTranslationKey( "upgrade", id ) + ".adjective", stack );
+    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, ItemConvertible item) {
+        this(id, type, new ItemStack(item));
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, ItemStack stack )
-    {
-        this( id, type, adjective, () -> stack );
+    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, ItemStack stack) {
+        this(id, type, Util.createTranslationKey("upgrade", id) + ".adjective", stack);
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, ItemStack stack )
-    {
-        this( id, type, () -> stack );
-    }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, IItemProvider item )
-    {
-        this( id, type, adjective, new CachedStack( () -> item ) );
-    }
-
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, IItemProvider item )
-    {
-        this( id, type, new CachedStack( () -> item ) );
-    }
-
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, Supplier<? extends IItemProvider> item )
-    {
-        this( id, type, adjective, new CachedStack( item ) );
-    }
-
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, Supplier<? extends IItemProvider> item )
-    {
-        this( id, type, new CachedStack( item ) );
+    @Nonnull
+    @Override
+    public final Identifier getUpgradeID() {
+        return this.id;
     }
 
     @Nonnull
     @Override
-    public final ResourceLocation getUpgradeID()
-    {
-        return id;
+    public final String getUnlocalisedAdjective() {
+        return this.adjective;
     }
 
     @Nonnull
     @Override
-    public final String getUnlocalisedAdjective()
-    {
-        return adjective;
+    public final TurtleUpgradeType getType() {
+        return this.type;
     }
 
     @Nonnull
     @Override
-    public final TurtleUpgradeType getType()
-    {
-        return type;
-    }
-
-    @Nonnull
-    @Override
-    public final ItemStack getCraftingItem()
-    {
-        return stack.get();
-    }
-
-    /**
-     * A supplier which converts an item into an item stack.
-     *
-     * Constructing item stacks is somewhat expensive due to attaching capabilities. We cache it if given a consistent item.
-     */
-    private static final class CachedStack implements NonNullSupplier<ItemStack>
-    {
-        private final Supplier<? extends IItemProvider> provider;
-        private Item item;
-        private ItemStack stack;
-
-        CachedStack( Supplier<? extends IItemProvider> provider )
-        {
-            this.provider = provider;
-        }
-
-        @Nonnull
-        @Override
-        public ItemStack get()
-        {
-            Item item = provider.get().asItem();
-            if( item == this.item && stack != null ) return stack;
-            return stack = new ItemStack( this.item = item );
-        }
+    public final ItemStack getCraftingItem() {
+        return this.stack;
     }
 }

src/main/java/dan200/computercraft/api/turtle/FakePlayer.java

@@ -0,0 +1,266 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.api.turtle;
+
+import java.util.Collection;
+import java.util.OptionalInt;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+import javax.crypto.SecretKey;
+
+import com.mojang.authlib.GameProfile;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+
+import net.minecraft.block.entity.CommandBlockBlockEntity;
+import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.command.argument.EntityAnchorArgumentType;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.MessageType;
+import net.minecraft.network.NetworkSide;
+import net.minecraft.network.NetworkState;
+import net.minecraft.network.Packet;
+import net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
+import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
+import net.minecraft.recipe.Recipe;
+import net.minecraft.screen.NamedScreenHandlerFactory;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.network.ServerPlayerInteractionManager;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.text.Text;
+import net.minecraft.util.Hand;
+import net.minecraft.util.collection.DefaultedList;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.village.TraderOfferList;
+import net.minecraft.world.GameMode;
+
+/**
+ * A wrapper for {@link ServerPlayerEntity} which denotes a "fake" player.
+ *
+ * Please note that this does not implement any of the traditional fake player behaviour. It simply exists to prevent me passing in normal players.
+ */
+public class FakePlayer extends ServerPlayerEntity {
+    public FakePlayer(ServerWorld world, GameProfile gameProfile) {
+        super(world.getServer(), world, gameProfile, new ServerPlayerInteractionManager(world));
+        this.networkHandler = new FakeNetHandler(this);
+    }
+
+    // region Direct networkHandler access
+    @Override
+    public void enterCombat() { }
+
+    @Override
+    public void endCombat() { }
+
+    @Override
+    public void tick() { }
+
+    @Override
+    public void playerTick() { }
+
+    @Override
+    public void onDeath(DamageSource damage) { }
+
+    @Override
+    public Entity moveToWorld(ServerWorld destination) {
+        return this;
+    }
+
+    @Override
+    public void wakeUp(boolean bl, boolean updateSleepingPlayers) {
+
+    }
+
+    @Override
+    public boolean startRiding(Entity entity, boolean flag) {
+        return false;
+    }
+
+    @Override
+    public void stopRiding() { }
+
+    @Override
+    public void openEditSignScreen(SignBlockEntity tile) { }
+
+    @Override
+    public OptionalInt openHandledScreen(@Nullable NamedScreenHandlerFactory container) {
+        return OptionalInt.empty();
+    }
+
+    @Override
+    public void sendTradeOffers(int id, TraderOfferList list, int level, int experience, boolean levelled, boolean refreshable) { }
+
+    @Override
+    public void openHorseInventory(HorseBaseEntity horse, Inventory inventory) { }
+
+    @Override
+    public void openEditBookScreen(ItemStack stack, Hand hand) { }
+
+    @Override
+    public void openCommandBlockScreen(CommandBlockBlockEntity block) { }
+
+    @Override
+    public void onSlotUpdate(ScreenHandler container, int slot, ItemStack stack) { }
+
+    @Override
+    public void onHandlerRegistered(ScreenHandler container, DefaultedList<ItemStack> defaultedList) { }
+
+    @Override
+    public void onPropertyUpdate(ScreenHandler container, int key, int value) { }
+
+    @Override
+    public void closeHandledScreen() { }
+
+    @Override
+    public void updateCursorStack() { }
+
+    @Override
+    public int unlockRecipes(Collection<Recipe<?>> recipes) {
+        return 0;
+    }
+
+    // Indirect
+    @Override
+    public int lockRecipes(Collection<Recipe<?>> recipes) {
+        return 0;
+    }
+
+    @Override
+    public void sendMessage(Text textComponent, boolean status) { }
+
+    @Override
+    protected void consumeItem() { }
+
+    @Override
+    public void lookAt(EntityAnchorArgumentType.EntityAnchor anchor, Vec3d vec3d) {}
+
+    @Override
+    public void method_14222(EntityAnchorArgumentType.EntityAnchor self, Entity entity, EntityAnchorArgumentType.EntityAnchor target) { }
+
+    @Override
+    protected void onStatusEffectApplied(StatusEffectInstance statusEffectInstance) { }
+
+    @Override
+    protected void onStatusEffectUpgraded(StatusEffectInstance statusEffectInstance, boolean particles) { }
+
+    @Override
+    protected void onStatusEffectRemoved(StatusEffectInstance statusEffectInstance) { }
+
+    @Override
+    public void requestTeleport(double x, double y, double z) { }
+
+    @Override
+    public void setGameMode(GameMode gameMode) { }
+
+    @Override
+    public void sendMessage(Text message, MessageType type, UUID senderUuid) {
+
+    }
+
+    @Override
+    public String getIp() {
+        return "[Fake Player]";
+    }
+
+    @Override
+    public void sendResourcePackUrl(String url, String hash) { }
+
+    @Override
+    public void onStoppedTracking(Entity entity) { }
+
+    @Override
+    public void setCameraEntity(Entity entity) { }
+
+    @Override
+    public void teleport(ServerWorld serverWorld, double x, double y, double z, float pitch, float yaw) { }
+
+    @Override
+    public void sendInitialChunkPackets(ChunkPos chunkPos, Packet<?> packet, Packet<?> packet2) { }
+
+    @Override
+    public void sendUnloadChunkPacket(ChunkPos chunkPos) { }
+
+    @Override
+    public void playSound(SoundEvent soundEvent, SoundCategory soundCategory, float volume, float pitch) { }
+
+    private static class FakeNetHandler extends ServerPlayNetworkHandler {
+        FakeNetHandler(ServerPlayerEntity player) {
+            super(player.server, new FakeConnection(), player);
+        }
+
+        @Override
+        public void disconnect(Text message) { }
+
+        @Override
+        public void onVehicleMove(VehicleMoveC2SPacket move) { }
+
+        @Override
+        public void onRequestCommandCompletions(RequestCommandCompletionsC2SPacket packet) { }
+
+        @Override
+        public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener) { }
+    }
+
+    private static class FakeConnection extends ClientConnection {
+        FakeConnection() {
+            super(NetworkSide.CLIENTBOUND);
+        }
+
+        @Override
+        public void channelActive(ChannelHandlerContext active) {
+        }
+
+        @Override
+        public void setState(NetworkState state) {
+        }
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext context, Throwable err) {
+        }
+
+        @Override
+        protected void channelRead0(ChannelHandlerContext context, Packet<?> packet) {
+        }
+
+        @Override
+        public void send(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener) {
+        }
+
+        @Override
+        public void tick() {
+        }
+
+        @Override
+        public void disconnect(Text message) {
+        }
+
+        @Override
+        public void setupEncryption(SecretKey key) {
+        }
+
+        @Override
+        public void disableAutoRead() {
+        }
+
+        @Override
+        public void setCompressionThreshold(int size) {
+        }
+    }
+}

src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java

@@ -3,31 +3,31 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.mojang.authlib.GameProfile;
 import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.Direction;
+import dan200.computercraft.shared.util.ItemStorage;
+
+import net.minecraft.inventory.Inventory;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.items.IItemHandlerModifiable;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * The interface passed to turtle by turtles, providing methods that they can call.
  *
- * This should not be implemented by your classes. Do not interact with turtles except via this interface and
- * {@link ITurtleUpgrade}.
+ * This should not be implemented by your classes. Do not interact with turtles except via this interface and {@link ITurtleUpgrade}.
  */
-public interface ITurtleAccess
-{
+public interface ITurtleAccess {
     /**
      * Returns the world in which the turtle resides.
      *
@@ -47,27 +47,25 @@ public interface ITurtleAccess
     /**
      * Attempt to move this turtle to a new position.
      *
-     * This will preserve the turtle's internal state, such as it's inventory, computer and upgrades. It should
-     * be used before playing a movement animation using {@link #playAnimation(TurtleAnimation)}.
+     * This will preserve the turtle's internal state, such as it's inventory, computer and upgrades. It should be used before playing a movement animation
+     * using {@link #playAnimation(TurtleAnimation)}.
      *
      * @param world The new world to move it to
-     * @param pos   The new position to move it to.
-     * @return Whether the movement was successful. It may fail if the block was not loaded or the block placement
-     * was cancelled.
+     * @param pos The new position to move it to.
+     * @return Whether the movement was successful. It may fail if the block was not loaded or the block placement was cancelled.
      * @throws UnsupportedOperationException When attempting to teleport on the client side.
      */
-    boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos );
+    boolean teleportTo(@Nonnull World world, @Nonnull BlockPos pos);
 
     /**
-     * Returns a vector containing the floating point co-ordinates at which the turtle is rendered.
-     * This will shift when the turtle is moving.
+     * Returns a vector containing the floating point co-ordinates at which the turtle is rendered. This will shift when the turtle is moving.
      *
      * @param f The subframe fraction.
      * @return A vector containing the floating point co-ordinates at which the turtle resides.
      * @see #getVisualYaw(float)
      */
     @Nonnull
-    Vec3d getVisualPosition( float f );
+    Vec3d getVisualPosition(float f);
 
     /**
      * Returns the yaw the turtle is facing when it is rendered.
@@ -76,7 +74,7 @@ public interface ITurtleAccess
      * @return The yaw the turtle is facing.
      * @see #getVisualPosition(float)
      */
-    float getVisualYaw( float f );
+    float getVisualYaw(float f);
 
     /**
      * Returns the world direction the turtle is currently facing.
@@ -88,13 +86,13 @@ public interface ITurtleAccess
     Direction getDirection();
 
     /**
-     * Set the direction the turtle is facing. Note that this will not play a rotation animation, you will also need to
-     * call {@link #playAnimation(TurtleAnimation)} to do so.
+     * Set the direction the turtle is facing. Note that this will not play a rotation animation, you will also need to call {@link
+     * #playAnimation(TurtleAnimation)} to do so.
      *
      * @param dir The new direction to set. This should be on either the x or z axis (so north, south, east or west).
      * @see #getDirection()
      */
-    void setDirection( @Nonnull Direction dir );
+    void setDirection(@Nonnull Direction dir);
 
     /**
      * Get the currently selected slot in the turtle's inventory.
@@ -108,32 +106,30 @@ public interface ITurtleAccess
     /**
      * Set the currently selected slot in the turtle's inventory.
      *
-     * @param slot The slot to set. This must be greater or equal to 0 and less than the inventory size. Otherwise no
-     *             action will be taken.
+     * @param slot The slot to set. This must be greater or equal to 0 and less than the inventory size. Otherwise no action will be taken.
      * @throws UnsupportedOperationException When attempting to change the slot on the client side.
      * @see #getInventory()
      * @see #getSelectedSlot()
      */
-    void setSelectedSlot( int slot );
-
-    /**
-     * Set the colour of the turtle to a RGB number.
-     *
-     * @param colour The colour this turtle should be changed to. This should be a RGB colour between {@code 0x000000}
-     *               and {@code 0xFFFFFF} or -1 to reset to the default colour.
-     * @see #getColour()
-     */
-    void setColour( int colour );
+    void setSelectedSlot(int slot);
 
     /**
      * Get the colour of this turtle as a RGB number.
      *
-     * @return The colour this turtle is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or
-     * -1 if it has no colour.
+     * @return The colour this turtle is. This will be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 if it has no colour.
      * @see #setColour(int)
      */
     int getColour();
 
+    /**
+     * Set the colour of the turtle to a RGB number.
+     *
+     * @param colour The colour this turtle should be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 to
+     *     reset to the default colour.
+     * @see #getColour()
+     */
+    void setColour(int colour);
+
     /**
      * Get the player who owns this turtle, namely whoever placed it.
      *
@@ -142,30 +138,6 @@ public interface ITurtleAccess
     @Nonnull
     GameProfile getOwningPlayer();
 
-    /**
-     * Get the inventory of this turtle.
-     *
-     * Note: this inventory should only be accessed and modified on the server thread.
-     *
-     * @return This turtle's inventory
-     * @see #getItemHandler()
-     */
-    @Nonnull
-    IInventory getInventory();
-
-    /**
-     * Get the inventory of this turtle as an {@link IItemHandlerModifiable}.
-     *
-     * Note: this inventory should only be accessed and modified on the server thread.
-     *
-     * @return This turtle's inventory
-     * @see #getInventory()
-     * @see IItemHandlerModifiable
-     * @see net.minecraftforge.items.CapabilityItemHandler#ITEM_HANDLER_CAPABILITY
-     */
-    @Nonnull
-    IItemHandlerModifiable getItemHandler();
-
     /**
      * Determine whether this turtle will require fuel when performing actions.
      *
@@ -185,8 +157,7 @@ public interface ITurtleAccess
     int getFuelLevel();
 
     /**
-     * Set the fuel level to a new value. It is generally preferred to use {@link #consumeFuel(int)}} or {@link #addFuel(int)}
-     * instead.
+     * Set the fuel level to a new value. It is generally preferred to use {@link #consumeFuel(int)}} or {@link #addFuel(int)} instead.
      *
      * @param fuel The new amount of fuel. This must be between 0 and the fuel limit.
      * @see #getFuelLevel()
@@ -194,7 +165,7 @@ public interface ITurtleAccess
      * @see #addFuel(int)
      * @see #consumeFuel(int)
      */
-    void setFuelLevel( int fuel );
+    void setFuelLevel(int fuel);
 
     /**
      * Get the maximum amount of fuel a turtle can hold.
@@ -207,11 +178,11 @@ public interface ITurtleAccess
      * Removes some fuel from the turtles fuel supply. Negative numbers can be passed in to INCREASE the fuel level of the turtle.
      *
      * @param fuel The amount of fuel to consume.
-     * @return Whether the turtle was able to consume the amount of fuel specified. Will return false if you supply a number
-     * greater than the current fuel level of the turtle. No fuel will be consumed if {@code false} is returned.
+     * @return Whether the turtle was able to consume the amount of fuel specified. Will return false if you supply a number greater than the current fuel
+     *     level of the turtle. No fuel will be consumed if {@code false} is returned.
      * @throws UnsupportedOperationException When attempting to consume fuel on the client side.
      */
-    boolean consumeFuel( int fuel );
+    boolean consumeFuel(int fuel);
 
     /**
      * Increase the turtle's fuel level by the given amount.
@@ -219,34 +190,31 @@ public interface ITurtleAccess
      * @param fuel The amount to refuel with.
      * @throws UnsupportedOperationException When attempting to refuel on the client side.
      */
-    void addFuel( int fuel );
+    void addFuel(int fuel);
 
     /**
-     * Adds a custom command to the turtles command queue. Unlike peripheral methods, these custom commands will be executed
-     * on the main thread, so are guaranteed to be able to access Minecraft objects safely, and will be queued up
-     * with the turtles standard movement and tool commands. An issued command will return an unique integer, which will
-     * be supplied as a parameter to a "turtle_response" event issued to the turtle after the command has completed. Look at the
-     * lua source code for "rom/apis/turtle" for how to build a lua wrapper around this functionality.
+     * Adds a custom command to the turtles command queue. Unlike peripheral methods, these custom commands will be executed on the main thread, so are
+     * guaranteed to be able to access Minecraft objects safely, and will be queued up with the turtles standard movement and tool commands. An issued
+     * command will return an unique integer, which will be supplied as a parameter to a "turtle_response" event issued to the turtle after the command has
+     * completed. Look at the lua source code for "rom/apis/turtle" for how to build a lua wrapper around this functionality.
      *
      * @param command An object which will execute the custom command when its point in the queue is reached
-     * @return The objects the command returned when executed. you should probably return these to the player
-     * unchanged if called from a peripheral method.
+     * @return The objects the command returned when executed. you should probably return these to the player unchanged if called from a peripheral method.
      * @throws UnsupportedOperationException When attempting to execute a command on the client side.
      * @see ITurtleCommand
      * @see MethodResult#pullEvent(String, ILuaCallback)
      */
     @Nonnull
-    MethodResult executeCommand( @Nonnull ITurtleCommand command );
+    MethodResult executeCommand(@Nonnull ITurtleCommand command);
 
     /**
-     * Start playing a specific animation. This will prevent other turtle commands from executing until
-     * it is finished.
+     * Start playing a specific animation. This will prevent other turtle commands from executing until it is finished.
      *
      * @param animation The animation to play.
      * @throws UnsupportedOperationException When attempting to execute play an animation on the client side.
      * @see TurtleAnimation
      */
-    void playAnimation( @Nonnull TurtleAnimation animation );
+    void playAnimation(@Nonnull TurtleAnimation animation);
 
     /**
      * Returns the turtle on the specified side of the turtle, if there is one.
@@ -256,16 +224,16 @@ public interface ITurtleAccess
      * @see #setUpgrade(TurtleSide, ITurtleUpgrade)
      */
     @Nullable
-    ITurtleUpgrade getUpgrade( @Nonnull TurtleSide side );
+    ITurtleUpgrade getUpgrade(@Nonnull TurtleSide side);
 
     /**
      * Set the upgrade for a given side, resetting peripherals and clearing upgrade specific data.
      *
-     * @param side    The side to set the upgrade on.
+     * @param side The side to set the upgrade on.
      * @param upgrade The upgrade to set, may be {@code null} to clear.
      * @see #getUpgrade(TurtleSide)
      */
-    void setUpgrade( @Nonnull TurtleSide side, @Nullable ITurtleUpgrade upgrade );
+    void setUpgrade(@Nonnull TurtleSide side, @Nullable ITurtleUpgrade upgrade);
 
     /**
      * Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one.
@@ -274,27 +242,40 @@ public interface ITurtleAccess
      * @return The peripheral created by the upgrade on the specified side of the turtle, {@code null} if none exists.
      */
     @Nullable
-    IPeripheral getPeripheral( @Nonnull TurtleSide side );
+    IPeripheral getPeripheral(@Nonnull TurtleSide side);
 
     /**
      * Get an upgrade-specific NBT compound, which can be used to store arbitrary data.
      *
-     * This will be persisted across turtle restarts and chunk loads, as well as being synced to the client. You must
-     * call {@link #updateUpgradeNBTData(TurtleSide)} after modifying it.
+     * This will be persisted across turtle restarts and chunk loads, as well as being synced to the client. You must call {@link
+     * #updateUpgradeNBTData(TurtleSide)} after modifying it.
      *
      * @param side The side to get the upgrade data for.
      * @return The upgrade-specific data.
      * @see #updateUpgradeNBTData(TurtleSide)
      */
     @Nonnull
-    CompoundNBT getUpgradeNBTData( @Nullable TurtleSide side );
+    CompoundTag getUpgradeNBTData(@Nullable TurtleSide side);
 
     /**
-     * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the
-     * client and persisted.
+     * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the client and persisted.
      *
      * @param side The side to mark dirty.
      * @see #updateUpgradeNBTData(TurtleSide)
      */
-    void updateUpgradeNBTData( @Nonnull TurtleSide side );
+    void updateUpgradeNBTData(@Nonnull TurtleSide side);
+
+    default ItemStorage getItemHandler() {
+        return ItemStorage.wrap(this.getInventory());
+    }
+
+    /**
+     * Get the inventory of this turtle.
+     *
+     * Note: this inventory should only be accessed and modified on the server thread.
+     *
+     * @return This turtle's inventory
+     */
+    @Nonnull
+    Inventory getInventory();
 }

src/main/java/dan200/computercraft/api/turtle/ITurtleCommand.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
 import javax.annotation.Nonnull;
@@ -13,13 +14,12 @@ import javax.annotation.Nonnull;
  * @see ITurtleAccess#executeCommand(ITurtleCommand)
  */
 @FunctionalInterface
-public interface ITurtleCommand
-{
+public interface ITurtleCommand {
     /**
      * Will be called by the turtle on the main thread when it is time to execute the custom command.
      *
-     * The handler should either perform the work of the command, and return success, or return
-     * failure with an error message to indicate the command cannot be executed at this time.
+     * The handler should either perform the work of the command, and return success, or return failure with an error message to indicate the command cannot
+     * be executed at this time.
      *
      * @param turtle Access to the turtle for whom the command was issued.
      * @return A result, indicating whether this action succeeded or not.
@@ -29,5 +29,5 @@ public interface ITurtleCommand
      * @see TurtleCommandResult
      */
     @Nonnull
-    TurtleCommandResult execute( @Nonnull ITurtleAccess turtle );
+    TurtleCommandResult execute(@Nonnull ITurtleAccess turtle);
 }

src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java

@@ -3,43 +3,38 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-package dan200.computercraft.api.turtle;
 
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.client.TransformedModel;
-import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.api.turtle.event.TurtleAttackEvent;
-import dan200.computercraft.api.turtle.event.TurtleBlockEvent;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.event.entity.player.AttackEntityEvent;
-import net.minecraftforge.event.world.BlockEvent;
+package dan200.computercraft.api.turtle;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.client.TransformedModel;
+import dan200.computercraft.api.peripheral.IPeripheral;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
 /**
- * The primary interface for defining an update for Turtles. A turtle update
- * can either be a new tool, or a new peripheral.
+ * The primary interface for defining an update for Turtles. A turtle update can either be a new tool, or a new peripheral.
  *
  * @see ComputerCraftAPI#registerTurtleUpgrade(ITurtleUpgrade)
  */
-public interface ITurtleUpgrade
-{
+public interface ITurtleUpgrade {
     /**
-     * Gets a unique identifier representing this type of turtle upgrade. eg: "computercraft:wireless_modem" or "my_mod:my_upgrade".
-     * You should use a unique resource domain to ensure this upgrade is uniquely identified.
-     * The turtle will fail registration if an already used ID is specified.
+     * Gets a unique identifier representing this type of turtle upgrade. eg: "computercraft:wireless_modem" or "my_mod:my_upgrade". You should use a unique
+     * resource domain to ensure this upgrade is uniquely identified. The turtle will fail registration if an already used ID is specified.
      *
      * @return The unique ID for this upgrade.
      * @see ComputerCraftAPI#registerTurtleUpgrade(ITurtleUpgrade)
      */
     @Nonnull
-    ResourceLocation getUpgradeID();
+    Identifier getUpgradeID();
 
     /**
      * Return an unlocalised string to describe this type of turtle in turtle item names.
@@ -61,12 +56,11 @@ public interface ITurtleUpgrade
     TurtleUpgradeType getType();
 
     /**
-     * Return an item stack representing the type of item that a turtle must be crafted
-     * with to create a turtle which holds this upgrade. This item stack is also used
-     * to determine the upgrade given by {@code turtle.equip()}
+     * Return an item stack representing the type of item that a turtle must be crafted with to create a turtle which holds this upgrade. This item stack is
+     * also used to determine the upgrade given by {@code turtle.equip()}
      *
-     * Ideally this should be constant over a session. It is recommended that you cache
-     * the item too, in order to prevent constructing it every time the method is called.
+     * Ideally this should be constant over a session. It is recommended that you cache the item too, in order to prevent constructing it every time the
+     * method is called.
      *
      * @return The item stack to craft with, or {@link ItemStack#EMPTY} if it cannot be crafted.
      */
@@ -76,67 +70,52 @@ public interface ITurtleUpgrade
     /**
      * Will only be called for peripheral upgrades. Creates a peripheral for a turtle being placed using this upgrade.
      *
-     * The peripheral created will be stored for the lifetime of the upgrade and will be passed as an argument to
-     * {@link #update(ITurtleAccess, TurtleSide)}. It will be attached, detached and have methods called in the same
-     * manner as a Computer peripheral.
+     * The peripheral created will be stored for the lifetime of the upgrade and will be passed as an argument to {@link #update(ITurtleAccess,
+     * TurtleSide)}. It will be attached, detached and have methods called in the same manner as a Computer peripheral.
      *
      * @param turtle Access to the turtle that the peripheral is being created for.
-     * @param side   Which side of the turtle (left or right) that the upgrade resides on.
-     * @return The newly created peripheral. You may return {@code null} if this upgrade is a Tool
-     * and this method is not expected to be called.
+     * @param side Which side of the turtle (left or right) that the upgrade resides on.
+     * @return The newly created peripheral. You may return {@code null} if this upgrade is a Tool and this method is not expected to be called.
      */
     @Nullable
-    default IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
-    {
+    default IPeripheral createPeripheral(@Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side) {
         return null;
     }
 
     /**
-     * Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called
-     * by the turtle, and the tool is required to do some work.
+     * Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called by the turtle, and the tool is required to do some work.
      *
-     * Conforming implementations should fire {@link BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig} for
-     * digging, {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
-     *
-     * @param turtle    Access to the turtle that the tool resides on.
-     * @param side      Which side of the turtle (left or right) the tool resides on.
-     * @param verb      Which action (dig or attack) the turtle is being called on to perform.
-     * @param direction Which world direction the action should be performed in, relative to the turtles
-     *                  position. This will either be up, down, or the direction the turtle is facing, depending on
-     *                  whether dig, digUp or digDown was called.
-     * @return Whether the turtle was able to perform the action, and hence whether the {@code turtle.dig()}
-     * or {@code turtle.attack()} lua method should return true. If true is returned, the tool will perform
-     * a swinging animation. You may return {@code null} if this turtle is a Peripheral  and this method is not expected
-     * to be called.
+     * @param turtle Access to the turtle that the tool resides on.
+     * @param side Which side of the turtle (left or right) the tool resides on.
+     * @param verb Which action (dig or attack) the turtle is being called on to perform.
+     * @param direction Which world direction the action should be performed in, relative to the turtles position. This will either be up, down, or the
+     *     direction the turtle is facing, depending on whether dig, digUp or digDown was called.
+     * @return Whether the turtle was able to perform the action, and hence whether the {@code turtle.dig()} or {@code turtle.attack()} lua method should
+     *     return true. If true is returned, the tool will perform a swinging animation. You may return {@code null} if this turtle is a Peripheral  and
+     *     this method is not expected to be called.
      */
     @Nonnull
-    default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction )
-    {
+    default TurtleCommandResult useTool(@Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction) {
         return TurtleCommandResult.failure();
     }
 
     /**
      * Called to obtain the model to be used when rendering a turtle peripheral.
      *
-     * This can be obtained from {@link net.minecraft.client.renderer.ItemModelMesher#getItemModel(ItemStack)},
-     * {@link net.minecraft.client.renderer.model.ModelManager#getModel(ModelResourceLocation)} or any other
-     * source.
-     *
      * @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!
-     * @param side   Which side of the turtle (left or right) the upgrade resides on.
+     * @param side Which side of the turtle (left or right) the upgrade resides on.
      * @return The model that you wish to be used to render your upgrade.
      */
     @Nonnull
-    @OnlyIn( Dist.CLIENT )
-    TransformedModel getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
+    @Environment (EnvType.CLIENT)
+    TransformedModel getModel(@Nullable ITurtleAccess turtle, @Nonnull TurtleSide side);
 
     /**
      * Called once per tick for each turtle which has the upgrade equipped.
      *
      * @param turtle Access to the turtle that the upgrade resides on.
-     * @param side   Which side of the turtle (left or right) the upgrade resides on.
+     * @param side Which side of the turtle (left or right) the upgrade resides on.
      */
-    default void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
-    {
+    default void update(@Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side) {
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleAnimation.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
 /**
@@ -12,8 +13,7 @@ package dan200.computercraft.api.turtle;
  *
  * @see ITurtleAccess#playAnimation(TurtleAnimation)
  */
-public enum TurtleAnimation
-{
+public enum TurtleAnimation {
     /**
      * An animation which does nothing. This takes no time to complete.
      *
@@ -23,38 +23,34 @@ public enum TurtleAnimation
     NONE,
 
     /**
-     * Make the turtle move forward. Note that the animation starts from the block <em>behind</em> it, and
-     * moves into this one.
+     * Make the turtle move forward. Note that the animation starts from the block <em>behind</em> it, and moves into this one.
      */
     MOVE_FORWARD,
 
     /**
-     * Make the turtle move backwards. Note that the animation starts from the block <em>in front</em> it, and
-     * moves into this one.
+     * Make the turtle move backwards. Note that the animation starts from the block <em>in front</em> it, and moves into this one.
      */
     MOVE_BACK,
 
     /**
-     * Make the turtle move backwards. Note that the animation starts from the block <em>above</em> it, and
-     * moves into this one.
+     * Make the turtle move backwards. Note that the animation starts from the block <em>above</em> it, and moves into this one.
      */
     MOVE_UP,
 
     /**
-     * Make the turtle move backwards. Note that the animation starts from the block <em>below</em> it, and
-     * moves into this one.
+     * Make the turtle move backwards. Note that the animation starts from the block <em>below</em> it, and moves into this one.
      */
     MOVE_DOWN,
 
     /**
-     * Turn the turtle to the left. Note that the animation starts with the turtle facing <em>right</em>, and
-     * the turtle turns to face in the current direction.
+     * Turn the turtle to the left. Note that the animation starts with the turtle facing <em>right</em>, and the turtle turns to face in the current
+     * direction.
      */
     TURN_LEFT,
 
     /**
-     * Turn the turtle to the left. Note that the animation starts with the turtle facing <em>right</em>, and
-     * the turtle turns to face in the current direction.
+     * Turn the turtle to the left. Note that the animation starts with the turtle facing <em>right</em>, and the turtle turns to face in the current
+     * direction.
      */
     TURN_RIGHT,
 

src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java

@@ -3,9 +3,8 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.Direction;
+package dan200.computercraft.api.turtle;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -16,10 +15,18 @@ import javax.annotation.Nullable;
  * @see ITurtleCommand#execute(ITurtleAccess)
  * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
  */
-public final class TurtleCommandResult
-{
-    private static final TurtleCommandResult EMPTY_SUCCESS = new TurtleCommandResult( true, null, null );
-    private static final TurtleCommandResult EMPTY_FAILURE = new TurtleCommandResult( false, null, null );
+public final class TurtleCommandResult {
+    private static final TurtleCommandResult EMPTY_SUCCESS = new TurtleCommandResult(true, null, null);
+    private static final TurtleCommandResult EMPTY_FAILURE = new TurtleCommandResult(false, null, null);
+    private final boolean success;
+    private final String errorMessage;
+    private final Object[] results;
+
+    private TurtleCommandResult(boolean success, String errorMessage, Object[] results) {
+        this.success = success;
+        this.errorMessage = errorMessage;
+        this.results = results;
+    }
 
     /**
      * Create a successful command result with no result.
@@ -27,8 +34,7 @@ public final class TurtleCommandResult
      * @return A successful command result with no values.
      */
     @Nonnull
-    public static TurtleCommandResult success()
-    {
+    public static TurtleCommandResult success() {
         return EMPTY_SUCCESS;
     }
 
@@ -39,10 +45,11 @@ public final class TurtleCommandResult
      * @return A successful command result with the given values.
      */
     @Nonnull
-    public static TurtleCommandResult success( @Nullable Object[] results )
-    {
-        if( results == null || results.length == 0 ) return EMPTY_SUCCESS;
-        return new TurtleCommandResult( true, null, results );
+    public static TurtleCommandResult success(@Nullable Object[] results) {
+        if (results == null || results.length == 0) {
+            return EMPTY_SUCCESS;
+        }
+        return new TurtleCommandResult(true, null, results);
     }
 
     /**
@@ -51,8 +58,7 @@ public final class TurtleCommandResult
      * @return A failed command result with no message.
      */
     @Nonnull
-    public static TurtleCommandResult failure()
-    {
+    public static TurtleCommandResult failure() {
         return EMPTY_FAILURE;
     }
 
@@ -63,21 +69,11 @@ public final class TurtleCommandResult
      * @return A failed command result with a message.
      */
     @Nonnull
-    public static TurtleCommandResult failure( @Nullable String errorMessage )
-    {
-        if( errorMessage == null ) return EMPTY_FAILURE;
-        return new TurtleCommandResult( false, errorMessage, null );
-    }
-
-    private final boolean success;
-    private final String errorMessage;
-    private final Object[] results;
-
-    private TurtleCommandResult( boolean success, String errorMessage, Object[] results )
-    {
-        this.success = success;
-        this.errorMessage = errorMessage;
-        this.results = results;
+    public static TurtleCommandResult failure(@Nullable String errorMessage) {
+        if (errorMessage == null) {
+            return EMPTY_FAILURE;
+        }
+        return new TurtleCommandResult(false, errorMessage, null);
     }
 
     /**
@@ -85,9 +81,8 @@ public final class TurtleCommandResult
      *
      * @return If the command was successful.
      */
-    public boolean isSuccess()
-    {
-        return success;
+    public boolean isSuccess() {
+        return this.success;
     }
 
     /**
@@ -96,9 +91,8 @@ public final class TurtleCommandResult
      * @return The command's error message, or {@code null} if it was a success.
      */
     @Nullable
-    public String getErrorMessage()
-    {
-        return errorMessage;
+    public String getErrorMessage() {
+        return this.errorMessage;
     }
 
     /**
@@ -107,8 +101,7 @@ public final class TurtleCommandResult
      * @return The command's result, or {@code null} if it was a failure.
      */
     @Nullable
-    public Object[] getResults()
-    {
-        return results;
+    public Object[] getResults() {
+        return this.results;
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleSide.java

@@ -3,13 +3,13 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
 /**
  * An enum representing the two sides of the turtle that a turtle turtle might reside.
  */
-public enum TurtleSide
-{
+public enum TurtleSide {
     /**
      * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle).
      */

src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
 /**
@@ -10,34 +11,30 @@ package dan200.computercraft.api.turtle;
  *
  * @see ITurtleUpgrade#getType()
  */
-public enum TurtleUpgradeType
-{
+public enum TurtleUpgradeType {
     /**
-     * A tool is rendered as an item on the side of the turtle, and responds to the {@code turtle.dig()}
-     * and {@code turtle.attack()} methods (Such as pickaxe or sword on Mining and Melee turtles).
+     * A tool is rendered as an item on the side of the turtle, and responds to the {@code turtle.dig()} and {@code turtle.attack()} methods (Such as
+     * pickaxe or sword on Mining and Melee turtles).
      */
     TOOL,
 
     /**
-     * A peripheral adds a special peripheral which is attached to the side of the turtle,
-     * and can be interacted with the {@code peripheral} API (Such as the modem on Wireless Turtles).
+     * A peripheral adds a special peripheral which is attached to the side of the turtle, and can be interacted with the {@code peripheral} API (Such as
+     * the modem on Wireless Turtles).
      */
     PERIPHERAL,
 
     /**
-     * An upgrade which provides both a tool and a peripheral. This can be used when you wish
-     * your upgrade to also provide methods. For example, a pickaxe could provide methods
-     * determining whether it can break the given block or not.
+     * An upgrade which provides both a tool and a peripheral. This can be used when you wish your upgrade to also provide methods. For example, a pickaxe
+     * could provide methods determining whether it can break the given block or not.
      */
     BOTH;
 
-    public boolean isTool()
-    {
+    public boolean isTool() {
         return this == TOOL || this == BOTH;
     }
 
-    public boolean isPeripheral()
-    {
+    public boolean isPeripheral() {
         return this == PERIPHERAL || this == BOTH;
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java

@@ -3,19 +3,16 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.Direction;
-
 /**
- * An enum representing the different actions that an {@link ITurtleUpgrade} of type Tool may be called on to perform by
- * a turtle.
+ * An enum representing the different actions that an {@link ITurtleUpgrade} of type Tool may be called on to perform by a turtle.
  *
  * @see ITurtleUpgrade#getType()
  * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
  */
-public enum TurtleVerb
-{
+public enum TurtleVerb {
     /**
      * The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}.
      */

src/main/java/dan200/computercraft/api/turtle/event/TurtleAction.java

@@ -3,6 +3,7 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
 /**
@@ -10,8 +11,7 @@ package dan200.computercraft.api.turtle.event;
  *
  * @see TurtleActionEvent
  */
-public enum TurtleAction
-{
+public enum TurtleAction {
     /**
      * A turtle moves to a new position.
      *

src/main/java/dan200/computercraft/api/turtle/event/TurtleActionEvent.java

@@ -3,36 +3,34 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.TurtleCommandResult;
-import net.minecraftforge.eventbus.api.Cancelable;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Objects;
+
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import dan200.computercraft.api.turtle.TurtleCommandResult;
 
 /**
  * An event fired when a turtle is performing a known action.
  */
-@Cancelable
-public class TurtleActionEvent extends TurtleEvent
-{
+public class TurtleActionEvent extends TurtleEvent {
     private final TurtleAction action;
     private String failureMessage;
+    private boolean cancelled = false;
 
-    public TurtleActionEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action )
-    {
-        super( turtle );
+    public TurtleActionEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action) {
+        super(turtle);
 
-        Objects.requireNonNull( action, "action cannot be null" );
+        Objects.requireNonNull(action, "action cannot be null");
         this.action = action;
     }
 
-    public TurtleAction getAction()
-    {
-        return action;
+    public TurtleAction getAction() {
+        return this.action;
     }
 
     /**
@@ -44,11 +42,9 @@ public class TurtleActionEvent extends TurtleEvent
      * @see TurtleCommandResult#failure()
      * @deprecated Use {@link #setCanceled(boolean, String)} instead.
      */
-    @Override
     @Deprecated
-    public void setCanceled( boolean cancel )
-    {
-        setCanceled( cancel, null );
+    public void setCanceled(boolean cancel) {
+        this.setCanceled(cancel, null);
     }
 
     /**
@@ -56,13 +52,12 @@ public class TurtleActionEvent extends TurtleEvent
      *
      * If {@code cancel} is {@code true}, this action will not be carried out.
      *
-     * @param cancel         The new canceled value.
+     * @param cancel The new canceled value.
      * @param failureMessage The message to return to the user explaining the failure.
      * @see TurtleCommandResult#failure(String)
      */
-    public void setCanceled( boolean cancel, @Nullable String failureMessage )
-    {
-        super.setCanceled( cancel );
+    public void setCanceled(boolean cancel, @Nullable String failureMessage) {
+        this.cancelled = true;
         this.failureMessage = cancel ? failureMessage : null;
     }
 
@@ -74,8 +69,11 @@ public class TurtleActionEvent extends TurtleEvent
      * @see #setCanceled(boolean, String)
      */
     @Nullable
-    public String getFailureMessage()
-    {
-        return failureMessage;
+    public String getFailureMessage() {
+        return this.failureMessage;
+    }
+
+    public boolean isCancelled() {
+        return this.cancelled;
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleAttackEvent.java

@@ -3,42 +3,36 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.turtle.TurtleVerb;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
-import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.event.entity.player.AttackEntityEvent;
 
-import javax.annotation.Nonnull;
-import java.util.Objects;
+import net.minecraft.entity.Entity;
 
 /**
  * Fired when a turtle attempts to attack an entity.
  *
- * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)},
- * as the base {@code turtle.attack()} command does not fire it.
- *
- * Note that such commands should also fire {@link AttackEntityEvent}, so you do not need to listen to both.
- *
  * @see TurtleAction#ATTACK
  */
-public class TurtleAttackEvent extends TurtlePlayerEvent
-{
+public class TurtleAttackEvent extends TurtlePlayerEvent {
     private final Entity target;
     private final ITurtleUpgrade upgrade;
     private final TurtleSide side;
 
-    public TurtleAttackEvent( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Entity target, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
-    {
-        super( turtle, TurtleAction.ATTACK, player );
-        Objects.requireNonNull( target, "target cannot be null" );
-        Objects.requireNonNull( upgrade, "upgrade cannot be null" );
-        Objects.requireNonNull( side, "side cannot be null" );
+    public TurtleAttackEvent(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Entity target, @Nonnull ITurtleUpgrade upgrade,
+                             @Nonnull TurtleSide side) {
+        super(turtle, TurtleAction.ATTACK, player);
+        Objects.requireNonNull(target, "target cannot be null");
+        Objects.requireNonNull(upgrade, "upgrade cannot be null");
+        Objects.requireNonNull(side, "side cannot be null");
         this.target = target;
         this.upgrade = upgrade;
         this.side = side;
@@ -50,9 +44,8 @@ public class TurtleAttackEvent extends TurtlePlayerEvent
      * @return The entity being attacked.
      */
     @Nonnull
-    public Entity getTarget()
-    {
-        return target;
+    public Entity getTarget() {
+        return this.target;
     }
 
     /**
@@ -61,9 +54,8 @@ public class TurtleAttackEvent extends TurtlePlayerEvent
      * @return The upgrade responsible for attacking.
      */
     @Nonnull
-    public ITurtleUpgrade getUpgrade()
-    {
-        return upgrade;
+    public ITurtleUpgrade getUpgrade() {
+        return this.upgrade;
     }
 
     /**
@@ -72,8 +64,7 @@ public class TurtleAttackEvent extends TurtlePlayerEvent
      * @return The upgrade's side.
      */
     @Nonnull
-    public TurtleSide getSide()
-    {
-        return side;
+    public TurtleSide getSide() {
+        return this.side;
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleBlockEvent.java

@@ -3,48 +3,44 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
+import java.util.Map;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
 import dan200.computercraft.api.lua.MethodResult;
+import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.api.turtle.TurtleVerb;
+
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.event.world.BlockEvent;
-
-import javax.annotation.Nonnull;
-import java.util.Map;
-import java.util.Objects;
 
 /**
  * A general event for when a turtle interacts with a block or region.
  *
- * You should generally listen to one of the sub-events instead, cancelling them where
- * appropriate.
+ * You should generally listen to one of the sub-events instead, cancelling them where appropriate.
  *
- * Note that you are not guaranteed to receive this event, if it has been cancelled by other
- * mechanisms, such as block protection systems.
+ * Note that you are not guaranteed to receive this event, if it has been cancelled by other mechanisms, such as block protection systems.
  *
- * Be aware that some events (such as {@link TurtleInventoryEvent}) do not necessarily interact
- * with a block, simply objects within that block space.
+ * Be aware that some events (such as {@link TurtleInventoryEvent}) do not necessarily interact with a block, simply objects within that block space.
  */
-public abstract class TurtleBlockEvent extends TurtlePlayerEvent
-{
+public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
     private final World world;
     private final BlockPos pos;
 
-    protected TurtleBlockEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
-    {
-        super( turtle, action, player );
+    protected TurtleBlockEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
+                               @Nonnull BlockPos pos) {
+        super(turtle, action, player);
 
-        Objects.requireNonNull( world, "world cannot be null" );
-        Objects.requireNonNull( pos, "pos cannot be null" );
+        Objects.requireNonNull(world, "world cannot be null");
+        Objects.requireNonNull(pos, "pos cannot be null");
         this.world = world;
         this.pos = pos;
     }
@@ -54,45 +50,36 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @return The world the turtle is interacting in.
      */
-    public World getWorld()
-    {
-        return world;
+    public World getWorld() {
+        return this.world;
     }
 
     /**
-     * Get the position the turtle is interacting with. Note that this is different
-     * to {@link ITurtleAccess#getPosition()}.
+     * Get the position the turtle is interacting with. Note that this is different to {@link ITurtleAccess#getPosition()}.
      *
      * @return The position the turtle is interacting with.
      */
-    public BlockPos getPos()
-    {
-        return pos;
+    public BlockPos getPos() {
+        return this.pos;
     }
 
     /**
      * Fired when a turtle attempts to dig a block.
      *
-     * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)},
-     * as the base {@code turtle.dig()} command does not fire it.
-     *
-     * Note that such commands should also fire {@link BlockEvent.BreakEvent}, so you do not need to listen to both.
-     *
      * @see TurtleAction#DIG
      */
-    public static class Dig extends TurtleBlockEvent
-    {
+    public static class Dig extends TurtleBlockEvent {
         private final BlockState block;
         private final ITurtleUpgrade upgrade;
         private final TurtleSide side;
 
-        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
-        {
-            super( turtle, TurtleAction.DIG, player, world, pos );
+        public Dig(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block,
+                   @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side) {
+            super(turtle, TurtleAction.DIG, player, world, pos);
 
-            Objects.requireNonNull( block, "block cannot be null" );
-            Objects.requireNonNull( upgrade, "upgrade cannot be null" );
-            Objects.requireNonNull( side, "side cannot be null" );
+            Objects.requireNonNull(block, "block cannot be null");
+            Objects.requireNonNull(upgrade, "upgrade cannot be null");
+            Objects.requireNonNull(side, "side cannot be null");
             this.block = block;
             this.upgrade = upgrade;
             this.side = side;
@@ -104,9 +91,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The block which is going to be broken.
          */
         @Nonnull
-        public BlockState getBlock()
-        {
-            return block;
+        public BlockState getBlock() {
+            return this.block;
         }
 
         /**
@@ -115,9 +101,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The upgrade doing the digging.
          */
         @Nonnull
-        public ITurtleUpgrade getUpgrade()
-        {
-            return upgrade;
+        public ITurtleUpgrade getUpgrade() {
+            return this.upgrade;
         }
 
         /**
@@ -126,9 +111,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The upgrade's side.
          */
         @Nonnull
-        public TurtleSide getSide()
-        {
-            return side;
+        public TurtleSide getSide() {
+            return this.side;
         }
     }
 
@@ -137,11 +121,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#MOVE
      */
-    public static class Move extends TurtleBlockEvent
-    {
-        public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
-        {
-            super( turtle, TurtleAction.MOVE, player, world, pos );
+    public static class Move extends TurtleBlockEvent {
+        public Move(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos) {
+            super(turtle, TurtleAction.MOVE, player, world, pos);
         }
     }
 
@@ -150,15 +132,13 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#PLACE
      */
-    public static class Place extends TurtleBlockEvent
-    {
+    public static class Place extends TurtleBlockEvent {
         private final ItemStack stack;
 
-        public Place( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull ItemStack stack )
-        {
-            super( turtle, TurtleAction.PLACE, player, world, pos );
+        public Place(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull ItemStack stack) {
+            super(turtle, TurtleAction.PLACE, player, world, pos);
 
-            Objects.requireNonNull( stack, "stack cannot be null" );
+            Objects.requireNonNull(stack, "stack cannot be null");
             this.stack = stack;
         }
 
@@ -168,9 +148,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The item stack to be placed.
          */
         @Nonnull
-        public ItemStack getStack()
-        {
-            return stack;
+        public ItemStack getStack() {
+            return this.stack;
         }
     }
 
@@ -181,17 +160,16 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#INSPECT
      */
-    public static class Inspect extends TurtleBlockEvent
-    {
+    public static class Inspect extends TurtleBlockEvent {
         private final BlockState state;
         private final Map<String, Object> data;
 
-        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull Map<String, Object> data )
-        {
-            super( turtle, TurtleAction.INSPECT, player, world, pos );
+        public Inspect(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state,
+                       @Nonnull Map<String, Object> data) {
+            super(turtle, TurtleAction.INSPECT, player, world, pos);
 
-            Objects.requireNonNull( state, "state cannot be null" );
-            Objects.requireNonNull( data, "data cannot be null" );
+            Objects.requireNonNull(state, "state cannot be null");
+            Objects.requireNonNull(data, "data cannot be null");
             this.data = data;
             this.state = state;
         }
@@ -202,9 +180,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The inspected block state.
          */
         @Nonnull
-        public BlockState getState()
-        {
-            return state;
+        public BlockState getState() {
+            return this.state;
         }
 
         /**
@@ -213,21 +190,18 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return This block's inspection data.
          */
         @Nonnull
-        public Map<String, Object> getData()
-        {
-            return data;
+        public Map<String, Object> getData() {
+            return this.data;
         }
 
         /**
          * Add new information to the inspection result. Note this will override fields with the same name.
          *
-         * @param newData The data to add. Note all values should be convertible to Lua (see
-         *                {@link MethodResult#of(Object)}).
+         * @param newData The data to add. Note all values should be convertible to Lua (see {@link MethodResult#of(Object)}).
          */
-        public void addData( @Nonnull Map<String, ?> newData )
-        {
-            Objects.requireNonNull( newData, "newData cannot be null" );
-            data.putAll( newData );
+        public void addData(@Nonnull Map<String, ?> newData) {
+            Objects.requireNonNull(newData, "newData cannot be null");
+            this.data.putAll(newData);
         }
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleEvent.java

@@ -3,40 +3,47 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraftforge.eventbus.api.Event;
-
-import javax.annotation.Nonnull;
 import java.util.Objects;
 
+import javax.annotation.Nonnull;
+
+import com.google.common.eventbus.EventBus;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+
 /**
- * A base class for all events concerning a turtle. This will only ever constructed and fired on the server side,
- * so sever specific methods on {@link ITurtleAccess} are safe to use.
+ * A base class for all events concerning a turtle. This will only ever constructed and fired on the server side, so sever specific methods on {@link
+ * ITurtleAccess} are safe to use.
  *
  * You should generally not need to subscribe to this event, preferring one of the more specific classes.
  *
  * @see TurtleActionEvent
  */
-public abstract class TurtleEvent extends Event
-{
+public abstract class TurtleEvent {
+    public static final EventBus EVENT_BUS = new EventBus();
+
     private final ITurtleAccess turtle;
 
-    protected TurtleEvent( @Nonnull ITurtleAccess turtle )
-    {
-        Objects.requireNonNull( turtle, "turtle cannot be null" );
+    protected TurtleEvent(@Nonnull ITurtleAccess turtle) {
+        Objects.requireNonNull(turtle, "turtle cannot be null");
         this.turtle = turtle;
     }
 
+    public static boolean post(TurtleActionEvent event) {
+        EVENT_BUS.post(event);
+        return event.isCancelled();
+    }
+
     /**
      * Get the turtle which is performing this action.
      *
      * @return The access for this turtle.
      */
     @Nonnull
-    public ITurtleAccess getTurtle()
-    {
-        return turtle;
+    public ITurtleAccess getTurtle() {
+        return this.turtle;
     }
+
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java

@@ -3,42 +3,42 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
+import java.util.Map;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
 
-import javax.annotation.Nonnull;
-import java.util.Map;
-import java.util.Objects;
+import net.minecraft.item.ItemStack;
 
 /**
  * Fired when a turtle gathers data on an item in its inventory.
  *
- * You may prevent items being inspected, or add additional information to the result. Be aware that this may be fired
- * on the computer thread, and so any operations on it must be thread safe.
+ * You may prevent items being inspected, or add additional information to the result. Be aware that this may be fired on the computer thread, and so any
+ * operations on it must be thread safe.
  *
  * @see TurtleAction#INSPECT_ITEM
  */
-public class TurtleInspectItemEvent extends TurtleActionEvent
-{
+public class TurtleInspectItemEvent extends TurtleActionEvent {
     private final ItemStack stack;
     private final Map<String, Object> data;
     private final boolean mainThread;
 
     @Deprecated
-    public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data )
-    {
-        this( turtle, stack, data, false );
+    public TurtleInspectItemEvent(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data) {
+        this(turtle, stack, data, false);
     }
 
-    public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data, boolean mainThread )
-    {
-        super( turtle, TurtleAction.INSPECT_ITEM );
+    public TurtleInspectItemEvent(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data, boolean mainThread) {
+        super(turtle, TurtleAction.INSPECT_ITEM);
 
-        Objects.requireNonNull( stack, "stack cannot be null" );
-        Objects.requireNonNull( data, "data cannot be null" );
+        Objects.requireNonNull(stack, "stack cannot be null");
+        Objects.requireNonNull(data, "data cannot be null");
         this.stack = stack;
         this.data = data;
         this.mainThread = mainThread;
@@ -50,9 +50,8 @@ public class TurtleInspectItemEvent extends TurtleActionEvent
      * @return The item stack which is being inspected. This should <b>not</b> be modified.
      */
     @Nonnull
-    public ItemStack getStack()
-    {
-        return stack;
+    public ItemStack getStack() {
+        return this.stack;
     }
 
     /**
@@ -61,31 +60,26 @@ public class TurtleInspectItemEvent extends TurtleActionEvent
      * @return This items's inspection data.
      */
     @Nonnull
-    public Map<String, Object> getData()
-    {
-        return data;
+    public Map<String, Object> getData() {
+        return this.data;
     }
 
     /**
-     * If this event is being fired on the server thread. When true, information which relies on server state may be
-     * exposed.
+     * If this event is being fired on the server thread. When true, information which relies on server state may be exposed.
      *
      * @return If this is run on the main thread.
      */
-    public boolean onMainThread()
-    {
-        return mainThread;
+    public boolean onMainThread() {
+        return this.mainThread;
     }
 
     /**
      * Add new information to the inspection result. Note this will override fields with the same name.
      *
-     * @param newData The data to add. Note all values should be convertible to Lua (see
-     *                {@link MethodResult#of(Object)}).
+     * @param newData The data to add. Note all values should be convertible to Lua (see {@link MethodResult#of(Object)}).
      */
-    public void addData( @Nonnull Map<String, ?> newData )
-    {
-        Objects.requireNonNull( newData, "newData cannot be null" );
-        data.putAll( newData );
+    public void addData(@Nonnull Map<String, ?> newData) {
+        Objects.requireNonNull(newData, "newData cannot be null");
+        this.data.putAll(newData);
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleInventoryEvent.java

@@ -3,29 +3,31 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.items.IItemHandler;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Objects;
+
+import dan200.computercraft.api.turtle.FakePlayer;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 
 /**
  * Fired when a turtle attempts to interact with an inventory.
  */
-public abstract class TurtleInventoryEvent extends TurtleBlockEvent
-{
-    private final IItemHandler handler;
+public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
+    private final Inventory handler;
 
-    protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
-    {
-        super( turtle, action, player, world, pos );
+    protected TurtleInventoryEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
+                                   @Nonnull BlockPos pos, @Nullable Inventory handler) {
+        super(turtle, action, player, world, pos);
         this.handler = handler;
     }
 
@@ -35,9 +37,8 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      * @return The inventory being interacted with, {@code null} if the item will be dropped to/sucked from the world.
      */
     @Nullable
-    public IItemHandler getItemHandler()
-    {
-        return handler;
+    public Inventory getItemHandler() {
+        return this.handler;
     }
 
     /**
@@ -45,11 +46,9 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      *
      * @see TurtleAction#SUCK
      */
-    public static class Suck extends TurtleInventoryEvent
-    {
-        public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
-        {
-            super( turtle, TurtleAction.SUCK, player, world, pos, handler );
+    public static class Suck extends TurtleInventoryEvent {
+        public Suck(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler) {
+            super(turtle, TurtleAction.SUCK, player, world, pos, handler);
         }
     }
 
@@ -58,15 +57,14 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      *
      * @see TurtleAction#DROP
      */
-    public static class Drop extends TurtleInventoryEvent
-    {
+    public static class Drop extends TurtleInventoryEvent {
         private final ItemStack stack;
 
-        public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler, @Nonnull ItemStack stack )
-        {
-            super( turtle, TurtleAction.DROP, player, world, pos, handler );
+        public Drop(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler,
+                    @Nonnull ItemStack stack) {
+            super(turtle, TurtleAction.DROP, player, world, pos, handler);
 
-            Objects.requireNonNull( stack, "stack cannot be null" );
+            Objects.requireNonNull(stack, "stack cannot be null");
             this.stack = stack;
         }
 
@@ -76,9 +74,8 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
          * @return The item stack which will be dropped. This should <b>not</b> be modified.
          */
         @Nonnull
-        public ItemStack getStack()
-        {
-            return stack;
+        public ItemStack getStack() {
+            return this.stack;
         }
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtlePlayerEvent.java

@@ -3,28 +3,28 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraftforge.common.util.FakePlayer;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
-import java.util.Objects;
+
+import dan200.computercraft.api.turtle.FakePlayer;
+import dan200.computercraft.api.turtle.ITurtleAccess;
 
 /**
  * An action done by a turtle which is normally done by a player.
  *
  * {@link #getPlayer()} may be used to modify the player's attributes or perform permission checks.
  */
-public abstract class TurtlePlayerEvent extends TurtleActionEvent
-{
+public abstract class TurtlePlayerEvent extends TurtleActionEvent {
     private final FakePlayer player;
 
-    protected TurtlePlayerEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player )
-    {
-        super( turtle, action );
+    protected TurtlePlayerEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player) {
+        super(turtle, action);
 
-        Objects.requireNonNull( player, "player cannot be null" );
+        Objects.requireNonNull(player, "player cannot be null");
         this.player = player;
     }
 
@@ -36,8 +36,7 @@ public abstract class TurtlePlayerEvent extends TurtleActionEvent
      * @return A {@link FakePlayer} representing this turtle.
      */
     @Nonnull
-    public FakePlayer getPlayer()
-    {
-        return player;
+    public FakePlayer getPlayer() {
+        return this.player;
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java

@@ -3,31 +3,32 @@
  * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
+
 package dan200.computercraft.api.turtle.event;
 
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Objects;
+
+import dan200.computercraft.api.turtle.ITurtleAccess;
+
+import net.minecraft.item.ItemStack;
 
 /**
  * Fired when a turtle attempts to refuel from an item.
  *
- * One may use {@link #setCanceled(boolean, String)} to prevent refueling from this specific item. Additionally, you
- * may use {@link #setHandler(Handler)} to register a custom fuel provider.
+ * One may use {@link #setCanceled(boolean, String)} to prevent refueling from this specific item. Additionally, you may use {@link #setHandler(Handler)} to
+ * register a custom fuel provider.
  */
-public class TurtleRefuelEvent extends TurtleActionEvent
-{
+public class TurtleRefuelEvent extends TurtleActionEvent {
     private final ItemStack stack;
     private Handler handler;
 
-    public TurtleRefuelEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack )
-    {
-        super( turtle, TurtleAction.REFUEL );
+    public TurtleRefuelEvent(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack) {
+        super(turtle, TurtleAction.REFUEL);
 
-        Objects.requireNonNull( turtle, "turtle cannot be null" );
+        Objects.requireNonNull(turtle, "turtle cannot be null");
         this.stack = stack;
     }
 
@@ -38,9 +39,8 @@ public class TurtleRefuelEvent extends TurtleActionEvent
      *
      * @return The stack to refuel from.
      */
-    public ItemStack getStack()
-    {
-        return stack;
+    public ItemStack getStack() {
+        return this.stack;
     }
 
     /**
@@ -50,22 +50,19 @@ public class TurtleRefuelEvent extends TurtleActionEvent
      * @see #setHandler(Handler)
      */
     @Nullable
-    public Handler getHandler()
-    {
-        return handler;
+    public Handler getHandler() {
+        return this.handler;
     }
 
     /**
      * Set the refuel handler for this stack.
      *
-     * You should call this if you can actually refuel from this item, and ideally only if there are no existing
-     * handlers.
+     * You should call this if you can actually refuel from this item, and ideally only if there are no existing handlers.
      *
      * @param handler The new refuel handler.
      * @see #getHandler()
      */
-    public void setHandler( @Nullable Handler handler )
-    {
+    public void setHandler(@Nullable Handler handler) {
         this.handler = handler;
     }
 
@@ -73,18 +70,16 @@ public class TurtleRefuelEvent extends TurtleActionEvent
      * Handles refuelling a turtle from a specific item.
      */
     @FunctionalInterface
-    public interface Handler
-    {
+    public interface Handler {
         /**
          * Refuel a turtle using an item.
          *
          * @param turtle The turtle to refuel.
-         * @param stack  The stack to refuel with.
-         * @param slot   The slot the stack resides within. This may be used to modify the inventory afterwards.
-         * @param limit  The maximum number of refuel operations to perform. This will often correspond to the number of
-         *               items to consume.
+         * @param stack The stack to refuel with.
+         * @param slot The slot the stack resides within. This may be used to modify the inventory afterwards.
+         * @param limit The maximum number of refuel operations to perform. This will often correspond to the number of items to consume.
          * @return The amount of fuel gained.
          */
-        int refuel( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit );
+        int refuel(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit);
     }
 }

src/main/java/dan200/computercraft/client/ClientRegistry.java

@@ -3,41 +3,41 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client;
 
+import java.util.HashSet;
+import java.util.function.Consumer;
+
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.render.TurtleModelLoader;
-import dan200.computercraft.shared.Registry;
+import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.IColouredItem;
 import dan200.computercraft.shared.media.items.ItemDisk;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.inventory.container.PlayerContainer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
-import net.minecraftforge.client.model.SimpleModelTransform;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
 
-import java.util.HashSet;
-import java.util.Map;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.ModelRotation;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.texture.SpriteAtlasTexture;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+
+import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
 
 /**
  * Registers textures and models for items.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
-public final class ClientRegistry
-{
+@SuppressWarnings ({
+    "MethodCallSideOnly",
+    "LocalVariableDeclarationSideOnly"
+})
+public final class ClientRegistry {
     private static final String[] EXTRA_MODELS = new String[] {
         "turtle_modem_normal_off_left",
         "turtle_modem_normal_on_left",
@@ -56,7 +56,7 @@ public final class ClientRegistry
 
         "turtle_colour",
         "turtle_elf_overlay",
-    };
+        };
 
     private static final String[] EXTRA_TEXTURES = new String[] {
         // TODO: Gather these automatically from the model. Sadly the model loader isn't available
@@ -65,87 +65,59 @@ public final class ClientRegistry
         "block/turtle_elf_overlay",
         "block/turtle_crafty_face",
         "block/turtle_speaker_face",
-    };
+        };
 
     private ClientRegistry() {}
 
-    @SubscribeEvent
-    public static void registerModels( ModelRegistryEvent event )
-    {
-        ModelLoaderRegistry.registerLoader( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ), TurtleModelLoader.INSTANCE );
-    }
-
-    @SubscribeEvent
-    public static void onTextureStitchEvent( TextureStitchEvent.Pre event )
-    {
-        if( !event.getMap().getTextureLocation().equals( PlayerContainer.LOCATION_BLOCKS_TEXTURE ) ) return;
-
-        for( String extra : EXTRA_TEXTURES )
-        {
-            event.addSprite( new ResourceLocation( ComputerCraft.MOD_ID, extra ) );
+    public static void onTextureStitchEvent(SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry) {
+        for (String extra : EXTRA_TEXTURES) {
+            registry.register(new Identifier(ComputerCraft.MOD_ID, extra));
         }
     }
 
-    @SubscribeEvent
-    public static void onModelBakeEvent( ModelBakeEvent event )
-    {
-        // Load all extra models
-        ModelLoader loader = event.getModelLoader();
-        Map<ResourceLocation, IBakedModel> registry = event.getModelRegistry();
+    @SuppressWarnings ("NewExpressionSideOnly")
+    public static void onModelBakeEvent(ResourceManager manager, Consumer<ModelIdentifier> out) {
+        for (String model : EXTRA_MODELS) {
+            out.accept(new ModelIdentifier(new Identifier(ComputerCraft.MOD_ID, model), "inventory"));
+        }
+    }
 
-        for( String modelName : EXTRA_MODELS )
-        {
-            ResourceLocation location = new ResourceLocation( ComputerCraft.MOD_ID, "item/" + modelName );
-            IUnbakedModel model = loader.getUnbakedModel( location );
-            model.getTextures( loader::getUnbakedModel, new HashSet<>() );
+    public static void onItemColours() {
+        ColorProviderRegistry.ITEM.register((stack, layer) -> {
+            return layer == 1 ? ((ItemDisk) stack.getItem()).getColour(stack) : 0xFFFFFF;
+        }, ComputerCraftRegistry.ModItems.DISK);
 
-            IBakedModel baked = model.bakeModel( loader, ModelLoader.defaultTextureGetter(), SimpleModelTransform.IDENTITY, location );
-            if( baked != null )
+        ColorProviderRegistry.ITEM.register((stack, layer) -> layer == 1 ? ItemTreasureDisk.getColour(stack) : 0xFFFFFF,
+                                            ComputerCraftRegistry.ModItems.TREASURE_DISK);
+
+        ColorProviderRegistry.ITEM.register((stack, layer) -> {
+            switch (layer) {
+            case 0:
+            default:
+                return 0xFFFFFF;
+            case 1: // Frame colour
+                return IColouredItem.getColourBasic(stack);
+            case 2: // Light colour
             {
-                registry.put( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, modelName ), "inventory" ), baked );
+                int light = ItemPocketComputer.getLightState(stack);
+                return light == -1 ? Colour.BLACK.getHex() : light;
             }
-        }
-    }
-
-    @SubscribeEvent
-    public static void onItemColours( ColorHandlerEvent.Item event )
-    {
-        if( Registry.ModItems.DISK == null || Registry.ModBlocks.TURTLE_NORMAL == null )
-        {
-            ComputerCraft.log.warn( "Block/item registration has failed. Skipping registration of item colours." );
-            return;
-        }
-
-        event.getItemColors().register(
-            ( stack, layer ) -> layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            Registry.ModItems.DISK.get()
-        );
-
-        event.getItemColors().register(
-            ( stack, layer ) -> layer == 1 ? ItemTreasureDisk.getColour( stack ) : 0xFFFFFF,
-            Registry.ModItems.TREASURE_DISK.get()
-        );
-
-        event.getItemColors().register( ( stack, layer ) -> {
-            switch( layer )
-            {
-                case 0:
-                default:
-                    return 0xFFFFFF;
-                case 1: // Frame colour
-                    return IColouredItem.getColourBasic( stack );
-                case 2: // Light colour
-                {
-                    int light = ItemPocketComputer.getLightState( stack );
-                    return light == -1 ? Colour.BLACK.getHex() : light;
-                }
             }
-        }, Registry.ModItems.POCKET_COMPUTER_NORMAL.get(), Registry.ModItems.POCKET_COMPUTER_ADVANCED.get() );
+        }, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED);
 
         // Setup turtle colours
-        event.getItemColors().register(
-            ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            Registry.ModBlocks.TURTLE_NORMAL.get(), Registry.ModBlocks.TURTLE_ADVANCED.get()
-        );
+        ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour(stack) : 0xFFFFFF,
+                                            ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL,
+                                            ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED);
+    }
+
+    private static BakedModel bake(ModelLoader loader, UnbakedModel model, Identifier identifier) {
+        model.getTextureDependencies(loader::getOrLoadModel, new HashSet<>());
+        return model.bake(loader,
+                          spriteIdentifier -> MinecraftClient.getInstance()
+                                                             .getSpriteAtlas(spriteIdentifier.getAtlasId())
+                                                             .apply(spriteIdentifier.getTextureId()),
+                          ModelRotation.X0_Y0,
+                          identifier);
     }
 }

src/main/java/dan200/computercraft/client/ClientTableFormatter.java

@@ -3,86 +3,89 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client;
 
+import javax.annotation.Nullable;
+
+import dan200.computercraft.mixin.ChatHudAccess;
 import dan200.computercraft.shared.command.text.ChatHelpers;
 import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.command.text.TableFormatter;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.NewChatGui;
-import net.minecraft.client.gui.RenderComponentsUtil;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextFormatting;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.annotation.Nullable;
-import java.util.List;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.hud.ChatHud;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.math.MathHelper;
 
-public class ClientTableFormatter implements TableFormatter
-{
+@SuppressWarnings ({
+    "MethodCallSideOnly",
+    "LocalVariableDeclarationSideOnly"
+})
+public class ClientTableFormatter implements TableFormatter {
     public static final ClientTableFormatter INSTANCE = new ClientTableFormatter();
 
     private static Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
 
-    private static FontRenderer renderer()
-    {
-        return Minecraft.getInstance().fontRenderer;
-    }
-
     @Override
     @Nullable
-    public ITextComponent getPadding( ITextComponent component, int width )
-    {
-        int extraWidth = width - getWidth( component );
-        if( extraWidth <= 0 ) return null;
+    public Text getPadding(Text component, int width) {
+        int extraWidth = width - this.getWidth(component);
+        if (extraWidth <= 0) {
+            return null;
+        }
 
-        FontRenderer renderer = renderer();
+        TextRenderer renderer = renderer();
 
-        float spaceWidth = renderer.getStringWidth( " " );
-        int spaces = MathHelper.floor( extraWidth / spaceWidth );
+        float spaceWidth = renderer.getWidth(" ");
+        int spaces = MathHelper.floor(extraWidth / spaceWidth);
         int extra = extraWidth - (int) (spaces * spaceWidth);
 
-        return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), TextFormatting.GRAY );
+        return ChatHelpers.coloured(StringUtils.repeat(' ', spaces) + StringUtils.repeat((char) 712, extra), Formatting.GRAY);
+    }
+
+    private static TextRenderer renderer() {
+        return MinecraftClient.getInstance().textRenderer;
     }
 
     @Override
-    public int getColumnPadding()
-    {
+    public int getColumnPadding() {
         return 3;
     }
 
     @Override
-    public int getWidth( ITextComponent component )
-    {
-        return renderer().getStringWidth( component.getFormattedText() );
+    public int getWidth(Text component) {
+        return renderer().getWidth(component);
     }
 
     @Override
-    public void writeLine( int id, ITextComponent component )
-    {
-        Minecraft mc = Minecraft.getInstance();
-        NewChatGui chat = mc.ingameGUI.getChatGUI();
+    public void writeLine(int id, Text component) {
+        MinecraftClient mc = MinecraftClient.getInstance();
+        ChatHud chat = mc.inGameHud.getChatHud();
 
-        // Trim the text if it goes over the allowed length
-        int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
-        List<ITextComponent> list = RenderComponentsUtil.splitText( component, maxWidth, mc.fontRenderer, false, false );
-        if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
+        // TODO: Trim the text if it goes over the allowed length
+        // int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
+        // List<ITextProperties> list = RenderComponentsUtil.func_238505_a_( component, maxWidth, mc.fontRenderer );
+        // if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
+        ((ChatHudAccess)chat).callAddMessage(component, id);
     }
 
     @Override
-    public int display( TableBuilder table )
-    {
-        NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI();
+    public int display(TableBuilder table) {
+        ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud();
 
-        int lastHeight = lastHeights.get( table.getId() );
+        int lastHeight = lastHeights.get(table.getId());
 
-        int height = TableFormatter.super.display( table );
-        lastHeights.put( table.getId(), height );
+        int height = TableFormatter.super.display(table);
+        lastHeights.put(table.getId(), height);
 
-        for( int i = height; i < lastHeight; i++ ) chat.deleteChatLine( i + table.getId() );
+        for (int i = height; i < lastHeight; i++) {
+            ((ChatHudAccess)chat).callRemoveMessage(i + table.getId());
+        }
         return height;
     }
 }

src/main/java/dan200/computercraft/client/FrameInfo.java

@@ -3,43 +3,43 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client;
 
-import dan200.computercraft.ComputerCraft;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
-public final class FrameInfo
-{
+public final class FrameInfo {
     private static int tick;
     private static long renderFrame;
 
-    private FrameInfo()
-    {
+    static {
+
     }
 
-    public static boolean getGlobalCursorBlink()
-    {
+    private FrameInfo() {
+    }
+
+    public static void init() {
+        ClientTickEvents.START_CLIENT_TICK.register(m -> {
+            tick++;
+        });
+    }
+
+    public static boolean getGlobalCursorBlink() {
         return (tick / 8) % 2 == 0;
     }
 
-    public static long getRenderFrame()
-    {
+    public static long getRenderFrame() {
         return renderFrame;
     }
 
-    @SubscribeEvent
-    public static void onTick( TickEvent.ClientTickEvent event )
-    {
-        if( event.phase == TickEvent.Phase.START ) tick++;
+    // TODO Call this in a callback
+    public static void onTick() {
+        tick++;
     }
 
-    @SubscribeEvent
-    public static void onRenderTick( TickEvent.RenderTickEvent event )
-    {
-        if( event.phase == TickEvent.Phase.START ) renderFrame++;
+    // TODO Call this in a callback
+    public static void onRenderFrame() {
+        renderFrame++;
     }
 }

src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java

@@ -3,58 +3,164 @@
  * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.IVertexBuilder;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.*;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public final class FixedWidthFontRenderer
-{
-    private static final Matrix4f IDENTITY = TransformationMatrix.identity().getMatrix();
-
-    private static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.RenderPhase;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.VertexFormat;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.util.math.AffineTransformation;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Matrix4f;
 
+public final class FixedWidthFontRenderer {
     public static final int FONT_HEIGHT = 9;
     public static final int FONT_WIDTH = 6;
     public static final float WIDTH = 256.0f;
-
     public static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
     public static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
+    private static final Matrix4f IDENTITY = AffineTransformation.identity()
+                                                                 .getMatrix();
+    private static final Identifier FONT = new Identifier("computercraft", "textures/gui/term_font.png");
+    public static final RenderLayer TYPE = Type.MAIN;
 
-    public static final RenderType TYPE = Type.MAIN;
 
-    private FixedWidthFontRenderer()
-    {
+    private FixedWidthFontRenderer() {
     }
 
-    public static float toGreyscale( double[] rgb )
-    {
+    public static void drawString(float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
+                                  @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize) {
+        bindFont();
+
+        VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
+                                                                   .getBufferBuilders()
+                                                                   .getEntityVertexConsumers();
+        drawString(IDENTITY,
+                   ((VertexConsumerProvider) renderer).getBuffer(TYPE),
+                   x,
+                   y,
+                   text,
+                   textColour,
+                   backgroundColour,
+                   palette,
+                   greyscale,
+                   leftMarginSize,
+                   rightMarginSize);
+        renderer.draw();
+    }
+
+    private static void bindFont() {
+        MinecraftClient.getInstance()
+                       .getTextureManager()
+                       .bindTexture(FONT);
+        RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP);
+    }
+
+    public static void drawString(@Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y, @Nonnull TextBuffer text,
+                                  @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
+                                  float leftMarginSize, float rightMarginSize) {
+        if (backgroundColour != null) {
+            drawBackground(transform, renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT);
+        }
+
+        for (int i = 0; i < text.length(); i++) {
+            double[] colour = palette.getColour(getColour(textColour.charAt(i), Colour.BLACK));
+            float r, g, b;
+            if (greyscale) {
+                r = g = b = toGreyscale(colour);
+            } else {
+                r = (float) colour[0];
+                g = (float) colour[1];
+                b = (float) colour[2];
+            }
+
+            // Draw char
+            int index = text.charAt(i);
+            if (index > 255) {
+                index = '?';
+            }
+            drawChar(transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b);
+        }
+
+    }
+
+    private static void drawBackground(@Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
+                                       @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale, float leftMarginSize,
+                                       float rightMarginSize, float height) {
+        if (leftMarginSize > 0) {
+            drawQuad(transform, renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt(0));
+        }
+
+        if (rightMarginSize > 0) {
+            drawQuad(transform,
+                     renderer,
+                     x + backgroundColour.length() * FONT_WIDTH,
+                     y,
+                     rightMarginSize,
+                     height,
+                     palette,
+                     greyscale,
+                     backgroundColour.charAt(backgroundColour.length() - 1));
+        }
+
+        // Batch together runs of identical background cells.
+        int blockStart = 0;
+        char blockColour = '\0';
+        for (int i = 0; i < backgroundColour.length(); i++) {
+            char colourIndex = backgroundColour.charAt(i);
+            if (colourIndex == blockColour) {
+                continue;
+            }
+
+            if (blockColour != '\0') {
+                drawQuad(transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour);
+            }
+
+            blockColour = colourIndex;
+            blockStart = i;
+        }
+
+        if (blockColour != '\0') {
+            drawQuad(transform,
+                     renderer,
+                     x + blockStart * FONT_WIDTH,
+                     y,
+                     FONT_WIDTH * (backgroundColour.length() - blockStart),
+                     height,
+                     palette,
+                     greyscale,
+                     blockColour);
+        }
+    }
+
+    public static int getColour(char c, Colour def) {
+        return 15 - Terminal.getColour(c, def);
+    }
+
+    public static float toGreyscale(double[] rgb) {
         return (float) ((rgb[0] + rgb[1] + rgb[2]) / 3);
     }
 
-    public static int getColour( char c, Colour def )
-    {
-        return 15 - Terminal.getColour( c, def );
-    }
-
-    private static void drawChar( Matrix4f transform, IVertexBuilder buffer, float x, float y, int index, float r, float g, float b )
-    {
+    private static void drawChar(Matrix4f transform, VertexConsumer buffer, float x, float y, int index, float r, float g, float b) {
         // Short circuit to avoid the common case - the texture should be blank here after all.
-        if( index == '\0' || index == ' ' ) return;
+        if (index == '\0' || index == ' ') {
+            return;
+        }
 
         int column = index % 16;
         int row = index / 16;
@@ -62,284 +168,217 @@ public final class FixedWidthFontRenderer
         int xStart = 1 + column * (FONT_WIDTH + 2);
         int yStart = 1 + row * (FONT_HEIGHT + 2);
 
-        buffer.pos( transform, x, y, 0f ).color( r, g, b, 1.0f ).tex( xStart / WIDTH, yStart / WIDTH ).endVertex();
-        buffer.pos( transform, x, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).tex( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
-        buffer.pos( transform, x + FONT_WIDTH, y, 0f ).color( r, g, b, 1.0f ).tex( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH ).endVertex();
-        buffer.pos( transform, x + FONT_WIDTH, y, 0f ).color( r, g, b, 1.0f ).tex( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH ).endVertex();
-        buffer.pos( transform, x, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).tex( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
-        buffer.pos( transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).tex( (xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
+        buffer.vertex(transform, x, y, 0f)
+              .color(r, g, b, 1.0f)
+              .texture(xStart / WIDTH, yStart / WIDTH)
+              .next();
+        buffer.vertex(transform, x, y + FONT_HEIGHT, 0f)
+              .color(r, g, b, 1.0f)
+              .texture(xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH)
+              .next();
+        buffer.vertex(transform, x + FONT_WIDTH, y, 0f)
+              .color(r, g, b, 1.0f)
+              .texture((xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH)
+              .next();
+        buffer.vertex(transform, x + FONT_WIDTH, y, 0f)
+              .color(r, g, b, 1.0f)
+              .texture((xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH)
+              .next();
+        buffer.vertex(transform, x, y + FONT_HEIGHT, 0f)
+              .color(r, g, b, 1.0f)
+              .texture(xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH)
+              .next();
+        buffer.vertex(transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f)
+              .color(r, g, b, 1.0f)
+              .texture((xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH)
+              .next();
     }
 
-    private static void drawQuad( Matrix4f transform, IVertexBuilder buffer, float x, float y, float width, float height, float r, float g, float b )
-    {
-        buffer.pos( transform, x, y, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_START, BACKGROUND_START ).endVertex();
-        buffer.pos( transform, x, y + height, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_START, BACKGROUND_END ).endVertex();
-        buffer.pos( transform, x + width, y, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_END, BACKGROUND_START ).endVertex();
-        buffer.pos( transform, x + width, y, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_END, BACKGROUND_START ).endVertex();
-        buffer.pos( transform, x, y + height, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_START, BACKGROUND_END ).endVertex();
-        buffer.pos( transform, x + width, y + height, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_END, BACKGROUND_END ).endVertex();
-    }
-
-    private static void drawQuad( Matrix4f transform, IVertexBuilder buffer, float x, float y, float width, float height, Palette palette, boolean greyscale, char colourIndex )
-    {
-        double[] colour = palette.getColour( getColour( colourIndex, Colour.BLACK ) );
+    private static void drawQuad(Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, Palette palette,
+                                 boolean greyscale, char colourIndex) {
+        double[] colour = palette.getColour(getColour(colourIndex, Colour.BLACK));
         float r, g, b;
-        if( greyscale )
-        {
-            r = g = b = toGreyscale( colour );
-        }
-        else
-        {
+        if (greyscale) {
+            r = g = b = toGreyscale(colour);
+        } else {
             r = (float) colour[0];
             g = (float) colour[1];
             b = (float) colour[2];
         }
 
-        drawQuad( transform, buffer, x, y, width, height, r, g, b );
+        drawQuad(transform, buffer, x, y, width, height, r, g, b);
     }
 
-    private static void drawBackground(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder renderer, float x, float y,
-        @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
-        float leftMarginSize, float rightMarginSize, float height
-    )
-    {
-        if( leftMarginSize > 0 )
-        {
-            drawQuad( transform, renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt( 0 ) );
-        }
-
-        if( rightMarginSize > 0 )
-        {
-            drawQuad( transform, renderer, x + backgroundColour.length() * FONT_WIDTH, y, rightMarginSize, height, palette, greyscale, backgroundColour.charAt( backgroundColour.length() - 1 ) );
-        }
-
-        // Batch together runs of identical background cells.
-        int blockStart = 0;
-        char blockColour = '\0';
-        for( int i = 0; i < backgroundColour.length(); i++ )
-        {
-            char colourIndex = backgroundColour.charAt( i );
-            if( colourIndex == blockColour ) continue;
-
-            if( blockColour != '\0' )
-            {
-                drawQuad( transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour );
-            }
-
-            blockColour = colourIndex;
-            blockStart = i;
-        }
-
-        if( blockColour != '\0' )
-        {
-            drawQuad( transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (backgroundColour.length() - blockStart), height, palette, greyscale, blockColour );
-        }
+    private static void drawQuad(Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, float r, float g, float b) {
+        buffer.vertex(transform, x, y, 0)
+              .color(r, g, b, 1.0f)
+              .texture(BACKGROUND_START, BACKGROUND_START)
+              .next();
+        buffer.vertex(transform, x, y + height, 0)
+              .color(r, g, b, 1.0f)
+              .texture(BACKGROUND_START, BACKGROUND_END)
+              .next();
+        buffer.vertex(transform, x + width, y, 0)
+              .color(r, g, b, 1.0f)
+              .texture(BACKGROUND_END, BACKGROUND_START)
+              .next();
+        buffer.vertex(transform, x + width, y, 0)
+              .color(r, g, b, 1.0f)
+              .texture(BACKGROUND_END, BACKGROUND_START)
+              .next();
+        buffer.vertex(transform, x, y + height, 0)
+              .color(r, g, b, 1.0f)
+              .texture(BACKGROUND_START, BACKGROUND_END)
+              .next();
+        buffer.vertex(transform, x + width, y + height, 0)
+              .color(r, g, b, 1.0f)
+              .texture(BACKGROUND_END, BACKGROUND_END)
+              .next();
     }
 
-    public static void drawString(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder renderer, float x, float y,
-        @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
-        @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize
-    )
-    {
-        if( backgroundColour != null )
-        {
-            drawBackground( transform, renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT );
-        }
-
-        for( int i = 0; i < text.length(); i++ )
-        {
-            double[] colour = palette.getColour( getColour( textColour.charAt( i ), Colour.BLACK ) );
-            float r, g, b;
-            if( greyscale )
-            {
-                r = g = b = toGreyscale( colour );
-            }
-            else
-            {
-                r = (float) colour[0];
-                g = (float) colour[1];
-                b = (float) colour[2];
-            }
-
-            // Draw char
-            int index = text.charAt( i );
-            if( index > 255 ) index = '?';
-            drawChar( transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b );
-        }
-
-    }
-
-    public static void drawString(
-        float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
-        @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize
-    )
-    {
-        bindFont();
-
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
-        drawString( IDENTITY, ((IRenderTypeBuffer) renderer).getBuffer( TYPE ), x, y, text, textColour, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize );
-        renderer.finish();
-    }
-
-    public static void drawTerminalWithoutCursor(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder buffer, float x, float y,
-        @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
+    public static void drawTerminalWithoutCursor(@Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
+                                                 @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
+                                                 float leftMarginSize, float rightMarginSize) {
         Palette palette = terminal.getPalette();
         int height = terminal.getHeight();
 
         // Top and bottom margins
-        drawBackground(
-            transform, buffer, x, y - topMarginSize,
-            terminal.getBackgroundColourLine( 0 ), palette, greyscale,
-            leftMarginSize, rightMarginSize, topMarginSize
-        );
+        drawBackground(transform,
+                       buffer,
+                       x,
+                       y - topMarginSize,
+                       terminal.getBackgroundColourLine(0),
+                       palette,
+                       greyscale,
+                       leftMarginSize,
+                       rightMarginSize,
+                       topMarginSize);
 
-        drawBackground(
-            transform, buffer, x, y + height * FONT_HEIGHT,
-            terminal.getBackgroundColourLine( height - 1 ), palette, greyscale,
-            leftMarginSize, rightMarginSize, bottomMarginSize
-        );
+        drawBackground(transform,
+                       buffer,
+                       x,
+                       y + height * FONT_HEIGHT,
+                       terminal.getBackgroundColourLine(height - 1),
+                       palette,
+                       greyscale,
+                       leftMarginSize,
+                       rightMarginSize,
+                       bottomMarginSize);
 
         // The main text
-        for( int i = 0; i < height; i++ )
-        {
-            drawString(
-                transform, buffer, x, y + FixedWidthFontRenderer.FONT_HEIGHT * i,
-                terminal.getLine( i ), terminal.getTextColourLine( i ), terminal.getBackgroundColourLine( i ),
-                palette, greyscale, leftMarginSize, rightMarginSize
-            );
+        for (int i = 0; i < height; i++) {
+            drawString(transform,
+                       buffer,
+                       x,
+                       y + FixedWidthFontRenderer.FONT_HEIGHT * i,
+                       terminal.getLine(i),
+                       terminal.getTextColourLine(i),
+                       terminal.getBackgroundColourLine(i),
+                       palette,
+                       greyscale,
+                       leftMarginSize,
+                       rightMarginSize);
         }
     }
 
-    public static void drawCursor(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder buffer, float x, float y,
-        @Nonnull Terminal terminal, boolean greyscale
-    )
-    {
+    public static void drawCursor(@Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
+                                  boolean greyscale) {
         Palette palette = terminal.getPalette();
         int width = terminal.getWidth();
         int height = terminal.getHeight();
 
         int cursorX = terminal.getCursorX();
         int cursorY = terminal.getCursorY();
-        if( terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink() )
-        {
-            double[] colour = palette.getColour( 15 - terminal.getTextColour() );
+        if (terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink()) {
+            double[] colour = palette.getColour(15 - terminal.getTextColour());
             float r, g, b;
-            if( greyscale )
-            {
-                r = g = b = toGreyscale( colour );
-            }
-            else
-            {
+            if (greyscale) {
+                r = g = b = toGreyscale(colour);
+            } else {
                 r = (float) colour[0];
                 g = (float) colour[1];
                 b = (float) colour[2];
             }
 
-            drawChar( transform, buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b );
+            drawChar(transform, buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b);
         }
     }
 
-    public static void drawTerminal(
-        @Nonnull Matrix4f transform, @Nonnull IVertexBuilder buffer, float x, float y,
-        @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
-        drawTerminalWithoutCursor( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-        drawCursor( transform, buffer, x, y, terminal, greyscale );
+    public static void drawTerminal(@Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
+                                    boolean greyscale, float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize) {
+        drawTerminalWithoutCursor(transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize);
+        drawCursor(transform, buffer, x, y, terminal, greyscale);
     }
 
-    public static void drawTerminal(
-        @Nonnull Matrix4f transform, float x, float y, @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
+    public static void drawTerminal(@Nonnull Matrix4f transform, float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize,
+                                    float bottomMarginSize, float leftMarginSize, float rightMarginSize) {
         bindFont();
 
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
-        IVertexBuilder buffer = renderer.getBuffer( TYPE );
-        drawTerminal( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-        renderer.finish( TYPE );
+        VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
+                                                                   .getBufferBuilders()
+                                                                   .getEntityVertexConsumers();
+        VertexConsumer buffer = renderer.getBuffer(TYPE);
+        drawTerminal(transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize);
+        renderer.draw(TYPE);
     }
 
-    public static void drawTerminal(
-        float x, float y, @Nonnull Terminal terminal, boolean greyscale,
-        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
-    )
-    {
-        drawTerminal( IDENTITY, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
+    public static void drawTerminal(float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
+                                    float leftMarginSize, float rightMarginSize) {
+        drawTerminal(IDENTITY, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize);
     }
 
-    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, @Nonnull IRenderTypeBuffer renderer, float x, float y, float width, float height )
-    {
-        Colour colour = Colour.BLACK;
-        drawQuad( transform, renderer.getBuffer( TYPE ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
+    public static void drawEmptyTerminal(float x, float y, float width, float height) {
+        drawEmptyTerminal(IDENTITY, x, y, width, height);
     }
 
-    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, float x, float y, float width, float height )
-    {
+    public static void drawEmptyTerminal(@Nonnull Matrix4f transform, float x, float y, float width, float height) {
         bindFont();
 
-        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
-        drawEmptyTerminal( transform, renderer, x, y, width, height );
-        renderer.finish();
+        VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
+                                                                   .getBufferBuilders()
+                                                                   .getEntityVertexConsumers();
+        drawEmptyTerminal(transform, renderer, x, y, width, height);
+        renderer.draw();
     }
 
-    public static void drawEmptyTerminal( float x, float y, float width, float height )
-    {
-        drawEmptyTerminal( IDENTITY, x, y, width, height );
-    }
-
-    public static void drawBlocker( @Nonnull Matrix4f transform, @Nonnull IRenderTypeBuffer renderer, float x, float y, float width, float height )
-    {
+    public static void drawEmptyTerminal(@Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width,
+                                         float height) {
         Colour colour = Colour.BLACK;
-        drawQuad( transform, renderer.getBuffer( Type.BLOCKER ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
+        drawQuad(transform, renderer.getBuffer(TYPE), x, y, width, height, colour.getR(), colour.getG(), colour.getB());
     }
 
-    private static void bindFont()
-    {
-        Minecraft.getInstance().getTextureManager().bindTexture( FONT );
-        RenderSystem.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
+    public static void drawBlocker(@Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width, float height) {
+        Colour colour = Colour.BLACK;
+        drawQuad(transform, renderer.getBuffer(Type.BLOCKER), x, y, width, height, colour.getR(), colour.getG(), colour.getB());
     }
 
-    private static final class Type extends RenderState
-    {
+    private static final class Type extends RenderPhase {
         private static final int GL_MODE = GL11.GL_TRIANGLES;
 
-        private static final VertexFormat FORMAT = DefaultVertexFormats.POSITION_COLOR_TEX;
+        private static final VertexFormat FORMAT = VertexFormats.POSITION_COLOR_TEXTURE;
 
-        static final RenderType MAIN = RenderType.makeType(
-            "terminal_font", FORMAT, GL_MODE, 1024,
-            false, false, // useDelegate, needsSorting
-            RenderType.State.getBuilder()
-                .texture( new RenderState.TextureState( FONT, false, false ) ) // blur, minimap
-                .alpha( DEFAULT_ALPHA )
-                .lightmap( LIGHTMAP_DISABLED )
-                .writeMask( COLOR_WRITE )
-                .build( false )
-        );
+        static final RenderLayer MAIN = RenderLayer.of("terminal_font", FORMAT, GL_MODE, 1024, false, false, // useDelegate, needsSorting
+                                                       RenderLayer.MultiPhaseParameters.builder()
+                                                                                       .texture(new RenderPhase.Texture(FONT,
+                                                                                                                        false,
+                                                                                                                        false)) // blur, minimap
+                                                                                       .alpha(ONE_TENTH_ALPHA)
+                                                                                       .lightmap(DISABLE_LIGHTMAP)
+                                                                                       .writeMaskState(COLOR_MASK)
+                                                                                       .build(false));
 
-        static final RenderType BLOCKER = RenderType.makeType(
-            "terminal_blocker", FORMAT, GL_MODE, 256,
-            false, false, // useDelegate, needsSorting
-            RenderType.State.getBuilder()
-                .texture( new RenderState.TextureState( FONT, false, false ) ) // blur, minimap
-                .alpha( DEFAULT_ALPHA )
-                .writeMask( DEPTH_WRITE )
-                .lightmap( LIGHTMAP_DISABLED )
-                .build( false )
-        );
+        static final RenderLayer BLOCKER = RenderLayer.of("terminal_blocker", FORMAT, GL_MODE, 256, false, false, // useDelegate, needsSorting
+                                                          RenderLayer.MultiPhaseParameters.builder()
+                                                                                          .texture(new RenderPhase.Texture(FONT,
+                                                                                                                           false,
+                                                                                                                           false)) // blur, minimap
+                                                                                          .alpha(ONE_TENTH_ALPHA)
+                                                                                          .writeMaskState(DEPTH_MASK)
+                                                                                          .lightmap(DISABLE_LIGHTMAP)
+                                                                                          .build(false));
 
-        private Type( String name, Runnable setup, Runnable destroy )
-        {
-            super( name, setup, destroy );
+        private Type(String name, Runnable setup, Runnable destroy) {
+            super(name, setup, destroy);
         }
     }
 }