Merge branch 'mc-1.15.x' into mc-1.16.x

Closes #694

.editorconfig

@@ -16,3 +16,6 @@ indent_size = 2
 
 [*.yml]
 indent_size = 2
+
+[*.properties]
+insert_final_newline = false

.gitattributes

@@ -1,15 +1,3 @@
 # Ignore changes in generated files
 src/generated/resources/data/** linguist-generated
 src/test/server-files/structures linguist-generated
-
-* text=auto
-
-*.gradle eol=lf diff=java
-*.java   eol=lf diff=java
-*.kt     eol=lf diff=java
-*.lua    eol=lf
-*.md     eol=lf diff=markdown
-*.txt    eol=lf
-
-*.png binary
-*.jar binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,16 @@
+---
+name: Bug report
+about: Report some misbehaviour in the mod
+labels: bug
+---
+
+<!--
+## Before reporting
+ - Search for the bug on the issue tracker. Make sure to look at closed issues too!
+-->
+
+## 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/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,33 +0,0 @@
-name: Bug report
-description: Report some misbehaviour in the mod
-labels: [ bug ]
-body:
-- type: dropdown
-  id: mc-version
-  attributes:
-    label: Minecraft Version
-    description: What version of Minecraft are you using?
-    options:
-      - 1.15.x
-      - 1.16.x
-  validations:
-    required: true
-- type: input
-  id: version
-  attributes:
-    label: Version
-    description: "What version of CC: Tweaked are you using?"
-    placeholder: "e.g. 1.96.0"
-  validations:
-    required: true
-- type: textarea
-  id: details
-  attributes:
-    label: Details
-    description: |
-      Description of the bug. Please include the following:
-      - 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/matchers/checkstyle.json

@@ -1,17 +0,0 @@
-{
-    "problemMatcher": [
-        {
-            "owner": "checkstyle",
-            "pattern": [
-                {
-                    "regexp": "^([a-z]+) ([\\w./-]+):(\\d+):(\\d+): (.*)$",
-                    "severity": 1,
-                    "file": 2,
-                    "line": 3,
-                    "column": 4,
-                    "message": 5
-                }
-            ]
-        }
-    ]
-}

.github/matchers/illuaminate.json

@@ -1,18 +0,0 @@
-{
-    "problemMatcher": [
-        {
-            "owner": "illuaminate",
-            "severity": "warning",
-            "pattern": [
-                {
-                    "regexp": "^([\\w./-]+):\\[(\\d+):(\\d+)\\-(?:\\d+):(?:\\d+)\\]: (.*) \\[([a-z:-]+)\\]$",
-                    "file": 1,
-                    "line": 2,
-                    "column": 3,
-                    "message": 4,
-                    "code": 5
-                }
-            ]
-        }
-    ]
-}

.github/matchers/junit.json

@@ -1,15 +0,0 @@
-{
-    "problemMatcher": [
-        {
-            "owner": "junit",
-            "pattern": [
-                {
-                    "regexp": "^## ([\\w./-]+):(\\d+): (.*)$",
-                    "file": 1,
-                    "line": 2,
-                    "message": 3
-                }
-            ]
-        }
-    ]
-}

.github/workflows/main-ci.yml

@@ -23,15 +23,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
 
-    - name: Disable Gradle daemon
-      run: |
-        mkdir -p ~/.gradle
-        echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
-
     - name: Build with Gradle
       run: |
-        ./gradlew assemble || ./gradlew assemble
-        ./gradlew downloadAssets || ./gradlew downloadAssets
+        ./gradlew assemble --no-daemon || ./gradlew assemble --no-daemon
+        ./gradlew downloadAssets --no-daemon || ./gradlew downloadAssets --no-daemon
         ./gradlew build
 
     - name: Upload Jar
@@ -41,21 +36,18 @@ jobs:
         path: build/libs
 
     - name: Upload Coverage
-      uses: codecov/codecov-action@v1
+      run: bash <(curl -s https://codecov.io/bash)
+      continue-on-error: true
 
-    - name: Parse test reports
-      run: ./tools/parse-reports.py
-      if: ${{ failure() }}
+    - name: Generate Java documentation stubs
+      run: ./gradlew luaJavadoc --no-daemon
 
-    - name: Cache pre-commit
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pre-commit
-        key: ${{ runner.os }}-pre-commit-${{ hashFiles('config/pre-commit/config.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-pre-commit-
-
-    - name: Run linters
+    - name: Lint Lua code
       run: |
-        pip install pre-commit
-        pre-commit run --config config/pre-commit/config.yml --show-diff-on-failure --all --color=always
+        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.yml

@@ -3,7 +3,7 @@ name: Build documentation
 on:
   push:
     branches:
-    - mc-1.16.x
+    - mc-1.15.x
 
 jobs:
   make_doc:

.gitpod.yml

@@ -1,22 +0,0 @@
-image:
-  file: config/gitpod/Dockerfile
-
-ports:
-  - port: 25565
-    onOpen: notify
-
-vscode:
-  extensions:
-    - eamodio.gitlens
-    - github.vscode-pull-request-github
-    - ms-azuretools.vscode-docker
-    - redhat.java
-    - richardwillis.vscode-gradle
-    - vscjava.vscode-java-debug
-    - vscode.github
-
-tasks:
-  - name: Setup pre-commit hool
-    init: pre-commit install --config config/pre-commit/config.yml --allow-missing-config
-  - name: Install npm packages
-    init: npm ci

CONTRIBUTING.md

@@ -19,10 +19,6 @@ 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).
- - **Optionally:** For small PRs (especially those only touching Lua code), it may be easier to use GitPod, which
-   provides a pre-configured environment: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-2b2b2b?logo=gitpod)](https://gitpod.io/#https://github.com/SquidDev-CC/CC-Tweaked/)
-
-   Do note you will need to download the mod after compiling to test.
 
 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
@@ -69,7 +65,7 @@ Gradle should be your entrypoint to building most documentation. There's two tas
 
 #### Writing documentation
 illuaminate's documentation system is not currently documented (somewhat ironic), but is _largely_ the same as
-[ldoc][ldoc]. Documentation comments are written in Markdown,
+[ldoc][ldoc]. Documentation comments are written in Markdown, 
 
 Our markdown engine does _not_ support GitHub flavoured markdown, and so does not support all the features one might
 expect (such as tables). It is very much recommended that you build and preview the docs locally first.
@@ -81,18 +77,18 @@ entire test suite (and some additional bits of verification).
 Before we get into writing tests, it's worth mentioning the various test suites that CC: Tweaked has:
  - "Core" Java (`./src/test/java`): These test core bits of the mod which don't require any Minecraft interaction.
    This includes the `@LuaFunction` system, file system code, etc...
-
+   
    These tests are run by `./gradlew test`.
 
  - CraftOS (`./src/test/resources/test-rom/`): These tests are written in Lua, and ensure the Lua environment, libraries
    and programs work as expected. These are (generally) written to be able to be run on emulators too, to provide some
    sort of compliance test.
-
+   
    These tests are run by the '"Core" Java' test suite, and so are also run with `./gradlew test`.
 
  - In-game (`./src/test/java/dan200/computercraft/ingame/`): These tests are run on an actual Minecraft server, using
    [the same system Mojang do][mc-test]. The aim of these is to test in-game behaviour of blocks and peripherals.
-
+   
    These are run by `./gradlew testInGame`.
 
 ## CraftOS tests

LICENSE

@@ -19,14 +19,14 @@ Mod: The mod code designated by the present license, in source form, binary
 form, as obtained standalone, as part of a wider distribution or resulting from
 the compilation of the original or modified sources.
 
-Dependency: Code required for the mod to work properly. This includes
+Dependency: Code required for the mod to work properly. This includes 
 dependencies required to compile the code as well as any file or modification
 that is explicitly or implicitly required for the mod to be working.
 
 1. Scope
 --------
 
-The present license is granted to any user of the mod. As a prerequisite,
+The present license is granted to any user of the mod. As a prerequisite, 
 a user must own a legally acquired copy of Minecraft
 
 2. Liability
@@ -41,13 +41,13 @@ or misuse of this mod fall on the user.
 3. Play rights
 --------------
 
-The user is allowed to install this mod on a Minecraft client or server and to play
+The user is allowed to install this mod on a Minecraft client or server and to play 
 without restriction.
 
 4. Modification rights
 ----------------------
 
-The user has the right to decompile the source code, look at either the
+The user has the right to decompile the source code, look at either the 
 decompiled version or the original source code, and to modify it.
 
 5. Distribution of original or modified copy rights
@@ -61,10 +61,10 @@ include:
    - patch to its source or binary files
    - any copy of a portion of its binary source files
 
-The user is allowed to redistribute this mod partially, in totality, or
+The user is allowed to redistribute this mod partially, in totality, or 
 included in a distribution.
 
-When distributing binary files, the user must provide means to obtain its
+When distributing binary files, the user must provide means to obtain its 
 entire set of sources or modified sources at no cost.
 
 All distributions of this mod must remain licensed under the CCPL.
@@ -92,7 +92,7 @@ must be made available at no cost and remain licensed under the CCPL.
 ---------------
 
 If you choose to contribute code or assets to be included in this mod, you
-agree that, if added to to the main repository at
+agree that, if added to to the main repository at 
 https://github.com/dan200/ComputerCraft, your contributions will be covered by
 this license, and that Daniel Ratcliffe will retain the right to re-license the
 mod, including your contributions, in part or in whole, under other licenses.

build.gradle

@@ -1,56 +1,47 @@
 buildscript {
     repositories {
+        jcenter()
         mavenCentral()
         maven {
             name = "forge"
-            url = "https://maven.minecraftforge.net"
+            url = "https://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "Sponge (Mixin)"
+            url = "https://repo.spongepowered.org/repository/maven-public/"
+            content { includeGroup "org.spongepowered" }
         }
     }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.6'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:4.1.3'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
 plugins {
     id "checkstyle"
     id "jacoco"
-    id "maven-publish"
-    id "com.github.hierynomus.license" version "0.16.1"
+    id "com.github.hierynomus.license" version "0.15.0"
     id "com.matthewprenger.cursegradle" version "1.4.0"
     id "com.github.breadmoirai.github-release" version "2.2.12"
     id "org.jetbrains.kotlin.jvm" version "1.3.72"
-    id "com.modrinth.minotaur" version "1.2.1"
 }
 
 apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'maven-publish'
+apply plugin: 'maven'
 
 version = mod_version
 
 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
-def javaVersion = JavaLanguageVersion.of(8)
 java {
     toolchain {
-        languageVersion = javaVersion
-    }
-
-    withSourcesJar()
-    withJavadocJar()
-}
-
-// Tragically java.toolchain.languageVersion doesn't apply to ForgeGradle's
-// tasks, so we force all launchers to use the right Java version.
-tasks.withType(JavaCompile).configureEach {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = javaVersion
-    }
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = javaVersion
+        languageVersion = JavaLanguageVersion.of(8)
     }
 }
 
@@ -97,6 +88,10 @@ minecraft {
         testServer {
             workingDirectory project.file('test-files/server')
             parent runs.server
+            properties 'mixin.env.disableRefMap': 'true'
+
+            arg "-mixin.config=cctest.mixin.json"
+            arg "--nogui"
 
             mods {
                 cctest {
@@ -106,11 +101,15 @@ minecraft {
         }
     }
 
-    mappings channel: 'official', version: project.mc_version
+    mappings channel: 'official', version: mc_version
 
     accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
 }
 
+mixin {
+    add sourceSets.test, "cctest.refmap.json"
+}
+
 sourceSets {
     main.resources {
         srcDir 'src/generated/resources'
@@ -128,6 +127,7 @@ repositories {
 configurations {
     shade
     compile.extendsFrom shade
+    deployerJars
     cctJavadoc
 }
 
@@ -136,12 +136,15 @@ dependencies {
 
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_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")
+    compileOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58:api")
+    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.4:7.0.0.63")
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58")
 
-    shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
+
+    shade 'org.squiddev:Cobalt:0.5.1-SNAPSHOT'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
@@ -151,7 +154,9 @@ dependencies {
     testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.3.72'
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
 
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.0'
+    deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
+
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.3.0'
 }
 
 // Compile tasks
@@ -178,6 +183,8 @@ task luaJavadoc(type: Javadoc) {
 }
 
 jar {
+    dependsOn javadoc
+
     manifest {
         attributes(["Specification-Title": "computercraft",
                     "Specification-Vendor": "SquidDev",
@@ -188,6 +195,10 @@ jar {
                     "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) }
 }
 
@@ -197,6 +208,59 @@ jar {
     }
 }
 
+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 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
+        )
+    }
+}
+
 processResources {
     inputs.property "version", mod_version
     inputs.property "mcversion", mc_version
@@ -214,7 +278,6 @@ processResources {
         e.printStackTrace()
     }
     inputs.property "commithash", hash
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
     from(sourceSets.main.resources.srcDirs) {
         include 'META-INF/mods.toml'
@@ -231,10 +294,49 @@ processResources {
     }
 }
 
-sourcesJar {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+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)
+    }
 }
 
+assemble.dependsOn compressJson
+
 // Web tasks
 
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -306,10 +408,6 @@ jacocoTestReport {
 
 check.dependsOn jacocoTestReport
 
-
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
-
 license {
     mapping("java", "SLASHSTAR_STYLE")
     strictCheck true
@@ -363,7 +461,7 @@ task setupServer(type: Copy) {
 tasks.register('testInGame', JavaExec.class).configure {
     it.group('test server')
     it.description("Runs tests on a temporary Minecraft server.")
-    it.dependsOn(setupServer, 'prepareRunTestServer', 'cleanTestInGame')
+    it.dependsOn(setupServer, 'prepareRunTestServer')
 
     // Copy from runTestServer. We do it in this slightly odd way as runTestServer
     // isn't created until the task is configured (which is no good for us).
@@ -417,31 +515,31 @@ task checkRelease {
     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.md")
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.md")
+    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(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.md").readLines()
+        def whatsnew = new File(projectDir, "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.md' to target $mod_version.")
+            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.md")
+            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(projectDir, "src/main/resources/data/computercraft/lua/rom/help/changelog.md").getText()
+        def changelog = new File(projectDir, "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")
@@ -462,69 +560,59 @@ curseforge {
         relations {
             incompatible "computercraft"
         }
+
+        addGameVersion '1.16.4'
+        addGameVersion '1.16.5'
     }
 }
 
-import com.modrinth.minotaur.TaskModrinthUpload
-tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
-    dependsOn('assemble', 'reobfJar')
-    onlyIf {
-        project.hasProperty('modrinthApiKey')
-    }
-
-    token = project.hasProperty('modrinthApiKey') ? project.getProperty('modrinthApiKey') : ''
-    projectId = 'gu7yAYhd'
-    versionNumber = "${project.mc_version}-${project.mod_version}"
-    uploadFile = jar
-    addGameVersion(project.mc_version)
-    changelog = "Release notes can be found on the [GitHub repository](https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
-    addLoader('forge')
-}
-
-tasks.withType(GenerateModuleMetadata) {
-    // We can't generate metadata as that includes Forge as a dependency.
-    enabled = false
-}
-
 publishing {
     publications {
-        maven(MavenPublication) {
+        mavenJava(MavenPublication) {
             from components.java
+            // artifact sourceJar
+        }
+    }
+}
 
-            pom {
-                name = 'CC: Tweaked'
-                description = 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
-                url = 'https://github.com/SquidDev-CC/CC-Tweaked'
+uploadArchives {
+    repositories {
+        if(project.hasProperty('mavenUploadUrl')) {
+            mavenDeployer {
+                configuration = configurations.deployerJars
 
-                scm {
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked.git'
+                repository(url: project.property('mavenUploadUrl')) {
+                    authentication(
+                        userName: project.property('mavenUploadUser'),
+                        privateKey: project.property('mavenUploadKey'))
                 }
 
-                issueManagement {
-                    system = 'github'
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
-                }
+                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'
 
-                licenses {
-                    license {
-                        name = 'ComputerCraft Public License, Version 1.0'
-                        url = 'https://github.com/SquidDev-CC/CC-Tweaked/blob/mc-1.15.x/LICENSE'
+                    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'
+                        }
                     }
                 }
 
-                withXml { asNode().remove(asNode().get("dependencies")) }
-            }
-        }
-    }
-
-    repositories {
-        if (project.hasProperty("mavenUser")) {
-            maven {
-                name = "SquidDev"
-                url = "https://squiddev.cc/maven"
-                credentials {
-                    username = project.property("mavenUser") as String
-                    password = project.property("mavenPass") as String
+                pom.whenConfigured { pom ->
+                    pom.dependencies.clear()
                 }
             }
         }
@@ -547,7 +635,7 @@ githubRelease {
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
     body.set(project.provider({
-        "## " + new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.md")
+        "## " + new File(projectDir, "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()
@@ -555,10 +643,10 @@ githubRelease {
     prerelease false
 }
 
-def uploadTasks = ["publish", "curseforge", "publishModrinth", "githubRelease"]
+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, Modrinth, GitHub release)"
+    description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }

config/checkstyle/suppressions.xml

@@ -7,6 +7,9 @@
     <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/gitpod/Dockerfile

@@ -1,8 +0,0 @@
-FROM gitpod/workspace-base
-
-USER gitpod
-
-RUN sudo apt-get -q update \
- && sudo apt-get install -yq openjdk-8-jdk openjdk-16-jdk python3-pip npm \
- && sudo pip3 install pre-commit \
- && sudo update-java-alternatives --set java-1.8.0-openjdk-amd64

config/idea/codeInspectionSettings.xml

@@ -2488,4 +2488,4 @@
       </option>
     </inspection_tool>
   </profile>
-</component>
+</component>

config/idea/codeStyleSettings.xml

@@ -58,4 +58,4 @@
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>

config/pre-commit/config.yml

@@ -1,55 +0,0 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v3.2.0
-  hooks:
-  - id: trailing-whitespace
-  - id: end-of-file-fixer
-  - id: check-merge-conflict
-
-  # Quick syntax checkers
-  - id: check-xml
-  - id: check-yaml
-  - id: check-toml
-  - id: check-json
-    exclude: "tsconfig\\.json$"
-
-- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-  rev: 2.3.5
-  hooks:
-  - id: editorconfig-checker
-    args: ['-disable-indentation']
-    exclude: "^(.*\\.(bat)|LICENSE)$"
-
-- repo: local
-  hooks:
-  - id: checkstyle
-    name: Check Java codestyle
-    files: ".*\\.java$"
-    language: system
-    entry: ./gradlew checkstyleMain checkstyleTest
-    pass_filenames: false
-    require_serial: true
-  - id: license
-    name: Check Java license headers
-    files: ".*\\.java$"
-    language: system
-    entry: ./gradlew licenseFormat
-    pass_filenames: false
-    require_serial: true
-  - id: illuaminate
-    name: Check Lua code
-    files: ".*\\.(lua|java|md)"
-    language: script
-    entry: config/pre-commit/illuaminate-lint.sh
-    pass_filenames: false
-    require_serial: true
-
-exclude: |
-  (?x)^(
-    src/generated|
-    src/test/resources/test-rom/data/json-parsing/|
-    src/test/server-files/|
-    config/idea/
-  )

config/pre-commit/illuaminate-lint.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-set -e
-
-test -d bin || mkdir bin
-test -f bin/illuaminate || curl -s -obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
-chmod +x bin/illuaminate
-
-if [ -n ${GITHUB_ACTIONS+x} ]; then
-    # Register a problem matcher (see https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md)
-    # for illuaminate.
-    echo "::add-matcher::.github/matchers/illuaminate.json"
-    trap 'echo "::remove-matcher owner=illuaminate::"' EXIT
-fi
-
-./gradlew luaJavadoc
-bin/illuaminate lint

doc/events/key.md

@@ -20,7 +20,7 @@ Prints each key when the user presses it, and if the key is being held.
 
 ```lua
 while true do
-  local event, key, is_held = os.pullEvent("key")
+  local event, key, is_held = os.pullEvent("key")  
   print(("%s held=%s"):format(keys.getName(key), is_held))
 end
 ```

doc/stub/turtle.lua

@@ -1,13 +1 @@
---[[- Craft a recipe based on the turtle's inventory.
-
-The turtle's inventory should set up like a crafting grid. For instance, to
-craft sticks, slots 1 and 5 should contain sticks. _All_ other slots should be
-empty, including those outside the crafting "grid".
-
-@tparam[opt=64] number limit The maximum number of crafting steps to run.
-@throws When limit is less than 1 or greater than 64.
-@treturn[1] true If crafting succeeds.
-@treturn[2] false If crafting fails.
-@treturn string A string describing why crafting failed.
-]]
 function craft(limit) end

gradle.properties

@@ -1,6 +1,6 @@
 # Mod properties
-mod_version=1.97.1
+mod_version=1.95.3
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.15.2
-forge_version=31.1.41
+mc_version=1.16.4
+forge_version=35.1.16

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

illuaminate.sexp

@@ -88,16 +88,27 @@
 
 ;; Suppress warnings for currently undocumented modules.
 (at
-  (; Lua APIs
+  (; Java APIs
+   /doc/stub/http.lua
+   /doc/stub/os.lua
+   /doc/stub/turtle.lua
+   /doc/stub/global.lua
+   ; Java generated APIs
+   /build/docs/luaJavadoc/turtle.lua
+   ; Peripherals
+   /build/docs/luaJavadoc/drive.lua
+   /build/docs/luaJavadoc/speaker.lua
+   /build/docs/luaJavadoc/printer.lua
+   ; Generic peripherals
+   /build/docs/luaJavadoc/fluid_storage.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))
 
-;; Suppress warnings for various APIs using its own deprecated members.
-(at
-  (/src/main/resources/*/computercraft/lua/bios.lua
-   /src/main/resources/*/computercraft/lua/rom/apis/turtle/turtle.lua)
+;; Suppress warnings for the BIOS using its own deprecated members for now.
+(at /src/main/resources/*/computercraft/lua/bios.lua
   (linters -var:deprecated))
 
 (at /src/test/resources/test-rom

src/generated/resources/data/minecraft/tags/items/piglin_loved.json

@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "computercraft:computer_advanced",
+    "computercraft:turtle_advanced",
+    "computercraft:wireless_modem_advanced",
+    "computercraft:pocket_computer_advanced",
+    "computercraft:monitor_advanced"
+  ]
+}

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

