Bump version

Oh no. I don't want to have to beta test this :D:.

.editorconfig

@@ -14,5 +14,9 @@ trim_trailing_whitespace = false
 [*.sexp]
 indent_size = 2
 
+[*.yml]
+indent_size = 2
+
+
 [*.properties]
 insert_final_newline = false

.github/workflows/main-ci.yml

@@ -15,6 +15,14 @@ jobs:
       with:
         java-version: 1.8
 
+    - name: Cache gradle dependencies
+      uses: actions/cache@v1
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-
+
     - name: Build with Gradle
       run: ./gradlew build --no-daemon
 
@@ -34,6 +42,9 @@ jobs:
     - name: Lint Lua code
       run: |
         test -d bin || mkdir bin
-        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/bin/illuaminate
+        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
         chmod +x bin/illuaminate
         bin/illuaminate lint
+
+    - name: Check whitespace
+      run: python3 tools/check-lines.py

.github/workflows/make-doc.sh

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

.github/workflows/make-doc.yml

@@ -0,0 +1,29 @@
+name: Build documentation
+
+on:
+  push:
+    branches: [ master ]
+    tags:
+
+jobs:
+  make_doc:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Build documentation
+      run: |
+        test -d bin || mkdir bin
+        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
+        chmod +x bin/illuaminate
+        bin/illuaminate doc-gen
+
+    - name: Upload documentation
+      run: .github/workflows/make-doc.sh 2> /dev/null
+      env:
+        SSH_KEY:  ${{ secrets.SSH_KEY  }}
+        SSH_USER: ${{ secrets.SSH_USER }}
+        SSH_HOST: ${{ secrets.SSH_HOST }}
+        SSH_PORT: ${{ secrets.SSH_PORT }}

.gitignore

@@ -3,6 +3,8 @@
 /logs
 /build
 /out
+/doc/**/*.html
+/doc/index.json
 
 # Runtime directories
 /run

CONTRIBUTING.md

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

README.md