@@ -8,6 +8,7 @@ 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;
@@ -16,6 +17,7 @@ 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;
@@ -36,6 +38,7 @@ public final class ComputerCraft
     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;
 
@@ -52,8 +55,6 @@ public final class ComputerCraft
 
     public static int httpMaxRequests = 16;
     public static int httpMaxWebsockets = 4;
-    public static int httpDownloadBandwidth = 32 * 1024 * 1024;
-    public static int httpUploadBandwidth = 32 * 1024 * 1024;
 
     public static boolean enableCommandBlock = false;
     public static int modemRange = 64;
@@ -116,5 +117,6 @@ public final class ComputerCraft
     {
         Config.setup();
         Registry.setup();
+        GenericSource.setup( () -> ServiceUtil.loadServicesForge( GenericSource.class ) );
     }
 }

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

@@ -8,7 +8,6 @@ package dan200.computercraft;
 import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
-import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
 import dan200.computercraft.api.media.IMediaProvider;
 import dan200.computercraft.api.network.IPacketNetwork;
@@ -19,11 +18,9 @@ import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.core.apis.ApiFactories;
-import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.filesystem.FileMount;
 import dan200.computercraft.core.filesystem.ResourceMount;
 import dan200.computercraft.shared.*;
-import dan200.computercraft.shared.peripheral.generic.GenericPeripheralProvider;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
@@ -34,7 +31,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.server.ServerLifecycleHooks;
@@ -58,7 +54,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
 
     public static InputStream getResourceFile( String domain, String subPath )
     {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResources();
+        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
         try
         {
             return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
@@ -101,7 +97,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     @Override
     public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
     {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResources();
+        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
         ResourceMount mount = ResourceMount.get( domain, subPath, manager );
         return mount.exists( "" ) ? mount : null;
     }
@@ -112,18 +108,6 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
         Peripherals.register( provider );
     }
 
-    @Override
-    public void registerGenericSource( @Nonnull GenericSource source )
-    {
-        GenericMethod.register( source );
-    }
-
-    @Override
-    public void registerGenericCapability( @Nonnull Capability<?> capability )
-    {
-        GenericPeripheralProvider.addCapability( capability );
-    }
-
     @Override
     public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
     {

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

@@ -7,7 +7,6 @@ package dan200.computercraft.api;
 
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
-import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.api.media.IMediaProvider;
@@ -24,7 +23,6 @@ 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.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
@@ -100,9 +98,7 @@ public final class ComputerCraftAPI
      * 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. For instance, ComputerCraft's resources are stored in
-     * "/data/computercraft/lua/rom". We construct a mount for that with
-     * {@code createResourceMount("computercraft", "lua/rom")}.
+     * resources with the same domain and path.
      *
      * @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".
@@ -118,7 +114,7 @@ public final class ComputerCraftAPI
     }
 
     /**
-     * rers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
+     * Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
      *
      * @param provider The peripheral provider to register.
      * @see IPeripheral
@@ -129,28 +125,6 @@ public final class ComputerCraftAPI
         getInstance().registerPeripheralProvider( provider );
     }
 
-    /**
-     * Registers a method source for generic peripherals.
-     *
-     * @param source The method source to register.
-     * @see GenericSource
-     */
-    public static void registerGenericSource( @Nonnull GenericSource source )
-    {
-        getInstance().registerGenericSource( source );
-    }
-
-    /**
-     * Registers a capability that can be used by generic peripherals.
-     *
-     * @param capability The capability to register.
-     * @see GenericSource
-     */
-    public static void registerGenericCapability( @Nonnull Capability<?> capability )
-    {
-        getInstance().registerGenericCapability( capability );
-    }
-
     /**
      * 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
@@ -282,10 +256,6 @@ public final class ComputerCraftAPI
 
         void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
 
-        void registerGenericSource( @Nonnull GenericSource source );
-
-        void registerGenericCapability( @Nonnull Capability<?> capability );
-
         void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
 
         void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );

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

@@ -6,11 +6,11 @@
 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 net.minecraft.util.math.vector.TransformationMatrix;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -32,7 +32,7 @@ public final class TransformedModel
     public TransformedModel( @Nonnull IBakedModel model )
     {
         this.model = Objects.requireNonNull( model );
-        matrix = TransformationMatrix.identity();
+        this.matrix = TransformationMatrix.identity();
     }
 
     public static TransformedModel of( @Nonnull ModelResourceLocation location )

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

@@ -30,7 +30,7 @@ public class FileOperationException extends IOException
     public FileOperationException( @Nonnull String message )
     {
         super( Objects.requireNonNull( message, "message cannot be null" ) );
-        filename = null;
+        this.filename = null;
     }
 
     @Nullable

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

@@ -1,60 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. 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;
-import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.api.peripheral.IPeripheralProvider;
-import dan200.computercraft.core.asm.LuaMethod;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.items.IItemHandler;
-
-import javax.annotation.Nonnull;
-
-/**
- * A generic source of {@link LuaMethod} functions.
- *
- * Unlike normal objects ({@link IDynamicLuaObject} or {@link IPeripheral}), methods do not target this object but
- * instead are defined as {@code static} and accept their target as the first parameter. This allows you to inject
- * methods onto objects you do not own, as well as declaring methods for a specific "trait" (for instance, a
- * {@link Capability}).
- *
- * Currently the "generic peripheral" system is incompatible with normal peripherals. Normal {@link IPeripheralProvider}
- * or {@link IPeripheral} implementations take priority. Tile entities which use this system are given a peripheral name
- * determined by their id, rather than any peripheral provider. This will hopefully change in the future, once a suitable
- * design has been established.
- *
- * For example, the main CC: Tweaked mod defines a generic source for inventories, which works on {@link IItemHandler}s:
- *
- * <pre>{@code
- * public class InventoryMethods implements GenericSource {
- *     \@LuaFunction( mainThread = true )
- *     public static int size(IItemHandler inventory) {
- *         return inventory.getSlots();
- *     }
- *
- *     // ...
- * }
- * }</pre>
- *
- * @see ComputerCraftAPI#registerGenericSource(GenericSource)
- * @see ComputerCraftAPI#registerGenericCapability(Capability) New capabilities (those not built into Forge) must be
- * explicitly given to the generic peripheral system, as there is no way to enumerate all capabilities.
- */
-public interface GenericSource
-{
-    /**
-     * A unique identifier for this generic source.
-     *
-     * This is currently unused, but may be used in the future to allow disabling specific sources. It is recommended
-     * to return an identifier using your mod's ID.
-     *
-     * @return This source's identifier.
-     */
-    @Nonnull
-    ResourceLocation id();
-}

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

@@ -19,14 +19,14 @@ public class LuaException extends Exception
     public LuaException( @Nullable String message )
     {
         super( message );
-        hasLevel = false;
-        level = 1;
+        this.hasLevel = false;
+        this.level = 1;
     }
 
     public LuaException( @Nullable String message, int level )
     {
         super( message );
-        hasLevel = true;
+        this.hasLevel = true;
         this.level = level;
     }
 

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

@@ -30,14 +30,14 @@ public final class MethodResult
 
     private MethodResult( Object[] arguments, ILuaCallback callback )
     {
-        result = arguments;
+        this.result = arguments;
         this.callback = callback;
-        adjust = 0;
+        this.adjust = 0;
     }
 
     private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
     {
-        result = arguments;
+        this.result = arguments;
         this.callback = callback;
         this.adjust = adjust;
     }

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

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.network;
 
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -29,7 +29,7 @@ public interface IPacketReceiver
      * @return The receiver's position.
      */
     @Nonnull
-    Vec3d getPosition();
+    Vector3d getPosition();
 
     /**
      * Get the maximum distance this receiver can send and receive messages.

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

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.network;
 
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -29,7 +29,7 @@ public interface IPacketSender
      * @return The sender's position.
      */
     @Nonnull
-    Vec3d getPosition();
+    Vector3d getPosition();
 
     /**
      * Get some sort of identification string for this sender. This does not strictly need to be unique, but you

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

@@ -13,7 +13,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
@@ -67,7 +67,7 @@ public interface ITurtleAccess
      * @see #getVisualYaw(float)
      */
     @Nonnull
-    Vec3d getVisualPosition( float f );
+    Vector3d getVisualPosition( float f );
 
     /**
      * Returns the yaw the turtle is facing when it is rendered.

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

@@ -1,40 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client;
-
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
-import net.minecraftforge.event.world.WorldEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
-public class ClientHooks
-{
-    @SubscribeEvent
-    public static void onWorldUnload( WorldEvent.Unload event )
-    {
-        if( event.getWorld().isClientSide() )
-        {
-            ClientMonitor.destroyAll();
-            SoundManager.reset();
-        }
-    }
-
-    @SubscribeEvent
-    public static void onLogIn( ClientPlayerNetworkEvent.LoggedInEvent event )
-    {
-        ComputerCraft.clientComputerRegistry.reset();
-    }
-
-    @SubscribeEvent
-    public static void onLogOut( ClientPlayerNetworkEvent.LoggedOutEvent event )
-    {
-        ComputerCraft.clientComputerRegistry.reset();
-    }
-}

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

@@ -6,34 +6,31 @@
 package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.*;
-import dan200.computercraft.client.render.TileEntityMonitorRenderer;
-import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.client.render.TurtleModelLoader;
-import dan200.computercraft.client.render.TurtlePlayerRenderer;
 import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.common.IColouredItem;
-import dan200.computercraft.shared.computer.inventory.ContainerComputer;
-import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.media.items.ItemDisk;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
-import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import net.minecraft.client.gui.ScreenManager;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.RenderTypeLookup;
+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.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+
+import java.util.HashSet;
+import java.util.Map;
 
 /**
  * Registers textures and models for items.
@@ -42,7 +39,6 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 public final class ClientRegistry
 {
     private static final String[] EXTRA_MODELS = new String[] {
-        // Turtle upgrades
         "turtle_modem_normal_off_left",
         "turtle_modem_normal_on_left",
         "turtle_modem_normal_off_right",
@@ -58,20 +54,56 @@ public final class ClientRegistry
         "turtle_speaker_upgrade_left",
         "turtle_speaker_upgrade_right",
 
-        // Turtle block renderer
         "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
+        //  when stitching textures.
+        "block/turtle_colour",
+        "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 );
-        for( String model : EXTRA_MODELS )
+    }
+
+    @SubscribeEvent
+    public static void onTextureStitchEvent( TextureStitchEvent.Pre event )
+    {
+        if( !event.getMap().location().equals( PlayerContainer.BLOCK_ATLAS ) ) return;
+
+        for( String extra : EXTRA_TEXTURES )
         {
-            ModelLoader.addSpecialModel( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ) );
+            event.addSprite( new ResourceLocation( 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();
+
+        for( String modelName : EXTRA_MODELS )
+        {
+            ResourceLocation location = new ResourceLocation( ComputerCraft.MOD_ID, "item/" + modelName );
+            IUnbakedModel model = loader.getModel( location );
+            model.getMaterials( loader::getModel, new HashSet<>() );
+
+            IBakedModel baked = model.bake( loader, ModelLoader.defaultTextureGetter(), SimpleModelTransform.IDENTITY, location );
+            if( baked != null )
+            {
+                registry.put( new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, modelName ), "inventory" ), baked );
+            }
         }
     }
 
@@ -116,41 +148,4 @@ public final class ClientRegistry
             Registry.ModBlocks.TURTLE_NORMAL.get(), Registry.ModBlocks.TURTLE_ADVANCED.get()
         );
     }
-
-    @SubscribeEvent
-    public static void setupClient( FMLClientSetupEvent event )
-    {
-        registerContainers();
-
-        // While turtles themselves are not transparent, their upgrades may be.
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.TURTLE_NORMAL.get(), RenderType.translucent() );
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.TURTLE_ADVANCED.get(), RenderType.translucent() );
-
-        // Monitors' textures have transparent fronts and so count as cutouts.
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.MONITOR_NORMAL.get(), RenderType.cutout() );
-        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.MONITOR_ADVANCED.get(), RenderType.cutout() );
-
-        // Setup TESRs
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.MONITOR_NORMAL.get(), TileEntityMonitorRenderer::new );
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.MONITOR_ADVANCED.get(), TileEntityMonitorRenderer::new );
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.TURTLE_NORMAL.get(), TileEntityTurtleRenderer::new );
-        net.minecraftforge.fml.client.registry.ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.TURTLE_ADVANCED.get(), TileEntityTurtleRenderer::new );
-
-        RenderingRegistry.registerEntityRenderingHandler( Registry.ModEntities.TURTLE_PLAYER.get(), TurtlePlayerRenderer::new );
-    }
-
-    private static void registerContainers()
-    {
-        // My IDE doesn't think so, but we do actually need these generics.
-
-        ScreenManager.<ContainerComputer, GuiComputer<ContainerComputer>>register( Registry.ModContainers.COMPUTER.get(), GuiComputer::create );
-        ScreenManager.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register( Registry.ModContainers.POCKET_COMPUTER.get(), GuiComputer::createPocket );
-        ScreenManager.register( Registry.ModContainers.TURTLE.get(), GuiTurtle::new );
-
-        ScreenManager.register( Registry.ModContainers.PRINTER.get(), GuiPrinter::new );
-        ScreenManager.register( Registry.ModContainers.DISK_DRIVE.get(), GuiDiskDrive::new );
-        ScreenManager.register( Registry.ModContainers.PRINTOUT.get(), GuiPrintout::new );
-
-        ScreenManager.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register( Registry.ModContainers.VIEW_COMPUTER.get(), GuiComputer::createView );
-    }
 }

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

@@ -12,14 +12,12 @@ 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;
 
 public class ClientTableFormatter implements TableFormatter
 {
@@ -57,7 +55,7 @@ public class ClientTableFormatter implements TableFormatter
     @Override
     public int getWidth( ITextComponent component )
     {
-        return renderer().width( component.getColoredString() );
+        return renderer().width( component );
     }
 
     @Override
@@ -66,10 +64,11 @@ public class ClientTableFormatter implements TableFormatter
         Minecraft mc = Minecraft.getInstance();
         NewChatGui chat = mc.gui.getChat();
 
-        // Trim the text if it goes over the allowed length
-        int maxWidth = MathHelper.floor( chat.getWidth() / chat.getScale() );
-        List<ITextComponent> list = RenderComponentsUtil.wrapComponents( component, maxWidth, mc.font, false, false );
-        if( !list.isEmpty() ) chat.addMessage( 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.wrapComponents( component, maxWidth, mc.fontRenderer );
+        // if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
+        chat.addMessage( component, id );
     }
 
     @Override

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

@@ -1,84 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.ISound;
-import net.minecraft.client.audio.ITickableSound;
-import net.minecraft.client.audio.LocatableSound;
-import net.minecraft.client.audio.SoundHandler;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.Vec3d;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-public class SoundManager
-{
-    private static final Map<UUID, MoveableSound> sounds = new HashMap<>();
-
-    public static void playSound( UUID source, Vec3d position, SoundEvent event, float volume, float pitch )
-    {
-        SoundHandler soundManager = Minecraft.getInstance().getSoundManager();
-
-        MoveableSound oldSound = sounds.get( source );
-        if( oldSound != null ) soundManager.stop( oldSound );
-
-        MoveableSound newSound = new MoveableSound( event, position, volume, pitch );
-        sounds.put( source, newSound );
-        soundManager.play( newSound );
-    }
-
-    public static void stopSound( UUID source )
-    {
-        ISound sound = sounds.remove( source );
-        if( sound == null ) return;
-
-        Minecraft.getInstance().getSoundManager().stop( sound );
-    }
-
-    public static void moveSound( UUID source, Vec3d position )
-    {
-        MoveableSound sound = sounds.get( source );
-        if( sound != null ) sound.setPosition( position );
-    }
-
-    public static void reset()
-    {
-        sounds.clear();
-    }
-
-    private static class MoveableSound extends LocatableSound implements ITickableSound
-    {
-        protected MoveableSound( SoundEvent sound, Vec3d position, float volume, float pitch )
-        {
-            super( sound, SoundCategory.RECORDS );
-            setPosition( position );
-            this.volume = volume;
-            this.pitch = pitch;
-        }
-
-        void setPosition( Vec3d position )
-        {
-            x = (float) position.x();
-            y = (float) position.y();
-            z = (float) position.z();
-        }
-
-        @Override
-        public boolean isStopped()
-        {
-            return false;
-        }
-
-        @Override
-        public void tick()
-        {
-        }
-    }
-}

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

@@ -1,94 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client.gui;
-
-import dan200.computercraft.client.gui.widgets.ComputerSidebar;
-import dan200.computercraft.client.gui.widgets.WidgetTerminal;
-import dan200.computercraft.shared.computer.core.ClientComputer;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.text.ITextComponent;
-import org.lwjgl.glfw.GLFW;
-
-public abstract class ComputerScreenBase<T extends ContainerComputerBase> extends ContainerScreen<T>
-{
-    protected WidgetTerminal terminal;
-    protected final ClientComputer computer;
-    protected final ComputerFamily family;
-
-    protected final int sidebarYOffset;
-
-    public ComputerScreenBase( T container, PlayerInventory player, ITextComponent title, int sidebarYOffset )
-    {
-        super( container, player, title );
-        computer = (ClientComputer) container.getComputer();
-        family = container.getFamily();
-        this.sidebarYOffset = sidebarYOffset;
-    }
-
-    protected abstract WidgetTerminal createTerminal();
-
-    @Override
-    protected final void init()
-    {
-        super.init();
-        minecraft.keyboardHandler.setSendRepeatsToGui( true );
-
-        terminal = addButton( createTerminal() );
-        ComputerSidebar.addButtons( this, computer, this::addButton, leftPos, topPos + sidebarYOffset );
-        setFocused( terminal );
-    }
-
-    @Override
-    public final void removed()
-    {
-        super.removed();
-        minecraft.keyboardHandler.setSendRepeatsToGui( false );
-    }
-
-    @Override
-    public final void tick()
-    {
-        super.tick();
-        terminal.update();
-    }
-
-    @Override
-    public final boolean keyPressed( int key, int scancode, int modifiers )
-    {
-        // Forward the tab key to the terminal, rather than moving between controls.
-        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminal )
-        {
-            return getFocused().keyPressed( key, scancode, modifiers );
-        }
-
-        return super.keyPressed( key, scancode, modifiers );
-    }
-
-
-    @Override
-    public final void render( int mouseX, int mouseY, float partialTicks )
-    {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
-        renderTooltip( mouseX, mouseY );
-
-        for( Widget widget : buttons )
-        {
-            if( widget.isHovered() ) widget.renderToolTip( mouseX, mouseY );
-        }
-    }
-
-    @Override
-    public final boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
-    {
-        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
-            || super.mouseDragged( x, y, button, deltaX, deltaY );
-    }
-}

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

@@ -13,10 +13,14 @@ 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.IRenderTypeBuffer;
+import net.minecraft.client.renderer.RenderState;
+import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.TransformationMatrix;
 import org.lwjgl.opengl.GL11;
 
 import javax.annotation.Nonnull;

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

@@ -5,35 +5,48 @@
  */
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
+import dan200.computercraft.client.gui.widgets.WidgetWrapper;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
+import dan200.computercraft.shared.computer.core.ClientComputer;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
+import org.lwjgl.glfw.GLFW;
+
+import javax.annotation.Nonnull;
 
 import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
 
-public final class GuiComputer<T extends ContainerComputerBase> extends ComputerScreenBase<T>
+public final class GuiComputer<T extends ContainerComputerBase> extends ContainerScreen<T>
 {
+    private final ComputerFamily family;
+    private final ClientComputer computer;
     private final int termWidth;
     private final int termHeight;
 
+    private WidgetTerminal terminal;
+    private WidgetWrapper terminalWrapper;
+
     private GuiComputer(
         T container, PlayerInventory player, ITextComponent title, int termWidth, int termHeight
     )
     {
-        super( container, player, title, BORDER );
+        super( container, player, title );
+        family = container.getFamily();
+        computer = (ClientComputer) container.getComputer();
         this.termWidth = termWidth;
         this.termHeight = termHeight;
-
-        imageWidth = WidgetTerminal.getWidth( termWidth ) + BORDER * 2 + ComputerSidebar.WIDTH;
-        imageHeight = WidgetTerminal.getHeight( termHeight ) + BORDER * 2;
+        terminal = null;
     }
 
     public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, ITextComponent component )
@@ -60,21 +73,87 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Computer
         );
     }
 