@@ -1,4 +1,4 @@
-# ![CC: Tweaked](logo.png)
+# ![CC: Tweaked](doc/logo.png)
 [![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
 
 CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
@@ -37,20 +37,14 @@ several features have been included, such as full block modems, the Cobalt runti
 computers.
 
 ## Contributing
-Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping
-develop CC:T, you'll need to follow these steps:
-
- - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
- - **Setup Forge:** `./gradlew build`
- - **Test your changes:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
-
-If you want to run CC:T in a normal Minecraft instance, run `./gradlew build` and copy the `.jar` from `build/libs`.
+Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
+developing the mod, [check out the instructions here](CONTRIBUTING.md#developing).
 
 ## Community
 If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord guild](https://discord.gg/H2UyJXe)!
-There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=#computercraft), if
-that's more your cup of tea.
+ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord guild](https://discord.computercraft.cc)!
+There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=computercraft), if that's
+more your cup of tea.
 
 I'd generally recommend you don't contact me directly (email, DM, etc...) unless absolutely necessary (i.e. in order to
 report exploits). You'll get a far quicker response if you ask the whole community!

build.gradle

@@ -1,7 +1,8 @@
+
+// For those who want the bleeding edge
 buildscript {
     repositories {
         jcenter()
-        mavenCentral()
         maven {
             name = "forge"
             url = "https://files.minecraftforge.net/maven"
@@ -9,8 +10,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.154'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1'
         classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
 }
@@ -22,7 +23,7 @@ plugins {
     id "com.github.breadmoirai.github-release" version "2.2.4"
 }
 
-apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
@@ -33,42 +34,15 @@ group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
 minecraft {
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
+    version = "${mc_version}-${forge_version}"
+    runDir = "run"
+    replace '${version}', mod_version
 
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                computercraft {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-
-    mappings channel: 'snapshot', version: "${mappings_version}".toString()
-
-    accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
+    mappings = mappings_version
+    makeObfSourceJar = false
 }
 
 repositories {
-    maven {
-        name "JEI"
-        url "https://dvs1.progwml6.com/files/maven"
-    }
     maven {
         name "SquidDev"
         url "https://squiddev.cc/maven"
@@ -96,14 +70,14 @@ configurations {
 dependencies {
     checkstyle "com.puppycrawl.tools:checkstyle:8.25"
 
-    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+    deobfProvided "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
+    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
+    deobfProvided "mezz.jei:jei_1.12.2:4.15.0.269:api"
+    deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
 
-    compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.25:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.14.4:5.0.1.150")
+    runtime "mezz.jei:jei_1.12.2:4.15.0.269"
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.25")
-
-    shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'
+    shade 'org.squiddev:Cobalt:0.5.1-SNAPSHOT'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
@@ -121,13 +95,7 @@ jar {
     dependsOn javadoc
 
     manifest {
-        attributes(["Specification-Title": "computercraft",
-                    "Specification-Vendor": "SquidDev",
-                    "Specification-Version": "1",
-                    "Implementation-Title": "CC: Tweaked",
-                    "Implementation-Version": "${mod_version}",
-                    "Implementation-Vendor" :"SquidDev",
-                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
+        attributes('FMLAT': 'computercraft_at.cfg')
     }
 
     from (sourceSets.main.allSource) {
@@ -139,7 +107,7 @@ jar {
 
 [compileJava, compileTestJava].forEach {
     it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
     }
 }
 
@@ -176,14 +144,10 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
     dontobfuscate; dontoptimize; keepattributes; keepparameternames
 
     // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'data/computercraft/lua**'
+    keepdirectories 'assets/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) {
@@ -199,7 +163,7 @@ task proguardMove(dependsOn: proguard) {
     }
 }
 
-
+reobfJar.dependsOn proguardMove
 
 processResources {
     inputs.property "version", mod_version
@@ -221,8 +185,8 @@ processResources {
     inputs.property "commithash", hash
 
     from(sourceSets.main.resources.srcDirs) {
-        include 'META-INF/mods.toml'
-        include 'data/computercraft/lua/rom/help/credits.txt'
+        include 'mcmod.info'
+        include 'assets/computercraft/lua/rom/help/credits.txt'
 
         expand 'version': mod_version,
                'mcversion': mc_version,
@@ -230,12 +194,12 @@ processResources {
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'META-INF/mods.toml'
-        exclude 'data/computercraft/lua/rom/help/credits.txt'
+        exclude 'mcmod.info'
+        exclude 'assets/computercraft/lua/rom/help/credits.txt'
     }
 }
 
-task compressJson(dependsOn: jar) {
+task compressJson(dependsOn: extractAnnotationsJar) {
     group "compact"
     description "Minifies all JSON files, stripping whitespace"
 
@@ -333,14 +297,14 @@ 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.txt")
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt")
+    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
 
     doLast {
         def ok = true
 
         // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
+        def whatsnew = new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt").readLines()
         if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
             ok = false
             project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
@@ -357,7 +321,7 @@ task checkRelease {
 
         // Check whatsnew and changelog match.
         def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
+        def changelog = new File("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt").getText()
         if (!changelog.startsWith(versionChangelog)) {
             ok = false
             project.logger.error("whatsnew and changelog are not in sync")
@@ -385,7 +349,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            // artifact sourceJar
+            artifact sourceJar
         }
     }
 }
@@ -445,7 +409,7 @@ githubRelease {
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
     body {
-        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+        "## " + new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
             .readLines()
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()
@@ -460,3 +424,6 @@ task uploadAll(dependsOn: uploadTasks) {
     group "upload"
     description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
+
+runClient.outputs.upToDateWhen { false }
+runServer.outputs.upToDateWhen { false }

config/checkstyle/checkstyle.xml

@@ -156,7 +156,7 @@
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true" />
             <property name="ignoreEnhancedForColon" value="false" />
-            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
+            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,DO_WHILE,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
         </module>
     </module>
 

doc/index.md

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

doc/stub/commands.lua

@@ -0,0 +1,6 @@
+function exec(command) end
+function execAsync(commad) end
+function list() end
+function getBlockPosition() end
+function getBlockInfos(min_x, min_y, min_z, max_x, max_y, max_z) end
+function getBlockInfo(x, y, z) end

doc/stub/fs.lua

@@ -0,0 +1,42 @@
+---  The FS API allows you to manipulate files and the filesystem.
+--
+-- @module fs
+
+function list(path) end
+function combine(base, child) end
+function getName(path) end
+function getSize(path) end
+function exists(path) end
+function isDir(path) end
+function isReadOnly(path) end
+function makeDir(path) end
+function move(from, to) end
+function copy(from, to) end
+function delete(path) end
+function open(path, mode) end
+function getDrive(path) end
+function getFreeSpace(path) end
+function find(pattern) end
+function getDir(path) end
+
+--- A file handle which can be read from.
+--
+-- @type ReadHandle
+-- @see fs.open
+local ReadHandle = {}
+function ReadHandle.read(count) end
+function ReadHandle.readAll() end
+function ReadHandle.readLine(with_trailing) end
+function ReadHandle.seek(whence, offset) end
+function ReadHandle.close() end
+
+--- A file handle which can be written to.
+--
+-- @type WriteHandle
+-- @see fs.open
+local WriteHandle = {}
+function WriteHandle.write(text) end
+function WriteHandle.writeLine(text) end
+function WriteHandle.flush(text) end
+function WriteHandle.seek(whence, offset) end
+function WriteHandle.close() end

doc/stub/http.lua

@@ -0,0 +1,229 @@
+--- The http library allows communicating with web servers, sending and
+-- receiving data from them.
+--
+-- #### `http_check` event
+--
+-- @module http
+
+--- Asynchronously make a HTTP request to the given url.
+--
+-- This returns immediately, a [`http_success`](#http-success-event) or
+-- [`http_failure`](#http-failure-event) will be queued once the request has
+-- completed.
+--
+-- @tparam      string url   The url to request
+-- @tparam[opt] string body  An optional string containing the body of the
+-- request. If specified, a `POST` request will be made instead.
+-- @tparam[opt] { [string] = string } headers Additional headers to send as part
+-- of this request.
+-- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
+-- the body will not be UTF-8 encoded, and the received response will not be
+-- decoded.
+--
+-- @tparam[2] {
+--   url = string, body? = string, headers? = { [string] = string },
+--   binary? = boolean, method? = string, redirect? = boolean,
+-- } request Options for the request.
+--
+-- This table form is an expanded version of the previous syntax. All arguments
+-- from above are passed in as fields instead (for instance,
+-- `http.request("https://example.com")` becomes `http.request { url =
+-- "https://example.com" }`).
+--
+-- This table also accepts several additional options:
+--
+--  - `method`: Which HTTP method to use, for instance `"PATCH"` or `"DELETE"`.
+--  - `redirect`: Whether to follow HTTP redirects. Defaults to true.
+--
+-- @see http.get  For a synchronous way to make GET requests.
+-- @see http.post For a synchronous way to make POST requests.
+function request(...) end
+
+--- Make a HTTP GET request to the given url.
+--
+-- @tparam string url   The url to request
+-- @tparam[opt] { [string] = string } headers Additional headers to send as part
+-- of this request.
+-- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
+-- the body will not be UTF-8 encoded, and the received response will not be
+-- decoded.
+--
+-- @tparam[2] {
+--   url = string, headers? = { [string] = string },
+--   binary? = boolean, method? = string, redirect? = boolean,
+-- } request Options for the request. See @{http.request} for details on how
+-- these options behave.
+--
+-- @treturn Response The resulting http response, which can be read from.
+-- @treturn[2] nil When the http request failed, such as in the event of a 404
+-- error or connection timeout.
+-- @treturn string A message detailing why the request failed.
+-- @treturn Response|nil The failing http response, if available.
+--
+-- @usage Make a request to [example.computercraft.cc](https://example.computercraft.cc),
+-- and print the returned page.
+-- ```lua
+-- local request = http.get("https://example.computercraft.cc")
+-- print(request.readAll())
+-- -- => HTTP is working!
+-- request.close()
+-- ```
+function get(...) end
+
+--- Make a HTTP POST request to the given url.
+--
+-- @tparam string url   The url to request
+-- @tparam string body  The body of the POST request.
+-- @tparam[opt] { [string] = string } headers Additional headers to send as part
+-- of this request.
+-- @tparam[opt] boolean binary Whether to make a binary HTTP request. If true,
+-- the body will not be UTF-8 encoded, and the received response will not be
+-- decoded.
+--
+-- @tparam[2] {
+--   url = string, body? = string, headers? = { [string] = string },
+--   binary? = boolean, method? = string, redirect? = boolean,
+-- } request Options for the request. See @{http.request} for details on how
+-- these options behave.
+--
+-- @treturn Response The resulting http response, which can be read from.
+-- @treturn[2] nil When the http request failed, such as in the event of a 404
+-- error or connection timeout.
+-- @treturn string A message detailing why the request failed.
+-- @treturn Response|nil The failing http response, if available.
+function post(...) end
+
+--- A http response. This acts very much like a @{fs.ReadHandle|file}, though
+-- provides some http specific methods.
+--
+-- #### `http_success` event
+-- #### `http_failure` event
+--
+-- @type Response
+-- @see http.request On how to make a http request.
+local Response = {}
+
+--- Returns the response code and response message returned by the server
+--
+-- @treturn number The response code (i.e. 200)
+-- @treturn string The response message (i.e. "OK")
+function Response.getResponseCode() end
+
+--- Get a table containing the response's headers, in a format similar to that
+-- required by @{http.request}. If multiple headers are sent with the same
+-- name, they will be combined with a comma.
+--
+-- @treturn { [string]=string } The response's headers.
+-- Make a request to [example.computercraft.cc](https://example.computercraft.cc),
+-- and print the returned headers.
+-- ```lua
+-- local request = http.get("https://example.computercraft.cc")
+-- print(textutils.serialize(request.getResponseHeaders()))
+-- -- => {
+-- --   [ "Content-Type" ] = "text/plain; charset=utf8",
+-- --   [ "content-length" ] = 17,
+-- --   ...
+-- -- }
+-- request.close()
+-- ```
+function Response.getResponseHeaders() end
+
+function Response.read(count) end
+function Response.readAll() end
+function Response.readLine(with_trailing) end
+function Response.seek(whence, offset) end
+function Response.close() end
+
+--- Asynchronously determine whether a URL can be requested.
+--
+-- If this returns `true`, one should also listen for [`http_check`
+-- events](#http-check-event) which will container further information about
+-- whether the URL is allowed or not.
+--
+-- @tparam string url The URL to check.
+-- @treturn true When this url is not invalid. This does not imply that it is
+-- allowed - see the comment above.
+-- @treturn[2] false When this url is invalid.
+-- @treturn string A reason why this URL is not valid (for instance, if it is
+-- malformed, or blocked).
+--
+-- @see http.checkURL For a synchronous version.
+function checkURLAsync(url) end
+
+--- Determine whether a URL can be requested.
+--
+-- If this returns `true`, one should also listen for [`http_check`
+-- events](#http-check-event) which will container further information about
+-- whether the URL is allowed or not.
+--
+-- @tparam string url The URL to check.
+-- @treturn true When this url is valid and can be requested via @{http.request}.
+-- @treturn[2] false When this url is invalid.
+-- @treturn string A reason why this URL is not valid (for instance, if it is
+-- malformed, or blocked).
+--
+-- @see http.checkURLAsync For an asynchronous version.
+--
+-- @usage
+-- ```lua
+-- print(http.checkURL("https://example.computercraft.cc/"))
+-- -- => true
+-- print(http.checkURL("http://localhost/"))
+-- -- => false Domain not permitted
+-- print(http.checkURL("not a url"))
+-- -- => false URL malformed
+-- ```
+function checkURL(url) end
+
+--- Open a websocket.
+--
+-- @tparam string url The websocket url to connect to. This should have the
+-- `ws://` or `wss://` protocol.
+-- @tparam[opt] { [string] = string } headers Additional headers to send as part
+-- of the initial websocket connection.
+--
+-- @treturn Websocket The websocket connection.
+-- @treturn[2] false If the websocket connection failed.
+-- @treturn string An error message describing why the connection failed.
+function websocket(url, headers) end
+
+--- Asynchronously open a websocket.
+--
+-- This returns immediately, a [`websocket_success`](#websocket-success-event)
+-- or [`websocket_failure`](#websocket-failure-event) will be queued once the
+-- request has completed.
+--
+-- @tparam string url The websocket url to connect to. This should have the
+-- `ws://` or `wss://` protocol.
+-- @tparam[opt] { [string] = string } headers Additional headers to send as part
+-- of the initial websocket connection.
+function websocketAsync(url, headers) end
+
+--- A websocket, which can be used to send an receive messages with a web
+-- server.
+--
+-- @type Websocket
+-- @see http.websocket On how to open a websocket.
+local Websocket = {}
+
+--- Send a websocket message to the connected server.
+--
+-- @tparam string message The message to send.
+-- @tparam[opt] boolean binary Whether this message should be treated as a
+-- binary string, rather than encoded text.
+-- @throws If the websocket has been closed.
+function Websocket.send(message, binary) end
+
+--- Wait for a message from the server.
+--
+-- @tparam[opt] number timeout The number of seconds to wait if no message is
+-- received.
+-- @treturn[1] string The received message.
+-- @treturn boolean If this was a binary message.
+-- @treturn[2] nil If the websocket was closed while waiting, or if we timed out.
+-- @throws If the websocket has been closed.
+function Websocket.receive(timeout) end
+
+--- Close this websocket. This will terminate the connection, meaning messages
+-- can no longer be sent or received along it.
+function Websocket.close() end

doc/stub/os.lua

@@ -0,0 +1,17 @@
+function queueEvent(event, ...) end
+function startTimer(delay) end
+function setAlarm(time) end
+function shutdown() end
+function reboot() end
+function getComputerID() end
+computerID = getComputerID
+function setComputerLabel(label) end
+function getComputerLabel() end
+computerLabel = getComputerLabel
+function clock() end
+function time(timezone) end
+function day(timezone) end
+function cancelTimer(id) end
+function cancelAlarm(id) end
+function epoch(timezone) end
+function date(format, time) end

doc/stub/redstone.lua

@@ -0,0 +1,14 @@
+function getSides() end
+function setOutput(side, on) end
+function getOutput(side) end
+function getInput(side) end
+function setBundledOutput(side, output) end
+function getBundledOutput(side) end
+function getBundledInput(side) end
+function testBundledInput(side, mask) end
+function setAnalogOutput(side, value) end
+setAnalogueOutput = setAnalogOutput
+function getAnalogOutput(sid) end
+getAnalogueOutput = getAnalogOutput
+function getAnalogInput(side) end
+getAnalogueInput = getAnaloguInput

doc/stub/term.lua

@@ -0,0 +1,52 @@
+function write(text) end
+function scroll(lines) end
+function setCursorPos(x, y) end
+function setCursorBlink(blink) end
+function getCursorPos() end
+function getSize() end
+function clear() end
+function clearLine() end
+function setTextColour(colour) end
+setTextColor = setTextColour
+function setBackgroundColour(colour) end
+setBackgroundColor = setBackgroundColour
+function isColour() end
+isColor = isColour
+function getTextColour() end
+getTextColor = getTextColor
+function getBackgroundColour() end
+getBackgroundColour = getBackgroundColour
+function blit(text, text_colours, background_colours) end
+function setPaletteColour(colour, ...) end
+setPaletteColour = setPaletteColour
+function getPaletteColour(colour, ...) end
+getPaletteColour = getPaletteColour
+function nativePaletteColour(colour) end
+nativePaletteColour = nativePaletteColour
+
+--- @type Redirect
+local Redirect = {}
+
+Redirect.write = write
+Redirect.scroll = scroll
+Redirect.setCursorPos = setCursorPos
+Redirect.setCursorBlink = setCursorBlink
+Redirect.getCursorPos = getCursorPos
+Redirect.getSize = getSize
+Redirect.clear = clear
+Redirect.clearLine = clearLine
+Redirect.setTextColour = setTextColour
+Redirect.setTextColor = setTextColor
+Redirect.setBackgroundColour = setBackgroundColour
+Redirect.setBackgroundColor = setBackgroundColor
+Redirect.isColour = isColour
+Redirect.isColor = isColor
+Redirect.getTextColour = getTextColour
+Redirect.getTextColor = getTextColor
+Redirect.getBackgroundColour = getBackgroundColour
+Redirect.getBackgroundColor = getBackgroundColor
+Redirect.blit = blit
+Redirect.setPaletteColour = setPaletteColour
+Redirect.setPaletteColor = setPaletteColor
+Redirect.getPaletteColour = getPaletteColour
+Redirect.getPaletteColor = getPaletteColor

doc/stub/turtle.lua

@@ -0,0 +1,230 @@
+--- Move the turtle forward one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function forward() end
+
+--- Move the turtle backwards one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function back() end
+
+--- Move the turtle up one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function up() end
+
+--- Move the turtle down one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function down() end
+
+--- Rotate the turtle 90 degress to the left.
+function turnLeft() end
+
+--- Rotate the turtle 90 degress to the right.
+function turnRight() end
+
+--- Attempt to break the block in front of the turtle.
+--
+-- This requires a turtle tool capable of breaking the block. Diamond pickaxes
+-- (mining turtles) can break any vanilla block, but other tools (such as axes)
+-- are more limited.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function dig(side) end
+
+--- Attempt to break the block above the turtle. See @{dig} for full details.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function digUp(side) end
+
+--- Attempt to break the block below the turtle. See @{dig} for full details.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function digDown(side) end
+
+--- Attack the entity in front of the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attack(side) end
+
+--- Attack the entity above the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attackUp(side) end
+
+--- Attack the entity below the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attackDown(side) end
+
+--- Place a block or item into the world in front of the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function place() end
+
+--- Place a block or item into the world above the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function placeUp() end
+
+--- Place a block or item into the world below the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function placeDown() end
+
+--- Drop the currently selected stack into the inventory in front of the turtle,
+-- or as an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function drop(count) end
+
+--- Drop the currently selected stack into the inventory above the turtle, or as
+-- an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function dropUp(count) end
+
+--- Drop the currently selected stack into the inventory below the turtle, or as
+-- an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function dropDown(count) end
+
+--- Suck an item from the inventory in front of the turtle, or from an item
+-- floating in the world.
+--
+-- This will pull items into the first acceptable slot, starting at the
+-- @{select|currently selected} one.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suck(count) end
+
+--- Suck an item from the inventory above the turtle, or from an item floating
+-- in the world.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suckUp(count) end
+
+--- Suck an item from the inventory below the turtle, or from an item floating
+-- in the world.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suckDown(count) end
+
+--- Check if there is a solid block in front of the turtle. In this case, solid
+-- refers to any non-air or liquid block.
+--
+-- @treturn boolean If there is a solid block in front.
+function detect() end
+
+--- Check if there is a solid block above the turtle.
+--
+-- @treturn boolean If there is a solid block above.
+function detectUp() end
+
+--- Check if there is a solid block below the turtle.
+--
+-- @treturn boolean If there is a solid block below.
+function detectDown() end
+
+function compare() end
+function compareUp() end
+function compareDown() end
+
+function inspect() end
+function inspectUp() end
+function inspectDown() end
+
+
+--- Change the currently selected slot.
+--
+-- The selected slot is determines what slot actions like @{drop} or
+-- @{getItemCount} act on.
+--
+-- @tparam number slot The slot to select.
+-- @see getSelectedSlot
+function select(slot) end
+
+--- Get the currently selected slot.
+--
+-- @treturn number The current slot.
+-- @see select
+function getSelectedSlot() end
+
+--- Get the number of items in the given slot.
+--
+-- @tparam[opt] number slot The slot we wish to check. Defaults to the @{turtle.select|selected slot}.
+-- @treturn number The number of items in this slot.
+function getItemCount(slot) end
+
+--- Get the remaining number of items which may be stored in this stack.
+--
+-- For instance, if a slot contains 13 blocks of dirt, it has room for another 51.
+--
+-- @tparam[opt] number slot The slot we wish to check. Defaults to the @{turtle.select|selected slot}.
+-- @treturn number The space left in this slot.
+function getItemSpace(slot) end
+
+
+--- Get detailed information about the items in the given slot.
+--
+-- @tparam[opt] number slot The slot to get information about. Defaults to the @{turtle.select|selected slot}.
+-- @treturn nil|table Information about the given slot, or @{nil} if it is empty.
+-- @usage Print the current slot, assuming it contains 13 dirt.
+--
+--     print(textutils.serialize(turtle.getItemDetail()))
+--     -- => {
+--     --    name = "minecraft:dirt",
+--     --    damage = 0,
+--     --    count = 13,
+--     -- }
+function getItemDetail(slot) end
+
+function getFuelLevel() end
+
+function refuel(count) end
+function compareTo(slot) end
+function transferTo(slot, count) end
+
+function getFuelLimit() end
+function equipLeft() end
+function equipRight() end
+
+function craft(limit) end

doc/styles.css

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

gradle.properties

@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.86.1
+mod_version=1.87.0
 
-# Minecraft properties (update mods.toml when changing)
-mc_version=1.14.4
-forge_version=28.1.71
-mappings_version=20191123-1.14.3
+# Minecraft properties
+mc_version=1.12.2
+forge_version=14.23.4.2749
+mappings_version=snapshot_20180724

gradle/wrapper/gradle-wrapper.properties

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

illuaminate.sexp

@@ -1,28 +1,84 @@
 ; -*- mode: Lisp;-*-
 
 (sources
-  /src/main/resources/assets/computercraft/lua/bios.lua
-  /src/main/resources/assets/computercraft/lua/rom/
+  /doc/stub/
+  /src/main/resources/*/computercraft/lua/bios.lua
+  /src/main/resources/*/computercraft/lua/rom/
   /src/test/resources/test-rom)
 
+
+(doc
+  (title "CC: Tweaked")
+  (index doc/index.md)
+  (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
+
+  (library-path
+    /doc/stub/
+
+    /src/main/resources/*/computercraft/lua/rom/apis
+    /src/main/resources/*/computercraft/lua/rom/apis/command
+    /src/main/resources/*/computercraft/lua/rom/apis/turtle
+
+    /src/main/resources/*/computercraft/lua/rom/modules/main
+    /src/main/resources/*/computercraft/lua/rom/modules/command
+    /src/main/resources/*/computercraft/lua/rom/modules/turtle))
+
 (at /
   (linters
+    syntax:string-index
+
     ;; It'd be nice to avoid this, but right now there's a lot of instances of
     ;; it.
     -var:set-loop
 
     ;; It's useful to name arguments for documentation, so we allow this. It'd
     ;; be good to find a compromise in the future, but this works for now.
-    -var:unused-arg))
+    -var:unused-arg
+
+    ;; Some APIS (keys, colour and os mainly) are incomplete right now.
+    -var:unresolved-member)
+  (lint
+    (bracket-spaces
+      (call no-space)
+      (function-args no-space)
+      (parens no-space)
+      (table space)
+      (index no-space))))
 
 ;; We disable the unused global linter in bios.lua and the APIs. In the future
 ;; hopefully we'll get illuaminate to handle this.
 (at
-  (/src/main/resources/assets/computercraft/lua/bios.lua
-   /src/main/resources/assets/computercraft/lua/rom/apis/)
+  (/src/main/resources/*/computercraft/lua/bios.lua
+   /src/main/resources/*/computercraft/lua/rom/apis/)
   (linters -var:unused-global)
-  (lint
-    (allow-toplevel-global true)))
+  (lint (allow-toplevel-global true)))
 
-;; These warnings are broken right now
-(at (bios.lua worm.lua) (linters -control:unreachable))
+;; Silence some variable warnings in documentation stubs.
+(at /doc/stub
+  (linters -var:unused-global)
+  (lint (allow-toplevel-global true)))
+
+;; Suppress warnings for currently undocumented modules.
+(at
+  (/doc/stub/commands.lua
+   /doc/stub/fs.lua
+   /doc/stub/http.lua
+   /doc/stub/os.lua
+   /doc/stub/redstone.lua
+   /doc/stub/term.lua
+   /doc/stub/turtle.lua
+   /src/main/resources/*/computercraft/lua/rom/apis/command/commands.lua
+   /src/main/resources/*/computercraft/lua/rom/apis/io.lua
+   /src/main/resources/*/computercraft/lua/rom/apis/window.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/shell/completion.lua)
+
+  (linters -doc:undocumented -doc:undocumented-arg))
+
+;; These currently rely on unknown references.
+(at
+  (/src/main/resources/*/computercraft/lua/rom/apis/textutils.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/completion.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/shell/completion.lua
+   /src/main/resources/*/computercraft/lua/rom/programs/advanced/multishell.lua
+   /src/main/resources/*/computercraft/lua/rom/programs/shell.lua)
+  (linters -doc:unresolved-reference))

src/main/java/dan200/computercraft/CCTweaked.java

@@ -0,0 +1,29 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft;
+
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.network.NetworkCheckHandler;
+import net.minecraftforge.fml.relauncher.Side;
+
+import java.util.Map;
+
+/**
+ * A stub mod for CC: Tweaked. This doesn't have any functionality (everything of note is done in
+ * {@link ComputerCraft}), but people may depend on this if they require CC: Tweaked functionality.
+ */
+@Mod(
+    modid = "cctweaked", name = ComputerCraft.NAME, version = ComputerCraft.VERSION,
+    acceptableRemoteVersions = "*"
+)
+public class CCTweaked
+{
+    @NetworkCheckHandler
+    public boolean onNetworkConnect( Map<String, String> mods, Side side )
+    {
+        return true;
+    }
+}

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

@@ -5,49 +5,96 @@
  */
 package dan200.computercraft;
 
+import dan200.computercraft.api.filesystem.IMount;
+import dan200.computercraft.api.filesystem.IWritableMount;
+import dan200.computercraft.api.lua.ILuaAPIFactory;
+import dan200.computercraft.api.media.IMedia;
+import dan200.computercraft.api.media.IMediaProvider;
+import dan200.computercraft.api.network.IPacketNetwork;
+import dan200.computercraft.api.network.wired.IWiredElement;
+import dan200.computercraft.api.network.wired.IWiredNode;
+import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
+import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.event.TurtleAction;
 import dan200.computercraft.core.apis.AddressPredicate;
-import dan200.computercraft.core.apis.http.websocket.Websocket;
-import dan200.computercraft.shared.Config;
+import dan200.computercraft.core.apis.ApiFactories;
+import dan200.computercraft.core.computer.MainThread;
+import dan200.computercraft.core.filesystem.ComboMount;
+import dan200.computercraft.core.filesystem.FileMount;
+import dan200.computercraft.core.filesystem.JarMount;
+import dan200.computercraft.core.tracking.Tracking;
+import dan200.computercraft.shared.*;
+import dan200.computercraft.shared.computer.blocks.BlockCommandComputer;
 import dan200.computercraft.shared.computer.blocks.BlockComputer;
 import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
 import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
+import dan200.computercraft.shared.computer.items.ItemCommandComputer;
 import dan200.computercraft.shared.computer.items.ItemComputer;
-import dan200.computercraft.shared.media.items.ItemDisk;
+import dan200.computercraft.shared.media.items.ItemDiskExpanded;
+import dan200.computercraft.shared.media.items.ItemDiskLegacy;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
-import dan200.computercraft.shared.peripheral.diskdrive.BlockDiskDrive;
+import dan200.computercraft.shared.peripheral.common.BlockPeripheral;
+import dan200.computercraft.shared.peripheral.common.ItemPeripheral;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockWiredModemFull;
-import dan200.computercraft.shared.peripheral.modem.wired.ItemBlockCable;
-import dan200.computercraft.shared.peripheral.modem.wireless.BlockWirelessModem;
-import dan200.computercraft.shared.peripheral.monitor.BlockMonitor;
-import dan200.computercraft.shared.peripheral.printer.BlockPrinter;
-import dan200.computercraft.shared.peripheral.speaker.BlockSpeaker;
+import dan200.computercraft.shared.peripheral.modem.wired.ItemCable;
+import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem;
+import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem;
+import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
+import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.pocket.peripherals.PocketModem;
 import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
+import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
-import dan200.computercraft.shared.turtle.items.ItemTurtle;
+import dan200.computercraft.shared.turtle.items.ItemTurtleAdvanced;
+import dan200.computercraft.shared.turtle.items.ItemTurtleLegacy;
+import dan200.computercraft.shared.turtle.items.ItemTurtleNormal;
 import dan200.computercraft.shared.turtle.upgrades.*;
-import net.minecraft.resources.IReloadableResourceManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
-import org.apache.logging.log4j.LogManager;
+import dan200.computercraft.shared.util.CreativeTabMain;
+import dan200.computercraft.shared.util.IDAssigner;
+import dan200.computercraft.shared.util.IoUtil;
+import dan200.computercraft.shared.wired.CapabilityWiredElement;
+import dan200.computercraft.shared.wired.WiredNode;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fml.common.*;
+import net.minecraftforge.fml.common.event.*;
+import net.minecraftforge.fml.relauncher.Side;
 import org.apache.logging.log4j.Logger;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.EnumSet;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
-@Mod( ComputerCraft.MOD_ID )
-public final class ComputerCraft
+@Mod(
+    modid = ComputerCraft.MOD_ID, name = ComputerCraft.NAME, version = ComputerCraft.VERSION,
+    guiFactory = "dan200.computercraft.client.gui.GuiConfigCC$Factory",
+    dependencies = "required:forge@[14.23.4.2746,)"
+)
+public class ComputerCraft
 {
     public static final String MOD_ID = "computercraft";
-
-    public static final int DATAFIXER_VERSION = 0;
+    static final String VERSION = "${version}";
+    static final String NAME = "CC: Tweaked";
 
     // Configuration options
     public static final String[] DEFAULT_HTTP_WHITELIST = new String[] { "*" };
@@ -81,7 +128,7 @@ public final class ComputerCraft
     public static long httpMaxDownload = 16 * 1024 * 1024;
     public static long httpMaxUpload = 4 * 1024 * 1024;
     public static int httpMaxWebsockets = 4;
-    public static int httpMaxWebsocketMessage = Websocket.MAX_MESSAGE_SIZE;
+    public static int httpMaxWebsocketMessage = 128 * 1024;
 
     public static boolean enableCommandBlock = false;
     public static int modem_range = 64;
@@ -89,6 +136,7 @@ public final class ComputerCraft
     public static int modem_rangeDuringStorm = 64;
     public static int modem_highAltitudeRangeDuringStorm = 384;
     public static int maxNotesPerTick = 8;
+    public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
 
     public static boolean turtlesNeedFuel = true;
     public static int turtleFuelLimit = 20000;
@@ -109,54 +157,46 @@ public final class ComputerCraft
     // Blocks and Items
     public static final class Blocks
     {
-        public static BlockComputer computerNormal;
-        public static BlockComputer computerAdvanced;
-        public static BlockComputer computerCommand;
+        public static BlockComputer computer;
+        public static BlockCommandComputer commandComputer;
 
-        public static BlockTurtle turtleNormal;
+        public static BlockTurtle turtle;
+        public static BlockTurtle turtleExpanded;
         public static BlockTurtle turtleAdvanced;
 
-        public static BlockSpeaker speaker;
-        public static BlockDiskDrive diskDrive;
-        public static BlockPrinter printer;
-
-        public static BlockMonitor monitorNormal;
-        public static BlockMonitor monitorAdvanced;
-
-        public static BlockWirelessModem wirelessModemNormal;
-        public static BlockWirelessModem wirelessModemAdvanced;
-
-        public static BlockWiredModemFull wiredModemFull;
+        public static BlockPeripheral peripheral;
         public static BlockCable cable;
+        public static BlockAdvancedModem advancedModem;
+        public static BlockWiredModemFull wiredModemFull;
     }
 
     public static final class Items
     {
-        public static ItemComputer computerNormal;
-        public static ItemComputer computerAdvanced;
-        public static ItemComputer computerCommand;
+        public static ItemComputer computer;
+        public static ItemCommandComputer commandComputer;
 
-        public static ItemPocketComputer pocketComputerNormal;
-        public static ItemPocketComputer pocketComputerAdvanced;
+        public static ItemTurtleLegacy turtle;
+        public static ItemTurtleNormal turtleExpanded;
+        public static ItemTurtleAdvanced turtleAdvanced;
 
-        public static ItemTurtle turtleNormal;
-        public static ItemTurtle turtleAdvanced;
+        public static ItemPocketComputer pocketComputer;
 
-        public static ItemDisk disk;
+        public static ItemDiskLegacy disk;
+        public static ItemDiskExpanded diskExpanded;
         public static ItemTreasureDisk treasureDisk;
 
-        public static ItemPrintout printedPage;
-        public static ItemPrintout printedPages;
-        public static ItemPrintout printedBook;
+        public static ItemPrintout printout;
 
-        public static ItemBlockCable.Cable cable;
-        public static ItemBlockCable.WiredModem wiredModem;
+        public static ItemPeripheral peripheral;
+        public static ItemAdvancedModem advancedModem;
+        public static ItemCable cable;
+        public static ItemBlock wiredModemFull;
     }
 
     public static final class TurtleUpgrades
     {
-        public static TurtleModem wirelessModemNormal;
-        public static TurtleModem wirelessModemAdvanced;
+        public static TurtleModem wirelessModem;
+        public static TurtleModem advancedModem;
         public static TurtleSpeaker speaker;
 
         public static TurtleCraftingTable craftingTable;
@@ -169,38 +209,457 @@ public final class ComputerCraft
 
     public static final class PocketUpgrades
     {
-        public static PocketModem wirelessModemNormal;
-        public static PocketModem wirelessModemAdvanced;
+        public static PocketModem wirelessModem;
+        public static PocketModem advancedModem;
         public static PocketSpeaker speaker;
+
+        @Deprecated
+        public static PocketSpeaker pocketSpeaker;
+    }
+
+    @Deprecated
+    public static final class Upgrades
+    {
+        public static TurtleModem advancedModem;
     }
 
     // Registries
     public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
     public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
 
-    // Logging
-    public static final Logger log = LogManager.getLogger( MOD_ID );
+    // Creative
+    public static CreativeTabMain mainCreativeTab;
 
-    public ComputerCraft()
+    // Logging
+    public static Logger log;
+
+    // Peripheral providers. This is still here to ensure compatibility with Plethora and Computronics
+    public static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
+
+    // Implementation
+    @Mod.Instance( ComputerCraft.MOD_ID )
+    public static ComputerCraft instance;
+
+    @SidedProxy(
+        clientSide = "dan200.computercraft.client.proxy.ComputerCraftProxyClient",
+        serverSide = "dan200.computercraft.shared.proxy.ComputerCraftProxyCommon"
+    )
+    private static ComputerCraftProxyCommon proxy;
+
+    @Mod.EventHandler
+    public void preInit( FMLPreInitializationEvent event )
     {
-        Config.load();
+        log = event.getModLog();
+
+        // Load config
+        Config.load( event.getSuggestedConfigurationFile() );
+
+        proxy.preInit();
+    }
+
+    @Mod.EventHandler
+    public void init( FMLInitializationEvent event )
+    {
+        proxy.init();
+    }
+
+    @Mod.EventHandler
+    public void onServerStarting( FMLServerStartingEvent event )
+    {
+        ComputerCraftProxyCommon.initServer( event.getServer() );
+    }
+
+    @Mod.EventHandler
+    public void onServerStart( FMLServerStartedEvent event )
+    {
+        if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
+        {
+            ComputerCraft.serverComputerRegistry.reset();
+            WirelessNetwork.resetNetworks();
+            MainThread.reset();
+            Tracking.reset();
+        }
+    }
+
+    @Mod.EventHandler
+    public void onServerStopped( FMLServerStoppedEvent event )
+    {
+        if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
+        {
+            ComputerCraft.serverComputerRegistry.reset();
+            WirelessNetwork.resetNetworks();
+            MainThread.reset();
+            Tracking.reset();
+        }
     }
 
     public static String getVersion()
     {
-        return "${version}";
+        return VERSION;
     }
 
-    public static InputStream getResourceFile( String domain, String subPath )
+    private static File getBaseDir()
+    {
+        return FMLCommonHandler.instance().getMinecraftServerInstance().getDataDirectory();
+    }
+
+    private static File getResourcePackDir()
+    {
+        return new File( getBaseDir(), "resourcepacks" );
+    }
+
+    @Deprecated
+    public static void registerPermissionProvider( ITurtlePermissionProvider provider )
+    {
+        TurtlePermissions.register( provider );
+    }
+
+    @Deprecated
+    public static void registerPocketUpgrade( IPocketUpgrade upgrade )
+    {
+        dan200.computercraft.shared.PocketUpgrades.register( upgrade );
+    }
+
+    @Deprecated
+    public static void registerPeripheralProvider( IPeripheralProvider provider )
+    {
+        Peripherals.register( provider );
+    }
+
+    @Deprecated
+    public static void registerBundledRedstoneProvider( IBundledRedstoneProvider provider )
+    {
+        BundledRedstone.register( provider );
+    }
+
+    @Deprecated
+    public static void registerMediaProvider( IMediaProvider provider )
+    {
+        MediaProviders.register( provider );
+    }
+
+    @Deprecated
+    public static void registerAPIFactory( ILuaAPIFactory factory )
+    {
+        ApiFactories.register( factory );
+    }
+
+    @Deprecated
+    public static IWiredNode createWiredNodeForElement( IWiredElement element )
+    {
+        return new WiredNode( element );
+    }
+
+    @Deprecated
+    public static IWiredElement getWiredElementAt( IBlockAccess world, BlockPos pos, EnumFacing side )
+    {
+        TileEntity tile = world.getTileEntity( pos );
+        return tile != null && tile.hasCapability( CapabilityWiredElement.CAPABILITY, side )
+            ? tile.getCapability( CapabilityWiredElement.CAPABILITY, side )
+            : null;
+    }
+
+    @Deprecated
+    public static int getDefaultBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
+    {
+        return BundledRedstone.getDefaultOutput( world, pos, side );
+    }
+
+    @Deprecated
+    public static IPacketNetwork getWirelessNetwork()
+    {
+        return WirelessNetwork.getUniversal();
+    }
+
+    @Deprecated
+    public static int createUniqueNumberedSaveDir( World world, String parentSubPath )
+    {
+        return IDAssigner.getNextIDFromDirectory( parentSubPath );
+    }
+
+    @Deprecated
+    public static IWritableMount createSaveDirMount( World world, String subPath, long capacity )
     {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
         try
         {
-            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
+            return new FileMount( new File( getWorldDir(), subPath ), capacity );
         }
-        catch( IOException ignored )
+        catch( Exception e )
         {
             return null;
         }
     }
+
+    private static void loadFromFile( List<IMount> mounts, File file, String path, boolean allowMissing )
+    {
+        try
+        {
+            if( file.isFile() )
+            {
+                mounts.add( new JarMount( file, path ) );
+            }
+            else
+            {
+                File subResource = new File( file, path );
+                if( subResource.exists() ) mounts.add( new FileMount( subResource, 0 ) );
+            }
+        }
+        catch( IOException | RuntimeException e )
+        {
+            if( allowMissing && e instanceof FileNotFoundException ) return;
+            ComputerCraft.log.error( "Could not load mount '" + path + " 'from '" + file.getName() + "'", e );
+        }
+    }
+
+    @Deprecated
+    public static IMount createResourceMount( Class<?> modClass, String domain, String subPath )
+    {
+        // Start building list of mounts
+        List<IMount> mounts = new ArrayList<>();
+        subPath = "assets/" + domain + "/" + subPath;
+
+        // Mount from debug dir
+        File codeDir = getDebugCodeDir( modClass );
+        if( codeDir != null )
+        {
+            File subResource = new File( codeDir, subPath );
+            if( subResource.exists() )
+            {
+                IMount resourcePackMount = new FileMount( subResource, 0 );
+                mounts.add( resourcePackMount );
+            }
+        }
+
+        // Mount from mod jars, preferring the specified one.
+        File modJar = getContainingJar( modClass );
+        Set<File> otherMods = new HashSet<>();
+        for( ModContainer container : Loader.instance().getActiveModList() )
+        {
+            File modFile = container.getSource();
+            if( modFile != null && !modFile.equals( modJar ) && modFile.exists() )
+            {
+                otherMods.add( container.getSource() );
+            }
+        }
+
+        for( File file : otherMods )
+        {
+            loadFromFile( mounts, file, subPath, true );
+        }
+
+        if( modJar != null )
+        {
+            loadFromFile( mounts, modJar, subPath, false );
+        }
+
+        // Mount from resource packs
+        File resourcePackDir = getResourcePackDir();
+        if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
+        {
+            String[] resourcePacks = resourcePackDir.list();
+            for( String resourcePackName : resourcePacks )
+            {
+                File resourcePack = new File( resourcePackDir, resourcePackName );
+                loadFromFile( mounts, resourcePack, subPath, true );
+            }
+        }
+
+        // Return the combination of all the mounts found
+        if( mounts.size() >= 2 )
+        {
+            IMount[] mountArray = new IMount[mounts.size()];
+            mounts.toArray( mountArray );
+            return new ComboMount( mountArray );
+        }
+        else if( mounts.size() == 1 )
+        {
+            return mounts.get( 0 );
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    public static InputStream getResourceFile( Class<?> modClass, String domain, String subPath )
+    {
+        // Start searching in possible locations
+        subPath = "assets/" + domain + "/" + subPath;
+
+        // Look in resource packs
+        File resourcePackDir = getResourcePackDir();
+        if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
+        {
+            String[] resourcePacks = resourcePackDir.list();
+            for( String resourcePackPath : resourcePacks )
+            {
+                File resourcePack = new File( resourcePackDir, resourcePackPath );
+                if( resourcePack.isDirectory() )
+                {
+                    // Mount a resource pack from a folder
+                    File subResource = new File( resourcePack, subPath );
+                    if( subResource.exists() && subResource.isFile() )
+                    {
+                        try
+                        {
+                            return new FileInputStream( subResource );
+                        }
+                        catch( FileNotFoundException ignored )
+                        {
+                        }
+                    }
+                }
+                else
+                {
+                    ZipFile zipFile = null;
+                    try
+                    {
+                        final ZipFile zip = zipFile = new ZipFile( resourcePack );
+                        ZipEntry entry = zipFile.getEntry( subPath );
+                        if( entry != null )
+                        {
+                            // Return a custom InputStream which will close the original zip when finished.
+                            return new FilterInputStream( zipFile.getInputStream( entry ) )
+                            {
+                                @Override
+                                public void close() throws IOException
+                                {
+                                    super.close();
+                                    zip.close();
+                                }
+                            };
+                        }
+                        else
+                        {
+                            IoUtil.closeQuietly( zipFile );
+                        }
+                    }
+                    catch( IOException e )
+                    {
+                        if( zipFile != null ) IoUtil.closeQuietly( zipFile );
+                    }
+                }
+            }
+        }
+
+        // Look in debug dir
+        File codeDir = getDebugCodeDir( modClass );
+        if( codeDir != null )
+        {
+            File subResource = new File( codeDir, subPath );
+            if( subResource.exists() && subResource.isFile() )
+            {
+                try
+                {
+                    return new FileInputStream( subResource );
+                }
+                catch( FileNotFoundException ignored )
+                {
+                }
+            }
+        }
+
+        // Look in class loader
+        return modClass.getClassLoader().getResourceAsStream( subPath );
+    }
+
+    private static File getContainingJar( Class<?> modClass )
+    {
+        String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
+        int bangIndex = path.indexOf( '!' );
+        if( bangIndex >= 0 )
+        {
+            path = path.substring( 0, bangIndex );
+        }
+
+        URL url;
+        try
+        {
+            url = new URL( path );
+        }
+        catch( MalformedURLException e1 )
+        {
+            return null;
+        }
+
+        File file;
+        try
+        {
+            file = new File( url.toURI() );
+        }
+        catch( URISyntaxException e )
+        {
+            file = new File( url.getPath() );
+        }
+        return file;
+    }
+
+    private static File getDebugCodeDir( Class<?> modClass )
+    {
+        String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
+        int bangIndex = path.indexOf( '!' );
+        return bangIndex >= 0 ? null : new File( new File( path ).getParentFile(), "../.." );
+    }
+
+    @Deprecated
+    public static void registerTurtleUpgrade( ITurtleUpgrade upgrade )
+    {
+        dan200.computercraft.shared.TurtleUpgrades.register( upgrade );
+    }
+
+    public static File getWorldDir()
+    {
+        return DimensionManager.getCurrentSaveRootDirectory();
+    }
+
+    //region Compatibility
+    @Deprecated
+    public static File getWorldDir( World world )
+    {
+        return DimensionManager.getCurrentSaveRootDirectory();
+    }
+
+    @Deprecated
+    public static IMedia getMedia( ItemStack stack )
+    {
+        return MediaProviders.get( stack );
+    }
+
+    @Deprecated
+    public static IPocketUpgrade getPocketUpgrade( ItemStack stack )
+    {
+        return dan200.computercraft.shared.PocketUpgrades.get( stack );
+    }
+
+    @Deprecated
+    public static ITurtleUpgrade getTurtleUpgrade( ItemStack stack )
+    {
+        return dan200.computercraft.shared.TurtleUpgrades.get( stack );
+    }
+
+    @Deprecated
+    public static IPocketUpgrade getPocketUpgrade( String id )
+    {
+        return dan200.computercraft.shared.PocketUpgrades.get( id );
+    }
+
+    @Deprecated
+    public static ITurtleUpgrade getTurtleUpgrade( String id )
+    {
+        return dan200.computercraft.shared.TurtleUpgrades.get( id );
+    }
+
+    @Deprecated
+    public static IPeripheral getPeripheralAt( World world, BlockPos pos, EnumFacing side )
+    {
+        return Peripherals.getPeripheral( world, pos, side );
+    }
+
+    @Deprecated
+    public static boolean canPlayerUseCommands( EntityPlayer player )
+    {
+        MinecraftServer server = player.getServer();
+        return server != null && server.getPlayerList().canSendCommands( player.getGameProfile() );
+    }
+    //endregion
 }

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

@@ -1,152 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft;
-
-import com.google.common.collect.MapMaker;
-import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
-import dan200.computercraft.api.filesystem.IMount;
-import dan200.computercraft.api.filesystem.IWritableMount;
-import dan200.computercraft.api.lua.ILuaAPIFactory;
-import dan200.computercraft.api.media.IMediaProvider;
-import dan200.computercraft.api.network.IPacketNetwork;
-import dan200.computercraft.api.network.wired.IWiredElement;
-import dan200.computercraft.api.network.wired.IWiredNode;
-import dan200.computercraft.api.peripheral.IPeripheralProvider;
-import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.core.apis.ApiFactories;
-import dan200.computercraft.core.filesystem.FileMount;
-import dan200.computercraft.core.filesystem.ResourceMount;
-import dan200.computercraft.shared.*;
-import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
-import dan200.computercraft.shared.util.IDAssigner;
-import dan200.computercraft.shared.wired.CapabilityWiredElement;
-import dan200.computercraft.shared.wired.WiredNode;
-import net.minecraft.resources.IReloadableResourceManager;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockReader;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.fml.server.ServerLifecycleHooks;
-
-import javax.annotation.Nonnull;
-import java.io.File;
-import java.lang.ref.WeakReference;
-import java.util.Map;
-
-public final class ComputerCraftAPIImpl implements IComputerCraftAPI
-{
-    public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
-
-    private ComputerCraftAPIImpl()
-    {
-    }
-
-    private WeakReference<IReloadableResourceManager> currentResources;
-    private final Map<ResourceLocation, ResourceMount> mountCache = new MapMaker().weakValues().concurrencyLevel( 1 ).makeMap();
-
-    @Nonnull
-    @Override
-    public String getInstalledVersion()
-    {
-        return "${version}";
-    }
-
-    @Override
-    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
-    {
-        return IDAssigner.getNextId( parentSubPath );
-    }
-
-    @Override
-    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
-    {
-        try
-        {
-            return new FileMount( new File( IDAssigner.getDir(), subPath ), capacity );
-        }
-        catch( Exception e )
-        {
-            return null;
-        }
-    }
-
-    @Override
-    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
-    {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
-        ResourceMount mount = ResourceMount.get( domain, subPath, manager );
-        return mount.exists( "" ) ? mount : null;
-    }
-
-    @Override
-    public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
-    {
-        Peripherals.register( provider );
-    }
-
-    @Override
-    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
-    {
-        TurtleUpgrades.register( upgrade );
-    }
-
-    @Override
-    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
-    {
-        BundledRedstone.register( provider );
-    }
-
-    @Override
-    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        return BundledRedstone.getDefaultOutput( world, pos, side );
-    }
-
-    @Override
-    public void registerMediaProvider( @Nonnull IMediaProvider provider )
-    {
-        MediaProviders.register( provider );
-    }
-
-    @Override
-    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-    {
-        PocketUpgrades.register( upgrade );
-    }
-
-    @Nonnull
-    @Override
-    public IPacketNetwork getWirelessNetwork()
-    {
-        return WirelessNetwork.getUniversal();
-    }
-
-    @Override
-    public void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
-    {
-        ApiFactories.register( factory );
-    }
-
-    @Nonnull
-    @Override
-    public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
-    {
-        return new WiredNode( element );
-    }
-
-    @Nonnull
-    @Override
-    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        TileEntity tile = world.getTileEntity( pos );
-        return tile == null ? LazyOptional.empty() : tile.getCapability( CapabilityWiredElement.CAPABILITY, side );
-    }
-}

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

@@ -7,10 +7,10 @@ package dan200.computercraft.api;
 
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleUpgradeType;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
 
 import javax.annotation.Nonnull;
 
@@ -22,31 +22,43 @@ import javax.annotation.Nonnull;
 public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
 {
     private final ResourceLocation id;
+    private final int legacyId;
     private final TurtleUpgradeType type;
     private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, ItemStack stack )
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, ItemStack stack )
     {
         this.id = id;
+        this.legacyId = legacyId;
         this.type = type;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, IItemProvider item )
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, Item item )
     {
-        this( id, type, adjective, new ItemStack( item ) );
+        this( id, legacyId, type, adjective, new ItemStack( item ) );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, ItemStack stack )
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, Block block )
     {
-        this( id, type, Util.makeTranslationKey( "upgrade", id ) + ".adjective", stack );
+        this( id, legacyId, type, adjective, new ItemStack( block ) );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, IItemProvider item )
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, ItemStack stack )
     {
-        this( id, type, new ItemStack( item ) );
+        this( id, legacyId, type, "upgrade." + id + ".adjective", stack );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, Item item )
+    {
+        this( id, legacyId, type, new ItemStack( item ) );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, Block block )
+    {
+        this( id, legacyId, type, new ItemStack( block ) );
     }
 
     @Nonnull
@@ -56,6 +68,12 @@ public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
         return id;
     }
 
+    @Override
+    public final int getLegacyUpgradeID()
+    {
+        return legacyId;
+    }
+
     @Nonnull
     @Override
     public final String getUnlocalisedAdjective()

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

@@ -16,17 +16,18 @@ import dan200.computercraft.api.network.wired.IWiredNode;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockReader;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.lang.reflect.Method;
 
 /**
  * The static entry point to the ComputerCraft API.
@@ -36,10 +37,28 @@ import javax.annotation.Nullable;
  */
 public final class ComputerCraftAPI
 {
+    public static boolean isInstalled()
+    {
+        findCC();
+        return computerCraft != null;
+    }
+
     @Nonnull
     public static String getInstalledVersion()
     {
-        return getInstance().getInstalledVersion();
+        findCC();
+        if( computerCraft_getVersion != null )
+        {
+            try
+            {
+                return (String) computerCraft_getVersion.invoke( null );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return "";
     }
 
     @Nonnull
@@ -63,7 +82,19 @@ public final class ComputerCraftAPI
      */
     public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
     {
-        return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
+        findCC();
+        if( computerCraft_createUniqueNumberedSaveDir != null )
+        {
+            try
+            {
+                return (Integer) computerCraft_createUniqueNumberedSaveDir.invoke( null, world, parentSubPath );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return -1;
     }
 
     /**
@@ -87,54 +118,55 @@ public final class ComputerCraftAPI
     @Nullable
     public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
     {
-        return getInstance().createSaveDirMount( world, subPath, capacity );
+        findCC();
+        if( computerCraft_createSaveDirMount != null )
+        {
+            try
+            {
+                return (IWritableMount) computerCraft_createSaveDirMount.invoke( null, world, subPath, capacity );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return null;
     }
 
     /**
      * Creates a file system mount to a resource folder, and returns it.
      *
-     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a
-     * resource folder onto a computer's file system.
+     * Use in conjunction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a resource folder
+     * onto a computer's file system.
      *
-     * The files in this mount will be a combination of files in all mod jar, and data packs that contain
+     * The files in this mount will be a combination of files in the specified mod jar, and resource packs that contain
      * 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".
-     * @return The mount, or {@code null} if it could be created for some reason.
+     * @param modClass A class in whose jar to look first for the resources to mount. Using your main mod class is recommended. eg: MyMod.class
+     * @param domain   The domain under which to look for resources. eg: "mymod".
+     * @param subPath  The domain under which to look for resources. eg: "mymod/lua/myfiles".
+     * @return The mount, or {@code null} if it could be created for some reason. Use IComputerAccess.mount() or
+     * IComputerAccess.mountWritable() to mount this on a Computers' file system.
      * @see IComputerAccess#mount(String, IMount)
      * @see IComputerAccess#mountWritable(String, IWritableMount)
      * @see IMount
      */
     @Nullable
-    public static IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
+    public static IMount createResourceMount( @Nonnull Class<?> modClass, @Nonnull String domain, @Nonnull String subPath )
     {
-        return getInstance().createResourceMount( domain, subPath );
-    }
-
-    /**
-     * Creates a file system mount to a resource folder, and returns it.
-     *
-     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a
-     * resource folder onto a computer's file system.
-     *
-     * The files in this mount will be a combination of files in all mod jar, and data packs that contain
-     * resources with the same domain and path.
-     *
-     * @param klass   The mod class to which the files belong.
-     * @param domain  The domain under which to look for resources. eg: "mymod".
-     * @param subPath The subPath under which to look for resources. eg: "lua/myfiles".
-     * @return The mount, or {@code null} if it could be created for some reason.
-     * @see IComputerAccess#mount(String, IMount)
-     * @see IComputerAccess#mountWritable(String, IWritableMount)
-     * @see IMount
-     * @deprecated Use {@link #createResourceMount(String, String)} instead.
-     */
-    @Nullable
-    @Deprecated
-    public static IMount createResourceMount( Class<?> klass, @Nonnull String domain, @Nonnull String subPath )
-    {
-        return getInstance().createResourceMount( domain, subPath );
+        findCC();
+        if( computerCraft_createResourceMount != null )
+        {
+            try
+            {
+                return (IMount) computerCraft_createResourceMount.invoke( null, modClass, domain, subPath );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return null;
     }
 
     /**
@@ -146,7 +178,18 @@ public final class ComputerCraftAPI
      */
     public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
     {
-        getInstance().registerPeripheralProvider( provider );
+        findCC();
+        if( computerCraft_registerPeripheralProvider != null )
+        {
+            try
+            {
+                computerCraft_registerPeripheralProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -159,7 +202,21 @@ public final class ComputerCraftAPI
      */
     public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
     {
-        getInstance().registerTurtleUpgrade( upgrade );
+        if( upgrade != null )
+        {
+            findCC();
+            if( computerCraft_registerTurtleUpgrade != null )
+            {
+                try
+                {
+                    computerCraft_registerTurtleUpgrade.invoke( null, upgrade );
+                }
+                catch( Exception e )
+                {
+                    // It failed
+                }
+            }
+        }
     }
 
     /**
@@ -170,7 +227,18 @@ public final class ComputerCraftAPI
      */
     public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
     {
-        getInstance().registerBundledRedstoneProvider( provider );
+        findCC();
+        if( computerCraft_registerBundledRedstoneProvider != null )
+        {
+            try
+            {
+                computerCraft_registerBundledRedstoneProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -183,9 +251,21 @@ public final class ComputerCraftAPI
      * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
      * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
     {
-        return getInstance().getBundledRedstoneOutput( world, pos, side );
+        findCC();
+        if( computerCraft_getDefaultBundledRedstoneOutput != null )
+        {
+            try
+            {
+                return (Integer) computerCraft_getDefaultBundledRedstoneOutput.invoke( null, world, pos, side );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return -1;
     }
 
     /**
@@ -196,12 +276,58 @@ public final class ComputerCraftAPI
      */
     public static void registerMediaProvider( @Nonnull IMediaProvider provider )
     {
-        getInstance().registerMediaProvider( provider );
+        findCC();
+        if( computerCraft_registerMediaProvider != null )
+        {
+            try
+            {
+                computerCraft_registerMediaProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+    }
+
+    /**
+     * Registers a permission provider to restrict where turtles can move or build.
+     *
+     * @param provider The turtle permission provider to register.
+     * @see ITurtlePermissionProvider
+     * @deprecated Prefer using {@link dan200.computercraft.api.turtle.event.TurtleBlockEvent} or the standard Forge events.
+     */
+    @Deprecated
+    public static void registerPermissionProvider( @Nonnull ITurtlePermissionProvider provider )
+    {
+        findCC();
+        if( computerCraft_registerPermissionProvider != null )
+        {
+            try
+            {
+                computerCraft_registerPermissionProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
     {
-        getInstance().registerPocketUpgrade( upgrade );
+        findCC();
+        if( computerCraft_registerPocketUpgrade != null )
+        {
+            try
+            {
+                computerCraft_registerPocketUpgrade.invoke( null, upgrade );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -211,12 +337,36 @@ public final class ComputerCraftAPI
      */
     public static IPacketNetwork getWirelessNetwork()
     {
-        return getInstance().getWirelessNetwork();
+        findCC();
+        if( computerCraft_getWirelessNetwork != null )
+        {
+            try
+            {
+                return (IPacketNetwork) computerCraft_getWirelessNetwork.invoke( null );
+            }
+            catch( Exception e )
+            {
+                // It failed;
+            }
+        }
+
+        return null;
     }
 
-    public static void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
+    public static void registerAPIFactory( @Nonnull ILuaAPIFactory upgrade )
     {
-        getInstance().registerAPIFactory( factory );
+        findCC();
+        if( computerCraft_registerAPIFactory != null )
+        {
+            try
+            {
+                computerCraft_registerAPIFactory.invoke( null, upgrade );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -229,7 +379,22 @@ public final class ComputerCraftAPI
     @Nonnull
     public static IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
     {
-        return getInstance().createWiredNodeForElement( element );
+        findCC();
+        if( computerCraft_createWiredNodeForElement != null )
+        {
+            try
+            {
+                return (IWiredNode) computerCraft_createWiredNodeForElement.invoke( null, element );
+            }
+            catch( ReflectiveOperationException e )
+            {
+                throw new IllegalStateException( "Error creating wired node", e );
+            }
+        }
+        else
+        {
+            throw new IllegalStateException( "ComputerCraft cannot be found" );
+        }
     }
 
     /**
@@ -241,64 +406,118 @@ public final class ComputerCraftAPI
      * @return The element's node
      * @see IWiredElement#getNode()
      */
-    @Nonnull
-    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    @Nullable
+    public static IWiredElement getWiredElementAt( @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
     {
-        return getInstance().getWiredElementAt( world, pos, side );
+        findCC();
+        if( computerCraft_getWiredElementAt != null )
+        {
+            try
+            {
+                return (IWiredElement) computerCraft_getWiredElementAt.invoke( null, world, pos, side );
+            }
+            catch( ReflectiveOperationException ignored )
+            {
+            }
+        }
+
+        return null;
     }
 
-    private static IComputerCraftAPI instance;
+    // The functions below here are private, and are used to interface with the non-API ComputerCraft classes.
+    // Reflection is used here so you can develop your mod without decompiling ComputerCraft and including
+    // it in your solution, and so your mod won't crash if ComputerCraft is installed.
 
-    @Nonnull
-    private static IComputerCraftAPI getInstance()
+    private static void findCC()
     {
-        if( instance != null ) return instance;
+        if( !ccSearched )
+        {
+            try
+            {
+                computerCraft = Class.forName( "dan200.computercraft.ComputerCraft" );
+                computerCraft_getVersion = findCCMethod( "getVersion", new Class<?>[] {
+                } );
+                computerCraft_createUniqueNumberedSaveDir = findCCMethod( "createUniqueNumberedSaveDir", new Class<?>[] {
+                    World.class, String.class,
+                } );
+                computerCraft_createSaveDirMount = findCCMethod( "createSaveDirMount", new Class<?>[] {
+                    World.class, String.class, Long.TYPE,
+                } );
+                computerCraft_createResourceMount = findCCMethod( "createResourceMount", new Class<?>[] {
+                    Class.class, String.class, String.class,
+                } );
+                computerCraft_registerPeripheralProvider = findCCMethod( "registerPeripheralProvider", new Class<?>[] {
+                    IPeripheralProvider.class,
+                } );
+                computerCraft_registerTurtleUpgrade = findCCMethod( "registerTurtleUpgrade", new Class<?>[] {
+                    ITurtleUpgrade.class,
+                } );
+                computerCraft_registerBundledRedstoneProvider = findCCMethod( "registerBundledRedstoneProvider", new Class<?>[] {
+                    IBundledRedstoneProvider.class,
+                } );
+                computerCraft_getDefaultBundledRedstoneOutput = findCCMethod( "getDefaultBundledRedstoneOutput", new Class<?>[] {
+                    World.class, BlockPos.class, EnumFacing.class,
+                } );
+                computerCraft_registerMediaProvider = findCCMethod( "registerMediaProvider", new Class<?>[] {
+                    IMediaProvider.class,
+                } );
+                computerCraft_registerPermissionProvider = findCCMethod( "registerPermissionProvider", new Class<?>[] {
+                    ITurtlePermissionProvider.class,
+                } );
+                computerCraft_registerPocketUpgrade = findCCMethod( "registerPocketUpgrade", new Class<?>[] {
+                    IPocketUpgrade.class,
+                } );
+                computerCraft_getWirelessNetwork = findCCMethod( "getWirelessNetwork", new Class<?>[] {
+                } );
+                computerCraft_registerAPIFactory = findCCMethod( "registerAPIFactory", new Class<?>[] {
+                    ILuaAPIFactory.class,
+                } );
+                computerCraft_createWiredNodeForElement = findCCMethod( "createWiredNodeForElement", new Class<?>[] {
+                    IWiredElement.class,
+                } );
+                computerCraft_getWiredElementAt = findCCMethod( "getWiredElementAt", new Class<?>[] {
+                    IBlockAccess.class, BlockPos.class, EnumFacing.class,
+                } );
+            }
+            catch( Exception e )
+            {
+                System.err.println( "ComputerCraftAPI: ComputerCraft not found." );
+            }
+            finally
+            {
+                ccSearched = true;
+            }
+        }
+    }
 
+    private static Method findCCMethod( String name, Class<?>[] args )
+    {
         try
         {
-            return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
-                .getField( "INSTANCE" ).get( null );
+            return computerCraft != null ? computerCraft.getMethod( name, args ) : null;
         }
-        catch( ReflectiveOperationException e )
+        catch( NoSuchMethodException e )
         {
-            throw new IllegalStateException( "Cannot find ComputerCraft API", e );
+            System.err.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." );
+            return null;
         }
     }
 
-    public interface IComputerCraftAPI
-    {
-        @Nonnull
-        String getInstalledVersion();
-
-        int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
-
-        @Nullable
-        IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
-
-        @Nullable
-        IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
-
-        void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
-
-        void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
-
-        void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
-
-        int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
-
-        void registerMediaProvider( @Nonnull IMediaProvider provider );
-
-        void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade );
-
-        @Nonnull
-        IPacketNetwork getWirelessNetwork();
-
-        void registerAPIFactory( @Nonnull ILuaAPIFactory factory );
-
-        @Nonnull
-        IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
-
-        @Nonnull
-        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side );
-    }
+    private static boolean ccSearched = false;
+    private static Class<?> computerCraft = null;
+    private static Method computerCraft_getVersion = null;
+    private static Method computerCraft_createUniqueNumberedSaveDir = null;
+    private static Method computerCraft_createSaveDirMount = null;
+    private static Method computerCraft_createResourceMount = null;
+    private static Method computerCraft_registerPeripheralProvider = null;
+    private static Method computerCraft_registerTurtleUpgrade = null;
+    private static Method computerCraft_registerBundledRedstoneProvider = null;
+    private static Method computerCraft_getDefaultBundledRedstoneOutput = null;
+    private static Method computerCraft_registerMediaProvider = null;
+    private static Method computerCraft_registerPermissionProvider = null;
+    private static Method computerCraft_registerPocketUpgrade = null;
+    private static Method computerCraft_getWirelessNetwork = null;
+    private static Method computerCraft_registerAPIFactory = null;
+    private static Method computerCraft_createWiredNodeForElement = null;
+    private static Method computerCraft_getWiredElementAt = null;
 }

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

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

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

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

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

@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
 /**
@@ -93,4 +94,18 @@ public interface IMount
     {
         return Channels.newChannel( openForRead( path ) );
     }
+
+    /**
+     * Get attributes about the given file.
+     *
+     * @param path The path to query.
+     * @return File attributes for the given file.
+     * @throws IOException If the file does not exist, or attributes could not be fetched.
+     */
+    @Nonnull
+    default BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
+    {
+        if( !exists( path ) ) throw new FileOperationException( path, "No such file" );
+        return new FileAttributes( isDirectory( path ), getSize( path ) );
+    }
 }

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

@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
+import java.util.OptionalLong;
 
 /**
  * Represents a part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)}
@@ -105,4 +106,16 @@ public interface IWritableMount extends IMount
      * @throws IOException If the remaining space could not be computed.
      */
     long getRemainingSpace() throws IOException;
+
+    /**
+     * Get the capacity of this mount. This should be equal to the size of all files/directories on this mount, minus
+     * the {@link #getRemainingSpace()}.
+     *
+     * @return The capacity of this mount, in bytes.
+     */
+    @Nonnull
+    default OptionalLong getCapacity()
+    {
+        return OptionalLong.empty();
+    }
 }

src/main/java/dan200/computercraft/api/filesystem/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|FileSystem", apiVersion = "${version}" )
+package dan200.computercraft.api.filesystem;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/lua/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Lua", apiVersion = "${version}" )
+package dan200.computercraft.api.lua;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/media/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Media", apiVersion = "${version}" )
+package dan200.computercraft.api.media;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/network/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Network", apiVersion = "${version}" )
+package dan200.computercraft.api.network;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/network/wired/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Network|Wired", apiVersion = "${version}" )
+package dan200.computercraft.api.network.wired;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API", apiVersion = "${version}" )
+package dan200.computercraft.api;
+
+import net.minecraftforge.fml.common.API;

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

@@ -6,7 +6,7 @@
 package dan200.computercraft.api.peripheral;
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -33,5 +33,5 @@ public interface IPeripheralProvider
      * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
      */
     @Nullable
-    IPeripheral getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+    IPeripheral getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side );
 }

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

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.peripheral;
 
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -25,8 +25,8 @@ public interface IPeripheralTile
      *
      * @param side The side to get the peripheral from.
      * @return A peripheral, or {@code null} if there is not a peripheral here.
-     * @see IPeripheralProvider#getPeripheral(World, BlockPos, Direction)
+     * @see IPeripheralProvider#getPeripheral(World, BlockPos, EnumFacing)
      */
     @Nullable
-    IPeripheral getPeripheral( @Nonnull Direction side );
+    IPeripheral getPeripheral( @Nonnull EnumFacing side );
 }

src/main/java/dan200/computercraft/api/peripheral/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Peripheral", apiVersion = "${version}" )
+package dan200.computercraft.api.peripheral;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/permissions/ITurtlePermissionProvider.java

@@ -0,0 +1,41 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.permissions;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import javax.annotation.Nonnull;
+
+/**
+ * This interface is used to restrict where turtles can move or build.
+ *
+ * Turtles will call these methods before attempting to perform an action, allowing them to be cancelled.
+ *
+ * @see dan200.computercraft.api.ComputerCraftAPI#registerPermissionProvider(ITurtlePermissionProvider)
+ */
+public interface ITurtlePermissionProvider
+{
+    /**
+     * Determine whether a block can be entered by a turtle.
+     *
+     * @param world The world the block exists in
+     * @param pos   The location of the block.
+     * @return Whether the turtle can move into this block.
+     */
+    boolean isBlockEnterable( @Nonnull World world, @Nonnull BlockPos pos );
+
+    /**
+     * Determine whether a block can be modified by a turtle.
+     *
+     * This includes breaking and placing blocks.
+     *
+     * @param world The world the block exists in
+     * @param pos   The location of the block.
+     * @return Whether the turtle can modify this block.
+     */
+    boolean isBlockEditable( @Nonnull World world, @Nonnull BlockPos pos );
+}

src/main/java/dan200/computercraft/api/permissions/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Permissions", apiVersion = "${version}" )
+package dan200.computercraft.api.permissions;
+
+import net.minecraftforge.fml.common.API;

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

@@ -6,9 +6,7 @@
 package dan200.computercraft.api.pocket;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IItemProvider;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Util;
 
 import javax.annotation.Nonnull;
 
@@ -30,14 +28,9 @@ public abstract class AbstractPocketUpgrade implements IPocketUpgrade
         this.stack = stack;
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, IItemProvider item )
+    protected AbstractPocketUpgrade( ResourceLocation id, ItemStack stack )
     {
-        this( id, adjective, new ItemStack( item ) );
-    }
-
-    protected AbstractPocketUpgrade( ResourceLocation id, IItemProvider item )
-    {
-        this( id, Util.makeTranslationKey( "upgrade", id ) + ".adjective", new ItemStack( item ) );
+        this( id, "upgrade." + id + ".adjective", stack );
     }
 
     @Nonnull

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

@@ -7,7 +7,7 @@ package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
 import net.minecraft.entity.Entity;
-import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 
 import javax.annotation.Nonnull;
@@ -22,12 +22,22 @@ public interface IPocketAccess
     /**
      * Gets the entity holding this item.
      *
+     * @return The holding entity. This may be {@code null}.
+     * @deprecated Use {@link #getValidEntity()} where possible.
+     */
+    @Nullable
+    @Deprecated
+    Entity getEntity();
+
+    /**
+     * Gets the entity holding this item with additional safety checks.
+     *
      * This must be called on the server thread.
      *
      * @return The holding entity, or {@code null} if none exists.
      */
     @Nullable
-    Entity getEntity();
+    Entity getValidEntity();
 
     /**
      * Get the colour of this pocket computer as a RGB number.
@@ -74,7 +84,7 @@ public interface IPocketAccess
      * @see #updateUpgradeNBTData()
      */
     @Nonnull
-    CompoundNBT getUpgradeNBTData();
+    NBTTagCompound getUpgradeNBTData();
 
     /**
      * Mark the upgrade-specific NBT as dirty.

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

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.redstone;
 
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -29,5 +29,5 @@ public interface IBundledRedstoneProvider
      * handle this block.
      * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
      */
-    int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
+    int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side );
 }

src/main/java/dan200/computercraft/api/redstone/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Redstone", apiVersion = "${version}" )
+package dan200.computercraft.api.redstone;
+
+import net.minecraftforge.fml.common.API;

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

@@ -10,8 +10,8 @@ import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.Direction;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -53,7 +53,8 @@ public interface ITurtleAccess
      * @param world The new world to move it to
      * @param pos   The new position to move it to.
      * @return Whether the movement was successful. It may fail if the block was not loaded or the block placement
-     * was cancelled.
+     * was cancelled. Note this will not check
+     * {@link dan200.computercraft.api.permissions.ITurtlePermissionProvider#isBlockEnterable(World, BlockPos)}.
      * @throws UnsupportedOperationException When attempting to teleport on the client side.
      */
     boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos );
@@ -82,10 +83,10 @@ public interface ITurtleAccess
      * Returns the world direction the turtle is currently facing.
      *
      * @return The world direction the turtle is currently facing.
-     * @see #setDirection(Direction)
+     * @see #setDirection(EnumFacing)
      */
     @Nonnull
-    Direction getDirection();
+    EnumFacing getDirection();
 
     /**
      * Set the direction the turtle is facing. Note that this will not play a rotation animation, you will also need to
@@ -94,7 +95,7 @@ public interface ITurtleAccess
      * @param dir The new direction to set. This should be on either the x or z axis (so north, south, east or west).
      * @see #getDirection()
      */
-    void setDirection( @Nonnull Direction dir );
+    void setDirection( @Nonnull EnumFacing dir );
 
     /**
      * Get the currently selected slot in the turtle's inventory.
@@ -293,7 +294,7 @@ public interface ITurtleAccess
      * @see #updateUpgradeNBTData(TurtleSide)
      */
     @Nonnull
-    CompoundNBT getUpgradeNBTData( @Nullable TurtleSide side );
+    NBTTagCompound getUpgradeNBTData( @Nullable TurtleSide side );
 
     /**
      * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the

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

@@ -9,15 +9,15 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.turtle.event.TurtleAttackEvent;
 import dan200.computercraft.api.turtle.event.TurtleBlockEvent;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
@@ -43,6 +43,17 @@ public interface ITurtleUpgrade
     @Nonnull
     ResourceLocation getUpgradeID();
 
+    /**
+     * Gets a numerical identifier representing this type of turtle upgrade,
+     * for backwards compatibility with pre-1.76 worlds. If your upgrade was
+     * not released for older ComputerCraft versions, you can return -1 here.
+     * The turtle will fail registration if an already used positive ID is specified.
+     *
+     * @return The legacy ID, or -1 if is needed.
+     * @see ComputerCraftAPI#registerTurtleUpgrade(ITurtleUpgrade)
+     */
+    int getLegacyUpgradeID();
+
     /**
      * Return an unlocalised string to describe this type of turtle in turtle item names.
      *
@@ -112,7 +123,7 @@ public interface ITurtleUpgrade
      * to be called.
      */
     @Nonnull
-    default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction )
+    default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull EnumFacing direction )
     {
         return TurtleCommandResult.failure();
     }
@@ -121,7 +132,7 @@ public interface ITurtleUpgrade
      * Called to obtain the model to be used when rendering a turtle peripheral.
      *
      * This can be obtained from {@link net.minecraft.client.renderer.ItemModelMesher#getItemModel(ItemStack)},
-     * {@link net.minecraft.client.renderer.model.ModelManager#getModel(ModelResourceLocation)} or any other
+     * {@link net.minecraft.client.renderer.block.model.ModelManager#getModel(ModelResourceLocation)} or any other
      * source.
      *
      * @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!
@@ -130,7 +141,7 @@ public interface ITurtleUpgrade
      * a transformation of {@code null} has the same effect as the identify matrix.
      */
     @Nonnull
-    @OnlyIn( Dist.CLIENT )
+    @SideOnly( Side.CLIENT )
     Pair<IBakedModel, Matrix4f> getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
 
     /**

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

@@ -5,7 +5,7 @@
  */
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -14,7 +14,7 @@ import javax.annotation.Nullable;
  * Used to indicate the result of executing a turtle command.
  *
  * @see ITurtleCommand#execute(ITurtleAccess)
- * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
+ * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, EnumFacing)
  */
 public final class TurtleCommandResult
 {

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

@@ -5,14 +5,14 @@
  */
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 
 /**
  * An enum representing the different actions that an {@link ITurtleUpgrade} of type Tool may be called on to perform by
  * a turtle.
  *
  * @see ITurtleUpgrade#getType()
- * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
+ * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, EnumFacing)
  */
 public enum TurtleVerb
 {

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

@@ -7,7 +7,7 @@ package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleCommandResult;
-import net.minecraftforge.eventbus.api.Cancelable;
+import net.minecraftforge.fml.common.eventhandler.Cancelable;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

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

@@ -10,7 +10,7 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 
@@ -20,7 +20,7 @@ import java.util.Objects;
 /**
  * Fired when a turtle attempts to attack an entity.
  *
- * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)},
+ * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, EnumFacing)},
  * as the base {@code turtle.attack()} command does not fire it.
  *
  * Note that such commands should also fire {@link AttackEntityEvent}, so you do not need to listen to both.

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

@@ -11,9 +11,9 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
@@ -74,7 +74,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
     /**
      * Fired when a turtle attempts to dig a block.
      *
-     * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)},
+     * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, EnumFacing)},
      * as the base {@code turtle.dig()} command does not fire it.
      *
      * Note that such commands should also fire {@link BlockEvent.BreakEvent}, so you do not need to listen to both.
@@ -83,11 +83,11 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      */
     public static class Dig extends TurtleBlockEvent
     {
-        private final BlockState block;
+        private final IBlockState block;
         private final ITurtleUpgrade upgrade;
         private final TurtleSide side;
 
-        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
+        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
         {
             super( turtle, TurtleAction.DIG, player, world, pos );
 
@@ -105,7 +105,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The block which is going to be broken.
          */
         @Nonnull
-        public BlockState getBlock()
+        public IBlockState getBlock()
         {
             return block;
         }
@@ -184,10 +184,10 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      */
     public static class Inspect extends TurtleBlockEvent
     {
-        private final BlockState state;
+        private final IBlockState state;
         private final Map<String, Object> data;
 
-        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull Map<String, Object> data )
+        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Map<String, Object> data )
         {
             super( turtle, TurtleAction.INSPECT, player, world, pos );
 
@@ -203,7 +203,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The inspected block state.
          */
         @Nonnull
-        public BlockState getState()
+        public IBlockState getState()
         {
             return state;
         }

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

@@ -6,7 +6,7 @@
 package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.fml.common.eventhandler.Event;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;

src/main/java/dan200/computercraft/api/turtle/event/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Turtle|Event", apiVersion = "${version}" )
+package dan200.computercraft.api.turtle.event;
+
+import net.minecraftforge.fml.common.API;

src/main/java/dan200/computercraft/api/turtle/package-info.java

@@ -0,0 +1,9 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Turtle", apiVersion = "${version}" )
+package dan200.computercraft.api.turtle;
+
+import net.minecraftforge.fml.common.API;

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

@@ -7,81 +7,104 @@ package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.render.TurtleModelLoader;
-import dan200.computercraft.shared.common.IColouredItem;
-import dan200.computercraft.shared.media.items.ItemDisk;
+import dan200.computercraft.shared.media.items.ItemDiskLegacy;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
+import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
 import dan200.computercraft.shared.util.Colour;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
+import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelBakery;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 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.BasicState;
+import net.minecraftforge.client.model.IModel;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 
-import java.util.HashSet;
-import java.util.Map;
+import javax.annotation.Nonnull;
 
 /**
  * Registers textures and models for items.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class ClientRegistry
 {
     private static final String[] EXTRA_MODELS = new String[] {
-        "turtle_modem_normal_off_left",
-        "turtle_modem_normal_on_left",
-        "turtle_modem_normal_off_right",
-        "turtle_modem_normal_on_right",
-
-        "turtle_modem_advanced_off_left",
-        "turtle_modem_advanced_on_left",
-        "turtle_modem_advanced_off_right",
-        "turtle_modem_advanced_on_right",
+        "turtle_modem_off_left",
+        "turtle_modem_on_left",
+        "turtle_modem_off_right",
+        "turtle_modem_on_right",
         "turtle_crafting_table_left",
         "turtle_crafting_table_right",
-
+        "advanced_turtle_modem_off_left",
+        "advanced_turtle_modem_on_left",
+        "advanced_turtle_modem_off_right",
+        "advanced_turtle_modem_on_right",
         "turtle_speaker_upgrade_left",
         "turtle_speaker_upgrade_right",
 
-        "turtle_colour",
+        "turtle_white",
         "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( TurtleModelLoader.INSTANCE );
+
+        // Register item models
+        registerUniversalItemModel( ComputerCraft.Items.computer, "computer" );
+        registerItemModel( ComputerCraft.Items.commandComputer, 0, "command_computer" );
+
+        registerItemModel( ComputerCraft.Items.pocketComputer, 0, "pocket_computer" );
+        registerItemModel( ComputerCraft.Items.pocketComputer, 1, "advanced_pocket_computer" );
+
+        registerItemModel( ComputerCraft.Items.peripheral, 0, "peripheral" );
+        registerItemModel( ComputerCraft.Items.peripheral, 1, "wireless_modem" );
+        registerItemModel( ComputerCraft.Items.peripheral, 2, "monitor" );
+        registerItemModel( ComputerCraft.Items.peripheral, 3, "printer" );
+        registerItemModel( ComputerCraft.Items.peripheral, 4, "advanced_monitor" );
+        registerItemModel( ComputerCraft.Items.cable, 0, "cable" );
+        registerItemModel( ComputerCraft.Items.cable, 1, "wired_modem" );
+        registerItemModel( ComputerCraft.Items.advancedModem, 0, "advanced_modem" );
+        registerItemModel( ComputerCraft.Items.peripheral, 5, "speaker" );
+        registerItemModel( ComputerCraft.Items.wiredModemFull, 0, "wired_modem_full" );
+
+        registerUniversalItemModel( ComputerCraft.Items.disk, "disk" );
+        registerItemModel( ComputerCraft.Items.diskExpanded, 0, "disk_expanded" );
+        registerItemModel( ComputerCraft.Items.treasureDisk, 0, "treasure_disk" );
+
+        registerItemModel( ComputerCraft.Items.printout, 0, "printout" );
+        registerItemModel( ComputerCraft.Items.printout, 1, "pages" );
+        registerItemModel( ComputerCraft.Items.printout, 2, "book" );
+
+        registerUniversalItemModel( ComputerCraft.Items.turtle, "turtle" );
+        registerUniversalItemModel( ComputerCraft.Items.turtleExpanded, "turtle" );
+        registerUniversalItemModel( ComputerCraft.Items.turtleAdvanced, "turtle_advanced" );
     }
 
     @SubscribeEvent
     public static void onTextureStitchEvent( TextureStitchEvent.Pre event )
     {
-        if( event.getMap() != Minecraft.getInstance().getTextureMap() ) return;
-
-        for( String extra : EXTRA_TEXTURES )
+        // Load all textures for the extra models
+        TextureMap map = event.getMap();
+        for( String upgrade : EXTRA_MODELS )
         {
-            event.addSprite( new ResourceLocation( ComputerCraft.MOD_ID, extra ) );
+            IModel model = ModelLoaderRegistry.getModelOrMissing( new ResourceLocation( "computercraft", "block/" + upgrade ) );
+            for( ResourceLocation texture : model.getTextures() ) map.registerSprite( texture );
         }
     }
 
@@ -89,79 +112,73 @@ public final class ClientRegistry
     public static void onModelBakeEvent( ModelBakeEvent event )
     {
         // Load all extra models
-        ModelLoader loader = event.getModelLoader();
-        Map<ResourceLocation, IBakedModel> registry = event.getModelRegistry();
-
-        for( String model : EXTRA_MODELS )
-        {
-            IBakedModel bakedModel = bake( loader, loader.getUnbakedModel( new ResourceLocation( ComputerCraft.MOD_ID, "item/" + model ) ) );
-
-            if( bakedModel != null )
-            {
-                registry.put(
-                    new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, model ), "inventory" ),
-                    bakedModel
-                );
-            }
-        }
-
-        // And load the custom turtle models in too.
-        registry.put(
-            new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_normal" ), "inventory" ),
-            bake( loader, TurtleModelLoader.INSTANCE.loadModel( new ResourceLocation( ComputerCraft.MOD_ID, "item/turtle_normal" ) ) )
-        );
-
-        registry.put(
-            new ModelResourceLocation( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ), "inventory" ),
-            bake( loader, TurtleModelLoader.INSTANCE.loadModel( new ResourceLocation( ComputerCraft.MOD_ID, "item/turtle_advanced" ) ) )
-        );
+        for( String model : EXTRA_MODELS ) loadBlockModel( event, model );
     }
 
     @SubscribeEvent
     public static void onItemColours( ColorHandlerEvent.Item event )
     {
-        if( ComputerCraft.Items.disk == null || ComputerCraft.Blocks.turtleNormal == null )
-        {
-            ComputerCraft.log.warn( "Block/item registration has failed. Skipping registration of item colours." );
-            return;
-        }
-
-        event.getItemColors().register(
-            ( stack, layer ) -> layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            ComputerCraft.Items.disk
+        event.getItemColors().registerItemColorHandler(
+            ( stack, layer ) -> layer == 1 ? ((ItemDiskLegacy) stack.getItem()).getColour( stack ) : 0xFFFFFF,
+            ComputerCraft.Items.disk, ComputerCraft.Items.diskExpanded
         );
 
-        event.getItemColors().register( ( stack, layer ) -> {
+        event.getItemColors().registerItemColorHandler( ( stack, layer ) -> {
             switch( layer )
             {
                 case 0:
                 default:
                     return 0xFFFFFF;
                 case 1: // Frame colour
-                    return IColouredItem.getColourBasic( stack );
+                    return ComputerCraft.Items.pocketComputer.getColour( stack );
                 case 2: // Light colour
                 {
                     int light = ItemPocketComputer.getLightState( stack );
                     return light == -1 ? Colour.Black.getHex() : light;
                 }
             }
-        }, ComputerCraft.Items.pocketComputerNormal, ComputerCraft.Items.pocketComputerAdvanced );
+        }, ComputerCraft.Items.pocketComputer );
 
         // Setup turtle colours
-        event.getItemColors().register(
-            ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            ComputerCraft.Blocks.turtleNormal, ComputerCraft.Blocks.turtleAdvanced
+        event.getItemColors().registerItemColorHandler(
+            ( stack, tintIndex ) -> tintIndex == 0 ? ((ItemTurtleBase) stack.getItem()).getColour( stack ) : 0xFFFFFF,
+            ComputerCraft.Blocks.turtle, ComputerCraft.Blocks.turtleExpanded, ComputerCraft.Blocks.turtleAdvanced
         );
     }
 
-    private static IBakedModel bake( ModelLoader loader, IUnbakedModel model )
+    private static void registerItemModel( Item item, int damage, String name )
     {
-        model.getTextures( loader::getUnbakedModel, new HashSet<>() );
+        ResourceLocation location = new ResourceLocation( ComputerCraft.MOD_ID, name );
+        final ModelResourceLocation res = new ModelResourceLocation( location, "inventory" );
+        ModelBakery.registerItemVariants( item, location );
+        ModelLoader.setCustomModelResourceLocation( item, damage, res );
+    }
 
-        return model.bake(
-            loader,
-            ModelLoader.defaultTextureGetter(),
-            new BasicState( model.getDefaultState(), false ), DefaultVertexFormats.BLOCK
+    private static void registerUniversalItemModel( Item item, String mainModel )
+    {
+        ResourceLocation mainLocation = new ResourceLocation( ComputerCraft.MOD_ID, mainModel );
+        ModelBakery.registerItemVariants( item, mainLocation );
+
+        final ModelResourceLocation mainModelLocation = new ModelResourceLocation( mainLocation, "inventory" );
+        ModelLoader.setCustomMeshDefinition( item, new ItemMeshDefinition()
+        {
+            @Nonnull
+            @Override
+            public ModelResourceLocation getModelLocation( @Nonnull ItemStack stack )
+            {
+                return mainModelLocation;
+            }
+        } );
+    }
+
+    private static void loadBlockModel( ModelBakeEvent event, String name )
+    {
+        IModel model = ModelLoaderRegistry.getModelOrMissing( new ResourceLocation( ComputerCraft.MOD_ID, "block/" + name ) );
+        IBakedModel bakedModel = model.bake(
+            model.getDefaultState(), DefaultVertexFormats.ITEM,
+            location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( location.toString() )
         );
+
+        event.getModelRegistry().putObject( new ModelResourceLocation( ComputerCraft.MOD_ID + ":" + name, "inventory" ), bakedModel );
     }
 }

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

@@ -11,8 +11,8 @@ import dan200.computercraft.shared.command.text.TableFormatter;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.NewChatGui;
-import net.minecraft.client.gui.RenderComponentsUtil;
+import net.minecraft.client.gui.GuiNewChat;
+import net.minecraft.client.gui.GuiUtilRenderComponents;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextFormatting;
@@ -29,7 +29,7 @@ public class ClientTableFormatter implements TableFormatter
 
     private static FontRenderer renderer()
     {
-        return Minecraft.getInstance().fontRenderer;
+        return Minecraft.getMinecraft().fontRenderer;
     }
 
     @Override
@@ -41,7 +41,7 @@ public class ClientTableFormatter implements TableFormatter
 
         FontRenderer renderer = renderer();
 
-        float spaceWidth = renderer.getStringWidth( " " );
+        float spaceWidth = renderer.getCharWidth( ' ' );
         int spaces = MathHelper.floor( extraWidth / spaceWidth );
         int extra = extraWidth - (int) (spaces * spaceWidth);
 
@@ -63,19 +63,19 @@ public class ClientTableFormatter implements TableFormatter
     @Override
     public void writeLine( int id, ITextComponent component )
     {
-        Minecraft mc = Minecraft.getInstance();
-        NewChatGui chat = mc.ingameGUI.getChatGUI();
+        Minecraft mc = Minecraft.getMinecraft();
+        GuiNewChat chat = mc.ingameGUI.getChatGUI();
 
         // Trim the text if it goes over the allowed length
-        int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
-        List<ITextComponent> list = RenderComponentsUtil.splitText( component, maxWidth, mc.fontRenderer, false, false );
+        int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getChatScale() );
+        List<ITextComponent> list = GuiUtilRenderComponents.splitText( component, maxWidth, mc.fontRenderer, false, false );
         if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
     }
 
     @Override
     public int display( TableBuilder table )
     {
-        NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI();
+        GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI();
 
         int lastHeight = lastHeights.get( table.getId() );
 

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

@@ -6,12 +6,12 @@
 package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+import net.minecraftforge.fml.relauncher.Side;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class FrameInfo
 {
     private static int tick;

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

@@ -5,195 +5,324 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
+import dan200.computercraft.client.FrameInfo;
+import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.terminal.TextBuffer;
+import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
-import java.util.Arrays;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public final class FixedWidthFontRenderer
 {
     private static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
-    public static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
+
+    /**
+     * Like {@link DefaultVertexFormats#POSITION_TEX_COLOR}, but flipped. This is backported from 1.15, hence the
+     * custom format.
+     */
+    public static final VertexFormat POSITION_COLOR_TEX = new VertexFormat();
+
+    static
+    {
+        POSITION_COLOR_TEX.addElement( DefaultVertexFormats.POSITION_3F );
+        POSITION_COLOR_TEX.addElement( DefaultVertexFormats.COLOR_4UB );
+        POSITION_COLOR_TEX.addElement( DefaultVertexFormats.TEX_2F );
+    }
 
     public static final int FONT_HEIGHT = 9;
     public static final int FONT_WIDTH = 6;
+    public static final float WIDTH = 256.0f;
 
-    private static FixedWidthFontRenderer instance;
-
-    public static FixedWidthFontRenderer instance()
-    {
-        if( instance != null ) return instance;
-        return instance = new FixedWidthFontRenderer();
-    }
-
-    private final TextureManager m_textureManager;
+    public static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
+    public static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
 
     private FixedWidthFontRenderer()
     {
-        m_textureManager = Minecraft.getInstance().getTextureManager();
     }
 
-    private static void greyscaleify( double[] rgb )
+    private static float toGreyscale( double[] rgb )
     {
-        Arrays.fill( rgb, (rgb[0] + rgb[1] + rgb[2]) / 3.0f );
+        return (float) ((rgb[0] + rgb[1] + rgb[2]) / 3);
     }
 
-    private void drawChar( BufferBuilder renderer, double x, double y, int index, int color, Palette p, boolean greyscale )
+    private static int getColour( char c )
     {
+        int i = "0123456789abcdef".indexOf( c );
+        return i < 0 ? 0 : 15 - i;
+    }
+
+    private static void drawChar( BufferBuilder buffer, float x, float y, int index, float r, float g, float b )
+    {
+        // Short circuit to avoid the common case - the texture should be blank here after all.
+        if( index == '\0' || index == ' ' ) return;
+
         int column = index % 16;
         int row = index / 16;
 
-        double[] colour = p.getColour( 15 - color );
-        if( greyscale )
-        {
-            greyscaleify( colour );
-        }
-        float r = (float) colour[0];
-        float g = (float) colour[1];
-        float b = (float) colour[2];
-
         int xStart = 1 + column * (FONT_WIDTH + 2);
         int yStart = 1 + row * (FONT_HEIGHT + 2);
 
-        renderer.pos( x, y, 0.0 ).tex( xStart / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y + FONT_HEIGHT, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        buffer.pos( x, y, 0f ).color( r, g, b, 1.0f ).tex( xStart / WIDTH, yStart / WIDTH ).endVertex();
+        buffer.pos( x, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).tex( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
+        buffer.pos( x + FONT_WIDTH, y, 0f ).color( r, g, b, 1.0f ).tex( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH ).endVertex();
+        buffer.pos( x + FONT_WIDTH, y, 0f ).color( r, g, b, 1.0f ).tex( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH ).endVertex();
+        buffer.pos( x, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).tex( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
+        buffer.pos( x + FONT_WIDTH, y + FONT_HEIGHT, 0f ).color( r, g, b, 1.0f ).tex( (xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH ).endVertex();
     }
 
-    private void drawQuad( BufferBuilder renderer, double x, double y, int color, double width, Palette p, boolean greyscale )
+    private static void drawQuad( BufferBuilder buffer, float x, float y, float width, float height, float r, float g, float b )
     {
-        double[] colour = p.getColour( 15 - color );
+        buffer.pos( x, y, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_START, BACKGROUND_START ).endVertex();
+        buffer.pos( x, y + height, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_START, BACKGROUND_END ).endVertex();
+        buffer.pos( x + width, y, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_END, BACKGROUND_START ).endVertex();
+        buffer.pos( x + width, y, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_END, BACKGROUND_START ).endVertex();
+        buffer.pos( x, y + height, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_START, BACKGROUND_END ).endVertex();
+        buffer.pos( x + width, y + height, 0 ).color( r, g, b, 1.0f ).tex( BACKGROUND_END, BACKGROUND_END ).endVertex();
+    }
+
+    private static void drawQuad( BufferBuilder buffer, float x, float y, float width, float height, Palette palette, boolean greyscale, char colourIndex )
+    {
+        double[] colour = palette.getColour( getColour( colourIndex ) );
+        float r, g, b;
         if( greyscale )
         {
-            greyscaleify( colour );
+            r = g = b = toGreyscale( colour );
+        }
+        else
+        {
+            r = (float) colour[0];
+            g = (float) colour[1];
+            b = (float) colour[2];
         }
-        float r = (float) colour[0];
-        float g = (float) colour[1];
-        float b = (float) colour[2];
 
-        renderer.pos( x, y, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + width, y, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + width, y, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + width, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).endVertex();
+        drawQuad( buffer, x, y, width, height, r, g, b );
     }
 
-    private boolean isGreyScale( int colour )
+    private static void drawBackground(
+        @Nonnull BufferBuilder renderer, float x, float y,
+        @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
+        float leftMarginSize, float rightMarginSize, float height
+    )
     {
-        return colour == 0 || colour == 15 || colour == 7 || colour == 8;
-    }
+        if( leftMarginSize > 0 )
+        {
+            drawQuad( renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt( 0 ) );
+        }
 
-    public void drawStringBackgroundPart( int x, int y, TextBuffer backgroundColour, double leftMarginSize, double rightMarginSize, boolean greyScale, Palette p )
-    {
-        // Draw the quads
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder renderer = tessellator.getBuffer();
-        renderer.begin( GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_COLOR );
-        if( leftMarginSize > 0.0 )
+        if( rightMarginSize > 0 )
         {
-            int colour1 = "0123456789abcdef".indexOf( backgroundColour.charAt( 0 ) );
-            if( colour1 < 0 || (greyScale && !isGreyScale( colour1 )) )
-            {
-                colour1 = 15;
-            }
-            drawQuad( renderer, x - leftMarginSize, y, colour1, leftMarginSize, p, greyScale );
-        }
-        if( rightMarginSize > 0.0 )
-        {
-            int colour2 = "0123456789abcdef".indexOf( backgroundColour.charAt( backgroundColour.length() - 1 ) );
-            if( colour2 < 0 || (greyScale && !isGreyScale( colour2 )) )
-            {
-                colour2 = 15;
-            }
-            drawQuad( renderer, x + backgroundColour.length() * FONT_WIDTH, y, colour2, rightMarginSize, p, greyScale );
+            drawQuad( renderer, x + backgroundColour.length() * FONT_WIDTH, y, rightMarginSize, height, palette, greyscale, backgroundColour.charAt( backgroundColour.length() - 1 ) );
         }
+
+        // Batch together runs of identical background cells.
+        int blockStart = 0;
+        char blockColour = '\0';
         for( int i = 0; i < backgroundColour.length(); i++ )
         {
-            int colour = "0123456789abcdef".indexOf( backgroundColour.charAt( i ) );
-            if( colour < 0 || (greyScale && !isGreyScale( colour )) )
+            char colourIndex = backgroundColour.charAt( i );
+            if( colourIndex == blockColour ) continue;
+
+            if( blockColour != '\0' )
             {
-                colour = 15;
+                drawQuad( renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour );
             }
-            drawQuad( renderer, x + i * FONT_WIDTH, y, colour, FONT_WIDTH, p, greyScale );
+
+            blockColour = colourIndex;
+            blockStart = i;
+        }
+
+        if( blockColour != '\0' )
+        {
+            drawQuad( renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (backgroundColour.length() - blockStart), height, palette, greyscale, blockColour );
         }
-        GlStateManager.disableTexture();
-        tessellator.draw();
-        GlStateManager.enableTexture();
     }
 
-    public void drawStringTextPart( int x, int y, TextBuffer s, TextBuffer textColour, boolean greyScale, Palette p )
+    public static void drawString(
+        @Nonnull BufferBuilder renderer, float x, float y,
+        @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
+        @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize
+    )
     {
-        // Draw the quads
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder renderer = tessellator.getBuffer();
-        renderer.begin( GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_TEX_COLOR );
-        for( int i = 0; i < s.length(); i++ )
+        if( backgroundColour != null )
         {
-            // Switch colour
-            int colour = "0123456789abcdef".indexOf( textColour.charAt( i ) );
-            if( colour < 0 || (greyScale && !isGreyScale( colour )) )
+            drawBackground( renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT );
+        }
+
+        for( int i = 0; i < text.length(); i++ )
+        {
+            double[] colour = palette.getColour( getColour( textColour.charAt( i ) ) );
+            float r, g, b;
+            if( greyscale )
             {
-                colour = 0;
+                r = g = b = toGreyscale( colour );
+            }
+            else
+            {
+                r = (float) colour[0];
+                g = (float) colour[1];
+                b = (float) colour[2];
             }
 
             // Draw char
-            int index = s.charAt( i );
-            if( index < 0 || index > 255 )
-            {
-                index = '?';
-            }
-            drawChar( renderer, x + i * FONT_WIDTH, y, index, colour, p, greyScale );
+            int index = text.charAt( i );
+            if( index > 255 ) index = '?';
+            drawChar( renderer, x + i * FONT_WIDTH, y, index, r, g, b );
         }
+
+    }
+
+    public static void drawString(
+        float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
+        @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize
+    )
+    {
+        bindFont();
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        begin( buffer );
+        drawString( buffer, x, y, text, textColour, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize );
         tessellator.draw();
     }
 
-    public void drawString( TextBuffer s, int x, int y, TextBuffer textColour, TextBuffer backgroundColour, double leftMarginSize, double rightMarginSize, boolean greyScale, Palette p )
+    public static void drawTerminalWithoutCursor(
+        @Nonnull BufferBuilder buffer, float x, float y,
+        @Nonnull Terminal terminal, boolean greyscale,
+        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
+    )
     {
-        // Draw background
-        if( backgroundColour != null )
+        Palette palette = terminal.getPalette();
+        int height = terminal.getHeight();
+
+        // Top and bottom margins
+        drawBackground(
+            buffer, x, y - topMarginSize,
+            terminal.getBackgroundColourLine( 0 ), palette, greyscale,
+            leftMarginSize, rightMarginSize, topMarginSize
+        );
+
+        drawBackground(
+            buffer, x, y + height * FONT_HEIGHT,
+            terminal.getBackgroundColourLine( height - 1 ), palette, greyscale,
+            leftMarginSize, rightMarginSize, bottomMarginSize
+        );
+
+        // The main text
+        for( int i = 0; i < height; i++ )
         {
-            // Bind the background texture
-            m_textureManager.bindTexture( BACKGROUND );
-
-            // Draw the quads
-            drawStringBackgroundPart( x, y, backgroundColour, leftMarginSize, rightMarginSize, greyScale, p );
-        }
-
-        // Draw text
-        if( s != null && textColour != null )
-        {
-            // Bind the font texture
-            bindFont();
-
-            // Draw the quads
-            drawStringTextPart( x, y, s, textColour, greyScale, p );
+            drawString(
+                buffer, x, y + FixedWidthFontRenderer.FONT_HEIGHT * i,
+                terminal.getLine( i ), terminal.getTextColourLine( i ), terminal.getBackgroundColourLine( i ),
+                palette, greyscale, leftMarginSize, rightMarginSize
+            );
         }
     }
 
-    public int getStringWidth( String s )
+    public static void drawCursor(
+        @Nonnull BufferBuilder buffer, float x, float y,
+        @Nonnull Terminal terminal, boolean greyscale
+    )
     {
-        if( s == null )
+        Palette palette = terminal.getPalette();
+        int width = terminal.getWidth();
+        int height = terminal.getHeight();
+
+        int cursorX = terminal.getCursorX();
+        int cursorY = terminal.getCursorY();
+        if( terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink() )
         {
-            return 0;
+            double[] colour = palette.getColour( 15 - terminal.getTextColour() );
+            float r, g, b;
+            if( greyscale )
+            {
+                r = g = b = toGreyscale( colour );
+            }
+            else
+            {
+                r = (float) colour[0];
+                g = (float) colour[1];
+                b = (float) colour[2];
+            }
+
+            drawChar( buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b );
         }
-        return s.length() * FONT_WIDTH;
     }
 
-    public void bindFont()
+    public static void drawTerminal(
+        @Nonnull BufferBuilder buffer, float x, float y,
+        @Nonnull Terminal terminal, boolean greyscale,
+        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
+    )
     {
-        m_textureManager.bindTexture( FONT );
-        GlStateManager.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
+        drawTerminalWithoutCursor( buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
+        drawCursor( buffer, x, y, terminal, greyscale );
+    }
+
+    public static void drawTerminal(
+        float x, float y, @Nonnull Terminal terminal, boolean greyscale,
+        float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize
+    )
+    {
+        bindFont();
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        begin( buffer );
+        drawTerminal( buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
+        tessellator.draw();
+    }
+
+    public static void drawEmptyTerminal( float x, float y, float width, float height )
+    {
+        bindFont();
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        begin( buffer );
+
+        Colour colour = Colour.Black;
+        drawQuad( buffer, x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
+
+        tessellator.draw();
+    }
+
+    public static void drawBlocker( @Nonnull BufferBuilder buffer, float x, float y, float width, float height )
+    {
+        Colour colour = Colour.Black;
+        drawQuad( buffer, x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
+    }
+
+    public static void drawBlocker( float x, float y, float width, float height )
+    {
+        bindFont();
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        begin( buffer );
+        drawBlocker( buffer, x, y, width, height );
+        tessellator.draw();
+    }
+
+    public static void bindFont()
+    {
+        Minecraft.getMinecraft().getTextureManager().bindTexture( FONT );
+        GlStateManager.glTexParameteri( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
+
+        GlStateManager.enableTexture2D();
+    }
+
+    public static void begin( BufferBuilder buffer )
+    {
+        buffer.begin( GL11.GL_TRIANGLES, POSITION_COLOR_TEX );
     }
 }

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

@@ -5,25 +5,25 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
-import dan200.computercraft.client.gui.widgets.WidgetWrapper;
+import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.computer.core.IComputer;
 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.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.inventory.Container;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-import org.lwjgl.glfw.GLFW;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
-public final class GuiComputer<T extends ContainerComputerBase> extends ContainerScreen<T>
+import java.io.IOException;
+
+public class GuiComputer extends GuiContainer
 {
-    public static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_normal.png" );
+    public static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners.png" );
     public static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
     public static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
     public static final ResourceLocation BACKGROUND_COLOUR = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
@@ -32,147 +32,151 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Containe
     private final ClientComputer m_computer;
     private final int m_termWidth;
     private final int m_termHeight;
+    private WidgetTerminal m_terminal;
 
-    private WidgetTerminal terminal;
-    private WidgetWrapper terminalWrapper;
-
-    private GuiComputer(
-        T container, PlayerInventory player, ITextComponent title, int termWidth, int termHeight
-    )
+    public GuiComputer( Container container, ComputerFamily family, ClientComputer computer, int termWidth, int termHeight )
     {
-        super( container, player, title );
-        m_family = container.getFamily();
-        m_computer = (ClientComputer) container.getComputer();
+        super( container );
+        m_family = family;
+        m_computer = computer;
         m_termWidth = termWidth;
         m_termHeight = termHeight;
-        terminal = null;
+        m_terminal = null;
     }
 
-    public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, ITextComponent component )
+    @Deprecated
+    public GuiComputer( Container container, ComputerFamily family, IComputer computer, int termWidth, int termHeight )
     {
-        return new GuiComputer<>(
-            container, inventory, component,
-            ComputerCraft.terminalWidth_computer, ComputerCraft.terminalHeight_computer
+        this( container, family, (ClientComputer) computer, termWidth, termHeight );
+    }
+
+    public GuiComputer( TileComputer computer )
+    {
+        this(
+            new ContainerComputer( computer ),
+            computer.getFamily(),
+            computer.createClientComputer(),
+            ComputerCraft.terminalWidth_computer,
+            ComputerCraft.terminalHeight_computer
         );
     }
 
-    public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, PlayerInventory inventory, ITextComponent component )
-    {
-        return new GuiComputer<>(
-            container, inventory, component,
-            ComputerCraft.terminalWidth_pocketComputer, ComputerCraft.terminalHeight_pocketComputer
-        );
-    }
-
-    public static GuiComputer<ContainerViewComputer> createView( ContainerViewComputer container, PlayerInventory inventory, ITextComponent component )
-    {
-        return new GuiComputer<>(
-            container, inventory, component,
-            container.getWidth(), container.getHeight()
-        );
-    }
-
-
     @Override
-    protected void init()
+    public void initGui()
     {
-        minecraft.keyboardListener.enableRepeatEvents( true );
+        super.initGui();
+        Keyboard.enableRepeatEvents( true );
 
-        int termPxWidth = m_termWidth * FixedWidthFontRenderer.FONT_WIDTH;
-        int termPxHeight = m_termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
-
-        xSize = termPxWidth + 4 + 24;
-        ySize = termPxHeight + 4 + 24;
-
-        super.init();
-
-        terminal = new WidgetTerminal( minecraft, () -> m_computer, m_termWidth, m_termHeight, 2, 2, 2, 2 );
-        terminalWrapper = new WidgetWrapper( terminal, 2 + 12 + guiLeft, 2 + 12 + guiTop, termPxWidth, termPxHeight );
-
-        children.add( terminalWrapper );
-        setFocused( terminalWrapper );
+        m_terminal = new WidgetTerminal( 0, 0, m_termWidth, m_termHeight, () -> m_computer, 2, 2, 2, 2 );
+        m_terminal.setAllowFocusLoss( false );
+        xSize = m_terminal.getWidth() + 24;
+        ySize = m_terminal.getHeight() + 24;
     }
 
     @Override
-    public void removed()
+    public void onGuiClosed()
     {
-        super.removed();
-        children.remove( terminal );
-        terminal = null;
-        minecraft.keyboardListener.enableRepeatEvents( false );
+        super.onGuiClosed();
+        Keyboard.enableRepeatEvents( false );
     }
 
     @Override
-    public void tick()
+    public void updateScreen()
     {
-        super.tick();
-        terminal.update();
+        super.updateScreen();
+        m_terminal.update();
     }
 
     @Override
-    public boolean keyPressed( int key, int scancode, int modifiers )
+    protected void keyTyped( char c, int k ) throws IOException
     {
-        // Forward the tab key to the terminal, rather than moving between controls.
-        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        if( k == 1 )
         {
-            return getFocused().keyPressed( key, scancode, modifiers );
+            super.keyTyped( c, k );
+        }
+        else
+        {
+            if( m_terminal.onKeyTyped( c, k ) ) keyHandled = true;
         }
-
-        return super.keyPressed( key, scancode, modifiers );
     }
 
     @Override
-    public void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void mouseClicked( int x, int y, int button )
+    {
+        int startX = (width - m_terminal.getWidth()) / 2;
+        int startY = (height - m_terminal.getHeight()) / 2;
+        m_terminal.mouseClicked( x - startX, y - startY, button );
+    }
+
+    @Override
+    public void handleMouseInput() throws IOException
+    {
+        super.handleMouseInput();
+
+        int x = Mouse.getEventX() * width / mc.displayWidth;
+        int y = height - Mouse.getEventY() * height / mc.displayHeight - 1;
+        int startX = (width - m_terminal.getWidth()) / 2;
+        int startY = (height - m_terminal.getHeight()) / 2;
+        m_terminal.handleMouseInput( x - startX, y - startY );
+    }
+
+    @Override
+    public void handleKeyboardInput() throws IOException
+    {
+        super.handleKeyboardInput();
+        if( m_terminal.onKeyboardInput() ) keyHandled = true;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer( int par1, int par2 )
+    {
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer( float var1, int var2, int var3 )
+    {
+    }
+
+    @Override
+    public void drawScreen( int mouseX, int mouseY, float partialTicks )
     {
         // Work out where to draw
-        int startX = terminalWrapper.getX() - 2;
-        int startY = terminalWrapper.getY() - 2;
-        int endX = startX + terminalWrapper.getWidth() + 4;
-        int endY = startY + terminalWrapper.getHeight() + 4;
+        int startX = (width - m_terminal.getWidth()) / 2;
+        int startY = (height - m_terminal.getHeight()) / 2;
+        int endX = startX + m_terminal.getWidth();
+        int endY = startY + m_terminal.getHeight();
+
+        // Draw background
+        drawDefaultBackground();
 
         // Draw terminal
-        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
+        m_terminal.draw( mc, startX, startY, mouseX, mouseY );
 
         // Draw a border around the terminal
-        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
         switch( m_family )
         {
             case Normal:
             default:
-                minecraft.getTextureManager().bindTexture( BACKGROUND_NORMAL );
+                mc.getTextureManager().bindTexture( BACKGROUND_NORMAL );
                 break;
             case Advanced:
-                minecraft.getTextureManager().bindTexture( BACKGROUND_ADVANCED );
+                mc.getTextureManager().bindTexture( BACKGROUND_ADVANCED );
                 break;
             case Command:
-                minecraft.getTextureManager().bindTexture( BACKGROUND_COMMAND );
+                mc.getTextureManager().bindTexture( BACKGROUND_COMMAND );
                 break;
         }
 
-        blit( startX - 12, startY - 12, 12, 28, 12, 12 );
-        blit( startX - 12, endY, 12, 40, 12, 12 );
-        blit( endX, startY - 12, 24, 28, 12, 12 );
-        blit( endX, endY, 24, 40, 12, 12 );
+        drawTexturedModalRect( startX - 12, startY - 12, 12, 28, 12, 12 );
+        drawTexturedModalRect( startX - 12, endY, 12, 40, 12, 12 );
+        drawTexturedModalRect( endX, startY - 12, 24, 28, 12, 12 );
+        drawTexturedModalRect( endX, endY, 24, 40, 12, 12 );
 
-        blit( startX, startY - 12, 0, 0, endX - startX, 12 );
-        blit( startX, endY, 0, 12, endX - startX, 12 );
+        drawTexturedModalRect( startX, startY - 12, 0, 0, endX - startX, 12 );
+        drawTexturedModalRect( startX, endY, 0, 12, endX - startX, 12 );
 
-        blit( startX - 12, startY, 0, 28, 12, endY - startY );
-        blit( endX, startY, 36, 28, 12, endY - startY );
-    }
-
-    @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
-    {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
-        renderHoveredToolTip( 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 );
+        drawTexturedModalRect( startX - 12, startY, 0, 28, 12, endY - startY );
+        drawTexturedModalRect( endX, startY, 36, 28, 12, endY - startY );
     }
 }

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

@@ -0,0 +1,49 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.gui;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.Config;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.client.IModGuiFactory;
+import net.minecraftforge.fml.client.config.GuiConfig;
+
+import java.util.Set;
+
+public class GuiConfigCC extends GuiConfig
+{
+    public GuiConfigCC( GuiScreen parentScreen )
+    {
+        super( parentScreen, Config.getConfigElements(), ComputerCraft.MOD_ID, false, false, "CC: Tweaked" );
+    }
+
+    public static class Factory implements IModGuiFactory
+    {
+        @Override
+        public void initialize( Minecraft minecraft )
+        {
+        }
+
+        @Override
+        public boolean hasConfigGui()
+        {
+            return true;
+        }
+
+        @Override
+        public GuiScreen createConfigGui( GuiScreen parentScreen )
+        {
+            return new GuiConfigCC( parentScreen );
+        }
+
+        @Override
+        public Set<RuntimeOptionCategoryElement> runtimeGuiCategories()
+        {
+            return null;
+        }
+    }
+}

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

@@ -5,43 +5,45 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
 
-public class GuiDiskDrive extends ContainerScreen<ContainerDiskDrive>
+public class GuiDiskDrive extends GuiContainer
 {
-    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/disk_drive.png" );
+    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/diskdrive.png" );
 
-    public GuiDiskDrive( ContainerDiskDrive container, PlayerInventory player, ITextComponent title )
+    private final ContainerDiskDrive m_container;
+
+    public GuiDiskDrive( ContainerDiskDrive container )
     {
-        super( container, player, title );
+        super( container );
+        m_container = container;
     }
 
     @Override
     protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
     {
-        String title = this.title.getFormattedText();
-        font.drawString( title, (xSize - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
-        font.drawString( title, 8, ySize - 96 + 2, 0x404040 );
+        String title = m_container.getDiskDrive().getDisplayName().getUnformattedText();
+        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2, 6, 0x404040 );
+        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
     }
 
     @Override
     protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
     {
-        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bindTexture( BACKGROUND );
-        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
+        GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
+        mc.getTextureManager().bindTexture( BACKGROUND );
+        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void drawScreen( int mouseX, int mouseY, float partialTicks )
     {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
+        drawDefaultBackground();
+        super.drawScreen( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );
     }
 }

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

@@ -0,0 +1,24 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.gui;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.media.inventory.ContainerHeldItem;
+import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
+
+public class GuiPocketComputer extends GuiComputer
+{
+    public GuiPocketComputer( ContainerHeldItem container )
+    {
+        super(
+            container,
+            ComputerCraft.Items.pocketComputer.getFamily( container.getStack() ),
+            ItemPocketComputer.createClientComputer( container.getStack() ),
+            ComputerCraft.terminalWidth_pocketComputer,
+            ComputerCraft.terminalHeight_pocketComputer
+        );
+    }
+}

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

@@ -5,46 +5,47 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.resources.I18n;
-import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
 
-public class GuiPrinter extends ContainerScreen<ContainerPrinter>
+public class GuiPrinter extends GuiContainer
 {
     private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/printer.png" );
 
-    public GuiPrinter( ContainerPrinter container, PlayerInventory player, ITextComponent title )
+    private final ContainerPrinter container;
+
+    public GuiPrinter( ContainerPrinter container )
     {
-        super( container, player, title );
+        super( container );
+        this.container = container;
     }
 
     @Override
     protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
     {
-        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 );
+        String title = container.getPrinter().getDisplayName().getUnformattedText();
+        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2, 6, 0x404040 );
+        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
     }
 
     @Override
     protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
     {
-        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bindTexture( BACKGROUND );
-        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
+        GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
+        mc.getTextureManager().bindTexture( BACKGROUND );
+        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
 
-        if( getContainer().isPrinting() ) blit( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
+        if( container.isPrinting() ) drawTexturedModalRect( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void drawScreen( int mouseX, int mouseY, float partialTicks )
     {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
+        drawDefaultBackground();
+        super.drawScreen( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );
     }
 }

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

@@ -5,18 +5,18 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.core.terminal.TextBuffer;
-import dan200.computercraft.shared.common.ContainerHeldItem;
+import dan200.computercraft.shared.media.inventory.ContainerHeldItem;
 import dan200.computercraft.shared.media.items.ItemPrintout;
-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 net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.input.Mouse;
+
+import java.io.IOException;
 
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
 
-public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
+public class GuiPrintout extends GuiContainer
 {
     private final boolean m_book;
     private final int m_pages;
@@ -24,9 +24,9 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
     private final TextBuffer[] m_colours;
     private int m_page;
 
-    public GuiPrintout( ContainerHeldItem container, PlayerInventory player, ITextComponent title )
+    public GuiPrintout( ContainerHeldItem container )
     {
-        super( container, player, title );
+        super( container );
 
         ySize = Y_SIZE;
 
@@ -40,70 +40,63 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
 
         m_page = 0;
         m_pages = Math.max( m_text.length / ItemPrintout.LINES_PER_PAGE, 1 );
-        m_book = ((ItemPrintout) container.getStack().getItem()).getType() == ItemPrintout.Type.BOOK;
+        m_book = ItemPrintout.getType( container.getStack() ) == ItemPrintout.Type.Book;
     }
 
     @Override
-    public boolean keyPressed( int key, int scancode, int modifiers )
+    protected void keyTyped( char c, int k ) throws IOException
     {
-        if( super.keyPressed( key, scancode, modifiers ) ) return true;
+        super.keyTyped( c, k );
 
-        if( key == GLFW.GLFW_KEY_RIGHT )
+        if( k == 205 )
         {
+            // Right
             if( m_page < m_pages - 1 ) m_page++;
-            return true;
         }
-
-        if( key == GLFW.GLFW_KEY_LEFT )
+        else if( k == 203 )
         {
+            // Left
             if( m_page > 0 ) m_page--;
-            return true;
         }
-
-        return false;
     }
 
     @Override
-    public boolean mouseScrolled( double x, double y, double delta )
+    public void handleMouseInput() throws IOException
     {
-        if( super.mouseScrolled( x, y, delta ) ) return true;
-        if( delta < 0 )
+        super.handleMouseInput();
+
+        int mouseWheelChange = Mouse.getEventDWheel();
+        if( mouseWheelChange < 0 )
         {
             // Scroll up goes to the next page
             if( m_page < m_pages - 1 ) m_page++;
-            return true;
         }
-
-        if( delta > 0 )
+        else if( mouseWheelChange > 0 )
         {
             // Scroll down goes to the previous page
             if( m_page > 0 ) m_page--;
-            return true;
         }
-
-        return false;
     }
 
     @Override
-    public void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
     {
         // Draw the printout
-        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
-        GlStateManager.enableDepthTest();
+        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
 
-        drawBorder( guiLeft, guiTop, blitOffset, m_page, m_pages, m_book );
+        drawBorder( guiLeft, guiTop, zLevel, m_page, m_pages, m_book );
         drawText( guiLeft + X_TEXT_MARGIN, guiTop + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void drawScreen( int mouseX, int mouseY, float partialTicks )
     {
         // We must take the background further back in order to not overlap with our printed pages.
-        blitOffset--;
-        renderBackground();
-        blitOffset++;
+        zLevel--;
+        drawDefaultBackground();
+        zLevel++;
 
-        super.render( mouseX, mouseY, partialTicks );
+        super.drawScreen( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );
     }
 }

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

@@ -5,104 +5,121 @@
  */
 package dan200.computercraft.client.gui;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
-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.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-import org.lwjgl.glfw.GLFW;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
-public class GuiTurtle extends ContainerScreen<ContainerTurtle>
+import java.io.IOException;
+
+public class GuiTurtle extends GuiContainer
 {
-    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/turtle_normal.png" );
+    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/turtle.png" );
     private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( "computercraft", "textures/gui/turtle_advanced.png" );
 
     private ContainerTurtle m_container;
 
     private final ComputerFamily m_family;
     private final ClientComputer m_computer;
+    private WidgetTerminal m_terminalGui;
 
-    private WidgetTerminal terminal;
-    private WidgetWrapper terminalWrapper;
-
-    public GuiTurtle( ContainerTurtle container, PlayerInventory player, ITextComponent title )
+    public GuiTurtle( TileTurtle turtle, ContainerTurtle container )
     {
-        super( container, player, title );
+        super( container );
 
         m_container = container;
-        m_family = container.getFamily();
-        m_computer = (ClientComputer) container.getComputer();
+        m_family = turtle.getFamily();
+        m_computer = turtle.getClientComputer();
 
         xSize = 254;
         ySize = 217;
     }
 
     @Override
-    protected void init()
+    public void initGui()
     {
-        super.init();
-        minecraft.keyboardListener.enableRepeatEvents( true );
-
-        int termPxWidth = ComputerCraft.terminalWidth_turtle * FixedWidthFontRenderer.FONT_WIDTH;
-        int termPxHeight = ComputerCraft.terminalHeight_turtle * FixedWidthFontRenderer.FONT_HEIGHT;
-
-        terminal = new WidgetTerminal(
-            minecraft, () -> m_computer,
+        super.initGui();
+        Keyboard.enableRepeatEvents( true );
+        m_terminalGui = new WidgetTerminal(
+            guiLeft + 8,
+            guiTop + 8,
             ComputerCraft.terminalWidth_turtle,
             ComputerCraft.terminalHeight_turtle,
+            () -> m_computer,
             2, 2, 2, 2
         );
-        terminalWrapper = new WidgetWrapper( terminal, 2 + 8 + guiLeft, 2 + 8 + guiTop, termPxWidth, termPxHeight );
-
-        children.add( terminalWrapper );
-        setFocused( terminalWrapper );
+        m_terminalGui.setAllowFocusLoss( false );
     }
 
     @Override
-    public void removed()
+    public void onGuiClosed()
     {
-        super.removed();
-        children.remove( terminal );
-        terminal = null;
-        minecraft.keyboardListener.enableRepeatEvents( false );
+        super.onGuiClosed();
+        Keyboard.enableRepeatEvents( false );
     }
 
     @Override
-    public void tick()
+    public void updateScreen()
     {
-        super.tick();
-        terminal.update();
+        super.updateScreen();
+        m_terminalGui.update();
     }
 
     @Override
-    public boolean keyPressed( int key, int scancode, int modifiers )
+    protected void keyTyped( char c, int k ) throws IOException
     {
-        // Forward the tab key to the terminal, rather than moving between controls.
-        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        if( k == 1 )
         {
-            return getFocused().keyPressed( key, scancode, modifiers );
+            super.keyTyped( c, k );
+        }
+        else
+        {
+            if( m_terminalGui.onKeyTyped( c, k ) ) keyHandled = true;
         }
-
-        return super.keyPressed( key, scancode, modifiers );
     }
 
-    private void drawSelectionSlot( boolean advanced )
+    @Override
+    protected void mouseClicked( int x, int y, int button ) throws IOException
+    {
+        super.mouseClicked( x, y, button );
+        m_terminalGui.mouseClicked( x, y, button );
+    }
+
+    @Override
+    public void handleMouseInput() throws IOException
+    {
+        super.handleMouseInput();
+        int x = Mouse.getEventX() * width / mc.displayWidth;
+        int y = height - Mouse.getEventY() * height / mc.displayHeight - 1;
+        m_terminalGui.handleMouseInput( x, y );
+    }
+
+    @Override
+    public void handleKeyboardInput() throws IOException
+    {
+        super.handleKeyboardInput();
+        if( m_terminalGui.onKeyboardInput() ) keyHandled = true;
+    }
+
+    protected void drawSelectionSlot( boolean advanced )
     {
         // Draw selection slot
         int slot = m_container.getSelectedSlot();
         if( slot >= 0 )
         {
-            GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+            GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
             int slotX = slot % 4;
             int slotY = slot / 4;
-            minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-            blit( guiLeft + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, guiTop + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18, 0, 217, 24, 24 );
+            mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+            drawTexturedModalRect( guiLeft + m_container.turtleInvStartX - 2 + slotX * 18, guiTop + m_container.playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
         }
     }
 
@@ -111,28 +128,21 @@ public class GuiTurtle extends ContainerScreen<ContainerTurtle>
     {
         // Draw term
         boolean advanced = m_family == ComputerFamily.Advanced;
-        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
+        m_terminalGui.draw( Minecraft.getMinecraft(), 0, 0, mouseX, mouseY );
 
         // Draw border/inventory
-        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
+        GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
+        mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
 
         drawSelectionSlot( advanced );
     }
 
     @Override
-    public void render( int mouseX, int mouseY, float partialTicks )
+    public void drawScreen( int mouseX, int mouseY, float partialTicks )
     {
-        renderBackground();
-        super.render( mouseX, mouseY, partialTicks );
+        drawDefaultBackground();
+        super.drawScreen( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( 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 );
-    }
 }

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

@@ -0,0 +1,83 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+package dan200.computercraft.client.gui.widgets;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+
+public abstract class Widget extends Gui
+{
+    private int m_xPosition;
+    private int m_yPosition;
+    private int m_width;
+    private int m_height;
+
+    protected Widget( int x, int y, int width, int height )
+    {
+        m_xPosition = x;
+        m_yPosition = y;
+        m_width = width;
+        m_height = height;
+    }
+
+    public int getXPosition()
+    {
+        return m_xPosition;
+    }
+
+    public int getYPosition()
+    {
+        return m_yPosition;
+    }
+
+    public int getWidth()
+    {
+        return m_width;
+    }
+
+    public int getHeight()
+    {
+        return m_height;
+    }
+
+    public void update()
+    {
+    }
+
+    public void draw( Minecraft mc, int xOrigin, int yOrigin, int mouseX, int mouseY )
+    {
+    }
+
+    public void handleMouseInput( int mouseX, int mouseY )
+    {
+    }
+
+    public boolean onKeyboardInput()
+    {
+        return false;
+    }
+
+    @Deprecated
+    public void handleKeyboardInput()
+    {
+        onKeyboardInput();
+    }
+
+    public void mouseClicked( int mouseX, int mouseY, int mouseButton )
+    {
+    }
+
+    public boolean onKeyTyped( char c, int k )
+    {
+        return false;
+    }
+
+    @Deprecated
+    public void keyTyped( char c, int k )
+    {
+        onKeyTyped( c, k );
+    }
+}

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

@@ -5,246 +5,135 @@
  */
 package dan200.computercraft.client.gui.widgets;
 
-import com.mojang.blaze3d.platform.GlStateManager;
-import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.core.terminal.TextBuffer;
-import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.IComputer;
-import dan200.computercraft.shared.util.Colour;
-import dan200.computercraft.shared.util.Palette;
+import dan200.computercraft.shared.computer.core.IComputerContainer;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.SharedConstants;
-import org.lwjgl.glfw.GLFW;
-import org.lwjgl.opengl.GL11;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.util.ChatAllowedCharacters;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 
-import java.util.BitSet;
-import java.util.function.Supplier;
+import java.util.ArrayList;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.BACKGROUND;
-
-public class WidgetTerminal implements IGuiEventListener
+public class WidgetTerminal extends Widget
 {
     private static final float TERMINATE_TIME = 0.5f;
 
-    private final Minecraft client;
+    private final IComputerContainer m_computer;
 
-    private boolean focused;
+    private float m_terminateTimer = 0.0f;
+    private float m_rebootTimer = 0.0f;
+    private float m_shutdownTimer = 0.0f;
 
-    private final Supplier<ClientComputer> computer;
-    private final int termWidth;
-    private final int termHeight;
+    private int m_lastClickButton = -1;
+    private int m_lastClickX = -1;
+    private int m_lastClickY = -1;
 
-    private float terminateTimer = -1;
-    private float rebootTimer = -1;
-    private float shutdownTimer = -1;
-
-    private int lastMouseButton = -1;
-    private int lastMouseX = -1;
-    private int lastMouseY = -1;
+    private boolean m_focus = false;
+    private boolean m_allowFocusLoss = true;
 
     private final int leftMargin;
     private final int rightMargin;
     private final int topMargin;
     private final int bottomMargin;
 
-    private final BitSet keysDown = new BitSet( 256 );
+    private final ArrayList<Integer> m_keysDown = new ArrayList<>();
 
-    public WidgetTerminal( Minecraft client, Supplier<ClientComputer> computer, int termWidth, int termHeight, int leftMargin, int rightMargin, int topMargin, int bottomMargin )
+    public WidgetTerminal( int x, int y, int termWidth, int termHeight, IComputerContainer computer, int leftMargin, int rightMargin, int topMargin, int bottomMargin )
     {
-        this.client = client;
-        this.computer = computer;
-        this.termWidth = termWidth;
-        this.termHeight = termHeight;
+        super(
+            x, y,
+            leftMargin + rightMargin + termWidth * FixedWidthFontRenderer.FONT_WIDTH,
+            topMargin + bottomMargin + termHeight * FixedWidthFontRenderer.FONT_HEIGHT
+        );
+
+        m_computer = computer;
+
         this.leftMargin = leftMargin;
         this.rightMargin = rightMargin;
         this.topMargin = topMargin;
         this.bottomMargin = bottomMargin;
     }
 
-    @Override
-    public boolean charTyped( char ch, int modifiers )
+    public void setAllowFocusLoss( boolean allowFocusLoss )
     {
-        if( ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255 ) // printable chars in byte range
-        {
-            // Queue the "char" event
-            queueEvent( "char", Character.toString( ch ) );
-        }
-
-        return true;
+        m_allowFocusLoss = allowFocusLoss;
+        m_focus = m_focus || !allowFocusLoss;
     }
 
     @Override
-    public boolean keyPressed( int key, int scancode, int modifiers )
+    public boolean onKeyTyped( char ch, int key )
     {
-        if( key == GLFW.GLFW_KEY_ESCAPE ) return false;
-        if( (modifiers & GLFW.GLFW_MOD_CONTROL) != 0 )
+        if( m_focus )
         {
-            switch( key )
+            // Ctrl+V for paste
+            if( ch == 22 )
             {
-                case GLFW.GLFW_KEY_T:
-                    if( terminateTimer < 0 ) terminateTimer = 0;
-                    return true;
-                case GLFW.GLFW_KEY_S:
-                    if( shutdownTimer < 0 ) shutdownTimer = 0;
-                    return true;
-                case GLFW.GLFW_KEY_R:
-                    if( rebootTimer < 0 ) rebootTimer = 0;
-                    return true;
-
-                case GLFW.GLFW_KEY_V:
-                    // Ctrl+V for paste
-                    String clipboard = client.keyboardListener.getClipboardString();
-                    if( clipboard != null )
+                String clipboard = GuiScreen.getClipboardString();
+                if( clipboard != null )
+                {
+                    // Clip to the first occurrence of \r or \n
+                    int newLineIndex1 = clipboard.indexOf( '\r' );
+                    int newLineIndex2 = clipboard.indexOf( '\n' );
+                    if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
                     {
-                        // Clip to the first occurrence of \r or \n
-                        int newLineIndex1 = clipboard.indexOf( "\r" );
-                        int newLineIndex2 = clipboard.indexOf( "\n" );
-                        if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
-                        {
-                            clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
-                        }
-                        else if( newLineIndex1 >= 0 )
-                        {
-                            clipboard = clipboard.substring( 0, newLineIndex1 );
-                        }
-                        else if( newLineIndex2 >= 0 )
-                        {
-                            clipboard = clipboard.substring( 0, newLineIndex2 );
-                        }
-
-                        // Filter the string
-                        clipboard = SharedConstants.filterAllowedCharacters( clipboard );
-                        if( !clipboard.isEmpty() )
-                        {
-                            // Clip to 512 characters and queue the event
-                            if( clipboard.length() > 512 ) clipboard = clipboard.substring( 0, 512 );
-                            queueEvent( "paste", clipboard );
-                        }
-
-                        return true;
+                        clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
+                    }
+                    else if( newLineIndex1 >= 0 )
+                    {
+                        clipboard = clipboard.substring( 0, newLineIndex1 );
+                    }
+                    else if( newLineIndex2 >= 0 )
+                    {
+                        clipboard = clipboard.substring( 0, newLineIndex2 );
                     }
-            }
-        }
 
-        if( key >= 0 && terminateTimer < 0 && rebootTimer < 0 && shutdownTimer < 0 )
-        {
-            // Queue the "key" event and add to the down set
-            boolean repeat = keysDown.get( key );
-            keysDown.set( key );
-            IComputer computer = this.computer.get();
-            if( computer != null ) computer.keyDown( key, repeat );
-        }
+                    // Filter the string
+                    clipboard = ChatAllowedCharacters.filterAllowedCharacters( clipboard );
 
-        return true;
-    }
+                    if( !clipboard.isEmpty() )
+                    {
+                        // Clip to 512 characters
+                        if( clipboard.length() > 512 )
+                        {
+                            clipboard = clipboard.substring( 0, 512 );
+                        }
 
-    @Override
-    public boolean keyReleased( int key, int scancode, int modifiers )
-    {
-        // Queue the "key_up" event and remove from the down set
-        if( key >= 0 && keysDown.get( key ) )
-        {
-            keysDown.set( key, false );
-            IComputer computer = this.computer.get();
-            if( computer != null ) computer.keyUp( key );
-        }
-
-        switch( key )
-        {
-            case GLFW.GLFW_KEY_T:
-                terminateTimer = -1;
-                break;
-            case GLFW.GLFW_KEY_R:
-                rebootTimer = -1;
-                break;
-            case GLFW.GLFW_KEY_S:
-                shutdownTimer = -1;
-                break;
-            case GLFW.GLFW_KEY_LEFT_CONTROL:
-            case GLFW.GLFW_KEY_RIGHT_CONTROL:
-                terminateTimer = rebootTimer = shutdownTimer = -1;
-                break;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean mouseClicked( double mouseX, double mouseY, int button )
-    {
-        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 / FixedWidthFontRenderer.FONT_WIDTH);
-            int charY = (int) (mouseY / FixedWidthFontRenderer.FONT_HEIGHT);
-            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
-
-            computer.mouseClick( button + 1, charX + 1, charY + 1 );
-
-            lastMouseButton = button;
-            lastMouseX = charX;
-            lastMouseY = charY;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean mouseReleased( double mouseX, double mouseY, int button )
-    {
-        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 / FixedWidthFontRenderer.FONT_WIDTH);
-            int charY = (int) (mouseY / FixedWidthFontRenderer.FONT_HEIGHT);
-            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
-
-            if( lastMouseButton == button )
-            {
-                computer.mouseUp( lastMouseButton + 1, charX + 1, charY + 1 );
-                lastMouseButton = -1;
+                        // Queue the "paste" event
+                        queueEvent( "paste", new Object[] { clipboard } );
+                    }
+                }
+                return true;
             }
 
-            lastMouseX = charX;
-            lastMouseY = charY;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean mouseDragged( double mouseX, double mouseY, int button, double v2, double v3 )
-    {
-        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 / FixedWidthFontRenderer.FONT_WIDTH);
-            int charY = (int) (mouseY / FixedWidthFontRenderer.FONT_HEIGHT);
-            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
-
-            if( button == lastMouseButton && (charX != lastMouseX || charY != lastMouseY) )
+            // Regular keys normally
+            if( m_terminateTimer <= 0.0f && m_rebootTimer <= 0.0f && m_shutdownTimer <= 0.0f )
             {
-                computer.mouseDrag( button + 1, charX + 1, charY + 1 );
-                lastMouseX = charX;
-                lastMouseY = charY;
+                boolean repeat = Keyboard.isRepeatEvent();
+                boolean handled = false;
+                if( key > 0 )
+                {
+                    if( !repeat )
+                    {
+                        m_keysDown.add( key );
+                    }
+
+                    // Queue the "key" event
+                    IComputer computer = m_computer.getComputer();
+                    if( computer != null ) computer.keyDown( key, repeat );
+                    handled = true;
+                }
+
+                if( (ch >= 32 && ch <= 126) || (ch >= 160 && ch <= 255) ) // printable chars in byte range
+                {
+                    // Queue the "char" event
+                    queueEvent( "char", new Object[] { Character.toString( ch ) } );
+                    handled = true;
+                }
+
+                return handled;
             }
         }
 
@@ -252,185 +141,218 @@ public class WidgetTerminal implements IGuiEventListener
     }
 
     @Override
-    public boolean mouseScrolled( double mouseX, double mouseY, double delta )
+    public void mouseClicked( int mouseX, int mouseY, int button )
     {
-        ClientComputer computer = this.computer.get();
-        if( computer == null || !computer.isColour() || delta == 0 ) return false;
-
-        Terminal term = computer.getTerminal();
-        if( term != null )
+        if( mouseX >= getXPosition() && mouseX < getXPosition() + getWidth() &&
+            mouseY >= getYPosition() && mouseY < getYPosition() + getHeight() )
         {
-            int charX = (int) (mouseX / FixedWidthFontRenderer.FONT_WIDTH);
-            int charY = (int) (mouseY / FixedWidthFontRenderer.FONT_HEIGHT);
-            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
+            if( !m_focus && button == 0 )
+            {
+                m_focus = true;
+            }
 
-            computer.mouseScroll( delta < 0 ? 1 : -1, charX + 1, charY + 1 );
+            if( m_focus )
+            {
+                IComputer computer = m_computer.getComputer();
+                if( computer != null && computer.isColour() && button >= 0 && button <= 2 )
+                {
+                    Terminal term = computer.getTerminal();
+                    if( term != null )
+                    {
+                        int charX = (mouseX - (getXPosition() + leftMargin)) / FixedWidthFontRenderer.FONT_WIDTH;
+                        int charY = (mouseY - (getYPosition() + topMargin)) / FixedWidthFontRenderer.FONT_HEIGHT;
+                        charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
+                        charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            lastMouseX = charX;
-            lastMouseY = charY;
+                        computer.mouseClick( button + 1, charX + 1, charY + 1 );
+
+                        m_lastClickButton = button;
+                        m_lastClickX = charX;
+                        m_lastClickY = charY;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if( m_focus && button == 0 && m_allowFocusLoss )
+            {
+                m_focus = false;
+            }
         }
-
-        return true;
     }
 
+    @Override
+    public boolean onKeyboardInput()
+    {
+        boolean handled = false;
+        for( int i = m_keysDown.size() - 1; i >= 0; --i )
+        {
+            int key = m_keysDown.get( i );
+            if( !Keyboard.isKeyDown( key ) )
+            {
+                m_keysDown.remove( i );
+                if( m_focus )
+                {
+                    // Queue the "key_up" event
+                    IComputer computer = m_computer.getComputer();
+                    if( computer != null ) computer.keyUp( key );
+                    handled = true;
+                }
+            }
+        }
+
+        return handled;
+    }
+
+    @Override
+    public void handleMouseInput( int mouseX, int mouseY )
+    {
+        IComputer computer = m_computer.getComputer();
+        if( mouseX >= getXPosition() && mouseX < getXPosition() + getWidth() &&
+            mouseY >= getYPosition() && mouseY < getYPosition() + getHeight() &&
+            computer != null && computer.isColour() )
+        {
+            Terminal term = computer.getTerminal();
+            if( term != null )
+            {
+                int charX = (mouseX - (getXPosition() + leftMargin)) / FixedWidthFontRenderer.FONT_WIDTH;
+                int charY = (mouseY - (getYPosition() + topMargin)) / FixedWidthFontRenderer.FONT_HEIGHT;
+                charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
+                charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
+
+                if( m_lastClickButton >= 0 && !Mouse.isButtonDown( m_lastClickButton ) )
+                {
+                    if( m_focus ) computer.mouseUp( m_lastClickButton + 1, charX + 1, charY + 1 );
+                    m_lastClickButton = -1;
+                }
+
+                int wheelChange = Mouse.getEventDWheel();
+                if( wheelChange == 0 && m_lastClickButton == -1 )
+                {
+                    return;
+                }
+
+                if( m_focus )
+                {
+                    if( wheelChange < 0 )
+                    {
+                        computer.mouseScroll( 1, charX + 1, charY + 1 );
+                    }
+                    else if( wheelChange > 0 )
+                    {
+                        computer.mouseScroll( -1, charX + 1, charY + 1 );
+                    }
+
+                    if( m_lastClickButton >= 0 && (charX != m_lastClickX || charY != m_lastClickY) )
+                    {
+                        computer.mouseDrag( m_lastClickButton + 1, charX + 1, charY + 1 );
+                        m_lastClickX = charX;
+                        m_lastClickY = charY;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
     public void update()
     {
-        if( terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME )
+        // Handle special keys
+        if( m_focus && (Keyboard.isKeyDown( 29 ) || Keyboard.isKeyDown( 157 )) )
         {
-            queueEvent( "terminate" );
-        }
-
-        if( shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (shutdownTimer += 0.05f) > TERMINATE_TIME )
-        {
-            ClientComputer computer = this.computer.get();
-            if( computer != null ) computer.shutdown();
-        }
-
-        if( rebootTimer >= 0 && rebootTimer < TERMINATE_TIME && (rebootTimer += 0.05f) > TERMINATE_TIME )
-        {
-            ClientComputer computer = this.computer.get();
-            if( computer != null ) computer.reboot();
-        }
-    }
-
-    @Override
-    public boolean changeFocus( boolean reversed )
-    {
-        if( focused )
-        {
-            // When blurring, we should make all keys go up
-            for( int key = 0; key < keysDown.size(); key++ )
+            // Ctrl+T for terminate
+            if( Keyboard.isKeyDown( 20 ) )
             {
-                if( keysDown.get( key ) ) queueEvent( "key_up", key );
-            }
-            keysDown.clear();
-
-            // When blurring, we should make the last mouse button go up
-            if( lastMouseButton > 0 )
-            {
-                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 )
-            {
-                // Draw the terminal
-                boolean greyscale = !computer.isColour();
-                Palette palette = terminal.getPalette();
-
-                // Get the data from the terminal first
-                // Unfortunately we have to keep the lock for the whole of drawing, so the text doesn't change under us.
-                FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
-                boolean tblink = terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink();
-                int tw = terminal.getWidth();
-                int th = terminal.getHeight();
-                int tx = terminal.getCursorX();
-                int ty = terminal.getCursorY();
-
-                // Draw margins
-                TextBuffer emptyLine = new TextBuffer( ' ', tw );
-                if( topMargin > 0 )
+                if( m_terminateTimer < TERMINATE_TIME )
                 {
-                    fontRenderer.drawString( emptyLine, originX, originY - topMargin,
-                        terminal.getTextColourLine( 0 ), terminal.getBackgroundColourLine( 0 ),
-                        leftMargin, rightMargin, greyscale, palette );
-                }
-
-                if( bottomMargin > 0 )
-                {
-                    fontRenderer.drawString( emptyLine, originX, originY + bottomMargin + (th - 1) * FixedWidthFontRenderer.FONT_HEIGHT,
-                        terminal.getTextColourLine( th - 1 ), terminal.getBackgroundColourLine( th - 1 ),
-                        leftMargin, rightMargin, greyscale, palette );
-                }
-
-                // Draw lines
-                int y = originY;
-                for( int line = 0; line < th; line++ )
-                {
-                    TextBuffer text = terminal.getLine( line );
-                    TextBuffer colour = terminal.getTextColourLine( line );
-                    TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
-                    fontRenderer.drawString( text, originX, y, colour, backgroundColour, leftMargin, rightMargin, greyscale, palette );
-                    y += FixedWidthFontRenderer.FONT_HEIGHT;
-                }
-
-                if( tblink && tx >= 0 && ty >= 0 && tx < tw && ty < th )
-                {
-                    TextBuffer cursor = new TextBuffer( '_', 1 );
-                    TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
-
-                    fontRenderer.drawString(
-                        cursor,
-                        originX + FixedWidthFontRenderer.FONT_WIDTH * tx,
-                        originY + FixedWidthFontRenderer.FONT_HEIGHT * ty,
-                        cursorColour, null,
-                        0, 0,
-                        greyscale,
-                        palette
-                    );
+                    m_terminateTimer += 0.05f;
+                    if( m_terminateTimer >= TERMINATE_TIME ) queueEvent( "terminate" );
                 }
             }
             else
             {
-                // Draw a black background
-                Colour black = Colour.Black;
-                GlStateManager.color4f( black.getR(), black.getG(), black.getB(), 1.0f );
-                try
-                {
-                    int x = originX - leftMargin;
-                    int y = originY - rightMargin;
-                    int width = termWidth * FixedWidthFontRenderer.FONT_WIDTH + leftMargin + rightMargin;
-                    int height = termHeight * FixedWidthFontRenderer.FONT_HEIGHT + topMargin + bottomMargin;
+                m_terminateTimer = 0.0f;
+            }
 
-                    client.getTextureManager().bindTexture( BACKGROUND );
-
-                    Tessellator tesslector = Tessellator.getInstance();
-                    BufferBuilder buffer = tesslector.getBuffer();
-                    buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX );
-                    buffer.pos( x, y + height, 0 ).tex( 0 / 256.0, height / 256.0 ).endVertex();
-                    buffer.pos( x + width, y + height, 0 ).tex( width / 256.0, height / 256.0 ).endVertex();
-                    buffer.pos( x + width, y, 0 ).tex( width / 256.0, 0 / 256.0 ).endVertex();
-                    buffer.pos( x, y, 0 ).tex( 0 / 256.0, 0 / 256.0 ).endVertex();
-                    tesslector.draw();
-                }
-                finally
+            // Ctrl+R for reboot
+            if( Keyboard.isKeyDown( 19 ) )
+            {
+                if( m_rebootTimer < TERMINATE_TIME )
                 {
-                    GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
+                    m_rebootTimer += 0.05f;
+                    if( m_rebootTimer >= TERMINATE_TIME )
+                    {
+                        IComputer computer = m_computer.getComputer();
+                        if( computer != null ) computer.reboot();
+                    }
                 }
             }
+            else
+            {
+                m_rebootTimer = 0.0f;
+            }
+
+            // Ctrl+S for shutdown
+            if( Keyboard.isKeyDown( 31 ) )
+            {
+                if( m_shutdownTimer < TERMINATE_TIME )
+                {
+                    m_shutdownTimer += 0.05f;
+                    if( m_shutdownTimer >= TERMINATE_TIME )
+                    {
+                        IComputer computer = m_computer.getComputer();
+                        if( computer != null ) computer.shutdown();
+                    }
+                }
+            }
+            else
+            {
+                m_shutdownTimer = 0.0f;
+            }
+        }
+        else
+        {
+            m_terminateTimer = 0.0f;
+            m_rebootTimer = 0.0f;
+            m_shutdownTimer = 0.0f;
+        }
+    }
+
+    @Override
+    public void draw( Minecraft mc, int xOrigin, int yOrigin, int mouseX, int mouseY )
+    {
+        int startX = xOrigin + getXPosition();
+        int startY = yOrigin + getYPosition();
+
+        synchronized( m_computer )
+        {
+            // Draw the screen contents
+            IComputer computer = m_computer.getComputer();
+            Terminal terminal = computer != null ? computer.getTerminal() : null;
+            if( terminal != null )
+            {
+                FixedWidthFontRenderer.drawTerminal(
+                    startX + topMargin, startY + bottomMargin,
+                    terminal, !computer.isColour(), topMargin, bottomMargin, leftMargin, rightMargin
+                );
+            }
+            else
+            {
+                FixedWidthFontRenderer.drawEmptyTerminal( startX, startY, getWidth(), getHeight() );
+            }
         }
     }
 
     private void queueEvent( String event )
     {
-        ClientComputer computer = this.computer.get();
+        IComputer computer = m_computer.getComputer();
         if( computer != null ) computer.queueEvent( event );
     }
 
-    private void queueEvent( String event, Object... args )
+    private void queueEvent( String event, Object[] args )
     {
-        ClientComputer computer = this.computer.get();
+        IComputer computer = m_computer.getComputer();
         if( computer != null ) computer.queueEvent( event, args );
     }
-
-    @Override
-    public boolean isMouseOver( double x, double y )
-    {
-        return true;
-    }
 }

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

@@ -1,105 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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

@@ -6,68 +6,56 @@
 package dan200.computercraft.client.proxy;
 
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.*;
 import dan200.computercraft.client.render.TileEntityCableRenderer;
 import dan200.computercraft.client.render.TileEntityMonitorRenderer;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
-import dan200.computercraft.shared.common.ContainerHeldItem;
-import dan200.computercraft.shared.computer.inventory.ContainerComputer;
-import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
-import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
+import dan200.computercraft.shared.command.CommandCopy;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
-import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
+import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
-import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-import net.minecraft.client.gui.ScreenManager;
-import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.event.world.WorldEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
-public final class ComputerCraftProxyClient
+public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
 {
-    @SubscribeEvent
-    public static void setupClient( FMLClientSetupEvent event )
+    @Override
+    public void preInit()
     {
-        registerContainers();
+        super.preInit();
 
-        // Setup TESRs
+        // Register any client-specific commands
+        ClientCommandHandler.instance.registerCommand( CommandCopy.INSTANCE );
+    }
+
+    @Override
+    public void init()
+    {
+        super.init();
+
+        // Setup renderers
         ClientRegistry.bindTileEntitySpecialRenderer( TileMonitor.class, new TileEntityMonitorRenderer() );
         ClientRegistry.bindTileEntitySpecialRenderer( TileCable.class, new TileEntityCableRenderer() );
         ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
     }
 
-    private static void registerContainers()
-    {
-        // My IDE doesn't think so, but we do actually need these generics.
-
-        ScreenManager.<ContainerComputer, GuiComputer<ContainerComputer>>registerFactory( ContainerComputer.TYPE, GuiComputer::create );
-        ScreenManager.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>registerFactory( ContainerPocketComputer.TYPE, GuiComputer::createPocket );
-        ScreenManager.registerFactory( ContainerTurtle.TYPE, GuiTurtle::new );
-
-        ScreenManager.registerFactory( ContainerPrinter.TYPE, GuiPrinter::new );
-        ScreenManager.registerFactory( ContainerDiskDrive.TYPE, GuiDiskDrive::new );
-        ScreenManager.registerFactory( ContainerHeldItem.PRINTOUT_TYPE, GuiPrintout::new );
-
-        ScreenManager.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>registerFactory( ContainerViewComputer.TYPE, GuiComputer::createView );
-    }
-
-    @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+    @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
     public static final class ForgeHandlers
     {
         @SubscribeEvent
         public static void onWorldUnload( WorldEvent.Unload event )
         {
-            if( event.getWorld().isRemote() )
+            if( event.getWorld().isRemote )
             {
                 ClientMonitor.destroyAll();
             }
         }
     }
+
+
 }

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

@@ -5,85 +5,217 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.peripheral.PeripheralType;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
-import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
+import dan200.computercraft.shared.peripheral.modem.wired.CableBounds;
 import dan200.computercraft.shared.util.WorldUtil;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ActiveRenderInfo;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.World;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 import org.lwjgl.opengl.GL11;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class CableHighlightRenderer
 {
+    private static final float EXPAND = 0.002f;
+    private static final double MIN = CableBounds.MIN - EXPAND;
+    private static final double MAX = CableBounds.MAX + EXPAND;
+
     private CableHighlightRenderer()
     {
     }
 
-    /**
-     * Draw an outline for a specific part of a cable "Multipart".
-     *
-     * @param event The event to observe
-     * @see WorldRenderer#drawSelectionBox(ActiveRenderInfo, RayTraceResult, int)
-     */
     @SubscribeEvent
     public static void drawHighlight( DrawBlockHighlightEvent event )
     {
-        if( event.getTarget().getType() != RayTraceResult.Type.BLOCK ) return;
+        if( event.getTarget().typeOfHit != RayTraceResult.Type.BLOCK ) return;
 
-        BlockRayTraceResult hit = (BlockRayTraceResult) event.getTarget();
-        BlockPos pos = hit.getPos();
-        World world = event.getInfo().getRenderViewEntity().getEntityWorld();
-        ActiveRenderInfo info = event.getInfo();
+        BlockPos pos = event.getTarget().getBlockPos();
+        World world = event.getPlayer().getEntityWorld();
 
-        BlockState state = world.getBlockState( pos );
+        IBlockState state = world.getBlockState( pos );
+        if( state.getBlock() != ComputerCraft.Blocks.cable ) return;
 
-        // We only care about instances with both cable and modem.
-        if( state.getBlock() != ComputerCraft.Blocks.cable || state.get( BlockCable.MODEM ).getFacing() == null || !state.get( BlockCable.CABLE ) )
-        {
-            return;
-        }
+        state = state.getActualState( world, pos );
 
         event.setCanceled( true );
-
-        Minecraft mc = Minecraft.getInstance();
+        PeripheralType type = BlockCable.getPeripheralType( state );
 
         GlStateManager.enableBlend();
-        GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
-        GlStateManager.lineWidth( Math.max( 2.5F, mc.mainWindow.getFramebufferWidth() / 1920.0F * 2.5F ) );
-        GlStateManager.disableTexture();
+        GlStateManager.tryBlendFuncSeparate( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0 );
+        GlStateManager.color( 0.0f, 0.0f, 0.0f, 0.4f );
+        GL11.glLineWidth( 2.0F );
+        GlStateManager.disableTexture2D();
         GlStateManager.depthMask( false );
-        GlStateManager.matrixMode( GL11.GL_PROJECTION );
         GlStateManager.pushMatrix();
-        GlStateManager.scalef( 1.0F, 1.0F, 0.999F );
 
-        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getHitVec().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
-            ? CableShapes.getModemShape( state )
-            : CableShapes.getCableShape( state );
+        {
+            EntityPlayer player = event.getPlayer();
+            double x = player.lastTickPosX + (player.posX - player.lastTickPosX) * event.getPartialTicks();
+            double y = player.lastTickPosY + (player.posY - player.lastTickPosY) * event.getPartialTicks();
+            double z = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * event.getPartialTicks();
 
-        Vec3d cameraPos = info.getProjectedView();
-        WorldRenderer.drawShape(
-            shape, pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ(),
-            0.0F, 0.0F, 0.0F, 0.4F
-        );
+            GlStateManager.translate( -x + pos.getX(), -y + pos.getY(), -z + pos.getZ() );
+        }
+
+        if( type != PeripheralType.Cable && WorldUtil.isVecInsideInclusive( CableBounds.getModemBounds( state ), event.getTarget().hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) ) )
+        {
+            RenderGlobal.drawSelectionBoundingBox( CableBounds.getModemBounds( state ), 0, 0, 0, 0.4f );
+        }
+        else
+        {
+            int flags = 0;
+
+            Tessellator tessellator = Tessellator.getInstance();
+            BufferBuilder buffer = tessellator.getBuffer();
+
+            for( EnumFacing facing : EnumFacing.VALUES )
+            {
+                if( BlockCable.doesConnectVisually( state, world, pos, facing ) )
+                {
+                    flags |= 1 << facing.ordinal();
+
+
+                    switch( facing.getAxis() )
+                    {
+                        case X:
+                        {
+                            double offset = facing == EnumFacing.WEST ? -EXPAND : 1 + EXPAND;
+                            double centre = facing == EnumFacing.WEST ? MIN : MAX;
+
+                            buffer.begin( GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION );
+                            buffer.pos( offset, MIN, MIN ).endVertex();
+                            buffer.pos( offset, MAX, MIN ).endVertex();
+                            buffer.pos( offset, MAX, MAX ).endVertex();
+                            buffer.pos( offset, MIN, MAX ).endVertex();
+                            buffer.pos( offset, MIN, MIN ).endVertex();
+                            tessellator.draw();
+
+                            buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION );
+                            buffer.pos( offset, MIN, MIN ).endVertex();
+                            buffer.pos( centre, MIN, MIN ).endVertex();
+                            buffer.pos( offset, MAX, MIN ).endVertex();
+                            buffer.pos( centre, MAX, MIN ).endVertex();
+                            buffer.pos( offset, MAX, MAX ).endVertex();
+                            buffer.pos( centre, MAX, MAX ).endVertex();
+                            buffer.pos( offset, MIN, MAX ).endVertex();
+                            buffer.pos( centre, MIN, MAX ).endVertex();
+                            tessellator.draw();
+                            break;
+                        }
+                        case Y:
+                        {
+                            double offset = facing == EnumFacing.DOWN ? -EXPAND : 1 + EXPAND;
+                            double centre = facing == EnumFacing.DOWN ? MIN : MAX;
+
+                            buffer.begin( GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION );
+                            buffer.pos( MIN, offset, MIN ).endVertex();
+                            buffer.pos( MAX, offset, MIN ).endVertex();
+                            buffer.pos( MAX, offset, MAX ).endVertex();
+                            buffer.pos( MIN, offset, MAX ).endVertex();
+                            buffer.pos( MIN, offset, MIN ).endVertex();
+                            tessellator.draw();
+
+                            buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION );
+                            buffer.pos( MIN, offset, MIN ).endVertex();
+                            buffer.pos( MIN, centre, MIN ).endVertex();
+                            buffer.pos( MAX, offset, MIN ).endVertex();
+                            buffer.pos( MAX, centre, MIN ).endVertex();
+                            buffer.pos( MAX, offset, MAX ).endVertex();
+                            buffer.pos( MAX, centre, MAX ).endVertex();
+                            buffer.pos( MIN, offset, MAX ).endVertex();
+                            buffer.pos( MIN, centre, MAX ).endVertex();
+                            tessellator.draw();
+                            break;
+                        }
+                        case Z:
+                        {
+                            double offset = facing == EnumFacing.NORTH ? -EXPAND : 1 + EXPAND;
+                            double centre = facing == EnumFacing.NORTH ? MIN : MAX;
+
+                            buffer.begin( GL11.GL_LINE_STRIP, DefaultVertexFormats.POSITION );
+                            buffer.pos( MIN, MIN, offset ).endVertex();
+                            buffer.pos( MAX, MIN, offset ).endVertex();
+                            buffer.pos( MAX, MAX, offset ).endVertex();
+                            buffer.pos( MIN, MAX, offset ).endVertex();
+                            buffer.pos( MIN, MIN, offset ).endVertex();
+                            tessellator.draw();
+
+                            buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION );
+                            buffer.pos( MIN, MIN, offset ).endVertex();
+                            buffer.pos( MIN, MIN, centre ).endVertex();
+                            buffer.pos( MAX, MIN, offset ).endVertex();
+                            buffer.pos( MAX, MIN, centre ).endVertex();
+                            buffer.pos( MAX, MAX, offset ).endVertex();
+                            buffer.pos( MAX, MAX, centre ).endVertex();
+                            buffer.pos( MIN, MAX, offset ).endVertex();
+                            buffer.pos( MIN, MAX, centre ).endVertex();
+                            tessellator.draw();
+                            break;
+                        }
+                    }
+                }
+            }
+
+            buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION );
+
+            draw( buffer, flags, EnumFacing.WEST, EnumFacing.DOWN, EnumFacing.Axis.Z );
+            draw( buffer, flags, EnumFacing.WEST, EnumFacing.UP, EnumFacing.Axis.Z );
+            draw( buffer, flags, EnumFacing.EAST, EnumFacing.DOWN, EnumFacing.Axis.Z );
+            draw( buffer, flags, EnumFacing.EAST, EnumFacing.UP, EnumFacing.Axis.Z );
+
+            draw( buffer, flags, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.Axis.Y );
+            draw( buffer, flags, EnumFacing.WEST, EnumFacing.SOUTH, EnumFacing.Axis.Y );
+            draw( buffer, flags, EnumFacing.EAST, EnumFacing.NORTH, EnumFacing.Axis.Y );
+            draw( buffer, flags, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.Axis.Y );
+
+            draw( buffer, flags, EnumFacing.DOWN, EnumFacing.NORTH, EnumFacing.Axis.X );
+            draw( buffer, flags, EnumFacing.DOWN, EnumFacing.SOUTH, EnumFacing.Axis.X );
+            draw( buffer, flags, EnumFacing.UP, EnumFacing.NORTH, EnumFacing.Axis.X );
+            draw( buffer, flags, EnumFacing.UP, EnumFacing.SOUTH, EnumFacing.Axis.X );
+
+            tessellator.draw();
+        }
 
         GlStateManager.popMatrix();
-        GlStateManager.matrixMode( GL11.GL_MODELVIEW );
         GlStateManager.depthMask( true );
-        GlStateManager.enableTexture();
+        GlStateManager.enableTexture2D();
         GlStateManager.disableBlend();
     }
+
+    private static void draw( BufferBuilder buffer, int flags, EnumFacing a, EnumFacing b, EnumFacing.Axis other )
+    {
+        if( ((flags >> a.ordinal()) & 1) != ((flags >> b.ordinal()) & 1) ) return;
+
+        double offA = a.getAxisDirection() == EnumFacing.AxisDirection.NEGATIVE ? MIN : MAX;
+        double offB = b.getAxisDirection() == EnumFacing.AxisDirection.NEGATIVE ? MIN : MAX;
+        switch( other )
+        {
+            case X:
+                buffer.pos( MIN, offA, offB ).endVertex();
+                buffer.pos( MAX, offA, offB ).endVertex();
+                break;
+            case Y:
+                buffer.pos( offA, MIN, offB ).endVertex();
+                buffer.pos( offA, MAX, offB ).endVertex();
+                break;
+            case Z:
+                buffer.pos( offA, offB, MIN ).endVertex();
+                buffer.pos( offA, offB, MAX ).endVertex();
+                break;
+        }
+    }
 }

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

@@ -5,13 +5,13 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.FirstPersonRenderer;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Hand;
-import net.minecraft.util.HandSide;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.EnumHandSide;
 import net.minecraft.util.math.MathHelper;
 
 public abstract class ItemMapLikeRenderer
@@ -20,23 +20,23 @@ public abstract class ItemMapLikeRenderer
      * The main rendering method for the item.
      *
      * @param stack The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPerson(ItemStack)
+     * @see ItemRenderer#renderMapFirstPerson(ItemStack)
      */
     protected abstract void renderItem( ItemStack stack );
 
-    protected void renderItemFirstPerson( Hand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack )
+    protected void renderItemFirstPerson( EnumHand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack )
     {
-        PlayerEntity player = Minecraft.getInstance().player;
+        EntityPlayer player = Minecraft.getMinecraft().player;
 
         GlStateManager.pushMatrix();
-        if( hand == Hand.MAIN_HAND && player.getHeldItemOffhand().isEmpty() )
+        if( hand == EnumHand.MAIN_HAND && player.getHeldItemOffhand().isEmpty() )
         {
             renderItemFirstPersonCenter( pitch, equipProgress, swingProgress, stack );
         }
         else
         {
             renderItemFirstPersonSide(
-                hand == Hand.MAIN_HAND ? player.getPrimaryHand() : player.getPrimaryHand().opposite(),
+                hand == EnumHand.MAIN_HAND ? player.getPrimaryHand() : player.getPrimaryHand().opposite(),
                 equipProgress, swingProgress, stack
             );
         }
@@ -50,35 +50,35 @@ public abstract class ItemMapLikeRenderer
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
      * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPersonSide(float, HandSide, float, ItemStack)
+     * @see ItemRenderer#renderMapFirstPersonSide(float, EnumHandSide, float, ItemStack)
      */
-    private void renderItemFirstPersonSide( HandSide side, float equipProgress, float swingProgress, ItemStack stack )
+    private void renderItemFirstPersonSide( EnumHandSide side, float equipProgress, float swingProgress, ItemStack stack )
     {
-        Minecraft minecraft = Minecraft.getInstance();
-        float offset = side == HandSide.RIGHT ? 1f : -1f;
-        GlStateManager.translatef( offset * 0.125f, -0.125f, 0f );
+        Minecraft minecraft = Minecraft.getMinecraft();
+        float offset = side == EnumHandSide.RIGHT ? 1f : -1f;
+        GlStateManager.translate( offset * 0.125f, -0.125f, 0f );
 
         // If the player is not invisible then render a single arm
         if( !minecraft.player.isInvisible() )
         {
             GlStateManager.pushMatrix();
-            GlStateManager.rotatef( offset * 10f, 0f, 0f, 1f );
-            minecraft.getFirstPersonRenderer().renderArmFirstPerson( equipProgress, swingProgress, side );
+            GlStateManager.rotate( offset * 10f, 0f, 0f, 1f );
+            minecraft.getItemRenderer().renderArmFirstPerson( equipProgress, swingProgress, side );
             GlStateManager.popMatrix();
         }
 
         // Setup the appropriate transformations. This is just copied from the
         // corresponding method in ItemRenderer.
         GlStateManager.pushMatrix();
-        GlStateManager.translatef( offset * 0.51f, -0.08f + equipProgress * -1.2f, -0.75f );
+        GlStateManager.translate( offset * 0.51f, -0.08f + equipProgress * -1.2f, -0.75f );
         float f1 = MathHelper.sqrt( swingProgress );
         float f2 = MathHelper.sin( f1 * (float) Math.PI );
         float f3 = -0.5f * f2;
         float f4 = 0.4f * MathHelper.sin( f1 * ((float) Math.PI * 2f) );
         float f5 = -0.3f * MathHelper.sin( swingProgress * (float) Math.PI );
-        GlStateManager.translatef( offset * f3, f4 - 0.3f * f2, f5 );
-        GlStateManager.rotatef( f2 * -45f, 1f, 0f, 0f );
-        GlStateManager.rotatef( offset * f2 * -30f, 0f, 1f, 0f );
+        GlStateManager.translate( offset * f3, f4 - 0.3f * f2, f5 );
+        GlStateManager.rotate( f2 * -45f, 1f, 0f, 0f );
+        GlStateManager.rotate( offset * f2 * -30f, 0f, 1f, 0f );
 
         renderItem( stack );
 
@@ -92,25 +92,25 @@ public abstract class ItemMapLikeRenderer
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
      * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPerson(float, float, float)
+     * @see ItemRenderer#renderMapFirstPerson(float, float, float)
      */
     private void renderItemFirstPersonCenter( float pitch, float equipProgress, float swingProgress, ItemStack stack )
     {
-        FirstPersonRenderer renderer = Minecraft.getInstance().getFirstPersonRenderer();
+        ItemRenderer itemRenderer = Minecraft.getMinecraft().getItemRenderer();
 
         // Setup the appropriate transformations. This is just copied from the
         // corresponding method in ItemRenderer.
         float swingRt = MathHelper.sqrt( swingProgress );
         float tX = -0.2f * MathHelper.sin( swingProgress * (float) Math.PI );
         float tZ = -0.4f * MathHelper.sin( swingRt * (float) Math.PI );
-        GlStateManager.translatef( 0f, -tX / 2f, tZ );
-        float pitchAngle = renderer.getMapAngleFromPitch( pitch );
-        GlStateManager.translatef( 0f, 0.04f + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f );
-        GlStateManager.rotatef( pitchAngle * -85f, 1f, 0f, 0f );
-        renderer.renderArms();
+        GlStateManager.translate( 0f, -tX / 2f, tZ );
+        float pitchAngle = itemRenderer.getMapAngleFromPitch( pitch );
+        GlStateManager.translate( 0f, 0.04f + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f );
+        GlStateManager.rotate( pitchAngle * -85f, 1f, 0f, 0f );
+        itemRenderer.renderArms();
         float rX = MathHelper.sin( swingRt * (float) Math.PI );
-        GlStateManager.rotatef( rX * 20f, 1f, 0f, 0f );
-        GlStateManager.scalef( 2f, 2f, 2f );
+        GlStateManager.rotate( rX * 20f, 1f, 0f, 0f );
+        GlStateManager.scale( 2f, 2f, 2f );
 
         renderItem( stack );
     }

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

@@ -5,35 +5,33 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderSpecificHandEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 import org.lwjgl.opengl.GL11;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.client.gui.GuiComputer.*;
 
 /**
  * Emulates map rendering for pocket computers.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class ItemPocketRenderer extends ItemMapLikeRenderer
 {
     private static final int MARGIN = 2;
@@ -82,20 +80,19 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         GlStateManager.pushMatrix();
 
         GlStateManager.disableLighting();
-        GlStateManager.disableDepthTest();
+        GlStateManager.disableDepth();
 
-        GlStateManager.rotatef( 180f, 0f, 1f, 0f );
-        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
-        GlStateManager.scalef( 0.5f, 0.5f, 0.5f );
+        GlStateManager.rotate( 180f, 0f, 1f, 0f );
+        GlStateManager.rotate( 180f, 0f, 0f, 1f );
+        GlStateManager.scale( 0.5, 0.5, 0.5 );
 
         double scale = 0.75 / Math.max( width + FRAME * 2, height + FRAME * 2 + LIGHT_HEIGHT );
-        GlStateManager.scaled( scale, scale, 0 );
-        GlStateManager.translated( -0.5 * width, -0.5 * height, 0 );
+        GlStateManager.scale( scale, scale, 0 );
+        GlStateManager.translate( -0.5 * width, -0.5 * height, 0 );
 
         // Render the main frame
-        ItemPocketComputer item = (ItemPocketComputer) stack.getItem();
-        ComputerFamily family = item.getFamily();
-        int frameColour = item.getColour( stack );
+        ComputerFamily family = ComputerCraft.Items.pocketComputer.getFamily( stack );
+        int frameColour = ComputerCraft.Items.pocketComputer.getColour( stack );
         renderFrame( family, frameColour, width, height );
 
         // Render the light
@@ -105,24 +102,14 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
 
         if( computer != null && terminal != null )
         {
-            // If we've a computer and terminal then attempt to render it.
-            renderTerminal( terminal, !computer.isColour(), width, height );
+            FixedWidthFontRenderer.drawTerminal( MARGIN, MARGIN, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN );
         }
         else
         {
-            // Otherwise render a plain background
-            Minecraft.getInstance().getTextureManager().bindTexture( BACKGROUND );
-
-            Tessellator tessellator = Tessellator.getInstance();
-            BufferBuilder buffer = tessellator.getBuffer();
-
-            Colour black = Colour.Black;
-            buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION );
-            renderTexture( buffer, 0, 0, 0, 0, width, height, black.getR(), black.getG(), black.getB() );
-            tessellator.draw();
+            FixedWidthFontRenderer.drawEmptyTerminal( 0, 0, width, height );
         }
 
-        GlStateManager.enableDepthTest();
+        GlStateManager.enableDepth();
         GlStateManager.enableLighting();
         GlStateManager.popMatrix();
     }
@@ -130,7 +117,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     private static void renderFrame( ComputerFamily family, int colour, int width, int height )
     {
 
-        Minecraft.getInstance().getTextureManager().bindTexture( colour != -1
+        Minecraft.getMinecraft().getTextureManager().bindTexture( colour != -1
             ? BACKGROUND_COLOUR
             : family == ComputerFamily.Normal ? BACKGROUND_NORMAL : BACKGROUND_ADVANCED
         );
@@ -172,7 +159,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     private static void renderLight( int colour, int width, int height )
     {
         GlStateManager.enableBlend();
-        GlStateManager.disableTexture();
+        GlStateManager.disableTexture2D();
 
         float r = ((colour >>> 16) & 0xFF) / 255.0f;
         float g = ((colour >>> 8) & 0xFF) / 255.0f;
@@ -187,54 +174,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         buffer.pos( width - LIGHT_HEIGHT * 2, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
 
         tessellator.draw();
-        GlStateManager.enableTexture();
-    }
-
-    private static void renderTerminal( Terminal terminal, boolean greyscale, int width, int height )
-    {
-        synchronized( terminal )
-        {
-            int termWidth = terminal.getWidth();
-            int termHeight = terminal.getHeight();
-
-            FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
-            Palette palette = terminal.getPalette();
-
-            // Render top/bottom borders
-            TextBuffer emptyLine = new TextBuffer( ' ', termWidth );
-            fontRenderer.drawString(
-                emptyLine, MARGIN, 0,
-                terminal.getTextColourLine( 0 ), terminal.getBackgroundColourLine( 0 ), MARGIN, MARGIN, greyscale, palette
-            );
-            fontRenderer.drawString(
-                emptyLine, MARGIN, 2 * MARGIN + (termHeight - 1) * FixedWidthFontRenderer.FONT_HEIGHT,
-                terminal.getTextColourLine( termHeight - 1 ), terminal.getBackgroundColourLine( termHeight - 1 ), MARGIN, MARGIN, greyscale, palette
-            );
-
-            // Render the actual text
-            for( int line = 0; line < termWidth; line++ )
-            {
-                TextBuffer text = terminal.getLine( line );
-                TextBuffer colour = terminal.getTextColourLine( line );
-                TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
-                fontRenderer.drawString(
-                    text, MARGIN, MARGIN + line * FONT_HEIGHT,
-                    colour, backgroundColour, MARGIN, MARGIN, greyscale, palette
-                );
-            }
-
-            // And render the cursor;
-            int tx = terminal.getCursorX(), ty = terminal.getCursorY();
-            if( terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink() &&
-                tx >= 0 && ty >= 0 && tx < termWidth && ty < termHeight )
-            {
-                TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
-                fontRenderer.drawString(
-                    new TextBuffer( '_', 1 ), MARGIN + FONT_WIDTH * tx, MARGIN + FONT_HEIGHT * ty,
-                    cursorColour, null, 0, 0, greyscale, palette
-                );
-            }
-        }
+        GlStateManager.enableTexture2D();
     }
 
     private static void renderTexture( BufferBuilder builder, int x, int y, int textureX, int textureY, int width, int height, float r, float g, float b )

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

@@ -5,15 +5,15 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.media.items.ItemPrintout;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderItemInFrameEvent;
 import net.minecraftforge.client.event.RenderSpecificHandEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
@@ -24,7 +24,7 @@ import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENG
 /**
  * Emulates map and item-frame rendering for printouts.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
 {
     private static final ItemPrintoutRenderer INSTANCE = new ItemPrintoutRenderer();
@@ -37,9 +37,10 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     public static void onRenderInHand( RenderSpecificHandEvent event )
     {
         ItemStack stack = event.getItemStack();
-        if( !(stack.getItem() instanceof ItemPrintout) ) return;
+        if( stack.getItem() != ComputerCraft.Items.printout ) return;
 
         event.setCanceled( true );
+
         INSTANCE.renderItemFirstPerson( event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack() );
     }
 
@@ -47,13 +48,13 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     protected void renderItem( ItemStack stack )
     {
         // Setup various transformations. Note that these are partially adapated from the corresponding method
-        // in FirstPersonRenderer.renderFirstPersonMap
+        // in ItemRenderer.renderMapFirstPerson
         GlStateManager.disableLighting();
 
-        GlStateManager.rotatef( 180f, 0f, 1f, 0f );
-        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
-        GlStateManager.scalef( 0.42f, 0.42f, -0.42f );
-        GlStateManager.translatef( -0.5f, -0.48f, 0.0f );
+        GlStateManager.rotate( 180f, 0f, 1f, 0f );
+        GlStateManager.rotate( 180f, 0f, 0f, 1f );
+        GlStateManager.scale( 0.42f, 0.42f, -0.42f );
+        GlStateManager.translate( -0.5f, -0.48f, 0.0f );
 
         drawPrintout( stack );
 
@@ -64,17 +65,17 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     public static void onRenderInFrame( RenderItemInFrameEvent event )
     {
         ItemStack stack = event.getItem();
-        if( !(stack.getItem() instanceof ItemPrintout) ) return;
+        if( stack.getItem() != ComputerCraft.Items.printout ) return;
 
         event.setCanceled( true );
 
         GlStateManager.disableLighting();
 
         // Move a little bit forward to ensure we're not clipping with the frame
-        GlStateManager.translatef( 0.0f, 0.0f, -0.001f );
-        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
-        GlStateManager.scalef( 0.95f, 0.95f, -0.95f );
-        GlStateManager.translatef( -0.5f, -0.5f, 0.0f );
+        GlStateManager.translate( 0.0f, 0.0f, -0.001f );
+        GlStateManager.rotate( 180f, 0f, 0f, 1f );
+        GlStateManager.scale( 0.95f, 0.95f, -0.95f );
+        GlStateManager.translate( -0.5f, -0.5f, 0.0f );
 
         drawPrintout( stack );
 
@@ -85,7 +86,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     private static void drawPrintout( ItemStack stack )
     {
         int pages = ItemPrintout.getPageCount( stack );
-        boolean book = ((ItemPrintout) stack.getItem()).getType() == ItemPrintout.Type.BOOK;
+        boolean book = ItemPrintout.getType( stack ) == ItemPrintout.Type.Book;
 
         double width = LINE_MAX_LENGTH * FONT_WIDTH + X_TEXT_MARGIN * 2;
         double height = LINES_PER_PAGE * FONT_HEIGHT + Y_TEXT_MARGIN * 2;
@@ -106,8 +107,8 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
 
         // Scale the printout to fit correctly.
         double scale = 1.0 / max;
-        GlStateManager.scaled( scale, scale, scale );
-        GlStateManager.translated( (max - width) / 2.0, (max - height) / 2.0, 0.0 );
+        GlStateManager.scale( scale, scale, scale );
+        GlStateManager.translate( (max - width) / 2.0f, (max - height) / 2.0f, 0.0f );
 
         drawBorder( 0, 0, -0.01, 0, pages, book );
         drawText( X_TEXT_MARGIN, Y_TEXT_MARGIN, 0, ItemPrintout.getText( stack ), ItemPrintout.getColours( stack ) );

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

@@ -5,10 +5,10 @@
  */
 package dan200.computercraft.client.render;
 
-import net.minecraft.client.renderer.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraftforge.client.model.pipeline.IVertexConsumer;
 import net.minecraftforge.client.model.pipeline.LightUtil;
 import net.minecraftforge.client.model.pipeline.VertexTransformer;
@@ -101,7 +101,7 @@ public final class ModelTransformer
         }
 
         @Override
-        public void setQuadOrientation( @Nonnull Direction orientation )
+        public void setQuadOrientation( @Nonnull EnumFacing orientation )
         {
             super.setQuadOrientation( orientation == null ? orientation : TRSRTransformation.rotate( positionMatrix, orientation ) );
         }
@@ -186,7 +186,7 @@ public final class ModelTransformer
         private final int[] vertexData;
         private int vertexIndex = 0, elementIndex = 0;
 
-        private Direction orientation;
+        private EnumFacing orientation;
         private int quadTint;
         private boolean diffuse;
         private TextureAtlasSprite texture;
@@ -211,7 +211,7 @@ public final class ModelTransformer
         }
 
         @Override
-        public void setQuadOrientation( @Nonnull Direction orientation )
+        public void setQuadOrientation( @Nonnull EnumFacing orientation )
         {
             this.orientation = orientation;
         }

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

@@ -5,31 +5,29 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.relauncher.Side;
 import org.lwjgl.opengl.GL11;
 
 import java.util.EnumSet;
 
-import static net.minecraft.util.Direction.*;
+import static net.minecraft.util.EnumFacing.*;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class MonitorHighlightRenderer
 {
     private static final float EXPAND = 0.002f;
@@ -41,13 +39,12 @@ public final class MonitorHighlightRenderer
     @SubscribeEvent
     public static void drawHighlight( DrawBlockHighlightEvent event )
     {
-        if( event.getTarget().getType() != RayTraceResult.Type.BLOCK || event.getInfo().getRenderViewEntity().isSneaking() )
-        {
-            return;
-        }
+        if( event.getTarget().typeOfHit != RayTraceResult.Type.BLOCK || event.getPlayer().isSneaking() ) return;
 
-        World world = event.getInfo().getRenderViewEntity().getEntityWorld();
-        BlockPos pos = ((BlockRayTraceResult) event.getTarget()).getPos();
+        World world = event.getPlayer().getEntityWorld();
+        BlockPos pos = event.getTarget().getBlockPos();
+
+        if( world.getBlockState( pos ).getBlock() != ComputerCraft.Blocks.peripheral ) return;
 
         TileEntity tile = world.getTileEntity( pos );
         if( !(tile instanceof TileMonitor) ) return;
@@ -56,8 +53,8 @@ public final class MonitorHighlightRenderer
         event.setCanceled( true );
 
         // Determine which sides are part of the external faces of the monitor, and so which need to be rendered.
-        EnumSet<Direction> faces = EnumSet.allOf( Direction.class );
-        Direction front = monitor.getFront();
+        EnumSet<EnumFacing> faces = EnumSet.allOf( EnumFacing.class );
+        EnumFacing front = monitor.getFront();
         faces.remove( front );
         if( monitor.getXIndex() != 0 ) faces.remove( monitor.getRight().getOpposite() );
         if( monitor.getXIndex() != monitor.getWidth() - 1 ) faces.remove( monitor.getRight() );
@@ -65,14 +62,18 @@ public final class MonitorHighlightRenderer
         if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );
 
         GlStateManager.enableBlend();
-        GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
-        GlStateManager.lineWidth( Math.max( 2.5F, (float) Minecraft.getInstance().mainWindow.getFramebufferWidth() / 1920.0F * 2.5F ) );
-        GlStateManager.disableTexture();
+        GlStateManager.tryBlendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
+        GL11.glLineWidth( 2.0F );
+        GlStateManager.disableTexture2D();
         GlStateManager.depthMask( false );
         GlStateManager.pushMatrix();
 
-        Vec3d cameraPos = event.getInfo().getProjectedView();
-        GlStateManager.translated( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );
+        EntityPlayer player = event.getPlayer();
+        double x = player.lastTickPosX + (player.posX - player.lastTickPosX) * event.getPartialTicks();
+        double y = player.lastTickPosY + (player.posY - player.lastTickPosY) * event.getPartialTicks();
+        double z = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * event.getPartialTicks();
+
+        GlStateManager.translate( -x + pos.getX(), -y + pos.getY(), -z + pos.getZ() );
 
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
@@ -96,11 +97,11 @@ public final class MonitorHighlightRenderer
 
         GlStateManager.popMatrix();
         GlStateManager.depthMask( true );
-        GlStateManager.enableTexture();
+        GlStateManager.enableTexture2D();
         GlStateManager.disableBlend();
     }
 
-    private static void line( BufferBuilder buffer, int x, int y, int z, Direction direction )
+    private static void line( BufferBuilder buffer, int x, int y, int z, EnumFacing direction )
     {
         double minX = x == 0 ? -EXPAND : 1 + EXPAND;
         double minY = y == 0 ? -EXPAND : 1 + EXPAND;

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

@@ -5,14 +5,14 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.platform.GlStateManager.DestFactor;
-import com.mojang.blaze3d.platform.GlStateManager.SourceFactor;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.GlStateManager.DestFactor;
+import net.minecraft.client.renderer.GlStateManager.SourceFactor;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
@@ -63,37 +63,40 @@ public final class PrintoutRenderer
 
     public static void drawText( int x, int y, int start, TextBuffer[] text, TextBuffer[] colours )
     {
-        FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
-
         for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
         {
-            fontRenderer.drawString( text[start + line], x, y + line * FONT_HEIGHT, colours[start + line], null, 0, 0, false, Palette.DEFAULT );
+            FixedWidthFontRenderer.drawString(
+                x, y + line * FONT_HEIGHT, text[start + line], colours[start + line], null, Palette.DEFAULT,
+                false, 0, 0
+            );
         }
     }
 
     public static void drawText( int x, int y, int start, String[] text, String[] colours )
     {
-        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableBlend();
-        GlStateManager.enableTexture();
-        GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
-
-        FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
+        GlStateManager.enableTexture2D();
+        GlStateManager.tryBlendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
 
         for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
         {
-            fontRenderer.drawString( new TextBuffer( text[start + line] ), x, y + line * FONT_HEIGHT, new TextBuffer( colours[start + line] ), null, 0, 0, false, Palette.DEFAULT );
+            FixedWidthFontRenderer.drawString(
+                x, y + line * FONT_HEIGHT,
+                new TextBuffer( text[start + line] ), new TextBuffer( colours[start + line] ),
+                null, Palette.DEFAULT, false, 0, 0
+            );
         }
     }
 
     public static void drawBorder( double x, double y, double z, int page, int pages, boolean isBook )
     {
-        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableBlend();
-        GlStateManager.enableTexture();
-        GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
+        GlStateManager.enableTexture2D();
+        GlStateManager.tryBlendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
 
-        Minecraft.getInstance().getTextureManager().bindTexture( BG );
+        Minecraft.getMinecraft().getTextureManager().bindTexture( BG );
 
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();

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

@@ -5,94 +5,86 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.peripheral.PeripheralType;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
-import dan200.computercraft.shared.peripheral.modem.wired.CableModemVariant;
-import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
+import dan200.computercraft.shared.peripheral.modem.wired.BlockCableModemVariant;
+import dan200.computercraft.shared.peripheral.modem.wired.CableBounds;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.model.data.EmptyModelData;
+import net.minecraftforge.client.MinecraftForgeClient;
 import org.lwjgl.opengl.GL11;
 
 import javax.annotation.Nonnull;
-import java.util.Random;
 
 /**
  * Render breaking animation only over part of a {@link TileCable}.
  */
-public class TileEntityCableRenderer extends TileEntityRenderer<TileCable>
+public class TileEntityCableRenderer extends TileEntitySpecialRenderer<TileCable>
 {
-    private static final ResourceLocation[] DESTROY_STAGES = new ResourceLocation[10];
-    private static final Random random = new Random();
-
-    static
-    {
-        for( int i = 0; i < DESTROY_STAGES.length; i++ )
-        {
-            DESTROY_STAGES[i] = new ResourceLocation( "block/destroy_stage_" + i );
-        }
-    }
-
     @Override
-    public void render( @Nonnull TileCable te, double x, double y, double z, float partialTicks, int destroyStage )
+    public void render( @Nonnull TileCable te, double x, double y, double z, float partialTicks, int destroyStage, float alpha )
     {
         if( destroyStage < 0 ) return;
 
         BlockPos pos = te.getPos();
 
-        Minecraft mc = Minecraft.getInstance();
+        Minecraft mc = Minecraft.getMinecraft();
 
         RayTraceResult hit = mc.objectMouseOver;
-        if( hit == null || hit.getType() != RayTraceResult.Type.BLOCK || !((BlockRayTraceResult) hit).getPos().equals( pos ) )
-        {
-            return;
-        }
+        if( hit == null || !hit.getBlockPos().equals( pos ) ) return;
+
+        if( MinecraftForgeClient.getRenderPass() != 0 ) return;
 
         World world = te.getWorld();
-        BlockState state = world.getBlockState( pos );
+        IBlockState state = world.getBlockState( pos );
         Block block = state.getBlock();
         if( block != ComputerCraft.Blocks.cable ) return;
 
-        state = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getHitVec().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
-            ? block.getDefaultState().with( BlockCable.MODEM, state.get( BlockCable.MODEM ) )
-            : state.with( BlockCable.MODEM, CableModemVariant.None );
+        state = state.getActualState( world, pos );
+        if( te.getPeripheralType() != PeripheralType.Cable && WorldUtil.isVecInsideInclusive( CableBounds.getModemBounds( state ), hit.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) ) )
+        {
+            state = block.getDefaultState().withProperty( BlockCable.MODEM, state.getValue( BlockCable.MODEM ) );
+        }
+        else
+        {
+            state = state.withProperty( BlockCable.MODEM, BlockCableModemVariant.None );
+        }
 
         IBakedModel model = mc.getBlockRendererDispatcher().getModelForState( state );
+        if( model == null ) return;
 
         preRenderDamagedBlocks();
 
-        ForgeHooksClient.setRenderLayer( block.getRenderLayer() );
-
-        // See BlockRendererDispatcher#renderBlockDamage
-        TextureAtlasSprite breakingTexture = mc.getTextureMap().getSprite( DESTROY_STAGES[destroyStage] );
-
         BufferBuilder buffer = Tessellator.getInstance().getBuffer();
         buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.BLOCK );
         buffer.setTranslation( x - pos.getX(), y - pos.getY(), z - pos.getZ() );
         buffer.noColor();
 
-        mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModel(
+        ForgeHooksClient.setRenderLayer( block.getRenderLayer() );
+
+        // See BlockRendererDispatcher#renderBlockDamage
+        TextureAtlasSprite breakingTexture = mc.getTextureMapBlocks().getAtlasSprite( "minecraft:blocks/destroy_stage_" + destroyStage );
+        Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModel(
             world,
-            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos, 0 ),
-            state, pos, buffer, true, random, state.getPositionRandom( pos ), EmptyModelData.INSTANCE
+            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos ),
+            state, pos, buffer, true
         );
 
         ForgeHooksClient.setRenderLayer( BlockRenderLayer.SOLID );
@@ -106,32 +98,32 @@ public class TileEntityCableRenderer extends TileEntityRenderer<TileCable>
     /**
      * Set up the state for rendering block-breaking progress.
      *
-     * @see WorldRenderer#preRenderDamagedBlocks()
+     * @see RenderGlobal#preRenderDamagedBlocks()
      */
     private void preRenderDamagedBlocks()
     {
         GlStateManager.disableLighting();
 
         GlStateManager.enableBlend();
-        GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
+        GlStateManager.tryBlendFuncSeparate( GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
         GlStateManager.enableBlend();
-        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 0.5F );
-        GlStateManager.polygonOffset( -3.0F, -3.0F );
+        GlStateManager.color( 1.0F, 1.0F, 1.0F, 0.5F );
+        GlStateManager.doPolygonOffset( -3.0F, -3.0F );
         GlStateManager.enablePolygonOffset();
         GlStateManager.alphaFunc( 516, 0.1F );
-        GlStateManager.enableAlphaTest();
+        GlStateManager.enableAlpha();
         GlStateManager.pushMatrix();
     }
 
     /**
      * Tear down the state for rendering block-breaking progress.
      *
-     * @see WorldRenderer#postRenderDamagedBlocks()
+     * @see RenderGlobal#postRenderDamagedBlocks()
      */
     private void postRenderDamagedBlocks()
     {
-        GlStateManager.disableAlphaTest();
-        GlStateManager.polygonOffset( 0.0F, 0.0F );
+        GlStateManager.disableAlpha();
+        GlStateManager.doPolygonOffset( 0.0F, 0.0F );
         GlStateManager.disablePolygonOffset();
         GlStateManager.disablePolygonOffset();
         GlStateManager.depthMask( true );

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

@@ -5,35 +5,36 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GLX;
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
-import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
+import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.DirectionUtil;
-import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.Direction;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import org.lwjgl.opengl.GL11;
 
-public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
+import javax.annotation.Nonnull;
+
+import static dan200.computercraft.shared.peripheral.monitor.TileMonitor.RENDER_MARGIN;
+
+public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMonitor>
 {
+    private static final float MARGIN = (float) (TileMonitor.RENDER_MARGIN * 1.1);
+
     @Override
-    public void render( TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i )
+    public void render( @Nonnull TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i, float f2 )
     {
-        if( tileEntity != null )
-        {
-            renderMonitorAt( tileEntity, posX, posY, posZ, f, i );
-        }
+        renderMonitorAt( tileEntity, posX, posY, posZ, f, i );
     }
 
     private static void renderMonitorAt( TileMonitor monitor, double posX, double posY, double posZ, float f, int i )
@@ -63,229 +64,147 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
         posZ += originPos.getZ() - monitorPos.getZ();
 
         // Determine orientation
-        Direction dir = origin.getDirection();
-        Direction front = origin.getFront();
+        EnumFacing dir = origin.getDirection();
+        EnumFacing front = origin.getFront();
         float yaw = dir.getHorizontalAngle();
         float pitch = DirectionUtil.toPitchAngle( front );
 
         GlStateManager.pushMatrix();
-        try
+
+        // Setup initial transform
+        GlStateManager.translate( posX + 0.5, posY + 0.5, posZ + 0.5 );
+        GlStateManager.rotate( -yaw, 0.0f, 1.0f, 0.0f );
+        GlStateManager.rotate( pitch, 1.0f, 0.0f, 0.0f );
+        GlStateManager.translate(
+            -0.5 + TileMonitor.RENDER_BORDER + RENDER_MARGIN,
+            origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + RENDER_MARGIN),
+            0.5
+        );
+        double xSize = origin.getWidth() - 2.0 * (RENDER_MARGIN + TileMonitor.RENDER_BORDER);
+        double ySize = origin.getHeight() - 2.0 * (RENDER_MARGIN + TileMonitor.RENDER_BORDER);
+
+        // Get renderers
+        Minecraft mc = Minecraft.getMinecraft();
+
+        // Set up render state for monitors. We disable writing to the depth buffer (we draw a "blocker" later),
+        // and setup lighting so that we render with a glow.
+        GlStateManager.depthMask( false );
+        OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, 0xFF, 0xFF );
+        GlStateManager.disableLighting();
+        mc.entityRenderer.disableLightmap();
+
+        Terminal terminal = originTerminal.getTerminal();
+        if( terminal != null )
         {
-            // Setup initial transform
-            GlStateManager.translated( posX + 0.5, posY + 0.5, posZ + 0.5 );
-            GlStateManager.rotatef( -yaw, 0.0f, 1.0f, 0.0f );
-            GlStateManager.rotatef( pitch, 1.0f, 0.0f, 0.0f );
-            GlStateManager.translated(
-                -0.5 + TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN,
-                origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN) + 0,
-                0.5
-            );
-            double xSize = origin.getWidth() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
-            double ySize = origin.getHeight() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
+            // Draw a terminal
+            double xScale = xSize / (terminal.getWidth() * FixedWidthFontRenderer.FONT_WIDTH);
+            double yScale = ySize / (terminal.getHeight() * FixedWidthFontRenderer.FONT_HEIGHT);
 
-            // Get renderers
-            Minecraft mc = Minecraft.getInstance();
-            Tessellator tessellator = Tessellator.getInstance();
-            BufferBuilder renderer = tessellator.getBuffer();
+            GlStateManager.pushMatrix();
+            GlStateManager.scale( (float) xScale, (float) -yScale, 1.0f );
 
-            // Get terminal
-            boolean redraw = originTerminal.pollTerminalChanged();
+            renderTerminal( originTerminal, (float) (MARGIN / xScale), (float) (MARGIN / yScale) );
 
-            // Draw the contents
-            GlStateManager.depthMask( false );
-            GLX.glMultiTexCoord2f( GLX.GL_TEXTURE1, 0xFFFF, 0xFFFF );
-            GlStateManager.disableLighting();
-            mc.gameRenderer.disableLightmap();
-            try
-            {
-                Terminal terminal = originTerminal.getTerminal();
-                if( terminal != null )
-                {
-                    Palette palette = terminal.getPalette();
-
-                    // Allocate display lists
-                    if( originTerminal.renderDisplayLists == null )
-                    {
-                        originTerminal.createLists();
-                        redraw = true;
-                    }
-
-                    // Draw a terminal
-                    boolean greyscale = !originTerminal.isColour();
-                    int width = terminal.getWidth();
-                    int height = terminal.getHeight();
-                    int cursorX = terminal.getCursorX();
-                    int cursorY = terminal.getCursorY();
-                    FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
-
-                    GlStateManager.pushMatrix();
-                    try
-                    {
-                        double xScale = xSize / (width * FixedWidthFontRenderer.FONT_WIDTH);
-                        double yScale = ySize / (height * FixedWidthFontRenderer.FONT_HEIGHT);
-                        GlStateManager.scaled( xScale, -yScale, 1.0 );
-
-                        // Draw background
-                        mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
-                        if( redraw )
-                        {
-                            // Build background display list
-                            GlStateManager.newList( originTerminal.renderDisplayLists[0], GL11.GL_COMPILE );
-                            try
-                            {
-                                double marginXSize = TileMonitor.RENDER_MARGIN / xScale;
-                                double marginYSize = TileMonitor.RENDER_MARGIN / yScale;
-                                double marginSquash = marginYSize / FixedWidthFontRenderer.FONT_HEIGHT;
-
-                                // Top and bottom margins
-                                GlStateManager.pushMatrix();
-                                try
-                                {
-                                    GlStateManager.scaled( 1.0, marginSquash, 1.0 );
-                                    GlStateManager.translated( 0.0, -marginYSize / marginSquash, 0.0 );
-                                    fontRenderer.drawStringBackgroundPart( 0, 0, terminal.getBackgroundColourLine( 0 ), marginXSize, marginXSize, greyscale, palette );
-                                    GlStateManager.translated( 0.0, (marginYSize + height * FixedWidthFontRenderer.FONT_HEIGHT) / marginSquash, 0.0 );
-                                    fontRenderer.drawStringBackgroundPart( 0, 0, terminal.getBackgroundColourLine( height - 1 ), marginXSize, marginXSize, greyscale, palette );
-                                }
-                                finally
-                                {
-                                    GlStateManager.popMatrix();
-                                }
-
-                                // Backgrounds
-                                for( int y = 0; y < height; y++ )
-                                {
-                                    fontRenderer.drawStringBackgroundPart(
-                                        0, FixedWidthFontRenderer.FONT_HEIGHT * y,
-                                        terminal.getBackgroundColourLine( y ),
-                                        marginXSize, marginXSize,
-                                        greyscale,
-                                        palette
-                                    );
-                                }
-                            }
-                            finally
-                            {
-                                GlStateManager.endList();
-                            }
-                        }
-                        GlStateManager.callList( originTerminal.renderDisplayLists[0] );
-                        GlStateManager.clearCurrentColor();
-
-                        // Draw text
-                        fontRenderer.bindFont();
-                        if( redraw )
-                        {
-                            // Build text display list
-                            GlStateManager.newList( originTerminal.renderDisplayLists[1], GL11.GL_COMPILE );
-                            try
-                            {
-                                // Lines
-                                for( int y = 0; y < height; y++ )
-                                {
-                                    fontRenderer.drawStringTextPart(
-                                        0, FixedWidthFontRenderer.FONT_HEIGHT * y,
-                                        terminal.getLine( y ),
-                                        terminal.getTextColourLine( y ),
-                                        greyscale,
-                                        palette
-                                    );
-                                }
-                            }
-                            finally
-                            {
-                                GlStateManager.endList();
-                            }
-                        }
-                        GlStateManager.callList( originTerminal.renderDisplayLists[1] );
-                        GlStateManager.clearCurrentColor();
-
-                        // Draw cursor
-                        fontRenderer.bindFont();
-                        if( redraw )
-                        {
-                            // Build cursor display list
-                            GlStateManager.newList( originTerminal.renderDisplayLists[2], GL11.GL_COMPILE );
-                            try
-                            {
-                                // Cursor
-                                if( terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height )
-                                {
-                                    TextBuffer cursor = new TextBuffer( "_" );
-                                    TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
-                                    fontRenderer.drawString(
-                                        cursor,
-                                        FixedWidthFontRenderer.FONT_WIDTH * cursorX,
-                                        FixedWidthFontRenderer.FONT_HEIGHT * cursorY,
-                                        cursorColour, null,
-                                        0, 0,
-                                        greyscale,
-                                        palette
-                                    );
-                                }
-                            }
-                            finally
-                            {
-                                GlStateManager.endList();
-                            }
-                        }
-                        if( FrameInfo.getGlobalCursorBlink() )
-                        {
-                            GlStateManager.callList( originTerminal.renderDisplayLists[2] );
-                            GlStateManager.clearCurrentColor();
-                        }
-                    }
-                    finally
-                    {
-                        GlStateManager.popMatrix();
-                    }
-                }
-                else
-                {
-                    // Draw a big black quad
-                    mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
-                    final Colour colour = Colour.Black;
-
-                    final float r = colour.getR();
-                    final float g = colour.getG();
-                    final float b = colour.getB();
-
-                    renderer.begin( GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX_COLOR );
-                    renderer.pos( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).tex( 0.0, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-                    renderer.pos( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).tex( 0.0, 1.0 ).color( r, g, b, 1.0f ).endVertex();
-                    renderer.pos( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).tex( 1.0, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-                    renderer.pos( xSize + TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).tex( 1.0, 1.0 ).color( r, g, b, 1.0f ).endVertex();
-                    tessellator.draw();
-                }
-            }
-            finally
-            {
-                GlStateManager.depthMask( true );
-                mc.gameRenderer.enableLightmap();
-                GlStateManager.enableLighting();
-            }
-
-            // Draw the depth blocker
-            GlStateManager.colorMask( false, false, false, false );
-            try
-            {
-                mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
-                renderer.begin( GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION );
-                renderer.pos( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                renderer.pos( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                renderer.pos( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                renderer.pos( xSize + TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                tessellator.draw();
-            }
-            finally
-            {
-                GlStateManager.colorMask( true, true, true, true );
-            }
-        }
-        finally
-        {
-            GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
             GlStateManager.popMatrix();
         }
+        else
+        {
+            FixedWidthFontRenderer.drawEmptyTerminal(
+                -MARGIN, MARGIN,
+                (float) (xSize + 2 * MARGIN), (float) -(ySize + MARGIN * 2)
+            );
+        }
+
+        // Tear down render state for monitors.
+        GlStateManager.depthMask( true );
+        mc.entityRenderer.enableLightmap();
+        GlStateManager.enableLighting();
+
+        // Draw the depth blocker
+        GlStateManager.colorMask( false, false, false, false );
+        FixedWidthFontRenderer.drawBlocker(
+            (float) -TileMonitor.RENDER_MARGIN, (float) TileMonitor.RENDER_MARGIN,
+            (float) (xSize + 2 * TileMonitor.RENDER_MARGIN), (float) -(ySize + TileMonitor.RENDER_MARGIN * 2)
+        );
+        GlStateManager.colorMask( true, true, true, true );
+
+        GlStateManager.popMatrix();
+    }
+
+    private static void renderTerminal( ClientMonitor monitor, float xMargin, float yMargin )
+    {
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+
+        boolean redraw = monitor.pollTerminalChanged();
+
+        // Setup the buffers if needed. We get the renderer here, to avoid the (unlikely) race condition between
+        // creating the buffers and rendering.
+        MonitorRenderer renderer = MonitorRenderer.current();
+        if( monitor.createBuffer( renderer ) ) redraw = true;
+
+        FixedWidthFontRenderer.bindFont();
+
+        switch( renderer )
+        {
+            case VBO:
+            {
+                VertexBuffer vbo = monitor.buffer;
+                if( redraw )
+                {
+                    renderTerminalTo( monitor, buffer, xMargin, yMargin );
+                    buffer.finishDrawing();
+                    buffer.reset();
+                    vbo.bufferData( buffer.getByteBuffer() );
+                }
+
+                vbo.bindBuffer();
+                setupBufferFormat();
+                vbo.drawArrays( GL11.GL_TRIANGLES );
+                vbo.unbindBuffer();
+
+                break;
+            }
+
+            case DISPLAY_LIST:
+                if( redraw )
+                {
+                    GlStateManager.glNewList( monitor.displayList, GL11.GL_COMPILE );
+                    renderTerminalTo( monitor, buffer, xMargin, yMargin );
+                    tessellator.draw();
+                    GlStateManager.glEndList();
+                }
+
+                GlStateManager.callList( monitor.displayList );
+                break;
+        }
+
+        // We don't draw the cursor with a buffer, as it's dynamic and so we'll end up refreshing far more than is
+        // reasonable.
+        FixedWidthFontRenderer.begin( buffer );
+        FixedWidthFontRenderer.drawCursor( buffer, 0, 0, monitor.getTerminal(), !monitor.isColour() );
+        tessellator.draw();
+    }
+
+    private static void renderTerminalTo( ClientMonitor monitor, BufferBuilder buffer, float xMargin, float yMargin )
+    {
+        FixedWidthFontRenderer.begin( buffer );
+        FixedWidthFontRenderer.drawTerminalWithoutCursor(
+            buffer, 0, 0,
+            monitor.getTerminal(), !monitor.isColour(), yMargin, yMargin, xMargin, xMargin
+        );
+    }
+
+    public static void setupBufferFormat()
+    {
+        int stride = FixedWidthFontRenderer.POSITION_COLOR_TEX.getSize();
+        GlStateManager.glVertexPointer( 3, GL11.GL_FLOAT, stride, 0 );
+        GlStateManager.glEnableClientState( GL11.GL_VERTEX_ARRAY );
+
+        GlStateManager.glColorPointer( 4, GL11.GL_UNSIGNED_BYTE, stride, 12 );
+        GlStateManager.glEnableClientState( GL11.GL_COLOR_ARRAY );
+
+        GlStateManager.glTexCoordPointer( 2, GL11.GL_FLOAT, stride, 16 );
+        GlStateManager.glEnableClientState( GL11.GL_TEXTURE_COORD_ARRAY );
     }
 }

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

@@ -5,51 +5,46 @@
  */
 package dan200.computercraft.client.render;
 
-import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
-import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.model.BakedQuad;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ModelManager;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelManager;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 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.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.pipeline.LightUtil;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.opengl.GL11;
 
 import javax.vecmath.Matrix4f;
 import java.util.List;
-import java.util.Random;
 
-public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
+public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurtle>
 {
-    private static final ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_normal", "inventory" );
+    private static final ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle", "inventory" );
     private static final ModelResourceLocation ADVANCED_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_advanced", "inventory" );
-    private static final ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_colour", "inventory" );
+    private static final ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_white", "inventory" );
     private static final ModelResourceLocation ELF_OVERLAY_MODEL = new ModelResourceLocation( "computercraft:turtle_elf_overlay", "inventory" );
 
     @Override
-    public void render( TileTurtle tileEntity, double posX, double posY, double posZ, float partialTicks, int breaking )
+    public void render( TileTurtle tileEntity, double posX, double posY, double posZ, float partialTicks, int breaking, float f2 )
     {
         if( tileEntity != null ) renderTurtleAt( tileEntity, posX, posY, posZ, partialTicks );
     }
@@ -86,14 +81,13 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
     {
         // Render the label
         String label = turtle.createProxy().getLabel();
-        RayTraceResult hit = rendererDispatcher.cameraHitResult;
-        if( label != null && hit.getType() == RayTraceResult.Type.BLOCK && turtle.getPos().equals( ((BlockRayTraceResult) hit).getPos() ) )
+        if( label != null && rendererDispatcher.cameraHitResult != null && turtle.getPos().equals( rendererDispatcher.cameraHitResult.getBlockPos() ) )
         {
             setLightmapDisabled( true );
-            GameRenderer.drawNameplate(
+            EntityRenderer.drawNameplate(
                 getFontRenderer(), label,
                 (float) posX + 0.5F, (float) posY + 1.2F, (float) posZ + 0.5F, 0,
-                rendererDispatcher.renderInfo.getYaw(), rendererDispatcher.renderInfo.getPitch(), false
+                rendererDispatcher.entityYaw, rendererDispatcher.entityPitch, false, false
             );
             setLightmapDisabled( false );
         }
@@ -101,21 +95,22 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         GlStateManager.pushMatrix();
         try
         {
-            BlockState state = turtle.getBlockState();
+            IBlockState state = turtle.getWorld().getBlockState( turtle.getPos() );
             // Setup the transform
             Vec3d offset = turtle.getRenderOffset( partialTicks );
             float yaw = turtle.getRenderYaw( partialTicks );
-            GlStateManager.translated( posX + offset.x, posY + offset.y, posZ + offset.z );
+            GlStateManager.translate( posX + offset.x, posY + offset.y, posZ + offset.z );
+
             // Render the turtle
-            GlStateManager.translatef( 0.5f, 0.5f, 0.5f );
-            GlStateManager.rotatef( 180.0f - yaw, 0.0f, 1.0f, 0.0f );
+            GlStateManager.translate( 0.5f, 0.5f, 0.5f );
+            GlStateManager.rotate( 180.0f - yaw, 0.0f, 1.0f, 0.0f );
             if( label != null && (label.equals( "Dinnerbone" ) || label.equals( "Grumm" )) )
             {
                 // Flip the model and swap the cull face as winding order will have changed.
-                GlStateManager.scalef( 1.0f, -1.0f, 1.0f );
+                GlStateManager.scale( 1.0f, -1.0f, 1.0f );
                 GlStateManager.cullFace( GlStateManager.CullFace.FRONT );
             }
-            GlStateManager.translatef( -0.5f, -0.5f, -0.5f );
+            GlStateManager.translate( -0.5f, -0.5f, -0.5f );
             // Render the turtle
             int colour = turtle.getColour();
             ComputerFamily family = turtle.getFamily();
@@ -155,7 +150,7 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         }
     }
 
-    private void renderUpgrade( BlockState state, TileTurtle turtle, TurtleSide side, float f )
+    private static void renderUpgrade( IBlockState state, TileTurtle turtle, TurtleSide side, float f )
     {
         ITurtleUpgrade upgrade = turtle.getUpgrade( side );
         if( upgrade != null )
@@ -164,9 +159,9 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
             try
             {
                 float toolAngle = turtle.getToolRenderAngle( side, f );
-                GlStateManager.translatef( 0.0f, 0.5f, 0.5f );
-                GlStateManager.rotatef( -toolAngle, 1.0f, 0.0f, 0.0f );
-                GlStateManager.translatef( 0.0f, -0.5f, -0.5f );
+                GlStateManager.translate( 0.0f, 0.5f, 0.5f );
+                GlStateManager.rotate( -toolAngle, 1.0f, 0.0f, 0.0f );
+                GlStateManager.translate( 0.0f, -0.5f, -0.5f );
 
                 Pair<IBakedModel, Matrix4f> pair = upgrade.getModel( turtle.getAccess(), side );
                 if( pair != null )
@@ -188,22 +183,22 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         }
     }
 
-    private void renderModel( BlockState state, ModelResourceLocation modelLocation, int[] tints )
+    private static void renderModel( IBlockState state, ModelResourceLocation modelLocation, int[] tints )
     {
-        Minecraft mc = Minecraft.getInstance();
-        ModelManager modelManager = mc.getItemRenderer().getItemModelMesher().getModelManager();
+        Minecraft mc = Minecraft.getMinecraft();
+        ModelManager modelManager = mc.getRenderItem().getItemModelMesher().getModelManager();
         renderModel( state, modelManager.getModel( modelLocation ), tints );
     }
 
-    private void renderModel( BlockState state, IBakedModel model, int[] tints )
+    private static void renderModel( IBlockState state, IBakedModel model, int[] tints )
     {
-        Random random = new Random( 0 );
+        Minecraft mc = Minecraft.getMinecraft();
         Tessellator tessellator = Tessellator.getInstance();
-        rendererDispatcher.textureManager.bindTexture( AtlasTexture.LOCATION_BLOCKS_TEXTURE );
-        renderQuads( tessellator, model.getQuads( state, null, random, EmptyModelData.INSTANCE ), tints );
-        for( Direction facing : DirectionUtil.FACINGS )
+        mc.getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
+        renderQuads( tessellator, model.getQuads( state, null, 0 ), tints );
+        for( EnumFacing facing : EnumFacing.VALUES )
         {
-            renderQuads( tessellator, model.getQuads( state, facing, random, EmptyModelData.INSTANCE ), tints );
+            renderQuads( tessellator, model.getQuads( state, facing, 0 ), tints );
         }
     }
 

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

@@ -5,29 +5,26 @@
  */
 package dan200.computercraft.client.render;
 
+import com.google.common.collect.ImmutableMap;
 import dan200.computercraft.ComputerCraft;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraft.client.renderer.model.ModelBakery;
-import net.minecraft.client.renderer.texture.ISprite;
+import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.resources.IResourceManager;
+import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ICustomModelLoader;
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.common.model.IModelState;
 
 import javax.annotation.Nonnull;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 
 public final class TurtleModelLoader implements ICustomModelLoader
 {
-    private static final ResourceLocation NORMAL_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle_normal" );
-    private static final ResourceLocation ADVANCED_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle_advanced" );
-    private static final ResourceLocation COLOUR_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle_colour" );
+    private static final ResourceLocation NORMAL_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle" );
+    private static final ResourceLocation ADVANCED_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/advanced_turtle" );
+    private static final ResourceLocation COLOUR_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle_white" );
 
     public static final TurtleModelLoader INSTANCE = new TurtleModelLoader();
 
@@ -44,60 +41,80 @@ public final class TurtleModelLoader implements ICustomModelLoader
     public boolean accepts( @Nonnull ResourceLocation name )
     {
         return name.getNamespace().equals( ComputerCraft.MOD_ID )
-            && (name.getPath().equals( "item/turtle_normal" ) || name.getPath().equals( "item/turtle_advanced" ));
+            && (name.getPath().equals( "turtle" ) || name.getPath().equals( "turtle_advanced" ));
     }
 
     @Nonnull
     @Override
-    public IUnbakedModel loadModel( @Nonnull ResourceLocation name )
+    public IModel loadModel( @Nonnull ResourceLocation name ) throws Exception
     {
         if( name.getNamespace().equals( ComputerCraft.MOD_ID ) )
         {
+            IModel colourModel = ModelLoaderRegistry.getModel( COLOUR_TURTLE_MODEL );
             switch( name.getPath() )
             {
-                case "item/turtle_normal":
-                    return new TurtleModel( NORMAL_TURTLE_MODEL );
-                case "item/turtle_advanced":
-                    return new TurtleModel( ADVANCED_TURTLE_MODEL );
+                case "turtle":
+                    return new TurtleModel( ModelLoaderRegistry.getModel( NORMAL_TURTLE_MODEL ), colourModel );
+                case "turtle_advanced":
+                    return new TurtleModel( ModelLoaderRegistry.getModel( ADVANCED_TURTLE_MODEL ), colourModel );
             }
         }
 
         throw new IllegalStateException( "Loader does not accept " + name );
     }
 
-    private static final class TurtleModel implements IUnbakedModel
+    private static final class TurtleModel implements IModel
     {
-        private final ResourceLocation family;
+        private final IModel family;
+        private final IModel colour;
 
-        private TurtleModel( ResourceLocation family )
+        private TurtleModel( IModel family, IModel colour )
         {
             this.family = family;
+            this.colour = colour;
         }
 
         @Nonnull
         @Override
-        public Collection<ResourceLocation> getDependencies()
-        {
-            return Arrays.asList( family, COLOUR_TURTLE_MODEL );
-        }
-
-        @Nonnull
-        @Override
-        public Collection<ResourceLocation> getTextures( @Nonnull Function<ResourceLocation, IUnbakedModel> modelGetter, @Nonnull Set<String> missingTextureErrors )
-        {
-            return getDependencies().stream()
-                .flatMap( x -> modelGetter.apply( x ).getTextures( modelGetter, missingTextureErrors ).stream() )
-                .collect( Collectors.toSet() );
-        }
-
-        @Nonnull
-        @Override
-        public IBakedModel bake( @Nonnull ModelBakery bakery, @Nonnull Function<ResourceLocation, TextureAtlasSprite> spriteGetter, @Nonnull ISprite sprite, @Nonnull VertexFormat format )
+        public IBakedModel bake( @Nonnull IModelState state, @Nonnull VertexFormat format, @Nonnull Function<ResourceLocation, TextureAtlasSprite> function )
         {
             return new TurtleSmartItemModel(
-                bakery.getBakedModel( family, sprite, spriteGetter, format ),
-                bakery.getBakedModel( COLOUR_TURTLE_MODEL, sprite, spriteGetter, format )
+                family.bake( state, format, function ),
+                colour.bake( state, format, function )
             );
         }
+
+        private TurtleModel copy( IModel family, IModel colour )
+        {
+            return this.family == family && this.colour == colour ? this : new TurtleModel( family, colour );
+        }
+
+        @Nonnull
+        @Override
+        public IModel smoothLighting( boolean value )
+        {
+            return copy( family.smoothLighting( value ), colour.smoothLighting( value ) );
+        }
+
+        @Nonnull
+        @Override
+        public IModel gui3d( boolean value )
+        {
+            return copy( family.gui3d( value ), colour.gui3d( value ) );
+        }
+
+        @Nonnull
+        @Override
+        public IModel uvlock( boolean value )
+        {
+            return copy( family.uvlock( value ), colour.uvlock( value ) );
+        }
+
+        @Nonnull
+        @Override
+        public IModel retexture( ImmutableMap<String, String> textures )
+        {
+            return copy( family.retexture( textures ), colour.retexture( textures ) );
+        }
     }
 }

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

@@ -5,18 +5,20 @@
  */
 package dan200.computercraft.client.render;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.model.BakedQuad;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ItemOverrideList;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.util.Direction;
-import net.minecraftforge.client.model.data.EmptyModelData;
-import net.minecraftforge.client.model.data.IModelData;
+import net.minecraft.util.EnumFacing;
 
 import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
 
 public class TurtleMultiModel implements IBakedModel
 {
@@ -28,7 +30,7 @@ public class TurtleMultiModel implements IBakedModel
     private final IBakedModel m_rightUpgradeModel;
     private final Matrix4f m_rightUpgradeTransform;
     private List<BakedQuad> m_generalQuads = null;
-    private Map<Direction, List<BakedQuad>> m_faceQuads = new EnumMap<>( Direction.class );
+    private Map<EnumFacing, List<BakedQuad>> m_faceQuads = new EnumMap<>( EnumFacing.class );
 
     public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, Matrix4f generalTransform, IBakedModel leftUpgradeModel, Matrix4f leftUpgradeTransform, IBakedModel rightUpgradeModel, Matrix4f rightUpgradeTransform )
     {
@@ -44,15 +46,7 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
-    @Deprecated
-    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
-    {
-        return getQuads( state, side, rand, EmptyModelData.INSTANCE );
-    }
-
-    @Nonnull
-    @Override
-    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand, @Nonnull IModelData data )
+    public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, long rand )
     {
         if( side != null )
         {
@@ -66,13 +60,17 @@ public class TurtleMultiModel implements IBakedModel
         }
     }
 
-    private List<BakedQuad> buildQuads( BlockState state, Direction side, Random rand )
+    private List<BakedQuad> buildQuads( IBlockState state, EnumFacing side, long rand )
     {
         ArrayList<BakedQuad> quads = new ArrayList<>();
-        ModelTransformer.transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
+        ModelTransformer.transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand ), m_generalTransform );
         if( m_overlayModel != null )
         {
-            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
+            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
+        }
+        if( m_overlayModel != null )
+        {
+            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
         }
         if( m_leftUpgradeModel != null )
         {
@@ -82,7 +80,7 @@ public class TurtleMultiModel implements IBakedModel
                 upgradeTransform = new Matrix4f( m_generalTransform );
                 upgradeTransform.mul( m_leftUpgradeTransform );
             }
-            ModelTransformer.transformQuadsTo( quads, m_leftUpgradeModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
+            ModelTransformer.transformQuadsTo( quads, m_leftUpgradeModel.getQuads( state, side, rand ), upgradeTransform );
         }
         if( m_rightUpgradeModel != null )
         {
@@ -92,7 +90,7 @@ public class TurtleMultiModel implements IBakedModel
                 upgradeTransform = new Matrix4f( m_generalTransform );
                 upgradeTransform.mul( m_rightUpgradeTransform );
             }
-            ModelTransformer.transformQuadsTo( quads, m_rightUpgradeModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
+            ModelTransformer.transformQuadsTo( quads, m_rightUpgradeModel.getQuads( state, side, rand ), upgradeTransform );
         }
         quads.trimToSize();
         return quads;
@@ -118,7 +116,6 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
-    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return m_baseModel.getParticleTexture();
@@ -127,7 +124,7 @@ public class TurtleMultiModel implements IBakedModel
     @Nonnull
     @Override
     @Deprecated
-    public net.minecraft.client.renderer.model.ItemCameraTransforms getItemCameraTransforms()
+    public ItemCameraTransforms getItemCameraTransforms()
     {
         return m_baseModel.getItemCameraTransforms();
     }
@@ -136,6 +133,6 @@ public class TurtleMultiModel implements IBakedModel
     @Override
     public ItemOverrideList getOverrides()
     {
-        return ItemOverrideList.EMPTY;
+        return ItemOverrideList.NONE;
     }
 }

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

@@ -8,27 +8,26 @@ package dan200.computercraft.client.render;
 import com.google.common.base.Objects;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.shared.turtle.items.ItemTurtle;
+import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.model.*;
+import net.minecraft.client.renderer.block.model.*;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.data.IModelData;
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.vecmath.Matrix4f;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Random;
 
 public class TurtleSmartItemModel implements IBakedModel
 {
@@ -106,13 +105,13 @@ public class TurtleSmartItemModel implements IBakedModel
         this.colourModel = colourModel;
 
         m_cachedModels = new HashMap<>();
-        m_overrides = new ItemOverrideList()
+        m_overrides = new ItemOverrideList( new ArrayList<>() )
         {
             @Nonnull
             @Override
-            public IBakedModel getModelWithOverrides( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable LivingEntity entity )
+            public IBakedModel handleItemState( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity )
             {
-                ItemTurtle turtle = (ItemTurtle) stack.getItem();
+                ItemTurtleBase turtle = (ItemTurtleBase) stack.getItem();
                 int colour = turtle.getColour( stack );
                 ITurtleUpgrade leftUpgrade = turtle.getUpgrade( stack, TurtleSide.Left );
                 ITurtleUpgrade rightUpgrade = turtle.getUpgrade( stack, TurtleSide.Right );
@@ -138,8 +137,8 @@ public class TurtleSmartItemModel implements IBakedModel
 
     private IBakedModel buildModel( TurtleModelCombination combo )
     {
-        Minecraft mc = Minecraft.getInstance();
-        ModelManager modelManager = mc.getItemRenderer().getItemModelMesher().getModelManager();
+        Minecraft mc = Minecraft.getMinecraft();
+        ModelManager modelManager = mc.getRenderItem().getItemModelMesher().getModelManager();
         ModelResourceLocation overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.m_overlay, combo.m_christmas );
 
         IBakedModel baseModel = combo.m_colour ? colourModel : familyModel;
@@ -167,20 +166,11 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
-    @Deprecated
-    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand )
+    public List<BakedQuad> getQuads( IBlockState state, EnumFacing facing, long rand )
     {
         return familyModel.getQuads( state, facing, rand );
     }
 
-    @Nonnull
-    @Override
-    @Deprecated
-    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand, @Nonnull IModelData data )
-    {
-        return familyModel.getQuads( state, facing, rand, data );
-    }
-
     @Override
     public boolean isAmbientOcclusion()
     {
@@ -201,7 +191,6 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
-    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return familyModel.getParticleTexture();

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

@@ -11,7 +11,6 @@ import dan200.computercraft.ComputerCraft;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -50,11 +49,6 @@ public class AddressPredicate
     private final List<HostRange> ranges;
 
     public AddressPredicate( String... filters )
-    {
-        this( Arrays.asList( filters ) );
-    }
-
-    public AddressPredicate( Iterable<? extends String> filters )
     {
         List<Pattern> wildcards = this.wildcards = new ArrayList<>();
         List<HostRange> ranges = this.ranges = new ArrayList<>();

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

@@ -22,7 +22,7 @@ public final class ApiFactories
     private static final Collection<ILuaAPIFactory> factories = new LinkedHashSet<>();
     private static final Collection<ILuaAPIFactory> factoriesView = Collections.unmodifiableCollection( factories );
 
-    public static synchronized void register( @Nonnull ILuaAPIFactory factory )
+    public static void register( @Nonnull ILuaAPIFactory factory )
     {
         Objects.requireNonNull( factory, "provider cannot be null" );
         factories.add( factory );

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

@@ -22,6 +22,11 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.OptionalLong;
 import java.util.function.Function;
 
 import static dan200.computercraft.api.lua.ArgumentHelper.getString;
@@ -76,6 +81,8 @@ public class FSAPI implements ILuaAPI
             "getFreeSpace",
             "find",
             "getDir",
+            "getCapacity",
+            "attributes",
         };
     }
 
@@ -315,9 +322,8 @@ public class FSAPI implements ILuaAPI
                     throw new LuaException( e.getMessage() );
                 }
             }
-            case 14:
+            case 14: // find
             {
-                // find
                 String path = getString( args, 0 );
                 try
                 {
@@ -329,15 +335,50 @@ public class FSAPI implements ILuaAPI
                     throw new LuaException( e.getMessage() );
                 }
             }
-            case 15:
+            case 15: // getDir
             {
-                // getDir
                 String path = getString( args, 0 );
                 return new Object[] { FileSystem.getDirectory( path ) };
             }
+            case 16: // getCapacity
+            {
+                String path = getString( args, 0 );
+                try
+                {
+                    OptionalLong capacity = m_fileSystem.getCapacity( path );
+                    return new Object[] { capacity.isPresent() ? capacity.getAsLong() : null };
+                }
+                catch( FileSystemException e )
+                {
+                    throw new LuaException( e.getMessage() );
+                }
+            }
+            case 17: // attributes
+            {
+                String path = getString( args, 0 );
+                try
+                {
+                    BasicFileAttributes attributes = m_fileSystem.getAttributes( path );
+                    Map<String, Object> result = new HashMap<>();
+                    result.put( "modification", getFileTime( attributes.lastModifiedTime() ) );
+                    result.put( "created", getFileTime( attributes.creationTime() ) );
+                    result.put( "size", attributes.isDirectory() ? 0 : attributes.size() );
+                    result.put( "isDir", attributes.isDirectory() );
+                    return new Object[] { result };
+                }
+                catch( FileSystemException e )
+                {
+                    throw new LuaException( e.getMessage() );
+                }
+            }
             default:
                 assert false;
                 return null;
         }
     }
+
+    private static long getFileTime( FileTime time )
+    {
+        return time == null ? 0 : time.toMillis();
+    }
 }

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

@@ -0,0 +1,35 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.core.apis;
+
+import dan200.computercraft.api.lua.LuaException;
+
+import javax.annotation.Nullable;
+
+/**
+ * A Lua exception which does not contain its stack trace.
+ */
+public class FastLuaException extends LuaException
+{
+    private static final long serialVersionUID = 5957864899303561143L;
+
+    public FastLuaException( @Nullable String message )
+    {
+        super( message );
+    }
+
+    public FastLuaException( @Nullable String message, int level )
+    {
+        super( message, level );
+    }
+
+    @Override
+    public synchronized Throwable fillInStackTrace()
+    {
+        return this;
+    }
+}

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

@@ -18,6 +18,8 @@ import javax.annotation.Nullable;
 
 public interface IAPIEnvironment
 {
+    String TIMER_EVENT = "timer";
+
     @FunctionalInterface
     interface IPeripheralChangeListener
     {
@@ -64,6 +66,10 @@ public interface IAPIEnvironment
 
     void setLabel( @Nullable String label );
 
+    int startTimer( long ticks );
+
+    void cancelTimer( int id );
+
     void addTrackingChange( @Nonnull TrackingField field, long change );
 
     default void addTrackingChange( @Nonnull TrackingField field )

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

@@ -9,6 +9,8 @@ import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.shared.util.StringUtil;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 import javax.annotation.Nonnull;
 import java.time.Instant;
@@ -24,24 +26,12 @@ public class OSAPI implements ILuaAPI
 {
     private IAPIEnvironment m_apiEnvironment;
 
-    private final Map<Integer, Timer> m_timers;
-    private final Map<Integer, Alarm> m_alarms;
+    private final Int2ObjectMap<Alarm> m_alarms = new Int2ObjectOpenHashMap<>();
     private int m_clock;
     private double m_time;
     private int m_day;
 
-    private int m_nextTimerToken;
-    private int m_nextAlarmToken;
-
-    private static class Timer
-    {
-        int m_ticksLeft;
-
-        Timer( int ticksLeft )
-        {
-            m_ticksLeft = ticksLeft;
-        }
-    }
+    private int m_nextAlarmToken = 0;
 
     private static class Alarm implements Comparable<Alarm>
     {
@@ -66,10 +56,6 @@ public class OSAPI implements ILuaAPI
     public OSAPI( IAPIEnvironment environment )
     {
         m_apiEnvironment = environment;
-        m_nextTimerToken = 0;
-        m_nextAlarmToken = 0;
-        m_timers = new HashMap<>();
-        m_alarms = new HashMap<>();
     }
 
     // ILuaAPI implementation
@@ -87,11 +73,6 @@ public class OSAPI implements ILuaAPI
         m_day = m_apiEnvironment.getComputerEnvironment().getDay();
         m_clock = 0;
 
-        synchronized( m_timers )
-        {
-            m_timers.clear();
-        }
-
         synchronized( m_alarms )
         {
             m_alarms.clear();
@@ -101,26 +82,7 @@ public class OSAPI implements ILuaAPI
     @Override
     public void update()
     {
-        synchronized( m_timers )
-        {
-            // Update the clock
-            m_clock++;
-
-            // Countdown all of our active timers
-            Iterator<Map.Entry<Integer, Timer>> it = m_timers.entrySet().iterator();
-            while( it.hasNext() )
-            {
-                Map.Entry<Integer, Timer> entry = it.next();
-                Timer timer = entry.getValue();
-                timer.m_ticksLeft--;
-                if( timer.m_ticksLeft <= 0 )
-                {
-                    // Queue the "timer" event
-                    queueLuaEvent( "timer", new Object[] { entry.getKey() } );
-                    it.remove();
-                }
-            }
-        }
+        m_clock++;
 
         // Wait for all of our alarms
         synchronized( m_alarms )
@@ -155,11 +117,6 @@ public class OSAPI implements ILuaAPI
     @Override
     public void shutdown()
     {
-        synchronized( m_timers )
-        {
-            m_timers.clear();
-        }
-
         synchronized( m_alarms )
         {
             m_alarms.clear();
@@ -229,11 +186,8 @@ public class OSAPI implements ILuaAPI
             {
                 // startTimer
                 double timer = getFiniteDouble( args, 0 );
-                synchronized( m_timers )
-                {
-                    m_timers.put( m_nextTimerToken, new Timer( (int) Math.round( timer / 0.05 ) ) );
-                    return new Object[] { m_nextTimerToken++ };
-                }
+                int id = m_apiEnvironment.startTimer( Math.round( timer / 0.05 ) );
+                return new Object[] { id };
             }
             case 2:
             {
@@ -278,10 +232,7 @@ public class OSAPI implements ILuaAPI
                 return null;
             }
             case 10: // clock
-                synchronized( m_timers )
-                {
-                    return new Object[] { m_clock * 0.05 };
-                }
+                return new Object[] { m_clock * 0.05 };
             case 11:
             {
                 // time
@@ -345,10 +296,7 @@ public class OSAPI implements ILuaAPI
             {
                 // cancelTimer
                 int token = getInt( args, 0 );
-                synchronized( m_timers )
-                {
-                    m_timers.remove( token );
-                }
+                m_apiEnvironment.cancelTimer( token );
                 return null;
             }
             case 14:

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

@@ -364,20 +364,17 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             case 2:
             {
                 // getMethods
-                String[] methods = null;
                 ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
                 if( side != null )
                 {
                     synchronized( m_peripherals )
                     {
                         PeripheralWrapper p = m_peripherals[side.ordinal()];
-                        if( p != null )
-                        {
-                            methods = p.getMethods();
-                        }
+                        if( p != null ) return new Object[] { p.getMethods() };
                     }
                 }
-                return methods != null ? new Object[] { new HashMap<>() } : null;
+
+                return null;
             }
             case 3:
             {
@@ -386,22 +383,30 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
                 String methodName = getString( args, 1 );
                 Object[] methodArgs = Arrays.copyOfRange( args, 2, args.length );
 
-                if( side != null )
+                if( side == null ) throw new LuaException( "No peripheral attached" );
+
+                PeripheralWrapper p;
+                synchronized( m_peripherals )
                 {
-                    PeripheralWrapper p;
-                    synchronized( m_peripherals )
-                    {
-                        p = m_peripherals[side.ordinal()];
-                    }
-                    if( p != null )
-                    {
-                        return p.call( context, methodName, methodArgs );
-                    }
+                    p = m_peripherals[side.ordinal()];
+                }
+                if( p == null ) throw new LuaException( "No peripheral attached" );
+
+                try
+                {
+                    return p.call( context, methodName, methodArgs );
+                }
+                catch( LuaException e )
+                {
+                    // We increase the error level by one in order to shift the error level to where peripheral.call was
+                    // invoked. It would be possible to do it in Lua code, but would add significantly more overhead.
+                    if( e.getLevel() > 0 ) throw new FastLuaException( e.getMessage(), e.getLevel() + 1 );
+                    throw e;
                 }
-                throw new LuaException( "No peripheral attached" );
             }
             default:
                 return null;
         }
     }
+
 }

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

@@ -40,7 +40,11 @@ import java.util.concurrent.Future;
  */
 public class Websocket extends Resource<Websocket>
 {
-    public static final int MAX_MESSAGE_SIZE = 64 * 1024;
+    /**
+     * We declare the maximum size to be 2^30 bytes. While messages can be much longer, we set an arbitrary limit as
+     * working with larger messages (especially within a Lua VM) is absurd.
+     */
+    public static final int MAX_MESSAGE_SIZE = 1 << 30;
 
     static final String SUCCESS_EVENT = "websocket_success";
     static final String FAILURE_EVENT = "websocket_failure";

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

@@ -7,6 +7,7 @@ package dan200.computercraft.core.apis.http.websocket;
 
 import com.google.common.base.Objects;
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.api.lua.ArgumentHelper;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.ILuaObject;
 import dan200.computercraft.api.lua.LuaException;
@@ -23,6 +24,7 @@ import java.io.Closeable;
 import java.util.Arrays;
 
 import static dan200.computercraft.api.lua.ArgumentHelper.optBoolean;
+import static dan200.computercraft.core.apis.IAPIEnvironment.TIMER_EVENT;
 import static dan200.computercraft.core.apis.http.websocket.Websocket.CLOSE_EVENT;
 import static dan200.computercraft.core.apis.http.websocket.Websocket.MESSAGE_EVENT;
 
@@ -53,7 +55,21 @@ public class WebsocketHandle implements ILuaObject, Closeable
         switch( method )
         {
             case 0: // receive
+            {
                 checkOpen();
+                int timeoutId;
+                if( arguments.length <= 0 || arguments[0] == null )
+                {
+                    // We do this rather odd argument validation to ensure we can tell the difference between a
+                    // negative timeout and an absent one.
+                    timeoutId = -1;
+                }
+                else
+                {
+                    double timeout = ArgumentHelper.getFiniteDouble( arguments, 0 );
+                    timeoutId = websocket.environment().startTimer( Math.round( timeout / 0.05 ) );
+                }
+
                 while( true )
                 {
                     Object[] event = context.pullEvent( null );
@@ -63,9 +79,17 @@ public class WebsocketHandle implements ILuaObject, Closeable
                     }
                     else if( event.length >= 2 && Objects.equal( event[0], CLOSE_EVENT ) && Objects.equal( event[1], websocket.address() ) && closed )
                     {
+                        // If the socket is closed abort.
+                        return null;
+                    }
+                    else if( event.length >= 2 && timeoutId != -1 && Objects.equal( event[0], TIMER_EVENT )
+                        && event[1] instanceof Number && ((Number) event[1]).intValue() == timeoutId )
+                    {
+                        // If we received a matching timer event then abort.
                         return null;
                     }
                 }
+            }
 
             case 1: // send
             {

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

@@ -6,7 +6,9 @@
 package dan200.computercraft.core.computer;
 
 import com.google.common.base.Objects;
+import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.lua.ILuaAPI;
+import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IWorkMonitor;
 import dan200.computercraft.core.apis.IAPIEnvironment;
 import dan200.computercraft.core.filesystem.FileSystem;
@@ -181,7 +183,7 @@ public class Computer
         executor.tick();
 
         // Update the environment's internal state.
-        internalEnvironment.update();
+        internalEnvironment.tick();
 
         // Propagate the environment's output to the world.
         if( internalEnvironment.updateOutput() ) externalOutputChanged.set( true );
@@ -216,4 +218,37 @@ public class Computer
     {
         executor.addApi( api );
     }
+
+    @Deprecated
+    public IPeripheral getPeripheral( int side )
+    {
+        return internalEnvironment.getPeripheral( ComputerSide.valueOf( side ) );
+    }
+
+    @Deprecated
+    public void setPeripheral( int side, IPeripheral peripheral )
+    {
+        internalEnvironment.setPeripheral( ComputerSide.valueOf( side ), peripheral );
+    }
+
+    @Deprecated
+    public void addAPI( dan200.computercraft.core.apis.ILuaAPI api )
+    {
+        addApi( api );
+    }
+
+    @Deprecated
+    public void advance( double dt )
+    {
+        tick();
+    }
+
+    @Deprecated
+    public IWritableMount getRootMount()
+    {
+        return executor.getRootMount();
+    }
+
+    @Deprecated
+    public static final String[] s_sideNames = ComputerSide.NAMES;
 }

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

@@ -55,6 +55,9 @@ final class ComputerExecutor
 {
     private static final int QUEUE_LIMIT = 256;
 
+    private static IMount romMount;
+    private static final Object romMountLock = new Object();
+
     private final Computer computer;
     private final List<ILuaAPI> apis = new ArrayList<>();
     final TimeoutState timeout = new TimeoutState();
@@ -325,10 +328,16 @@ final class ComputerExecutor
 
     private IMount getRomMount()
     {
-        return computer.getComputerEnvironment().createResourceMount( "computercraft", "lua/rom" );
+        if( romMount != null ) return romMount;
+
+        synchronized( romMountLock )
+        {
+            if( romMount != null ) return romMount;
+            return romMount = computer.getComputerEnvironment().createResourceMount( "computercraft", "lua/rom" );
+        }
     }
 
-    private IWritableMount getRootMount()
+    IWritableMount getRootMount()
     {
         if( rootMount == null )
         {
@@ -426,6 +435,7 @@ final class ComputerExecutor
             }
 
             // Init APIs
+            computer.getEnvironment().reset();
             for( ILuaAPI api : apis ) api.startup();
 
             // Init lua
@@ -469,6 +479,7 @@ final class ComputerExecutor
 
             // Shutdown our APIs
             for( ILuaAPI api : apis ) api.shutdown();
+            computer.getEnvironment().reset();
 
             // Unload filesystem
             if( fileSystem != null )

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

@@ -5,13 +5,11 @@
  */
 package dan200.computercraft.core.computer;
 
-import net.minecraft.util.Direction;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
- * A side on a computer. Unlike {@link Direction}, this is relative to the direction the computer is
+ * A side on a computer. Unlike {@link net.minecraft.util.EnumFacing}, this is relative to the direction the computer is
  * facing..
  */
 public enum ComputerSide

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

@@ -5,6 +5,7 @@
  */
 package dan200.computercraft.core.computer;
 
+import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IWorkMonitor;
 import dan200.computercraft.core.apis.IAPIEnvironment;
@@ -12,9 +13,12 @@ import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.core.tracking.TrackingField;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
+import java.util.Iterator;
 
 /**
  * Represents the "environment" that a {@link Computer} exists in.
@@ -53,6 +57,9 @@ public final class Environment implements IAPIEnvironment
     private final IPeripheral[] peripherals = new IPeripheral[ComputerSide.COUNT];
     private IPeripheralChangeListener peripheralListener = null;
 
+    private final Int2ObjectMap<Timer> timers = new Int2ObjectOpenHashMap<>();
+    private int nextTimerToken = 0;
+
     Environment( Computer computer )
     {
         this.computer = computer;
@@ -198,17 +205,47 @@ public final class Environment implements IAPIEnvironment
     }
 
     /**
-     * Called on the main thread to update the internal state of the computer.
+     * Called when the computer starts up or shuts down, to reset any internal state.
      *
-     * This just queues a {@code redstone} event if the input has changed.
+     * @see ILuaAPI#startup()
+     * @see ILuaAPI#shutdown()
      */
-    void update()
+    void reset()
+    {
+        synchronized( timers )
+        {
+            timers.clear();
+        }
+    }
+
+    /**
+     * Called on the main thread to update the internal state of the computer.
+     */
+    void tick()
     {
         if( inputChanged )
         {
             inputChanged = false;
             queueEvent( "redstone", null );
         }
+
+        synchronized( timers )
+        {
+            // Countdown all of our active timers
+            Iterator<Int2ObjectMap.Entry<Timer>> it = timers.int2ObjectEntrySet().iterator();
+            while( it.hasNext() )
+            {
+                Int2ObjectMap.Entry<Timer> entry = it.next();
+                Timer timer = entry.getValue();
+                timer.ticksLeft--;
+                if( timer.ticksLeft <= 0 )
+                {
+                    // Queue the "timer" event
+                    queueEvent( TIMER_EVENT, new Object[] { entry.getIntKey() } );
+                    it.remove();
+                }
+            }
+        }
     }
 
     /**
@@ -303,9 +340,38 @@ public final class Environment implements IAPIEnvironment
         computer.setLabel( label );
     }
 
+    @Override
+    public int startTimer( long ticks )
+    {
+        synchronized( timers )
+        {
+            timers.put( nextTimerToken, new Timer( ticks ) );
+            return nextTimerToken++;
+        }
+    }
+
+    @Override
+    public void cancelTimer( int id )
+    {
+        synchronized( timers )
+        {
+            timers.remove( id );
+        }
+    }
+
     @Override
     public void addTrackingChange( @Nonnull TrackingField field, long change )
     {
         Tracking.addValue( computer, field, change );
     }
+
+    private static class Timer
+    {
+        long ticksLeft;
+
+        Timer( long ticksLeft )
+        {
+            this.ticksLeft = ticksLeft;
+        }
+    }
 }

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

@@ -12,6 +12,7 @@ import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -143,4 +144,19 @@ public class ComboMount implements IMount
         }
         throw new FileOperationException( path, "No such file" );
     }
+
+    @Nonnull
+    @Override
+    public BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
+    {
+        for( int i = m_parts.length - 1; i >= 0; --i )
+        {
+            IMount part = m_parts[i];
+            if( part.exists( path ) && !part.isDirectory( path ) )
+            {
+                return part.getAttributes( path );
+            }
+        }
+        throw new FileOperationException( path, "No such file" );
+    }
 }

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

@@ -6,6 +6,7 @@
 package dan200.computercraft.core.filesystem;
 
 import com.google.common.collect.Sets;
+import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.filesystem.FileOperationException;
 import dan200.computercraft.api.filesystem.IWritableMount;
 
@@ -13,11 +14,11 @@ import javax.annotation.Nonnull;
 import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
-import java.nio.file.Files;
-import java.nio.file.OpenOption;
-import java.nio.file.StandardOpenOption;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
 import java.util.List;
+import java.util.OptionalLong;
 import java.util.Set;
 
 public class FileMount implements IWritableMount
@@ -224,6 +225,19 @@ public class FileMount implements IWritableMount
         throw new FileOperationException( path, "No such file" );
     }
 
+    @Nonnull
+    @Override
+    public BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
+    {
+        if( created() )
+        {
+            File file = getRealPath( path );
+            if( file.exists() ) return Files.readAttributes( file.toPath(), BasicFileAttributes.class );
+        }
+
+        throw new FileOperationException( path, "No such file" );
+    }
+
     // IWritableMount implementation
 
     @Override
@@ -360,6 +374,13 @@ public class FileMount implements IWritableMount
         return Math.max( m_capacity - m_usedSpace, 0 );
     }
 
+    @Nonnull
+    @Override
+    public OptionalLong getCapacity()
+    {
+        return OptionalLong.of( m_capacity - MINIMUM_FILE_SIZE );
+    }
+
     private File getRealPath( String path )
     {
         return new File( m_rootPath, path );
@@ -382,23 +403,46 @@ public class FileMount implements IWritableMount
         }
     }
 
+    private static class Visitor extends SimpleFileVisitor<Path>
+    {
+        long size;
+
+        @Override
+        public FileVisitResult preVisitDirectory( Path dir, BasicFileAttributes attrs )
+        {
+            size += MINIMUM_FILE_SIZE;
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFile( Path file, BasicFileAttributes attrs )
+        {
+            size += Math.max( attrs.size(), MINIMUM_FILE_SIZE );
+            return FileVisitResult.CONTINUE;
+        }
+
+        @Override
+        public FileVisitResult visitFileFailed( Path file, IOException exc )
+        {
+            ComputerCraft.log.error( "Error computing file size for {}", file, exc );
+            return FileVisitResult.CONTINUE;
+        }
+    }
+
     private static long measureUsedSpace( File file )
     {
         if( !file.exists() ) return 0;
 
-        if( file.isDirectory() )
+        try
         {
-            long size = MINIMUM_FILE_SIZE;
-            String[] contents = file.list();
-            for( String content : contents )
-            {
-                size += measureUsedSpace( new File( file, content ) );
-            }
-            return size;
+            Visitor visitor = new Visitor();
+            Files.walkFileTree( file.toPath(), visitor );
+            return visitor.size;
         }
-        else
+        catch( IOException e )
         {
-            return Math.max( file.length(), MINIMUM_FILE_SIZE );
+            ComputerCraft.log.error( "Error computing file size for {}", file, e );
+            return 0;
         }
     }
 }