+
     @Override
-    protected WidgetTerminal createTerminal()
+    protected void init()
     {
-        return new WidgetTerminal( computer,
-            leftPos + ComputerSidebar.WIDTH + BORDER, topPos + BORDER, termWidth, termHeight
+        minecraft.keyboardHandler.setSendRepeatsToGui( true );
+
+        int termPxWidth = termWidth * FixedWidthFontRenderer.FONT_WIDTH;
+        int termPxHeight = termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
+
+        imageWidth = termPxWidth + MARGIN * 2 + BORDER * 2;
+        imageHeight = termPxHeight + MARGIN * 2 + BORDER * 2;
+
+        super.init();
+
+        terminal = new WidgetTerminal( minecraft, () -> computer, termWidth, termHeight, MARGIN, MARGIN, MARGIN, MARGIN );
+        terminalWrapper = new WidgetWrapper( terminal, MARGIN + BORDER + leftPos, MARGIN + BORDER + topPos, termPxWidth, termPxHeight );
+
+        children.add( terminalWrapper );
+        setFocused( terminalWrapper );
+    }
+
+    @Override
+    public void removed()
+    {
+        super.removed();
+        children.remove( terminal );
+        terminal = null;
+        minecraft.keyboardHandler.setSendRepeatsToGui( false );
+    }
+
+    @Override
+    public void tick()
+    {
+        super.tick();
+        terminal.update();
+    }
+
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        // Forward the tab key to the terminal, rather than moving between controls.
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        {
+            return getFocused().keyPressed( key, scancode, modifiers );
+        }
+
+        return super.keyPressed( key, scancode, modifiers );
+    }
+
+    @Override
+    public void renderBg( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY )
+    {
+        // Draw terminal
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
+
+        // Draw a border around the terminal
+        RenderSystem.color4f( 1, 1, 1, 1 );
+        minecraft.getTextureManager().bind( ComputerBorderRenderer.getTexture( family ) );
+        ComputerBorderRenderer.render(
+            terminalWrapper.getX() - MARGIN, terminalWrapper.getY() - MARGIN, getBlitOffset(),
+            terminalWrapper.getWidth() + MARGIN * 2, terminalWrapper.getHeight() + MARGIN * 2
         );
     }
 
     @Override
-    public void renderBg( float partialTicks, int mouseX, int mouseY )
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
     {
-        // Draw a border around the terminal
-        RenderSystem.color4f( 1, 1, 1, 1 );
-        minecraft.getTextureManager().bind( ComputerBorderRenderer.getTexture( family ) );
-        ComputerBorderRenderer.render( terminal.x, terminal.y, getBlitOffset(), terminal.getWidth(), terminal.getHeight() );
-        ComputerSidebar.renderBackground( leftPos, topPos + sidebarYOffset );
+        super.render( stack, mouseX, mouseY, partialTicks );
+        renderTooltip( stack, mouseX, mouseY );
+    }
+
+    @Override
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
+            || super.mouseDragged( x, y, button, deltaX, deltaY );
+    }
+
+    @Override
+    protected void renderLabels( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    {
+        // Skip rendering labels.
     }
 }

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

@@ -5,6 +5,7 @@
  */
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
@@ -12,6 +13,8 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 
+import javax.annotation.Nonnull;
+
 public class GuiDiskDrive extends ContainerScreen<ContainerDiskDrive>
 {
     private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/disk_drive.png" );
@@ -22,26 +25,18 @@ public class GuiDiskDrive extends ContainerScreen<ContainerDiskDrive>
     }
 
     @Override
-    protected void renderLabels( int mouseX, int mouseY )
-    {
-        String title = this.title.getColoredString();
-        font.draw( title, (imageWidth - font.width( title )) / 2.0f, 6, 0x404040 );
-        font.draw( title, 8, imageHeight - 96 + 2, 0x404040 );
-    }
-
-    @Override
-    protected void renderBg( float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
     {
         RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
         minecraft.getTextureManager().bind( BACKGROUND );
-        blit( leftPos, topPos, 0, 0, imageWidth, imageHeight );
+        blit( transform, leftPos, topPos, 0, 0, imageWidth, imageHeight );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
     {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
-        renderTooltip( mouseX, mouseY );
+        renderBackground( transform );
+        super.render( transform, mouseX, mouseY, partialTicks );
+        renderTooltip( transform, mouseX, mouseY );
     }
 }

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

@@ -5,14 +5,16 @@
  */
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 
+import javax.annotation.Nonnull;
+
 public class GuiPrinter extends ContainerScreen<ContainerPrinter>
 {
     private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/printer.png" );
@@ -22,29 +24,29 @@ public class GuiPrinter extends ContainerScreen<ContainerPrinter>
         super( container, player, title );
     }
 
-    @Override
-    protected void renderLabels( int mouseX, int mouseY )
+    /*@Override
+    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
     {
-        String title = getTitle().getColoredString();
-        font.draw( title, (imageWidth - font.width( title )) / 2.0f, 6, 0x404040 );
-        font.draw( I18n.get( "container.inventory" ), 8, imageHeight - 96 + 2, 0x404040 );
-    }
+        String title = getTitle().getFormattedText();
+        font.drawString( title, (xSize - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
+        font.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
+    }*/
 
     @Override
-    protected void renderBg( float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
     {
         RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
         minecraft.getTextureManager().bind( BACKGROUND );
-        blit( leftPos, topPos, 0, 0, imageWidth, imageHeight );
+        blit( transform, leftPos, topPos, 0, 0, imageWidth, imageHeight );
 
-        if( getMenu().isPrinting() ) blit( leftPos + 34, topPos + 21, 176, 0, 25, 45 );
+        if( getMenu().isPrinting() ) blit( transform, leftPos + 34, topPos + 21, 176, 0, 25, 45 );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
     {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
-        renderTooltip( mouseX, mouseY );
+        renderBackground( stack );
+        super.render( stack, mouseX, mouseY, partialTicks );
+        renderTooltip( stack, mouseX, mouseY );
     }
 }

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

@@ -5,6 +5,7 @@
  */
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.ContainerHeldItem;
@@ -12,18 +13,17 @@ import dan200.computercraft.shared.media.items.ItemPrintout;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Matrix4f;
-import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.util.math.vector.Matrix4f;
 import net.minecraft.util.text.ITextComponent;
 import org.lwjgl.glfw.GLFW;
 
+import javax.annotation.Nonnull;
+
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
 
 public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
 {
-    private static final Matrix4f IDENTITY = TransformationMatrix.identity().getMatrix();
-
     private final boolean book;
     private final int pages;
     private final TextBuffer[] text;
@@ -91,27 +91,33 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
     }
 
     @Override
-    public void renderBg( float partialTicks, int mouseX, int mouseY )
+    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
     {
         // Draw the printout
         RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         RenderSystem.enableDepthTest();
 
         IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().renderBuffers().bufferSource();
-        drawBorder( IDENTITY, renderer, leftPos, topPos, getBlitOffset(), page, pages, book );
-        drawText( IDENTITY, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * page, text, colours );
+        Matrix4f matrix = transform.last().pose();
+        drawBorder( matrix, renderer, leftPos, topPos, getBlitOffset(), page, pages, book );
+        drawText( matrix, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * page, text, colours );
         renderer.endBatch();
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
     {
         // We must take the background further back in order to not overlap with our printed pages.
         setBlitOffset( getBlitOffset() - 1 );
-        renderBackground();
+        renderBackground( stack );
         setBlitOffset( getBlitOffset() + 1 );
 
-        super.render( mouseX, mouseY, partialTicks );
-        renderTooltip( mouseX, mouseY );
+        super.render( stack, mouseX, mouseY, partialTicks );
+    }
+
+    @Override
+    protected void renderLabels( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    {
+        // Skip rendering labels.
     }
 }

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

@@ -5,69 +5,140 @@
  */
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.widgets.ComputerSidebar;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
-import dan200.computercraft.client.render.ComputerBorderRenderer;
+import dan200.computercraft.client.gui.widgets.WidgetWrapper;
+import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
+import org.lwjgl.glfw.GLFW;
 
-import static dan200.computercraft.shared.turtle.inventory.ContainerTurtle.*;
+import javax.annotation.Nonnull;
 
-public class GuiTurtle extends ComputerScreenBase<ContainerTurtle>
+public class GuiTurtle extends ContainerScreen<ContainerTurtle>
 {
     private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/turtle_normal.png" );
     private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/turtle_advanced.png" );
 
-    private static final int TEX_WIDTH = 254;
-    private static final int TEX_HEIGHT = 217;
+    private final ContainerTurtle container;
 
     private final ComputerFamily family;
+    private final ClientComputer computer;
+
+    private WidgetTerminal terminal;
+    private WidgetWrapper terminalWrapper;
 
     public GuiTurtle( ContainerTurtle container, PlayerInventory player, ITextComponent title )
     {
-        super( container, player, title, BORDER );
+        super( container, player, title );
+
+        this.container = container;
         family = container.getFamily();
+        computer = (ClientComputer) container.getComputer();
 
-        imageWidth = TEX_WIDTH + ComputerSidebar.WIDTH;
-        imageHeight = TEX_HEIGHT;
+        imageWidth = 254;
+        imageHeight = 217;
     }
 
     @Override
-    protected WidgetTerminal createTerminal()
+    protected void init()
     {
-        return new WidgetTerminal(
-            computer, leftPos + BORDER + ComputerSidebar.WIDTH, topPos + BORDER,
-            ComputerCraft.turtleTermWidth, ComputerCraft.turtleTermHeight
+        super.init();
+        minecraft.keyboardHandler.setSendRepeatsToGui( true );
+
+        int termPxWidth = ComputerCraft.turtleTermWidth * FixedWidthFontRenderer.FONT_WIDTH;
+        int termPxHeight = ComputerCraft.turtleTermHeight * FixedWidthFontRenderer.FONT_HEIGHT;
+
+        terminal = new WidgetTerminal(
+            minecraft, () -> computer,
+            ComputerCraft.turtleTermWidth,
+            ComputerCraft.turtleTermHeight,
+            2, 2, 2, 2
         );
+        terminalWrapper = new WidgetWrapper( terminal, 2 + 8 + leftPos, 2 + 8 + topPos, termPxWidth, termPxHeight );
+
+        children.add( terminalWrapper );
+        setFocused( terminalWrapper );
     }
 
     @Override
-    protected void renderBg( float partialTicks, int mouseX, int mouseY )
+    public void removed()
     {
-        boolean advanced = family == ComputerFamily.ADVANCED;
+        super.removed();
+        children.remove( terminal );
+        terminal = null;
+        minecraft.keyboardHandler.setSendRepeatsToGui( false );
+    }
 
+    @Override
+    public void tick()
+    {
+        super.tick();
+        terminal.update();
+    }
+
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        // Forward the tab key to the terminal, rather than moving between controls.
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        {
+            return getFocused().keyPressed( key, scancode, modifiers );
+        }
+
+        return super.keyPressed( key, scancode, modifiers );
+    }
+
+    @Override
+    protected void renderBg( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    {
+        // Draw term
+        ResourceLocation texture = family == ComputerFamily.ADVANCED ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
+
+        // Draw border/inventory
         RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bind( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-        blit( leftPos + ComputerSidebar.WIDTH, topPos, 0, 0, TEX_WIDTH, TEX_HEIGHT );
+        minecraft.getTextureManager().bind( texture );
+        blit( transform, leftPos, topPos, 0, 0, imageWidth, imageHeight );
 
-        int slot = getMenu().getSelectedSlot();
+        // Draw selection slot
+        int slot = container.getSelectedSlot();
         if( slot >= 0 )
         {
-            RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
             int slotX = slot % 4;
             int slotY = slot / 4;
-            blit(
-                leftPos + TURTLE_START_X - 2 + slotX * 18, topPos + PLAYER_START_Y - 2 + slotY * 18,
+            blit( transform,
+                leftPos + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18,
+                topPos + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18,
                 0, 217, 24, 24
             );
         }
+    }
 
-        minecraft.getTextureManager().bind( advanced ? ComputerBorderRenderer.BACKGROUND_ADVANCED : ComputerBorderRenderer.BACKGROUND_NORMAL );
-        ComputerSidebar.renderBackground( leftPos, topPos + sidebarYOffset );
+    @Override
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    {
+        renderBackground( stack );
+        super.render( stack, mouseX, mouseY, partialTicks );
+        renderTooltip( stack, mouseX, mouseY );
+    }
+
+    @Override
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
+            || super.mouseDragged( x, y, button, deltaX, deltaY );
+    }
+
+    @Override
+    protected void renderLabels( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    {
+        // Skip rendering labels.
     }
 }

src/main/java/dan200/computercraft/client/gui/widgets/ComputerSidebar.java

@@ -1,105 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client.gui.widgets;
-
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.render.ComputerBorderRenderer;
-import dan200.computercraft.shared.computer.core.ClientComputer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.TextFormatting;
-
-import java.util.Arrays;
-import java.util.function.Consumer;
-
-/**
- * Registers buttons to interact with a computer.
- */
-public final class ComputerSidebar
-{
-    private static final ResourceLocation TEXTURE = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/buttons.png" );
-
-    private static final int TEX_SIZE = 64;
-
-    private static final int ICON_WIDTH = 12;
-    private static final int ICON_HEIGHT = 12;
-    private static final int ICON_MARGIN = 2;
-
-    private static final int ICON_TEX_Y_DIFF = 14;
-
-    private static final int CORNERS_BORDER = 3;
-    private static final int FULL_BORDER = CORNERS_BORDER + ICON_MARGIN;
-
-    private static final int BUTTONS = 2;
-    private static final int HEIGHT = (ICON_HEIGHT + ICON_MARGIN * 2) * BUTTONS + CORNERS_BORDER * 2;
-    public static final int WIDTH = 17;
-
-    private ComputerSidebar()
-    {
-    }
-
-    public static void addButtons( Screen screen, ClientComputer computer, Consumer<Widget> add, int x, int y )
-    {
-        x += CORNERS_BORDER + 1;
-        y += CORNERS_BORDER + ICON_MARGIN;
-
-        add.accept( new DynamicImageButton(
-            screen, x, y, ICON_WIDTH, ICON_HEIGHT, () -> computer.isOn() ? 15 : 1, 1, ICON_TEX_Y_DIFF,
-            TEXTURE, TEX_SIZE, TEX_SIZE, b -> toggleComputer( computer ),
-            () -> computer.isOn() ? Arrays.asList(
-                I18n.get( "gui.computercraft.tooltip.turn_off" ),
-                TextFormatting.GRAY + I18n.get( "gui.computercraft.tooltip.turn_off.key" )
-            ) : Arrays.asList(
-                I18n.get( "gui.computercraft.tooltip.turn_on" ),
-                TextFormatting.GRAY + I18n.get( "gui.computercraft.tooltip.turn_off.key" )
-            )
-        ) );
-
-        y += ICON_HEIGHT + ICON_MARGIN * 2;
-
-        add.accept( new DynamicImageButton(
-            screen, x, y, ICON_WIDTH, ICON_HEIGHT, 29, 1, ICON_TEX_Y_DIFF,
-            TEXTURE, TEX_SIZE, TEX_SIZE, b -> computer.queueEvent( "terminate" ),
-            Arrays.asList(
-                I18n.get( "gui.computercraft.tooltip.terminate" ),
-                TextFormatting.GRAY + I18n.get( "gui.computercraft.tooltip.terminate.key" )
-            )
-        ) );
-    }
-
-    public static void renderBackground( int x, int y )
-    {
-        Screen.blit(
-            x, y, 0, 102, WIDTH, FULL_BORDER,
-            ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
-        );
-
-        Screen.blit(
-            x, y + FULL_BORDER, WIDTH, HEIGHT - FULL_BORDER * 2,
-            0, 107, WIDTH, 4,
-            ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
-        );
-
-        Screen.blit(
-            x, y + HEIGHT - FULL_BORDER, 0, 111, WIDTH, FULL_BORDER,
-            ComputerBorderRenderer.TEX_SIZE, ComputerBorderRenderer.TEX_SIZE
-        );
-    }
-
-    private static void toggleComputer( ClientComputer computer )
-    {
-        if( computer.isOn() )
-        {
-            computer.shutdown();
-        }
-        else
-        {
-            computer.turnOn();
-        }
-    }
-}

src/main/java/dan200/computercraft/client/gui/widgets/DynamicImageButton.java

@@ -1,93 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client.gui.widgets;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.NonNullSupplier;
-
-import javax.annotation.Nonnull;
-import java.util.List;
-import java.util.function.IntSupplier;
-
-/**
- * Version of {@link net.minecraft.client.gui.widget.button.ImageButton} which allows changing some properties
- * dynamically.
- */
-public class DynamicImageButton extends Button
-{
-    private final Screen screen;
-    private final ResourceLocation texture;
-    private final IntSupplier xTexStart;
-    private final int yTexStart;
-    private final int yDiffTex;
-    private final int textureWidth;
-    private final int textureHeight;
-    private final NonNullSupplier<List<String>> tooltip;
-
-    public DynamicImageButton(
-        Screen screen, int x, int y, int width, int height, int xTexStart, int yTexStart, int yDiffTex,
-        ResourceLocation texture, int textureWidth, int textureHeight,
-        IPressable onPress, List<String> tooltip
-    )
-    {
-        this(
-            screen, x, y, width, height, () -> xTexStart, yTexStart, yDiffTex,
-            texture, textureWidth, textureHeight,
-            onPress, () -> tooltip
-        );
-    }
-
-
-    public DynamicImageButton(
-        Screen screen, int x, int y, int width, int height, IntSupplier xTexStart, int yTexStart, int yDiffTex,
-        ResourceLocation texture, int textureWidth, int textureHeight,
-        IPressable onPress, NonNullSupplier<List<String>> tooltip
-    )
-    {
-        super( x, y, width, height, "", onPress );
-        this.screen = screen;
-        this.textureWidth = textureWidth;
-        this.textureHeight = textureHeight;
-        this.xTexStart = xTexStart;
-        this.yTexStart = yTexStart;
-        this.yDiffTex = yDiffTex;
-        this.texture = texture;
-        this.tooltip = tooltip;
-    }
-
-    @Override
-    public void renderButton( int mouseX, int mouseY, float partialTicks )
-    {
-        Minecraft minecraft = Minecraft.getInstance();
-        minecraft.getTextureManager().bind( texture );
-        RenderSystem.disableDepthTest();
-
-        int yTex = yTexStart;
-        if( isHovered() ) yTex += yDiffTex;
-
-        blit( x, y, xTexStart.getAsInt(), yTex, width, height, textureWidth, textureHeight );
-        RenderSystem.enableDepthTest();
-    }
-
-    @Nonnull
-    @Override
-    public String getMessage()
-    {
-        List<String> tooltip = this.tooltip.get();
-        return tooltip.isEmpty() ? "" : tooltip.get( 0 );
-    }
-
-    @Override
-    public void renderToolTip( int mouseX, int mouseY )
-    {
-        List<String> tooltip = this.tooltip.get();
-        if( !tooltip.isEmpty() ) screen.renderTooltip( tooltip, mouseX, mouseY );
-    }
-}

src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java

@@ -8,29 +8,29 @@ package dan200.computercraft.client.gui.widgets;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
+import dan200.computercraft.shared.computer.core.IComputer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraft.util.SharedConstants;
 import org.lwjgl.glfw.GLFW;
 
-import javax.annotation.Nonnull;
 import java.util.BitSet;
+import java.util.function.Supplier;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
-import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
 
-public class WidgetTerminal extends Widget
+public class WidgetTerminal implements IGuiEventListener
 {
     private static final float TERMINATE_TIME = 0.5f;
 
-    private final ClientComputer computer;
+    private final Minecraft client;
 
-    // The positions of the actual terminal
-    private final int innerX;
-    private final int innerY;
-    private final int innerWidth;
-    private final int innerHeight;
+    private boolean focused;
+
+    private final Supplier<ClientComputer> computer;
+    private final int termWidth;
+    private final int termHeight;
 
     private float terminateTimer = -1;
     private float rebootTimer = -1;
@@ -40,18 +40,23 @@ public class WidgetTerminal extends Widget
     private int lastMouseX = -1;
     private int lastMouseY = -1;
 
+    private final int leftMargin;
+    private final int rightMargin;
+    private final int topMargin;
+    private final int bottomMargin;
+
     private final BitSet keysDown = new BitSet( 256 );
 
-    public WidgetTerminal( @Nonnull ClientComputer computer, int x, int y, int termWidth, int termHeight )
+    public WidgetTerminal( Minecraft client, Supplier<ClientComputer> computer, int termWidth, int termHeight, int leftMargin, int rightMargin, int topMargin, int bottomMargin )
     {
-        super( x, y, termWidth * FONT_WIDTH + MARGIN * 2, termHeight * FONT_HEIGHT + MARGIN * 2, "" );
-
+        this.client = client;
         this.computer = computer;
-
-        innerX = x + MARGIN;
-        innerY = y + MARGIN;
-        innerWidth = termWidth * FONT_WIDTH;
-        innerHeight = termHeight * FONT_HEIGHT;
+        this.termWidth = termWidth;
+        this.termHeight = termHeight;
+        this.leftMargin = leftMargin;
+        this.rightMargin = rightMargin;
+        this.topMargin = topMargin;
+        this.bottomMargin = bottomMargin;
     }
 
     @Override
@@ -60,7 +65,7 @@ public class WidgetTerminal extends Widget
         if( ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255 ) // printable chars in byte range
         {
             // Queue the "char" event
-            computer.queueEvent( "char", new Object[] { Character.toString( ch ) } );
+            queueEvent( "char", Character.toString( ch ) );
         }
 
         return true;
@@ -86,7 +91,7 @@ public class WidgetTerminal extends Widget
 
                 case GLFW.GLFW_KEY_V:
                     // Ctrl+V for paste
-                    String clipboard = Minecraft.getInstance().keyboardHandler.getClipboard();
+                    String clipboard = client.keyboardHandler.getClipboard();
                     if( clipboard != null )
                     {
                         // Clip to the first occurrence of \r or \n
@@ -111,7 +116,7 @@ public class WidgetTerminal extends Widget
                         {
                             // Clip to 512 characters and queue the event
                             if( clipboard.length() > 512 ) clipboard = clipboard.substring( 0, 512 );
-                            computer.queueEvent( "paste", new Object[] { clipboard } );
+                            queueEvent( "paste", clipboard );
                         }
 
                         return true;
@@ -124,7 +129,8 @@ public class WidgetTerminal extends Widget
             // Queue the "key" event and add to the down set
             boolean repeat = keysDown.get( key );
             keysDown.set( key );
-            computer.keyDown( key, repeat );
+            IComputer computer = this.computer.get();
+            if( computer != null ) computer.keyDown( key, repeat );
         }
 
         return true;
@@ -137,7 +143,8 @@ public class WidgetTerminal extends Widget
         if( key >= 0 && keysDown.get( key ) )
         {
             keysDown.set( key, false );
-            computer.keyUp( key );
+            IComputer computer = this.computer.get();
+            if( computer != null ) computer.keyUp( key );
         }
 
         switch( key )
@@ -163,14 +170,14 @@ public class WidgetTerminal extends Widget
     @Override
     public boolean mouseClicked( double mouseX, double mouseY, int button )
     {
-        if( !inTermRegion( mouseX, mouseY ) ) return false;
-        if( !computer.isColour() || button < 0 || button > 2 ) return false;
+        ClientComputer computer = this.computer.get();
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 ) return false;
 
         Terminal term = computer.getTerminal();
         if( term != null )
         {
-            int charX = (int) ((mouseX - innerX) / FONT_WIDTH);
-            int charY = (int) ((mouseY - innerY) / FONT_HEIGHT);
+            int charX = (int) (mouseX / FONT_WIDTH);
+            int charY = (int) (mouseY / FONT_HEIGHT);
             charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
             charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
@@ -187,14 +194,14 @@ public class WidgetTerminal extends Widget
     @Override
     public boolean mouseReleased( double mouseX, double mouseY, int button )
     {
-        if( !inTermRegion( mouseX, mouseY ) ) return false;
-        if( !computer.isColour() || button < 0 || button > 2 ) return false;
+        ClientComputer computer = this.computer.get();
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 ) return false;
 
         Terminal term = computer.getTerminal();
         if( term != null )
         {
-            int charX = (int) ((mouseX - innerX) / FONT_WIDTH);
-            int charY = (int) ((mouseY - innerY) / FONT_HEIGHT);
+            int charX = (int) (mouseX / FONT_WIDTH);
+            int charY = (int) (mouseY / FONT_HEIGHT);
             charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
             charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
@@ -214,14 +221,14 @@ public class WidgetTerminal extends Widget
     @Override
     public boolean mouseDragged( double mouseX, double mouseY, int button, double v2, double v3 )
     {
-        if( !inTermRegion( mouseX, mouseY ) ) return false;
-        if( !computer.isColour() || button < 0 || button > 2 ) return false;
+        ClientComputer computer = this.computer.get();
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 ) return false;
 
         Terminal term = computer.getTerminal();
         if( term != null )
         {
-            int charX = (int) ((mouseX - innerX) / FONT_WIDTH);
-            int charY = (int) ((mouseY - innerY) / FONT_HEIGHT);
+            int charX = (int) (mouseX / FONT_WIDTH);
+            int charY = (int) (mouseY / FONT_HEIGHT);
             charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
             charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
@@ -239,14 +246,14 @@ public class WidgetTerminal extends Widget
     @Override
     public boolean mouseScrolled( double mouseX, double mouseY, double delta )
     {
-        if( !inTermRegion( mouseX, mouseY ) ) return false;
-        if( !computer.isColour() || delta == 0 ) return false;
+        ClientComputer computer = this.computer.get();
+        if( computer == null || !computer.isColour() || delta == 0 ) return false;
 
         Terminal term = computer.getTerminal();
         if( term != null )
         {
-            int charX = (int) ((mouseX - innerX) / FONT_WIDTH);
-            int charY = (int) ((mouseY - innerY) / FONT_HEIGHT);
+            int charX = (int) (mouseX / FONT_WIDTH);
+            int charY = (int) (mouseY / FONT_HEIGHT);
             charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
             charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
@@ -259,74 +266,89 @@ public class WidgetTerminal extends Widget
         return true;
     }
 
-    private boolean inTermRegion( double mouseX, double mouseY )
-    {
-        return active && visible && mouseX >= innerX && mouseY >= innerY && mouseX < innerX + innerWidth && mouseY < innerY + innerHeight;
-    }
-
     public void update()
     {
         if( terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME )
         {
-            computer.queueEvent( "terminate" );
+            queueEvent( "terminate" );
         }
 
         if( shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (shutdownTimer += 0.05f) > TERMINATE_TIME )
         {
-            computer.shutdown();
+            ClientComputer computer = this.computer.get();
+            if( computer != null ) computer.shutdown();
         }
 
         if( rebootTimer >= 0 && rebootTimer < TERMINATE_TIME && (rebootTimer += 0.05f) > TERMINATE_TIME )
         {
-            computer.reboot();
+            ClientComputer computer = this.computer.get();
+            if( computer != null ) computer.reboot();
         }
     }
 
     @Override
-    public void onFocusedChanged( boolean focused )
+    public boolean changeFocus( boolean reversed )
     {
-        if( !focused )
+        if( focused )
         {
             // When blurring, we should make all keys go up
             for( int key = 0; key < keysDown.size(); key++ )
             {
-                if( keysDown.get( key ) ) computer.keyUp( key );
+                if( keysDown.get( key ) ) queueEvent( "key_up", key );
             }
             keysDown.clear();
 
             // When blurring, we should make the last mouse button go up
             if( lastMouseButton > 0 )
             {
-                computer.mouseUp( lastMouseButton + 1, lastMouseX + 1, lastMouseY + 1 );
+                IComputer computer = this.computer.get();
+                if( computer != null ) computer.mouseUp( lastMouseButton + 1, lastMouseX + 1, lastMouseY + 1 );
                 lastMouseButton = -1;
             }
 
             shutdownTimer = terminateTimer = rebootTimer = -1;
         }
+        focused = !focused;
+        return true;
+    }
+
+    public void draw( int originX, int originY )
+    {
+        synchronized( computer )
+        {
+            // Draw the screen contents
+            ClientComputer computer = this.computer.get();
+            Terminal terminal = computer != null ? computer.getTerminal() : null;
+            if( terminal != null )
+            {
+                FixedWidthFontRenderer.drawTerminal( originX, originY, terminal, !computer.isColour(), topMargin, bottomMargin, leftMargin, rightMargin );
+            }
+            else
+            {
+                FixedWidthFontRenderer.drawEmptyTerminal(
+                    originX - leftMargin, originY - rightMargin,
+                    termWidth * FONT_WIDTH + leftMargin + rightMargin,
+                    termHeight * FONT_HEIGHT + topMargin + bottomMargin
+                );
+            }
+        }
+    }
+
+    private void queueEvent( String event )
+    {
+        ClientComputer computer = this.computer.get();
+        if( computer != null ) computer.queueEvent( event );
+    }
+
+    private void queueEvent( String event, Object... args )
+    {
+        ClientComputer computer = this.computer.get();
+        if( computer != null ) computer.queueEvent( event, args );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public boolean isMouseOver( double x, double y )
     {
-        // Draw the screen contents
-        Terminal terminal = computer.getTerminal();
-        if( terminal != null )
-        {
-            FixedWidthFontRenderer.drawTerminal( innerX, innerY, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN );
-        }
-        else
-        {
-            FixedWidthFontRenderer.drawEmptyTerminal( x, y, width, height );
-        }
-    }
-
-    public static int getWidth( int termWidth )
-    {
-        return termWidth * FONT_WIDTH + MARGIN * 2;
-    }
-
-    public static int getHeight( int termHeight )
-    {
-        return termHeight * FONT_HEIGHT + MARGIN * 2;
+        return true;
     }
 }

src/main/java/dan200/computercraft/client/gui/widgets/WidgetWrapper.java

@@ -0,0 +1,105 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.gui.widgets;
+
+import net.minecraft.client.gui.IGuiEventListener;
+
+public class WidgetWrapper implements IGuiEventListener
+{
+    private final IGuiEventListener listener;
+    private final int x;
+    private final int y;
+    private final int width;
+    private final int height;
+
+    public WidgetWrapper( IGuiEventListener listener, int x, int y, int width, int height )
+    {
+        this.listener = listener;
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+    }
+
+    @Override
+    public boolean changeFocus( boolean b )
+    {
+        return listener.changeFocus( b );
+    }
+
+    @Override
+    public boolean mouseClicked( double x, double y, int button )
+    {
+        double dx = x - this.x, dy = y - this.y;
+        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseClicked( dx, dy, button );
+    }
+
+    @Override
+    public boolean mouseReleased( double x, double y, int button )
+    {
+        double dx = x - this.x, dy = y - this.y;
+        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseReleased( dx, dy, button );
+    }
+
+    @Override
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
+        double dx = x - this.x, dy = y - this.y;
+        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseDragged( dx, dy, button, deltaX, deltaY );
+    }
+
+    @Override
+    public boolean mouseScrolled( double x, double y, double delta )
+    {
+        double dx = x - this.x, dy = y - this.y;
+        return dx >= 0 && dx < width && dy >= 0 && dy < height && listener.mouseScrolled( dx, dy, delta );
+    }
+
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        return listener.keyPressed( key, scancode, modifiers );
+    }
+
+    @Override
+    public boolean keyReleased( int key, int scancode, int modifiers )
+    {
+        return listener.keyReleased( key, scancode, modifiers );
+    }
+
+    @Override
+    public boolean charTyped( char character, int modifiers )
+    {
+        return listener.charTyped( character, modifiers );
+    }
+
+    public int getX()
+    {
+        return x;
+    }
+
+    public int getY()
+    {
+        return y;
+    }
+
+    public int getWidth()
+    {
+        return width;
+    }
+
+    public int getHeight()
+    {
+        return height;
+    }
+
+    @Override
+    public boolean isMouseOver( double x, double y )
+    {
+        double dx = x - this.x, dy = y - this.y;
+        return dx >= 0 && dx < width && dy >= 0 && dy < height;
+    }
+}

src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java

@@ -0,0 +1,108 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.proxy;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.client.gui.*;
+import dan200.computercraft.client.render.TileEntityMonitorRenderer;
+import dan200.computercraft.client.render.TileEntityTurtleRenderer;
+import dan200.computercraft.client.render.TurtlePlayerRenderer;
+import dan200.computercraft.shared.Registry;
+import dan200.computercraft.shared.common.IColouredItem;
+import dan200.computercraft.shared.computer.inventory.ContainerComputer;
+import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
+import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
+import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
+import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
+import net.minecraft.client.gui.ScreenManager;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderTypeLookup;
+import net.minecraft.item.IItemPropertyGetter;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemModelsProperties;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.client.registry.ClientRegistry;
+import net.minecraftforge.fml.client.registry.RenderingRegistry;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+
+import java.util.function.Supplier;
+
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
+public final class ComputerCraftProxyClient
+{
+    @SubscribeEvent
+    public static void setupClient( FMLClientSetupEvent event )
+    {
+        registerContainers();
+
+        // While turtles themselves are not transparent, their upgrades may be.
+        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.TURTLE_NORMAL.get(), RenderType.translucent() );
+        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.TURTLE_ADVANCED.get(), RenderType.translucent() );
+
+        // Monitors' textures have transparent fronts and so count as cutouts.
+        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.MONITOR_NORMAL.get(), RenderType.cutout() );
+        RenderTypeLookup.setRenderLayer( Registry.ModBlocks.MONITOR_ADVANCED.get(), RenderType.cutout() );
+
+        // Setup TESRs
+        ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.MONITOR_NORMAL.get(), TileEntityMonitorRenderer::new );
+        ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.MONITOR_ADVANCED.get(), TileEntityMonitorRenderer::new );
+        ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.TURTLE_NORMAL.get(), TileEntityTurtleRenderer::new );
+        ClientRegistry.bindTileEntityRenderer( Registry.ModTiles.TURTLE_ADVANCED.get(), TileEntityTurtleRenderer::new );
+
+        RenderingRegistry.registerEntityRenderingHandler( Registry.ModEntities.TURTLE_PLAYER.get(), TurtlePlayerRenderer::new );
+
+        registerItemProperty( "state",
+            ( stack, world, player ) -> ItemPocketComputer.getState( stack ).ordinal(),
+            Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
+        );
+        registerItemProperty( "state",
+            ( stack, world, player ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
+            Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
+        );
+    }
+
+    @SafeVarargs
+    private static void registerItemProperty( String name, IItemPropertyGetter getter, Supplier<? extends Item>... items )
+    {
+        ResourceLocation id = new ResourceLocation( ComputerCraft.MOD_ID, name );
+        for( Supplier<? extends Item> item : items )
+        {
+            ItemModelsProperties.register( item.get(), id, getter );
+        }
+    }
+
+    private static void registerContainers()
+    {
+        // My IDE doesn't think so, but we do actually need these generics.
+
+        ScreenManager.<ContainerComputer, GuiComputer<ContainerComputer>>register( Registry.ModContainers.COMPUTER.get(), GuiComputer::create );
+        ScreenManager.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register( Registry.ModContainers.POCKET_COMPUTER.get(), GuiComputer::createPocket );
+        ScreenManager.register( Registry.ModContainers.TURTLE.get(), GuiTurtle::new );
+
+        ScreenManager.register( Registry.ModContainers.PRINTER.get(), GuiPrinter::new );
+        ScreenManager.register( Registry.ModContainers.DISK_DRIVE.get(), GuiDiskDrive::new );
+        ScreenManager.register( Registry.ModContainers.PRINTOUT.get(), GuiPrintout::new );
+
+        ScreenManager.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register( Registry.ModContainers.VIEW_COMPUTER.get(), GuiComputer::createView );
+    }
+
+    @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+    public static final class ForgeHandlers
+    {
+        @SubscribeEvent
+        public static void onWorldUnload( WorldEvent.Unload event )
+        {
+            if( event.getWorld().isClientSide() )
+            {
+                ClientMonitor.destroyAll();
+            }
+        }
+    }
+}

src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java

@@ -14,14 +14,14 @@ import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.ActiveRenderInfo;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawHighlightEvent;
@@ -63,7 +63,7 @@ public final class CableHighlightRenderer
             ? CableShapes.getModemShape( state )
             : CableShapes.getCableShape( state );
 
-        Vec3d cameraPos = info.getPosition();
+        Vector3d cameraPos = info.getPosition();
         double xOffset = pos.getX() - cameraPos.x();
         double yOffset = pos.getY() - cameraPos.y();
         double zOffset = pos.getZ() - cameraPos.z();

src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java

@@ -10,10 +10,10 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.vector.Matrix4f;
 import org.lwjgl.opengl.GL11;
 
 import javax.annotation.Nonnull;
@@ -47,13 +47,9 @@ public class ComputerBorderRenderer
     private static final int CORNER_LEFT_X = BORDER;
     private static final int CORNER_RIGHT_X = CORNER_LEFT_X + BORDER;
     private static final int BORDER_RIGHT_X = 36;
-    private static final int LIGHT_BORDER_Y = 56;
-    private static final int LIGHT_CORNER_Y = 80;
+    private static final int GAP = 4;
 
-    public static final int LIGHT_HEIGHT = 8;
-
-    public static final int TEX_SIZE = 256;
-    private static final float TEX_SCALE = 1 / (float) TEX_SIZE;
+    private static final float TEX_SCALE = 1 / 256.0f;
 
     private final Matrix4f transform;
     private final IVertexBuilder builder;
@@ -105,15 +101,15 @@ public class ComputerBorderRenderer
 
     public static void render( Matrix4f transform, IVertexBuilder buffer, int x, int y, int z, int width, int height, float r, float g, float b )
     {
-        render( transform, buffer, x, y, z, width, height, false, r, g, b );
+        render( transform, buffer, x, y, z, width, height, 0, r, g, b );
     }
 
-    public static void render( Matrix4f transform, IVertexBuilder buffer, int x, int y, int z, int width, int height, boolean withLight, float r, float g, float b )
+    public static void render( Matrix4f transform, IVertexBuilder buffer, int x, int y, int z, int width, int height, int borderHeight, float r, float g, float b )
     {
-        new ComputerBorderRenderer( transform, buffer, z, r, g, b ).doRender( x, y, width, height, withLight );
+        new ComputerBorderRenderer( transform, buffer, z, r, g, b ).doRender( x, y, width, height, borderHeight );
     }
 
-    public void doRender( int x, int y, int width, int height, boolean withLight )
+    public void doRender( int x, int y, int width, int height, int bottomHeight )
     {
         int endX = x + width;
         int endY = y + height;
@@ -129,18 +125,28 @@ public class ComputerBorderRenderer
 
         // Bottom bar. We allow for drawing a stretched version, which allows for additional elements (such as the
         // pocket computer's lights).
-        if( withLight )
-        {
-            renderTexture( x, endY, 0, LIGHT_BORDER_Y, endX - x, BORDER + LIGHT_HEIGHT, BORDER, BORDER + LIGHT_HEIGHT );
-            renderTexture( x - BORDER, endY, CORNER_LEFT_X, LIGHT_CORNER_Y, BORDER, BORDER + LIGHT_HEIGHT );
-            renderTexture( endX, endY, CORNER_RIGHT_X, LIGHT_CORNER_Y, BORDER, BORDER + LIGHT_HEIGHT );
-        }
-        else
+        if( bottomHeight <= 0 )
         {
             renderLine( x, endY, 0, BORDER, endX - x, BORDER );
             renderCorner( x - BORDER, endY, CORNER_LEFT_X, CORNER_BOTTOM_Y );
             renderCorner( endX, endY, CORNER_RIGHT_X, CORNER_BOTTOM_Y );
         }
+        else
+        {
+            // Bottom left, middle, right. We do this in three portions: the top inner corners, an extended region for
+            // lights, and then the bottom outer corners.
+            renderTexture( x - BORDER, endY, CORNER_LEFT_X, CORNER_BOTTOM_Y, BORDER, BORDER / 2 );
+            renderTexture( x, endY, 0, BORDER, width, BORDER / 2, BORDER, BORDER / 2 );
+            renderTexture( endX, endY, CORNER_RIGHT_X, CORNER_BOTTOM_Y, BORDER, BORDER / 2 );
+
+            renderTexture( x - BORDER, endY + BORDER / 2, CORNER_LEFT_X, CORNER_BOTTOM_Y + GAP, BORDER, bottomHeight, BORDER, GAP );
+            renderTexture( x, endY + BORDER / 2, 0, BORDER + GAP, width, bottomHeight, BORDER, GAP );
+            renderTexture( endX, endY + BORDER / 2, CORNER_RIGHT_X, CORNER_BOTTOM_Y + GAP, BORDER, bottomHeight, BORDER, GAP );
+
+            renderTexture( x - BORDER, endY + bottomHeight + BORDER / 2, CORNER_LEFT_X, CORNER_BOTTOM_Y + BORDER / 2, BORDER, BORDER / 2 );
+            renderTexture( x, endY + bottomHeight + BORDER / 2, 0, BORDER + BORDER / 2, width, BORDER / 2 );
+            renderTexture( endX, endY + bottomHeight + BORDER / 2, CORNER_RIGHT_X, CORNER_BOTTOM_Y + BORDER / 2, BORDER, BORDER / 2 );
+        }
     }
 
     private void renderCorner( int x, int y, int u, int v )

src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java

@@ -10,12 +10,12 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
 import net.minecraft.client.renderer.FirstPersonRenderer;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 import net.minecraft.util.HandSide;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.vector.Vector3f;
 
 public abstract class ItemMapLikeRenderer
 {

src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java

@@ -15,9 +15,13 @@ import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.*;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.Vector3f;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -26,7 +30,8 @@ import org.lwjgl.opengl.GL11;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
-import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
 
 /**
  * Emulates map rendering for pocket computers.
@@ -34,6 +39,8 @@ import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
 @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class ItemPocketRenderer extends ItemMapLikeRenderer
 {
+    private static final int LIGHT_HEIGHT = 8;
+
     private static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
 
     private ItemPocketRenderer()
@@ -124,7 +131,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         BufferBuilder buffer = tessellator.getBuilder();
         buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_TEX );
 
-        ComputerBorderRenderer.render( transform, buffer, 0, 0, 0, width, height, true, r, g, b );
+        ComputerBorderRenderer.render( transform, buffer, 0, 0, 0, width, height, LIGHT_HEIGHT, r, g, b );
 
         tessellator.end();
     }

src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java

@@ -9,9 +9,9 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Matrix4f;
-import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.Vector3f;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderItemInFrameEvent;

src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java

@@ -9,12 +9,12 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawHighlightEvent;
@@ -61,7 +61,7 @@ public final class MonitorHighlightRenderer
         if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );
 
         MatrixStack transformStack = event.getMatrix();
-        Vec3d cameraPos = event.getInfo().getPosition();
+        Vector3d cameraPos = event.getInfo().getPosition();
         transformStack.pushPose();
         transformStack.translate( pos.getX() - cameraPos.x(), pos.getY() - cameraPos.y(), pos.getZ() - cameraPos.z() );
 

src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java

@@ -11,8 +11,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.util.math.vector.Matrix4f;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;

src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java

@@ -10,11 +10,11 @@ import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.RenderState;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.vector.Matrix4f;
 import org.lwjgl.opengl.GL11;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;

src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java

@@ -24,6 +24,9 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexBuffer;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.TransformationMatrix;
+import net.minecraft.util.math.vector.Vector3f;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
@@ -141,6 +144,10 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
             (float) (xSize + 2 * TileMonitor.RENDER_MARGIN), (float) -(ySize + TileMonitor.RENDER_MARGIN * 2)
         );
 
+        // Force a flush of the blocker. WorldRenderer.updateCameraAndRender will "finish" all the built-in
+        // buffers before calling renderer.finish, which means the blocker isn't actually rendered at that point!
+        renderer.getBuffer( RenderType.solid() );
+
         transform.popPose();
     }
 

src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java

@@ -19,8 +19,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.Atlases;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Matrix4f;
-import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelManager;
@@ -31,7 +29,9 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.vector.Matrix4f;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.vector.Vector3f;
 import net.minecraftforge.client.model.data.EmptyModelData;
 
 import javax.annotation.Nonnull;
@@ -99,7 +99,7 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         transform.pushPose();
 
         // Setup the transform.
-        Vec3d offset = turtle.getRenderOffset( partialTicks );
+        Vector3d offset = turtle.getRenderOffset( partialTicks );
         float yaw = turtle.getRenderYaw( partialTicks );
         transform.translate( offset.x, offset.y, offset.z );
 

src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java

@@ -57,16 +57,16 @@ public final class TurtleModelLoader implements IModelLoader<TurtleModelLoader.T
         }
 
         @Override
-        public Collection<Material> getTextures( IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
+        public Collection<RenderMaterial> getTextures( IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
         {
-            Set<Material> materials = new HashSet<>();
+            Set<RenderMaterial> materials = new HashSet<>();
             materials.addAll( modelGetter.apply( family ).getMaterials( modelGetter, missingTextureErrors ) );
             materials.addAll( modelGetter.apply( COLOUR_TURTLE_MODEL ).getMaterials( modelGetter, missingTextureErrors ) );
             return materials;
         }
 
         @Override
-        public IBakedModel bake( IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation modelLocation )
+        public IBakedModel bake( IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation modelLocation )
         {
             return new TurtleSmartItemModel(
                 bakery.getBakedModel( family, transform, spriteGetter ),

src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java

@@ -7,12 +7,12 @@ package dan200.computercraft.client.render;
 
 import dan200.computercraft.api.client.TransformedModel;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.Direction;
+import net.minecraft.util.math.vector.TransformationMatrix;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;

src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java

@@ -15,14 +15,14 @@ import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.client.renderer.model.*;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
+import net.minecraft.util.math.vector.TransformationMatrix;
 import net.minecraftforge.client.model.data.IModelData;
 
 import javax.annotation.Nonnull;
@@ -109,7 +109,7 @@ public class TurtleSmartItemModel implements IBakedModel
         {
             @Nonnull
             @Override
-            public IBakedModel resolve( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable LivingEntity entity )
+            public IBakedModel resolve( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity )
             {
                 ItemTurtle turtle = (ItemTurtle) stack.getItem();
                 int colour = turtle.getColour( stack );

src/main/java/dan200/computercraft/core/apis/HTTPAPI.java

@@ -37,7 +37,7 @@ public class HTTPAPI implements ILuaAPI
 {
     private final IAPIEnvironment apiEnvironment;
 
-    private final ResourceGroup<CheckUrl> checkUrls = new ResourceGroup<>( ResourceGroup.DEFAULT );
+    private final ResourceGroup<CheckUrl> checkUrls = new ResourceGroup<>();
     private final ResourceGroup<HttpRequest> requests = new ResourceQueue<>( () -> ComputerCraft.httpMaxRequests );
     private final ResourceGroup<Websocket> websockets = new ResourceGroup<>( () -> ComputerCraft.httpMaxWebsockets );
 
@@ -127,10 +127,7 @@ public class HTTPAPI implements ILuaAPI
             HttpRequest request = new HttpRequest( requests, apiEnvironment, address, postString, headers, binary, redirect );
 
             // Make the request
-            if( !request.queue( r -> r.request( uri, httpMethod ) ) )
-            {
-                throw new LuaException( "Too many ongoing HTTP requests" );
-            }
+            request.queue( r -> r.request( uri, httpMethod ) );
 
             return new Object[] { true };
         }
@@ -141,15 +138,12 @@ public class HTTPAPI implements ILuaAPI
     }
 
     @LuaFunction
-    public final Object[] checkURL( String address ) throws LuaException
+    public final Object[] checkURL( String address )
     {
         try
         {
             URI uri = HttpRequest.checkUri( address );
-            if( !new CheckUrl( checkUrls, apiEnvironment, address, uri ).queue( CheckUrl::run ) )
-            {
-                throw new LuaException( "Too many ongoing checkUrl calls" );
-            }
+            new CheckUrl( checkUrls, apiEnvironment, address, uri ).queue( CheckUrl::run );
 
             return new Object[] { true };
         }

src/main/java/dan200/computercraft/core/apis/IAPIEnvironment.java

@@ -62,7 +62,6 @@ public interface IAPIEnvironment
     @Nullable
     IPeripheral getPeripheral( ComputerSide side );
 
-    @Nullable
     String getLabel();
 
     void setLabel( @Nullable String label );

src/main/java/dan200/computercraft/core/apis/LuaDateTime.java

@@ -89,7 +89,7 @@ final class LuaDateTime
                             formatter.appendValue( ChronoField.HOUR_OF_DAY, 2 );
                             break;
                         case 'I':
-                            formatter.appendValue( ChronoField.HOUR_OF_AMPM, 2 );
+                            formatter.appendValue( ChronoField.HOUR_OF_AMPM );
                             break;
                         case 'j':
                             formatter.appendValue( ChronoField.DAY_OF_YEAR, 3 );

src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java

@@ -11,26 +11,19 @@ import dan200.computercraft.core.apis.http.options.AddressRule;
 import dan200.computercraft.core.apis.http.options.Options;
 import dan200.computercraft.shared.util.ThreadUtils;
 import io.netty.buffer.ByteBuf;
-import io.netty.channel.ConnectTimeoutException;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.handler.codec.DecoderException;
-import io.netty.handler.codec.TooLongFrameException;
-import io.netty.handler.codec.http.websocketx.WebSocketHandshakeException;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.timeout.ReadTimeoutException;
-import io.netty.handler.traffic.AbstractTrafficShapingHandler;
-import io.netty.handler.traffic.GlobalTrafficShapingHandler;
 
-import javax.annotation.Nonnull;
 import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
 import javax.net.ssl.TrustManagerFactory;
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.security.KeyStore;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -38,8 +31,10 @@ import java.util.concurrent.TimeUnit;
  */
 public final class NetworkUtils
 {
-    public static final ScheduledThreadPoolExecutor EXECUTOR = new ScheduledThreadPoolExecutor(
-        4,
+    public static final ExecutorService EXECUTOR = new ThreadPoolExecutor(
+        4, Integer.MAX_VALUE,
+        60L, TimeUnit.SECONDS,
+        new SynchronousQueue<>(),
         ThreadUtils.builder( "Network" )
             .setPriority( Thread.MIN_PRIORITY + (Thread.NORM_PRIORITY - Thread.MIN_PRIORITY) / 2 )
             .build()
@@ -50,15 +45,6 @@ public final class NetworkUtils
         .build()
     );
 
-    public static final AbstractTrafficShapingHandler SHAPING_HANDLER = new GlobalTrafficShapingHandler(
-        EXECUTOR, ComputerCraft.httpUploadBandwidth, ComputerCraft.httpDownloadBandwidth
-    );
-
-    static
-    {
-        EXECUTOR.setKeepAliveTime( 60, TimeUnit.SECONDS );
-    }
-
     private NetworkUtils()
     {
     }
@@ -114,16 +100,6 @@ public final class NetworkUtils
         }
     }
 
-    public static void reloadConfig()
-    {
-        SHAPING_HANDLER.configure( ComputerCraft.httpUploadBandwidth, ComputerCraft.httpDownloadBandwidth );
-    }
-
-    public static void reset()
-    {
-        SHAPING_HANDLER.trafficCounter().resetCumulativeTime();
-    }
-
     /**
      * Create a {@link InetSocketAddress} from a {@link java.net.URI}.
      *
@@ -185,29 +161,4 @@ public final class NetworkUtils
         buffer.readBytes( bytes );
         return bytes;
     }
-
-    @Nonnull
-    public static String toFriendlyError( @Nonnull Throwable cause )
-    {
-        if( cause instanceof WebSocketHandshakeException || cause instanceof HTTPRequestException )
-        {
-            return cause.getMessage();
-        }
-        else if( cause instanceof TooLongFrameException )
-        {
-            return "Message is too large";
-        }
-        else if( cause instanceof ReadTimeoutException || cause instanceof ConnectTimeoutException )
-        {
-            return "Timed out";
-        }
-        else if( cause instanceof SSLHandshakeException || (cause instanceof DecoderException && cause.getCause() instanceof SSLHandshakeException) )
-        {
-            return "Could not create a secure connection";
-        }
-        else
-        {
-            return "Could not connect";
-        }
-    }
 }

src/main/java/dan200/computercraft/core/apis/http/Resource.java

@@ -97,7 +97,7 @@ public abstract class Resource<T extends Resource<T>> implements Closeable
         tryClose();
     }
 
-    public final boolean queue( Consumer<T> task )
+    public boolean queue( Consumer<T> task )
     {
         @SuppressWarnings( "unchecked" )
         T thisT = (T) this;

src/main/java/dan200/computercraft/core/apis/http/ResourceGroup.java

@@ -18,9 +18,6 @@ import java.util.function.Supplier;
  */
 public class ResourceGroup<T extends Resource<T>>
 {
-    public static final int DEFAULT_LIMIT = 512;
-    public static final IntSupplier DEFAULT = () -> DEFAULT_LIMIT;
-
     private static final IntSupplier ZERO = () -> 0;
 
     final IntSupplier limit;

src/main/java/dan200/computercraft/core/apis/http/ResourceQueue.java

@@ -38,10 +38,8 @@ public class ResourceQueue<T extends Resource<T>> extends ResourceGroup<T>
     public synchronized boolean queue( Supplier<T> resource )
     {
         if( !active ) return false;
-        if( super.queue( resource ) ) return true;
-        if( pending.size() > DEFAULT_LIMIT ) return false;
 
-        pending.add( resource );
+        if( !super.queue( resource ) ) pending.add( resource );
         return true;
     }
 

src/main/java/dan200/computercraft/core/apis/http/request/HttpRequest.java

@@ -19,10 +19,13 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ConnectTimeoutException;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.codec.TooLongFrameException;
 import io.netty.handler.codec.http.*;
 import io.netty.handler.ssl.SslContext;
+import io.netty.handler.timeout.ReadTimeoutException;
 import io.netty.handler.timeout.ReadTimeoutHandler;
 
 import java.net.InetSocketAddress;
@@ -167,7 +170,6 @@ public class HttpRequest extends Resource<HttpRequest>
                         }
 
                         ChannelPipeline p = ch.pipeline();
-                        p.addLast( NetworkUtils.SHAPING_HANDLER );
                         if( sslContext != null )
                         {
                             p.addLast( sslContext.newHandler( ch.alloc(), uri.getHost(), socketAddress.getPort() ) );
@@ -188,7 +190,7 @@ public class HttpRequest extends Resource<HttpRequest>
                 .remoteAddress( socketAddress )
                 .connect()
                 .addListener( c -> {
-                    if( !c.isSuccess() ) failure( NetworkUtils.toFriendlyError( c.cause() ) );
+                    if( !c.isSuccess() ) failure( c.cause() );
                 } );
 
             // Do an additional check for cancellation
@@ -200,7 +202,7 @@ public class HttpRequest extends Resource<HttpRequest>
         }
         catch( Exception e )
         {
-            failure( NetworkUtils.toFriendlyError( e ) );
+            failure( "Could not connect" );
             if( ComputerCraft.logComputerErrors ) ComputerCraft.log.error( "Error in HTTP request", e );
         }
     }
@@ -210,6 +212,29 @@ public class HttpRequest extends Resource<HttpRequest>
         if( tryClose() ) environment.queueEvent( FAILURE_EVENT, address, message );
     }
 
+    void failure( Throwable cause )
+    {
+        String message;
+        if( cause instanceof HTTPRequestException )
+        {
+            message = cause.getMessage();
+        }
+        else if( cause instanceof TooLongFrameException )
+        {
+            message = "Response is too large";
+        }
+        else if( cause instanceof ReadTimeoutException || cause instanceof ConnectTimeoutException )
+        {
+            message = "Timed out";
+        }
+        else
+        {
+            message = "Could not connect";
+        }
+
+        failure( message );
+    }
+
     void failure( String message, HttpResponseHandle object )
     {
         if( tryClose() ) environment.queueEvent( FAILURE_EVENT, address, message, object );

src/main/java/dan200/computercraft/core/apis/http/request/HttpRequestHandler.java

@@ -183,7 +183,7 @@ public final class HttpRequestHandler extends SimpleChannelInboundHandler<HttpOb
     public void exceptionCaught( ChannelHandlerContext ctx, Throwable cause )
     {
         if( ComputerCraft.logComputerErrors ) ComputerCraft.log.error( "Error handling HTTP response", cause );
-        request.failure( NetworkUtils.toFriendlyError( cause ) );
+        request.failure( cause );
     }
 
     private void sendResponse()

src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java

@@ -22,12 +22,12 @@ import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
 import io.netty.handler.codec.http.websocketx.WebSocketVersion;
+import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketClientCompressionHandler;
 import io.netty.handler.ssl.SslContext;
 
 import java.lang.ref.WeakReference;
@@ -145,22 +145,20 @@ public class Websocket extends Resource<Websocket>
                     protected void initChannel( SocketChannel ch )
                     {
                         ChannelPipeline p = ch.pipeline();
-                        p.addLast( NetworkUtils.SHAPING_HANDLER );
                         if( sslContext != null )
                         {
                             p.addLast( sslContext.newHandler( ch.alloc(), uri.getHost(), socketAddress.getPort() ) );
                         }
 
-                        String subprotocol = headers.get( HttpHeaderNames.SEC_WEBSOCKET_PROTOCOL );
                         WebSocketClientHandshaker handshaker = WebSocketClientHandshakerFactory.newHandshaker(
-                            uri, WebSocketVersion.V13, subprotocol, true, headers,
+                            uri, WebSocketVersion.V13, null, true, headers,
                             options.websocketMessage <= 0 ? MAX_MESSAGE_SIZE : options.websocketMessage
                         );
 
                         p.addLast(
                             new HttpClientCodec(),
                             new HttpObjectAggregator( 8192 ),
-                            WebsocketCompressionHandler.INSTANCE,
+                            WebSocketClientCompressionHandler.INSTANCE,
                             new WebsocketHandler( Websocket.this, handshaker, options )
                         );
                     }
@@ -168,7 +166,7 @@ public class Websocket extends Resource<Websocket>
                 .remoteAddress( socketAddress )
                 .connect()
                 .addListener( c -> {
-                    if( !c.isSuccess() ) failure( NetworkUtils.toFriendlyError( c.cause() ) );
+                    if( !c.isSuccess() ) failure( c.cause().getMessage() );
                 } );
 
             // Do an additional check for cancellation
@@ -180,7 +178,7 @@ public class Websocket extends Resource<Websocket>
         }
         catch( Exception e )
         {
-            failure( NetworkUtils.toFriendlyError( e ) );
+            failure( "Could not connect" );
             if( ComputerCraft.logComputerErrors ) ComputerCraft.log.error( "Error in websocket", e );
         }
     }

src/main/java/dan200/computercraft/core/apis/http/websocket/WebsocketCompressionHandler.java

@@ -1,38 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.core.apis.http.websocket;
-
-import io.netty.channel.ChannelHandler;
-import io.netty.handler.codec.compression.ZlibCodecFactory;
-import io.netty.handler.codec.http.websocketx.extensions.WebSocketClientExtensionHandler;
-import io.netty.handler.codec.http.websocketx.extensions.compression.DeflateFrameClientExtensionHandshaker;
-import io.netty.handler.codec.http.websocketx.extensions.compression.PerMessageDeflateClientExtensionHandshaker;
-import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketClientCompressionHandler;
-
-import static io.netty.handler.codec.http.websocketx.extensions.compression.PerMessageDeflateServerExtensionHandshaker.MAX_WINDOW_SIZE;
-
-/**
- * An alternative to {@link WebSocketClientCompressionHandler} which supports the {@literal client_no_context_takeover}
- * extension. Makes CC <em>slightly</em> more flexible.
- */
-@ChannelHandler.Sharable
-final class WebsocketCompressionHandler extends WebSocketClientExtensionHandler
-{
-    public static final WebsocketCompressionHandler INSTANCE = new WebsocketCompressionHandler();
-
-    private WebsocketCompressionHandler()
-    {
-        super(
-            new PerMessageDeflateClientExtensionHandshaker(
-                6, ZlibCodecFactory.isSupportingWindowSizeAndMemLevel(), MAX_WINDOW_SIZE,
-                true, false
-            ),
-            new DeflateFrameClientExtensionHandshaker( false ),
-            new DeflateFrameClientExtensionHandshaker( true )
-        );
-
-    }
-}

src/main/java/dan200/computercraft/core/apis/http/websocket/WebsocketHandler.java

@@ -5,13 +5,17 @@
  */
 package dan200.computercraft.core.apis.http.websocket;
 
+import dan200.computercraft.core.apis.http.HTTPRequestException;
 import dan200.computercraft.core.apis.http.NetworkUtils;
 import dan200.computercraft.core.apis.http.options.Options;
 import dan200.computercraft.core.tracking.TrackingField;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ConnectTimeoutException;
 import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.TooLongFrameException;
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.websocketx.*;
+import io.netty.handler.timeout.ReadTimeoutException;
 import io.netty.util.CharsetUtil;
 
 import static dan200.computercraft.core.apis.http.websocket.Websocket.MESSAGE_EVENT;
@@ -93,7 +97,24 @@ public class WebsocketHandler extends SimpleChannelInboundHandler<Object>
     {
         ctx.close();
 
-        String message = NetworkUtils.toFriendlyError( cause );
+        String message;
+        if( cause instanceof WebSocketHandshakeException || cause instanceof HTTPRequestException )
+        {
+            message = cause.getMessage();
+        }
+        else if( cause instanceof TooLongFrameException )
+        {
+            message = "Message is too large";
+        }
+        else if( cause instanceof ReadTimeoutException || cause instanceof ConnectTimeoutException )
+        {
+            message = "Timed out";
+        }
+        else
+        {
+            message = "Could not connect";
+        }
+
         if( handshaker.isHandshakeComplete() )
         {
             websocket.close( -1, message );

src/main/java/dan200/computercraft/core/asm/Generator.java

@@ -66,7 +66,7 @@ public final class Generator<T>
     {
         this.base = base;
         this.context = context;
-        interfaces = new String[] { Type.getInternalName( base ) };
+        this.interfaces = new String[] { Type.getInternalName( base ) };
         this.wrap = wrap;
 
         StringBuilder methodDesc = new StringBuilder().append( "(Ljava/lang/Object;" );
@@ -111,7 +111,7 @@ public final class Generator<T>
             addMethod( methods, method, annotation, instance );
         }
 
-        for( GenericMethod method : GenericMethod.all() )
+        for( GenericSource.GenericMethod method : GenericSource.GenericMethod.all() )
         {
             if( !method.target.isAssignableFrom( klass ) ) continue;
 

src/main/java/dan200/computercraft/core/asm/GenericMethod.java

@@ -1,90 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.core.asm;
-
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.api.lua.GenericSource;
-import dan200.computercraft.api.lua.LuaFunction;
-
-import javax.annotation.Nonnull;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * A generic method is a method belonging to a {@link GenericSource} with a known target.
- */
-public class GenericMethod
-{
-    final Method method;
-    final LuaFunction annotation;
-    final Class<?> target;
-
-    private static final List<GenericSource> sources = new ArrayList<>();
-    private static List<GenericMethod> cache;
-
-    GenericMethod( Method method, LuaFunction annotation, Class<?> target )
-    {
-        this.method = method;
-        this.annotation = annotation;
-        this.target = target;
-    }
-
-    /**
-     * Find all public static methods annotated with {@link LuaFunction} which belong to a {@link GenericSource}.
-     *
-     * @return All available generic methods.
-     */
-    static List<GenericMethod> all()
-    {
-        if( cache != null ) return cache;
-        return cache = sources.stream()
-            .flatMap( x -> Arrays.stream( x.getClass().getDeclaredMethods() ) )
-            .map( method ->
-            {
-                LuaFunction annotation = method.getAnnotation( LuaFunction.class );
-                if( annotation == null ) return null;
-
-                if( !Modifier.isStatic( method.getModifiers() ) )
-                {
-                    ComputerCraft.log.error( "GenericSource method {}.{} should be static.", method.getDeclaringClass(), method.getName() );
-                    return null;
-                }
-
-                Type[] types = method.getGenericParameterTypes();
-                if( types.length == 0 )
-                {
-                    ComputerCraft.log.error( "GenericSource method {}.{} has no parameters.", method.getDeclaringClass(), method.getName() );
-                    return null;
-                }
-
-                Class<?> target = Reflect.getRawType( method, types[0], false );
-                if( target == null ) return null;
-
-                return new GenericMethod( method, annotation, target );
-            } )
-            .filter( Objects::nonNull )
-            .collect( Collectors.toList() );
-    }
-
-
-    public static synchronized void register( @Nonnull GenericSource source )
-    {
-        Objects.requireNonNull( source, "Source cannot be null" );
-
-        if( cache != null )
-        {
-            ComputerCraft.log.warn( "Registering a generic source {} after cache has been built. This source will be ignored.", cache );
-        }
-
-        sources.add( source );
-    }
-}

src/main/java/dan200/computercraft/core/asm/GenericSource.java

@@ -0,0 +1,120 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.core.asm;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.api.lua.LuaFunction;
+import dan200.computercraft.shared.peripheral.generic.GenericPeripheralProvider;
+import dan200.computercraft.shared.util.ServiceUtil;
+import net.minecraft.util.ResourceLocation;
+
+import javax.annotation.Nonnull;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * A generic source of {@link LuaMethod} functions. This allows for injecting methods onto objects you do not own.
+ *
+ * Unlike conventional Lua objects, the annotated methods should be {@code static}, with their target as the first
+ * parameter.
+ *
+ * This is used by the generic peripheral system ({@link GenericPeripheralProvider}) to provide methods for arbitrary
+ * tile entities. Eventually this'll be be exposed in the public API. Until it is stabilised, it will remain in this
+ * package - do not use it in external mods!
+ */
+public interface GenericSource
+{
+    /**
+     * A unique identifier for this generic source. This may be used in the future to allow disabling specific sources.
+     *
+     * @return This source's identifier.
+     */
+    @Nonnull
+    ResourceLocation id();
+
+    /**
+     * Register a stream of generic sources.
+     *
+     * @param sources The source of generic methods.
+     * @see ServiceUtil For ways to load this. Sadly {@link java.util.ServiceLoader} is broken under Forge, but we don't
+     * want to add a hard-dep on Forge within core either.
+     */
+    static void setup( Supplier<Stream<GenericSource>> sources )
+    {
+        GenericMethod.sources = sources;
+    }
+
+    /**
+     * A generic method is a method belonging to a {@link GenericSource} with a known target.
+     */
+    class GenericMethod
+    {
+        final Method method;
+        final LuaFunction annotation;
+        final Class<?> target;
+
+        static Supplier<Stream<GenericSource>> sources;
+        private static List<GenericMethod> cache;
+
+        GenericMethod( Method method, LuaFunction annotation, Class<?> target )
+        {
+            this.method = method;
+            this.annotation = annotation;
+            this.target = target;
+        }
+
+        /**
+         * Find all public static methods annotated with {@link LuaFunction} which belong to a {@link GenericSource}.
+         *
+         * @return All available generic methods.
+         */
+        static List<GenericMethod> all()
+        {
+            if( cache != null ) return cache;
+            if( sources == null )
+            {
+                ComputerCraft.log.warn( "Getting GenericMethods without a provider" );
+                return cache = Collections.emptyList();
+            }
+
+            return cache = sources.get()
+                .flatMap( x -> Arrays.stream( x.getClass().getDeclaredMethods() ) )
+                .map( method ->
+                {
+                    LuaFunction annotation = method.getAnnotation( LuaFunction.class );
+                    if( annotation == null ) return null;
+
+                    if( !Modifier.isStatic( method.getModifiers() ) )
+                    {
+                        ComputerCraft.log.error( "GenericSource method {}.{} should be static.", method.getDeclaringClass(), method.getName() );
+                        return null;
+                    }
+
+                    Type[] types = method.getGenericParameterTypes();
+                    if( types.length == 0 )
+                    {
+                        ComputerCraft.log.error( "GenericSource method {}.{} has no parameters.", method.getDeclaringClass(), method.getName() );
+                        return null;
+                    }
+
+                    Class<?> target = Reflect.getRawType( method, types[0], false );
+                    if( target == null ) return null;
+
+                    return new GenericMethod( method, annotation, target );
+                } )
+                .filter( Objects::nonNull )
+                .collect( Collectors.toList() );
+        }
+    }
+}

src/main/java/dan200/computercraft/core/computer/ComputerExecutor.java

@@ -251,20 +251,6 @@ final class ComputerExecutor
      * and then schedule a shutdown.
      */
     void abort()
-    {
-        immediateFail( StateCommand.ABORT );
-    }
-
-    /**
-     * Abort this whole computer due to an internal error. This will immediately destroy the Lua machine,
-     * and then schedule a shutdown.
-     */
-    void fastFail()
-    {
-        immediateFail( StateCommand.ERROR );
-    }
-
-    private void immediateFail( StateCommand command )
     {
         ILuaMachine machine = this.machine;
         if( machine != null ) machine.close();
@@ -272,7 +258,7 @@ final class ComputerExecutor
         synchronized( queueLock )
         {
             if( closed ) return;
-            this.command = command;
+            command = StateCommand.ABORT;
             if( isOn ) enqueue();
         }
     }
@@ -610,12 +596,6 @@ final class ComputerExecutor
                     displayFailure( "Error running computer", TimeoutState.ABORT_MESSAGE );
                     shutdown();
                     break;
-
-                case ERROR:
-                    if( !isOn ) return;
-                    displayFailure( "Error running computer", "An internal error occurred, see logs." );
-                    shutdown();
-                    break;
             }
         }
         else if( event != null )
@@ -664,7 +644,6 @@ final class ComputerExecutor
         SHUTDOWN,
         REBOOT,
         ABORT,
-        ERROR,
     }
 
     private static final class Event

src/main/java/dan200/computercraft/core/computer/ComputerThread.java

@@ -506,8 +506,6 @@ public final class ComputerThread
                 catch( Exception | LinkageError | VirtualMachineError e )
                 {
                     ComputerCraft.log.error( "Error running task on computer #" + executor.getComputer().getID(), e );
-                    // Tear down the computer immediately. There's no guarantee it's well behaved from now on.
-                    executor.fastFail();
                 }
                 finally
                 {

src/main/java/dan200/computercraft/core/filesystem/ResourceMount.java

@@ -12,7 +12,6 @@ import com.google.common.io.ByteStreams;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.core.apis.handles.ArrayByteChannel;
-import dan200.computercraft.shared.util.IoUtil;
 import net.minecraft.resources.IReloadableResourceManager;
 import net.minecraft.resources.IResource;
 import net.minecraft.resources.IResourceManager;
@@ -104,13 +103,9 @@ public final class ResourceMount implements IMount
     private void load()
     {
         boolean hasAny = false;
-        String existingNamespace = null;
-
         FileEntry newRoot = new FileEntry( new ResourceLocation( namespace, subPath ) );
         for( ResourceLocation file : manager.listResources( subPath, s -> true ) )
         {
-            existingNamespace = file.getNamespace();
-
             if( !file.getNamespace().equals( namespace ) ) continue;
 
             String localPath = FileSystem.toLocal( file.getPath(), subPath );
@@ -119,15 +114,6 @@ public final class ResourceMount implements IMount
         }
 
         root = hasAny ? newRoot : null;
-
-        if( !hasAny )
-        {
-            ComputerCraft.log.warn( "Cannot find any files under /data/{}/{} for resource mount.", namespace, subPath );
-            if( existingNamespace != null )
-            {
-                ComputerCraft.log.warn( "There are files under /data/{}/{} though. Did you get the wrong namespace?", existingNamespace, subPath );
-            }
-        }
     }
 
     private FileEntry get( String path )
@@ -245,20 +231,11 @@ public final class ResourceMount implements IMount
             byte[] contents = CONTENTS_CACHE.getIfPresent( file );
             if( contents != null ) return new ArrayByteChannel( contents );
 
-            try
+            try( InputStream stream = manager.getResource( file.identifier ).getInputStream() )
             {
-                InputStream stream = manager.getResource( file.identifier ).getInputStream();
                 if( stream.available() > MAX_CACHED_SIZE ) return Channels.newChannel( stream );
 
-                try
-                {
-                    contents = ByteStreams.toByteArray( stream );
-                }
-                finally
-                {
-                    IoUtil.closeQuietly( stream );
-                }
-
+                contents = ByteStreams.toByteArray( stream );
                 CONTENTS_CACHE.put( file, contents );
                 return new ArrayByteChannel( contents );
             }

src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java

@@ -10,6 +10,7 @@ import dan200.computercraft.api.lua.*;
 import dan200.computercraft.core.asm.LuaMethod;
 import dan200.computercraft.core.asm.ObjectSource;
 import dan200.computercraft.core.computer.Computer;
+import dan200.computercraft.core.computer.MainThread;
 import dan200.computercraft.core.computer.TimeoutState;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.core.tracking.TrackingField;
@@ -52,7 +53,7 @@ public class CobaltLuaMachine implements ILuaMachine
     private final Computer computer;
     private final TimeoutState timeout;
     private final TimeoutDebugHandler debug;
-    private final ILuaContext context;
+    private final ILuaContext context = new CobaltLuaContext();
 
     private LuaState state;
     private LuaTable globals;
@@ -64,7 +65,6 @@ public class CobaltLuaMachine implements ILuaMachine
     {
         this.computer = computer;
         this.timeout = timeout;
-        context = new LuaContext( computer );
         debug = new TimeoutDebugHandler();
 
         // Create an environment to run in
@@ -97,7 +97,7 @@ public class CobaltLuaMachine implements ILuaMachine
         globals.load( state, new CoroutineLib() );
         globals.load( state, new Bit32Lib() );
         globals.load( state, new Utf8Lib() );
-        globals.load( state, new DebugLib() );
+        if( ComputerCraft.debugEnable ) globals.load( state, new DebugLib() );
 
         // Remove globals we don't want to expose
         globals.rawset( "collectgarbage", Constants.NIL );
@@ -509,6 +509,53 @@ public class CobaltLuaMachine implements ILuaMachine
         }
     }
 
+    private class CobaltLuaContext implements ILuaContext
+    {
+        @Override
+        public long issueMainThreadTask( @Nonnull final ILuaTask task ) throws LuaException
+        {
+            // Issue command
+            final long taskID = MainThread.getUniqueTaskID();
+            final Runnable iTask = () -> {
+                try
+                {
+                    Object[] results = task.execute();
+                    if( results != null )
+                    {
+                        Object[] eventArguments = new Object[results.length + 2];
+                        eventArguments[0] = taskID;
+                        eventArguments[1] = true;
+                        System.arraycopy( results, 0, eventArguments, 2, results.length );
+                        computer.queueEvent( "task_complete", eventArguments );
+                    }
+                    else
+                    {
+                        computer.queueEvent( "task_complete", new Object[] { taskID, true } );
+                    }
+                }
+                catch( LuaException e )
+                {
+                    computer.queueEvent( "task_complete", new Object[] { taskID, false, e.getMessage() } );
+                }
+                catch( Throwable t )
+                {
+                    if( ComputerCraft.logComputerErrors ) ComputerCraft.log.error( "Error running task", t );
+                    computer.queueEvent( "task_complete", new Object[] {
+                        taskID, false, "Java Exception Thrown: " + t,
+                    } );
+                }
+            };
+            if( computer.queueMainThread( iTask ) )
+            {
+                return taskID;
+            }
+            else
+            {
+                throw new LuaException( "Task limit exceeded" );
+            }
+        }
+    }
+
     private static final class HardAbortError extends Error
     {
         private static final long serialVersionUID = 7954092008586367501L;

src/main/java/dan200/computercraft/core/lua/LuaContext.java

@@ -1,69 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.core.lua;
-
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.lua.ILuaTask;
-import dan200.computercraft.api.lua.LuaException;
-import dan200.computercraft.core.computer.Computer;
-import dan200.computercraft.core.computer.MainThread;
-
-import javax.annotation.Nonnull;
-
-class LuaContext implements ILuaContext
-{
-    private final Computer computer;
-
-    LuaContext( Computer computer )
-    {
-        this.computer = computer;
-    }
-
-    @Override
-    public long issueMainThreadTask( @Nonnull final ILuaTask task ) throws LuaException
-    {
-        // Issue command
-        final long taskID = MainThread.getUniqueTaskID();
-        final Runnable iTask = () -> {
-            try
-            {
-                Object[] results = task.execute();
-                if( results != null )
-                {
-                    Object[] eventArguments = new Object[results.length + 2];
-                    eventArguments[0] = taskID;
-                    eventArguments[1] = true;
-                    System.arraycopy( results, 0, eventArguments, 2, results.length );
-                    computer.queueEvent( "task_complete", eventArguments );
-                }
-                else
-                {
-                    computer.queueEvent( "task_complete", new Object[] { taskID, true } );
-                }
-            }
-            catch( LuaException e )
-            {
-                computer.queueEvent( "task_complete", new Object[] { taskID, false, e.getMessage() } );
-            }
-            catch( Exception t )
-            {
-                if( ComputerCraft.logComputerErrors ) ComputerCraft.log.error( "Error running task", t );
-                computer.queueEvent( "task_complete", new Object[] {
-                    taskID, false, "Java Exception Thrown: " + t,
-                } );
-            }
-        };
-        if( computer.queueMainThread( iTask ) )
-        {
-            return taskID;
-        }
-        else
-        {
-            throw new LuaException( "Task limit exceeded" );
-        }
-    }
-}

src/main/java/dan200/computercraft/core/terminal/Terminal.java

@@ -44,9 +44,9 @@ public class Terminal
         this.height = height;
         onChanged = changedCallback;
 
-        text = new TextBuffer[height];
-        textColour = new TextBuffer[height];
-        backgroundColour = new TextBuffer[height];
+        text = new TextBuffer[this.height];
+        textColour = new TextBuffer[this.height];
+        backgroundColour = new TextBuffer[this.height];
         for( int i = 0; i < this.height; i++ )
         {
             text[i] = new TextBuffer( ' ', this.width );
@@ -93,9 +93,9 @@ public class Terminal
         this.width = width;
         this.height = height;
 
-        text = new TextBuffer[height];
-        textColour = new TextBuffer[height];
-        backgroundColour = new TextBuffer[height];
+        text = new TextBuffer[this.height];
+        textColour = new TextBuffer[this.height];
+        backgroundColour = new TextBuffer[this.height];
         for( int i = 0; i < this.height; i++ )
         {
             if( i >= oldHeight )

src/main/java/dan200/computercraft/core/terminal/TextBuffer.java

@@ -12,12 +12,46 @@ public class TextBuffer
     public TextBuffer( char c, int length )
     {
         text = new char[length];
-        fill( c );
+        for( int i = 0; i < length; i++ )
+        {
+            text[i] = c;
+        }
     }
 
     public TextBuffer( String text )
     {
-        this.text = text.toCharArray();
+        this( text, 1 );
+    }
+
+    public TextBuffer( String text, int repetitions )
+    {
+        int textLength = text.length();
+        this.text = new char[textLength * repetitions];
+        for( int i = 0; i < repetitions; i++ )
+        {
+            for( int j = 0; j < textLength; j++ )
+            {
+                this.text[j + i * textLength] = text.charAt( j );
+            }
+        }
+    }
+
+    public TextBuffer( TextBuffer text )
+    {
+        this( text, 1 );
+    }
+
+    public TextBuffer( TextBuffer text, int repetitions )
+    {
+        int textLength = text.length();
+        this.text = new char[textLength * repetitions];
+        for( int i = 0; i < repetitions; i++ )
+        {
+            for( int j = 0; j < textLength; j++ )
+            {
+                this.text[j + i * textLength] = text.charAt( j );
+            }
+        }
     }
 
     public int length()
@@ -25,16 +59,39 @@ public class TextBuffer
         return text.length;
     }
 
+    public String read()
+    {
+        return read( 0, text.length );
+    }
+
+    public String read( int start )
+    {
+        return read( start, text.length );
+    }
+
+    public String read( int start, int end )
+    {
+        start = Math.max( start, 0 );
+        end = Math.min( end, text.length );
+        int textLength = Math.max( end - start, 0 );
+        return new String( text, start, textLength );
+    }
+
     public void write( String text )
     {
-        write( text, 0 );
+        write( text, 0, text.length() );
     }
 
     public void write( String text, int start )
+    {
+        write( text, start, start + text.length() );
+    }
+
+    public void write( String text, int start, int end )
     {
         int pos = start;
         start = Math.max( start, 0 );
-        int end = Math.min( start + text.length(), pos + text.length() );
+        end = Math.min( end, pos + text.length() );
         end = Math.min( end, this.text.length );
         for( int i = start; i < end; i++ )
         {
@@ -44,10 +101,23 @@ public class TextBuffer
 
     public void write( TextBuffer text )
     {
-        int end = Math.min( text.length(), this.text.length );
-        for( int i = 0; i < end; i++ )
+        write( text, 0, text.length() );
+    }
+
+    public void write( TextBuffer text, int start )
+    {
+        write( text, start, start + text.length() );
+    }
+
+    public void write( TextBuffer text, int start, int end )
+    {
+        int pos = start;
+        start = Math.max( start, 0 );
+        end = Math.min( end, pos + text.length() );
+        end = Math.min( end, this.text.length );
+        for( int i = start; i < end; i++ )
         {
-            this.text[i] = text.charAt( i );
+            this.text[i] = text.charAt( i - pos );
         }
     }
 
@@ -56,6 +126,11 @@ public class TextBuffer
         fill( c, 0, text.length );
     }
 
+    public void fill( char c, int start )
+    {
+        fill( c, start, text.length );
+    }
+
     public void fill( char c, int start, int end )
     {
         start = Math.max( start, 0 );
@@ -66,6 +141,52 @@ public class TextBuffer
         }
     }
 
+    public void fill( String text )
+    {
+        fill( text, 0, this.text.length );
+    }
+
+    public void fill( String text, int start )
+    {
+        fill( text, start, this.text.length );
+    }
+
+    public void fill( String text, int start, int end )
+    {
+        int pos = start;
+        start = Math.max( start, 0 );
+        end = Math.min( end, this.text.length );
+
+        int textLength = text.length();
+        for( int i = start; i < end; i++ )
+        {
+            this.text[i] = text.charAt( (i - pos) % textLength );
+        }
+    }
+
+    public void fill( TextBuffer text )
+    {
+        fill( text, 0, this.text.length );
+    }
+
+    public void fill( TextBuffer text, int start )
+    {
+        fill( text, start, this.text.length );
+    }
+
+    public void fill( TextBuffer text, int start, int end )
+    {
+        int pos = start;
+        start = Math.max( start, 0 );
+        end = Math.min( end, this.text.length );
+
+        int textLength = text.length();
+        for( int i = start; i < end; i++ )
+        {
+            this.text[i] = text.charAt( (i - pos) % textLength );
+        }
+    }
+
     public char charAt( int i )
     {
         return text[i];
@@ -79,7 +200,6 @@ public class TextBuffer
         }
     }
 
-    @Override
     public String toString()
     {
         return new String( text );

src/main/java/dan200/computercraft/data/BlockModelProvider.java

@@ -16,6 +16,7 @@ import net.minecraft.data.DataGenerator;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.generators.*;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import javax.annotation.Nonnull;
 

src/main/java/dan200/computercraft/data/Generators.java

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.data;
 
-import dan200.computercraft.shared.Registry;
+import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -17,12 +17,12 @@ public class Generators
     @SubscribeEvent
     public static void gather( GatherDataEvent event )
     {
-        Registry.registerLoot();
+        ComputerCraftProxyCommon.registerLoot();
 
         DataGenerator generator = event.getGenerator();
         generator.addProvider( new Recipes( generator ) );
         generator.addProvider( new LootTables( generator ) );
-        generator.addProvider( new Tags( generator ) );
+        generator.addProvider( new Tags( generator, event.getExistingFileHelper() ) );
         generator.addProvider( new BlockModelProvider( generator, event.getExistingFileHelper() ) );
     }
 }

src/main/java/dan200/computercraft/data/LootTableProvider.java

@@ -12,11 +12,11 @@ import dan200.computercraft.ComputerCraft;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.DirectoryCache;
 import net.minecraft.data.IDataProvider;
+import net.minecraft.loot.LootParameterSets;
+import net.minecraft.loot.LootTable;
+import net.minecraft.loot.LootTableManager;
+import net.minecraft.loot.ValidationTracker;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.storage.loot.LootParameterSets;
-import net.minecraft.world.storage.loot.LootTable;
-import net.minecraft.world.storage.loot.LootTableManager;
-import net.minecraft.world.storage.loot.ValidationTracker;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;

src/main/java/dan200/computercraft/data/LootTables.java

@@ -6,17 +6,17 @@
 package dan200.computercraft.data;
 
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.CommonHooks;
 import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
 import dan200.computercraft.shared.data.HasComputerIdLootCondition;
 import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
+import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import net.minecraft.block.Block;
 import net.minecraft.data.DataGenerator;
+import net.minecraft.loot.*;
+import net.minecraft.loot.conditions.Alternative;
+import net.minecraft.loot.conditions.SurvivesExplosion;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.storage.loot.*;
-import net.minecraft.world.storage.loot.conditions.Alternative;
-import net.minecraft.world.storage.loot.conditions.SurvivesExplosion;
 import net.minecraftforge.fml.RegistryObject;
 
 import java.util.function.BiConsumer;
@@ -46,7 +46,7 @@ public class LootTables extends LootTableProvider
         computerDrop( add, Registry.ModBlocks.TURTLE_NORMAL );
         computerDrop( add, Registry.ModBlocks.TURTLE_ADVANCED );
 
-        add.accept( CommonHooks.LOOT_TREASURE_DISK, LootTable
+        add.accept( ComputerCraftProxyCommon.ForgeHandlers.LOOT_TREASURE_DISK, LootTable
             .lootTable()
             .setParamSet( LootParameterSets.ALL_PARAMS )
             .build() );
@@ -77,9 +77,9 @@ public class LootTables extends LootTableProvider
                 .setRolls( ConstantRange.exactly( 1 ) )
                 .add( DynamicLootEntry.dynamicEntry( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ) )
                 .when( Alternative.alternative(
-                    BlockNamedEntityLootCondition.builder(),
-                    HasComputerIdLootCondition.builder(),
-                    PlayerCreativeLootCondition.builder().invert()
+                    BlockNamedEntityLootCondition.BUILDER,
+                    HasComputerIdLootCondition.BUILDER,
+                    PlayerCreativeLootCondition.BUILDER.invert()
                 ) )
             ).build() );
     }

src/main/java/dan200/computercraft/data/Recipes.java

@@ -22,7 +22,7 @@ import net.minecraft.advancements.criterion.ItemPredicate;
 import net.minecraft.block.Blocks;
 import net.minecraft.data.*;
 import net.minecraft.item.*;
-import net.minecraft.tags.Tag;
+import net.minecraft.tags.ITag;
 import net.minecraft.util.IItemProvider;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.Tags;
@@ -62,7 +62,7 @@ public class Recipes extends RecipeProvider
                 .requires( Items.PAPER )
                 .requires( DyeItem.byColor( ofColour( colour ) ) )
                 .group( "computercraft:disk" )
-                .unlocks( "has_drive", inventoryChange( Registry.ModBlocks.DISK_DRIVE.get() ) )
+                .unlockedBy( "has_drive", inventoryChange( Registry.ModBlocks.DISK_DRIVE.get() ) )
                 .save( RecipeWrapper.wrap(
                     ImpostorShapelessRecipe.SERIALIZER, add,
                     x -> x.putInt( IColouredItem.NBT_COLOUR, colour.getHex() )
@@ -92,7 +92,7 @@ public class Recipes extends RecipeProvider
                     .pattern( "#T" )
                     .define( '#', base.getItem() )
                     .define( 'T', upgrade.getCraftingItem().getItem() )
-                    .unlocks( "has_items",
+                    .unlockedBy( "has_items",
                         inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
                     .save(
                         RecipeWrapper.wrap( ImpostorRecipe.SERIALIZER, add, result.getTag() ),
@@ -127,7 +127,7 @@ public class Recipes extends RecipeProvider
                     .pattern( "P" )
                     .define( '#', base.getItem() )
                     .define( 'P', upgrade.getCraftingItem().getItem() )
-                    .unlocks( "has_items",
+                    .unlockedBy( "has_items",
                         inventoryChange( base.getItem(), upgrade.getCraftingItem().getItem() ) )
                     .save(
                         RecipeWrapper.wrap( ImpostorRecipe.SERIALIZER, add, result.getTag() ),
@@ -148,8 +148,8 @@ public class Recipes extends RecipeProvider
             .pattern( " # " )
             .define( '#', Tags.Items.STONE )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
-            .unlocks( "has_modem", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_modem", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -160,7 +160,7 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.STONE )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_redstone", inventoryChange( Tags.Items.DUSTS_REDSTONE ) )
+            .unlockedBy( "has_redstone", inventoryChange( Tags.Items.DUSTS_REDSTONE ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -171,7 +171,7 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.INGOTS_GOLD )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_components", inventoryChange( Items.REDSTONE, Items.GOLD_INGOT ) )
+            .unlockedBy( "has_components", inventoryChange( Items.REDSTONE, Items.GOLD_INGOT ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -182,7 +182,7 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.INGOTS_GOLD )
             .define( 'R', Blocks.COMMAND_BLOCK )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_components", inventoryChange( Blocks.COMMAND_BLOCK ) )
+            .unlockedBy( "has_components", inventoryChange( Blocks.COMMAND_BLOCK ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -192,7 +192,7 @@ public class Recipes extends RecipeProvider
             .pattern( "#R#" )
             .define( '#', Tags.Items.STONE )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -202,7 +202,7 @@ public class Recipes extends RecipeProvider
             .pattern( "###" )
             .define( '#', Tags.Items.STONE )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -212,7 +212,7 @@ public class Recipes extends RecipeProvider
             .pattern( "###" )
             .define( '#', Tags.Items.INGOTS_GOLD )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -223,8 +223,8 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.STONE )
             .define( 'A', Items.GOLDEN_APPLE )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
-            .unlocks( "has_apple", inventoryChange( Items.GOLDEN_APPLE ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_apple", inventoryChange( Items.GOLDEN_APPLE ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -235,8 +235,8 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.INGOTS_GOLD )
             .define( 'A', Items.GOLDEN_APPLE )
             .define( 'G', Tags.Items.GLASS_PANES )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
-            .unlocks( "has_apple", inventoryChange( Items.GOLDEN_APPLE ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_apple", inventoryChange( Items.GOLDEN_APPLE ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -247,7 +247,7 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.STONE )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
             .define( 'D', Tags.Items.DYES )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -258,7 +258,7 @@ public class Recipes extends RecipeProvider
             .define( '#', Tags.Items.STONE )
             .define( 'N', Blocks.NOTE_BLOCK )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -268,19 +268,19 @@ public class Recipes extends RecipeProvider
             .pattern( "###" )
             .define( '#', Tags.Items.STONE )
             .define( 'R', Tags.Items.DUSTS_REDSTONE )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
-            .unlocks( "has_cable", inventoryChange( Registry.ModItems.CABLE.get() ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_cable", inventoryChange( Registry.ModItems.CABLE.get() ) )
             .save( add );
 
         ShapelessRecipeBuilder
             .shapeless( Registry.ModBlocks.WIRED_MODEM_FULL.get() )
             .requires( Registry.ModItems.WIRED_MODEM.get() )
-            .unlocks( "has_modem", inventoryChange( CCTags.WIRED_MODEM ) )
+            .unlockedBy( "has_modem", inventoryChange( CCTags.WIRED_MODEM ) )
             .save( add, new ResourceLocation( ComputerCraft.MOD_ID, "wired_modem_full_from" ) );
         ShapelessRecipeBuilder
             .shapeless( Registry.ModItems.WIRED_MODEM.get() )
             .requires( Registry.ModBlocks.WIRED_MODEM_FULL.get() )
-            .unlocks( "has_modem", inventoryChange( CCTags.WIRED_MODEM ) )
+            .unlockedBy( "has_modem", inventoryChange( CCTags.WIRED_MODEM ) )
             .save( add, new ResourceLocation( ComputerCraft.MOD_ID, "wired_modem_full_to" ) );
 
         ShapedRecipeBuilder
@@ -290,7 +290,7 @@ public class Recipes extends RecipeProvider
             .pattern( "###" )
             .define( '#', Tags.Items.STONE )
             .define( 'E', Tags.Items.ENDER_PEARLS )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
             .save( add );
 
         ShapedRecipeBuilder
@@ -300,8 +300,8 @@ public class Recipes extends RecipeProvider
             .pattern( "###" )
             .define( '#', Tags.Items.INGOTS_GOLD )
             .define( 'E', Items.ENDER_EYE )
-            .unlocks( "has_computer", inventoryChange( CCTags.COMPUTER ) )
-            .unlocks( "has_wireless", inventoryChange( Registry.ModBlocks.WIRELESS_MODEM_NORMAL.get() ) )
+            .unlockedBy( "has_computer", inventoryChange( CCTags.COMPUTER ) )
+            .unlockedBy( "has_wireless", inventoryChange( Registry.ModBlocks.WIRELESS_MODEM_NORMAL.get() ) )
             .save( add );
     }
 
@@ -310,13 +310,13 @@ public class Recipes extends RecipeProvider
         return DyeColor.byId( 15 - colour.ordinal() );
     }
 
-    private static InventoryChangeTrigger.Instance inventoryChange( Tag<Item> stack )
+    private static InventoryChangeTrigger.Instance inventoryChange( ITag<Item> stack )
     {
-        return InventoryChangeTrigger.Instance.hasItem( ItemPredicate.Builder.item().of( stack ).build() );
+        return InventoryChangeTrigger.Instance.hasItems( ItemPredicate.Builder.item().of( stack ).build() );
     }
 
     private static InventoryChangeTrigger.Instance inventoryChange( IItemProvider... stack )
     {
-        return InventoryChangeTrigger.Instance.hasItem( stack );
+        return InventoryChangeTrigger.Instance.hasItems( stack );
     }
 }

src/main/java/dan200/computercraft/data/Tags.java

@@ -7,46 +7,55 @@ package dan200.computercraft.data;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.Registry;
+import net.minecraft.data.BlockTagsProvider;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.ItemTagsProvider;
 import net.minecraft.item.Item;
+import net.minecraft.tags.ITag;
 import net.minecraft.tags.ItemTags;
-import net.minecraft.tags.Tag;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.common.data.ExistingFileHelper;
 
 import static dan200.computercraft.data.Tags.CCTags.*;
 
 public class Tags extends ItemTagsProvider
 {
+    private static final ITag.INamedTag<Item> PIGLIN_LOVED = ItemTags.PIGLIN_LOVED;
+
     public static class CCTags
     {
-        public static final Tag<Item> COMPUTER = item( "computer" );
-        public static final Tag<Item> TURTLE = item( "turtle" );
-        public static final Tag<Item> WIRED_MODEM = item( "wired_modem" );
-        public static final Tag<Item> MONITOR = item( "monitor" );
+        public static final ITag.INamedTag<Item> COMPUTER = item( "computer" );
+        public static final ITag.INamedTag<Item> TURTLE = item( "turtle" );
+        public static final ITag.INamedTag<Item> WIRED_MODEM = item( "wired_modem" );
+        public static final ITag.INamedTag<Item> MONITOR = item( "monitor" );
     }
 
-    public Tags( DataGenerator generator )
+    public Tags( DataGenerator generator, ExistingFileHelper helper )
     {
-        super( generator );
+        super( generator, new BlockTagsProvider( generator, ComputerCraft.MOD_ID, helper ), ComputerCraft.MOD_ID, helper );
     }
 
     @Override
     protected void addTags()
     {
-        tag( COMPUTER )
-            .add( Registry.ModItems.COMPUTER_NORMAL.get() )
-            .add( Registry.ModItems.COMPUTER_ADVANCED.get() )
-            .add( Registry.ModItems.COMPUTER_COMMAND.get() );
+        tag( COMPUTER ).add(
+            Registry.ModItems.COMPUTER_NORMAL.get(),
+            Registry.ModItems.COMPUTER_ADVANCED.get(),
+            Registry.ModItems.COMPUTER_COMMAND.get()
+        );
         tag( TURTLE ).add( Registry.ModItems.TURTLE_NORMAL.get(), Registry.ModItems.TURTLE_ADVANCED.get() );
         tag( WIRED_MODEM ).add( Registry.ModItems.WIRED_MODEM.get(), Registry.ModItems.WIRED_MODEM_FULL.get() );
-        tag( MONITOR )
-            .add( Registry.ModItems.MONITOR_NORMAL.get() )
-            .add( Registry.ModItems.MONITOR_ADVANCED.get() );
+        tag( MONITOR ).add( Registry.ModItems.MONITOR_NORMAL.get(), Registry.ModItems.MONITOR_ADVANCED.get() );
+
+        tag( PIGLIN_LOVED ).add(
+            Registry.ModItems.COMPUTER_ADVANCED.get(), Registry.ModItems.TURTLE_ADVANCED.get(),
+            Registry.ModItems.WIRELESS_MODEM_ADVANCED.get(), Registry.ModItems.POCKET_COMPUTER_ADVANCED.get(),
+            Registry.ModItems.MONITOR_ADVANCED.get()
+        );
     }
 
-    private static Tag<Item> item( String name )
+    private static ITag.INamedTag<Item> item( String name )
     {
-        return new ItemTags.Wrapper( new ResourceLocation( ComputerCraft.MOD_ID, name ) );
+        return ItemTags.bind( new ResourceLocation( ComputerCraft.MOD_ID, name ).toString() );
     }
 }

src/main/java/dan200/computercraft/shared/CommonHooks.java

@@ -1,126 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.shared;
-
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.core.apis.http.NetworkUtils;
-import dan200.computercraft.core.computer.MainThread;
-import dan200.computercraft.core.tracking.Tracking;
-import dan200.computercraft.shared.command.CommandComputerCraft;
-import dan200.computercraft.shared.computer.core.IComputer;
-import dan200.computercraft.shared.computer.core.IContainerComputer;
-import dan200.computercraft.shared.computer.core.ServerComputer;
-import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.storage.loot.ConstantRange;
-import net.minecraft.world.storage.loot.LootPool;
-import net.minecraft.world.storage.loot.LootTables;
-import net.minecraft.world.storage.loot.TableLootEntry;
-import net.minecraftforge.event.LootTableLoadEvent;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.event.entity.player.PlayerContainerEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
-import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Miscellaneous hooks which are present on the client and server.
- *
- * These should possibly be refactored into separate classes at some point, but are fine here for now.
- *
- * @see dan200.computercraft.client.ClientHooks For client-specific ones.
- */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID )
-public final class CommonHooks
-{
-    private CommonHooks()
-    {
-    }
-
-    @SubscribeEvent
-    public static void onServerTick( TickEvent.ServerTickEvent event )
-    {
-        if( event.phase == TickEvent.Phase.START )
-        {
-            MainThread.executePendingTasks();
-            ComputerCraft.serverComputerRegistry.update();
-        }
-    }
-
-    @SubscribeEvent
-    public static void onContainerOpen( PlayerContainerEvent.Open event )
-    {
-        // If we're opening a computer container then broadcast the terminal state
-        Container container = event.getContainer();
-        if( container instanceof IContainerComputer )
-        {
-            IComputer computer = ((IContainerComputer) container).getComputer();
-            if( computer instanceof ServerComputer )
-            {
-                ((ServerComputer) computer).sendTerminalState( event.getPlayer() );
-            }
-        }
-    }
-
-    @SubscribeEvent
-    public static void onServerStarting( FMLServerStartingEvent event )
-    {
-        CommandComputerCraft.register( event.getCommandDispatcher() );
-    }
-
-    @SubscribeEvent
-    public static void onServerStarted( FMLServerStartedEvent event )
-    {
-        ComputerCraft.serverComputerRegistry.reset();
-        WirelessNetwork.resetNetworks();
-        Tracking.reset();
-        NetworkUtils.reset();
-    }
-
-    @SubscribeEvent
-    public static void onServerStopped( FMLServerStoppedEvent event )
-    {
-        ComputerCraft.serverComputerRegistry.reset();
-        WirelessNetwork.resetNetworks();
-        Tracking.reset();
-        NetworkUtils.reset();
-    }
-
-    public static final ResourceLocation LOOT_TREASURE_DISK = new ResourceLocation( ComputerCraft.MOD_ID, "treasure_disk" );
-
-    private static final Set<ResourceLocation> TABLES = new HashSet<>( Arrays.asList(
-        LootTables.SIMPLE_DUNGEON,
-        LootTables.ABANDONED_MINESHAFT,
-        LootTables.STRONGHOLD_CORRIDOR,
-        LootTables.STRONGHOLD_CROSSING,
-        LootTables.STRONGHOLD_LIBRARY,
-        LootTables.DESERT_PYRAMID,
-        LootTables.JUNGLE_TEMPLE,
-        LootTables.IGLOO_CHEST,
-        LootTables.WOODLAND_MANSION,
-        LootTables.VILLAGE_CARTOGRAPHER
-    ) );
-
-    @SubscribeEvent
-    public static void lootLoad( LootTableLoadEvent event )
-    {
-        ResourceLocation name = event.getName();
-        if( !name.getNamespace().equals( "minecraft" ) || !TABLES.contains( name ) ) return;
-
-        event.getTable().addPool( LootPool.lootPool()
-            .add( TableLootEntry.lootTableReference( LOOT_TREASURE_DISK ) )
-            .setRolls( ConstantRange.exactly( 1 ) )
-            .name( "computercraft_treasure" )
-            .build() );
-    }
-}

src/main/java/dan200/computercraft/shared/Config.java

@@ -12,7 +12,6 @@ import com.google.common.base.CaseFormat;
 import com.google.common.base.Converter;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.turtle.event.TurtleAction;
-import dan200.computercraft.core.apis.http.NetworkUtils;
 import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.AddressRuleConfig;
 import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
@@ -43,6 +42,7 @@ public final class Config
     private static final ConfigValue<Integer> maximumFilesOpen;
     private static final ConfigValue<Boolean> disableLua51Features;
     private static final ConfigValue<String> defaultComputerSettings;
+    private static final ConfigValue<Boolean> debugEnabled;
     private static final ConfigValue<Boolean> logComputerErrors;
     private static final ConfigValue<Boolean> commandRequireCreative;
 
@@ -57,9 +57,6 @@ public final class Config
     private static final ConfigValue<Integer> httpMaxRequests;
     private static final ConfigValue<Integer> httpMaxWebsockets;
 
-    private static final ConfigValue<Integer> httpDownloadBandwidth;
-    private static final ConfigValue<Integer> httpUploadBandwidth;
-
     private static final ConfigValue<Boolean> commandBlockEnabled;
     private static final ConfigValue<Integer> modemRange;
     private static final ConfigValue<Integer> modemHighAltitudeRange;
@@ -123,6 +120,10 @@ public final class Config
                     "autocompletion" )
                 .define( "default_computer_settings", ComputerCraft.defaultComputerSettings );
 
+            debugEnabled = builder
+                .comment( "Enable Lua's debug library. This is sandboxed to each computer, so is generally safe to be used by players." )
+                .define( "debug_enabled", ComputerCraft.debugEnable );
+
             logComputerErrors = builder
                 .comment( "Log exceptions thrown by peripherals and other Lua objects.\n" +
                     "This makes it easier for mod authors to debug problems, but may result in log spam should people use buggy methods." )
@@ -191,20 +192,6 @@ public final class Config
                 .comment( "The number of websockets a computer can have open at one time. Set to 0 for unlimited." )
                 .defineInRange( "max_websockets", ComputerCraft.httpMaxWebsockets, 1, Integer.MAX_VALUE );
 
-            builder
-                .comment( "Limits bandwidth used by computers" )
-                .push( "bandwidth" );
-
-            httpDownloadBandwidth = builder
-                .comment( "The number of bytes which can be downloaded in a second. This is shared across all computers. (bytes/s)" )
-                .defineInRange( "global_download", ComputerCraft.httpDownloadBandwidth, 1, Integer.MAX_VALUE );
-
-            httpUploadBandwidth = builder
-                .comment( "The number of bytes which can be uploaded in a second. This is shared across all computers. (bytes/s)" )
-                .defineInRange( "global_upload", ComputerCraft.httpUploadBandwidth, 1, Integer.MAX_VALUE );
-
-            builder.pop();
-
             builder.pop();
         }
 
@@ -330,6 +317,7 @@ public final class Config
         ComputerCraft.maximumFilesOpen = maximumFilesOpen.get();
         ComputerCraft.disableLua51Features = disableLua51Features.get();
         ComputerCraft.defaultComputerSettings = defaultComputerSettings.get();
+        ComputerCraft.debugEnable = debugEnabled.get();
         ComputerCraft.computerThreads = computerThreads.get();
         ComputerCraft.logComputerErrors = logComputerErrors.get();
         ComputerCraft.commandRequireCreative = commandRequireCreative.get();
@@ -347,8 +335,6 @@ public final class Config
 
         ComputerCraft.httpMaxRequests = httpMaxRequests.get();
         ComputerCraft.httpMaxWebsockets = httpMaxWebsockets.get();
-        ComputerCraft.httpDownloadBandwidth = httpDownloadBandwidth.get();
-        NetworkUtils.reloadConfig();
 
         // Peripheral
         ComputerCraft.enableCommandBlock = commandBlockEnabled.get();

src/main/java/dan200/computercraft/shared/Registry.java

@@ -7,13 +7,8 @@ package dan200.computercraft.shared;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.media.IMedia;
-import dan200.computercraft.api.network.wired.IWiredElement;
-import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.shared.command.arguments.ArgumentSerializers;
 import dan200.computercraft.shared.common.ColourableRecipe;
 import dan200.computercraft.shared.common.ContainerHeldItem;
-import dan200.computercraft.shared.common.DefaultBundledRedstoneProvider;
 import dan200.computercraft.shared.computer.blocks.BlockComputer;
 import dan200.computercraft.shared.computer.blocks.TileCommandComputer;
 import dan200.computercraft.shared.computer.blocks.TileComputer;
@@ -22,17 +17,11 @@ import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.computer.items.ItemComputer;
 import dan200.computercraft.shared.computer.recipe.ComputerUpgradeRecipe;
-import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
-import dan200.computercraft.shared.data.ConstantLootConditionSerializer;
-import dan200.computercraft.shared.data.HasComputerIdLootCondition;
-import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
 import dan200.computercraft.shared.media.items.ItemDisk;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
-import dan200.computercraft.shared.media.items.RecordMedia;
 import dan200.computercraft.shared.media.recipes.DiskRecipe;
 import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
-import dan200.computercraft.shared.network.NetworkHandler;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import dan200.computercraft.shared.network.container.ContainerData;
 import dan200.computercraft.shared.network.container.HeldItemContainerData;
@@ -40,9 +29,6 @@ import dan200.computercraft.shared.network.container.ViewComputerContainerData;
 import dan200.computercraft.shared.peripheral.diskdrive.BlockDiskDrive;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
 import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive;
-import dan200.computercraft.shared.peripheral.generic.methods.EnergyMethods;
-import dan200.computercraft.shared.peripheral.generic.methods.FluidMethods;
-import dan200.computercraft.shared.peripheral.generic.methods.InventoryMethods;
 import dan200.computercraft.shared.peripheral.modem.wired.*;
 import dan200.computercraft.shared.peripheral.modem.wireless.BlockWirelessModem;
 import dan200.computercraft.shared.peripheral.modem.wireless.TileWirelessModem;
@@ -66,30 +52,30 @@ import dan200.computercraft.shared.turtle.items.ItemTurtle;
 import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
 import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
 import dan200.computercraft.shared.turtle.upgrades.*;
-import dan200.computercraft.shared.util.*;
+import dan200.computercraft.shared.util.CreativeTabMain;
+import dan200.computercraft.shared.util.FixedPointTileEntityType;
+import dan200.computercraft.shared.util.ImpostorRecipe;
+import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
+import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.EntityType;
 import net.minecraft.inventory.container.ContainerType;
-import net.minecraft.item.*;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.Items;
 import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.storage.loot.conditions.LootConditionManager;
-import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import net.minecraftforge.fml.DeferredWorkQueue;
 import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
 
@@ -107,21 +93,21 @@ public final class Registry
 
     public static final class ModBlocks
     {
-        static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>( ForgeRegistries.BLOCKS, ComputerCraft.MOD_ID );
+        static final DeferredRegister<Block> BLOCKS = DeferredRegister.create( ForgeRegistries.BLOCKS, ComputerCraft.MOD_ID );
 
-        private static Block.Properties properties()
+        private static AbstractBlock.Properties properties()
         {
-            return Block.Properties.of( Material.STONE ).strength( 2 );
+            return AbstractBlock.Properties.of( Material.STONE ).strength( 2 );
         }
 
-        private static Block.Properties turtleProperties()
+        private static AbstractBlock.Properties turtleProperties()
         {
-            return Block.Properties.of( Material.STONE ).strength( 2.5f );
+            return AbstractBlock.Properties.of( Material.STONE ).strength( 2.5f );
         }
 
-        private static Block.Properties modemProperties()
+        private static AbstractBlock.Properties modemProperties()
         {
-            return Block.Properties.of( Material.STONE ).strength( 1.5f );
+            return AbstractBlock.Properties.of( Material.STONE ).strength( 1.5f );
         }
 
         public static final RegistryObject<BlockComputer> COMPUTER_NORMAL = BLOCKS.register( "computer_normal",
@@ -130,7 +116,7 @@ public final class Registry
             () -> new BlockComputer( properties(), ComputerFamily.ADVANCED, ModTiles.COMPUTER_ADVANCED ) );
 
         public static final RegistryObject<BlockComputer> COMPUTER_COMMAND = BLOCKS.register( "computer_command", () -> new BlockComputer(
-            Block.Properties.of( Material.STONE ).strength( -1, 6000000.0F ),
+            AbstractBlock.Properties.of( Material.STONE ).strength( -1, 6000000.0F ),
             ComputerFamily.COMMAND, ModTiles.COMPUTER_COMMAND
         ) );
 
@@ -160,7 +146,7 @@ public final class Registry
 
     public static class ModTiles
     {
-        static final DeferredRegister<TileEntityType<?>> TILES = new DeferredRegister<>( ForgeRegistries.TILE_ENTITIES, ComputerCraft.MOD_ID );
+        static final DeferredRegister<TileEntityType<?>> TILES = DeferredRegister.create( ForgeRegistries.TILE_ENTITIES, ComputerCraft.MOD_ID );
 
         private static <T extends TileEntity> RegistryObject<TileEntityType<T>> ofBlock( RegistryObject<? extends Block> block, Function<TileEntityType<T>, T> factory )
         {
@@ -198,7 +184,7 @@ public final class Registry
 
     public static final class ModItems
     {
-        static final DeferredRegister<Item> ITEMS = new DeferredRegister<>( ForgeRegistries.ITEMS, ComputerCraft.MOD_ID );
+        static final DeferredRegister<Item> ITEMS = DeferredRegister.create( ForgeRegistries.ITEMS, ComputerCraft.MOD_ID );
 
         private static Item.Properties properties()
         {
@@ -260,7 +246,7 @@ public final class Registry
     {
         // Upgrades
         ComputerCraft.TurtleUpgrades.wirelessModemNormal = new TurtleModem( false, new ResourceLocation( ComputerCraft.MOD_ID, "wireless_modem_normal" ) );
-        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.wirelessModemNormal );
+        TurtleUpgrades.register( ComputerCraft.TurtleUpgrades.wirelessModemNormal );
 
         ComputerCraft.TurtleUpgrades.wirelessModemAdvanced = new TurtleModem( true, new ResourceLocation( ComputerCraft.MOD_ID, "wireless_modem_advanced" ) );
         ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.wirelessModemAdvanced );
@@ -296,7 +282,7 @@ public final class Registry
 
     public static class ModEntities
     {
-        static final DeferredRegister<EntityType<?>> ENTITIES = new DeferredRegister<>( ForgeRegistries.ENTITIES, ComputerCraft.MOD_ID );
+        static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create( ForgeRegistries.ENTITIES, ComputerCraft.MOD_ID );
 
         public static final RegistryObject<EntityType<TurtlePlayer>> TURTLE_PLAYER = ENTITIES.register( "turtle_player", () ->
             EntityType.Builder.<TurtlePlayer>createNothing( EntityClassification.MISC )
@@ -308,7 +294,7 @@ public final class Registry
 
     public static class ModContainers
     {
-        static final DeferredRegister<ContainerType<?>> CONTAINERS = new DeferredRegister<>( ForgeRegistries.CONTAINERS, ComputerCraft.MOD_ID );
+        static final DeferredRegister<ContainerType<?>> CONTAINERS = DeferredRegister.create( ForgeRegistries.CONTAINERS, ComputerCraft.MOD_ID );
 
         public static final RegistryObject<ContainerType<ContainerComputer>> COMPUTER = CONTAINERS.register( "computer",
             () -> ContainerData.toType( ComputerContainerData::new, ContainerComputer::new ) );
@@ -348,68 +334,6 @@ public final class Registry
         );
     }
 
-    @SubscribeEvent
-    @SuppressWarnings( "deprecation" )
-    public static void init( FMLCommonSetupEvent event )
-    {
-        NetworkHandler.setup();
-
-        DeferredWorkQueue.runLater( () -> {
-            registerProviders();
-            ArgumentSerializers.register();
-            registerLoot();
-        } );
-
-        ComputerCraftAPI.registerGenericSource( new InventoryMethods() );
-        ComputerCraftAPI.registerGenericSource( new FluidMethods() );
-        ComputerCraftAPI.registerGenericSource( new EnergyMethods() );
-    }
-
-    private static void registerProviders()
-    {
-        // Register bundled power providers
-        ComputerCraftAPI.registerBundledRedstoneProvider( new DefaultBundledRedstoneProvider() );
-
-        // Register media providers
-        ComputerCraftAPI.registerMediaProvider( stack -> {
-            Item item = stack.getItem();
-            if( item instanceof IMedia ) return (IMedia) item;
-            if( item instanceof MusicDiscItem ) return RecordMedia.INSTANCE;
-            return null;
-        } );
-
-        // Register capabilities
-        CapabilityManager.INSTANCE.register( IWiredElement.class, new NullStorage<>(), () -> null );
-        CapabilityManager.INSTANCE.register( IPeripheral.class, new NullStorage<>(), () -> null );
-
-        // Register generic capabilities. This can technically be done off-thread, but we need it to happen
-        // after Forge's common setup, so this is easiest.
-        ComputerCraftAPI.registerGenericCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY );
-        ComputerCraftAPI.registerGenericCapability( CapabilityEnergy.ENERGY );
-        ComputerCraftAPI.registerGenericCapability( CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY );
-    }
-
-    public static void registerLoot()
-    {
-        LootConditionManager.register( ConstantLootConditionSerializer.of(
-            new ResourceLocation( ComputerCraft.MOD_ID, "block_named" ),
-            BlockNamedEntityLootCondition.class,
-            BlockNamedEntityLootCondition.INSTANCE
-        ) );
-
-        LootConditionManager.register( ConstantLootConditionSerializer.of(
-            new ResourceLocation( ComputerCraft.MOD_ID, "player_creative" ),
-            PlayerCreativeLootCondition.class,
-            PlayerCreativeLootCondition.INSTANCE
-        ) );
-
-        LootConditionManager.register( ConstantLootConditionSerializer.of(
-            new ResourceLocation( ComputerCraft.MOD_ID, "has_id" ),
-            HasComputerIdLootCondition.class,
-            HasComputerIdLootCondition.INSTANCE
-        ) );
-    }
-
     public static void setup()
     {
         IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();

src/main/java/dan200/computercraft/shared/TurtlePermissions.java

@@ -11,6 +11,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
@@ -20,13 +21,12 @@ public final class TurtlePermissions
     public static boolean isBlockEnterable( World world, BlockPos pos, PlayerEntity player )
     {
         MinecraftServer server = world.getServer();
-        return server == null || world.isClientSide || !server.isUnderSpawnProtection( world, pos, player );
+        return server == null || world.isClientSide || (world instanceof ServerWorld && !server.isUnderSpawnProtection( (ServerWorld) world, pos, player ));
     }
 
     public static boolean isBlockEditable( World world, BlockPos pos, PlayerEntity player )
     {
-        MinecraftServer server = world.getServer();
-        return server == null || world.isClientSide || !server.isUnderSpawnProtection( world, pos, player );
+        return isBlockEnterable( world, pos, player );
     }
 
     @SubscribeEvent

src/main/java/dan200/computercraft/shared/TurtleUpgrades.java

@@ -33,9 +33,9 @@ public final class TurtleUpgrades
         Wrapper( ITurtleUpgrade upgrade )
         {
             this.upgrade = upgrade;
-            id = upgrade.getUpgradeID().toString();
-            modId = ModLoadingContext.get().getActiveNamespace();
-            enabled = true;
+            this.id = upgrade.getUpgradeID().toString();
+            this.modId = ModLoadingContext.get().getActiveNamespace();
+            this.enabled = true;
         }
     }
 

src/main/java/dan200/computercraft/shared/command/ClientCommands.java

@@ -1,63 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.shared.command;
-
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.util.IDAssigner;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.Util;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.ClientChatEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
-
-import java.io.File;
-
-/**
- * Basic client-side commands.
- *
- * Simply hooks into client chat messages and intercepts matching strings.
- */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
-public final class ClientCommands
-{
-    public static final String OPEN_COMPUTER = "/computercraft open-computer ";
-
-    private ClientCommands()
-    {
-    }
-
-    @SubscribeEvent
-    public static void onClientSendMessage( ClientChatEvent event )
-    {
-        // Emulate the command on the client side
-        if( event.getMessage().startsWith( OPEN_COMPUTER ) )
-        {
-            MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
-            if( server == null || server.isDedicatedServer() ) return;
-
-            event.setCanceled( true );
-
-            String idStr = event.getMessage().substring( OPEN_COMPUTER.length() ).trim();
-            int id;
-            try
-            {
-                id = Integer.parseInt( idStr );
-            }
-            catch( NumberFormatException ignore )
-            {
-                return;
-            }
-
-            File file = new File( IDAssigner.getDir(), "computer/" + id );
-            if( !file.isDirectory() ) return;
-
-            Util.getPlatform().openFile( file );
-        }
-    }
-
-}

src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java

@@ -21,7 +21,6 @@ import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.network.container.ViewComputerContainerData;
-import dan200.computercraft.shared.util.IDAssigner;
 import net.minecraft.command.CommandSource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -31,6 +30,7 @@ import net.minecraft.inventory.container.Container;
 import net.minecraft.inventory.container.INamedContainerProvider;
 import net.minecraft.network.play.server.SPlayerPositionLookPacket;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.IFormattableTextComponent;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
@@ -38,7 +38,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
 import javax.annotation.Nonnull;
-import java.io.File;
 import java.util.*;
 
 import static dan200.computercraft.shared.command.CommandUtils.isPlayer;
@@ -285,7 +284,7 @@ public final class CommandComputerCraft
 
     private static ITextComponent linkComputer( CommandSource source, ServerComputer serverComputer, int computerId )
     {
-        ITextComponent out = new StringTextComponent( "" );
+        IFormattableTextComponent out = new StringTextComponent( "" );
 
         // Append the computer instance
         if( serverComputer == null )
@@ -322,12 +321,6 @@ public final class CommandComputerCraft
                 ) );
         }
 
-        if( UserLevel.OWNER.test( source ) && isPlayer( source ) )
-        {
-            ITextComponent linkPath = linkStorage( computerId );
-            if( linkPath != null ) out.append( " " ).append( linkPath );
-        }
-
         return out;
     }
 
@@ -347,18 +340,6 @@ public final class CommandComputerCraft
         }
     }
 
-    private static ITextComponent linkStorage( int id )
-    {
-        File file = new File( IDAssigner.getDir(), "computer/" + id );
-        if( !file.isDirectory() ) return null;
-
-        return link(
-            text( "\u270E" ),
-            ClientCommands.OPEN_COMPUTER + id,
-            translate( "commands.computercraft.dump.open_path" )
-        );
-    }
-
     @Nonnull
     private static TrackingContext getTimingContext( CommandSource source )
     {