Bumpity bumpity bump

This isn't going to get annoying or anything

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Report some misbehaviour in the mod
-
+labels: bug
 ---
 
 <!--

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea or improvement
-
+labels: enhancement
 ---
 
 <!--
@@ -11,4 +11,4 @@ about: Suggest an idea or improvement
 
 ## Useful information to include:
  - Explanation of how the feature/change should work.
- - Some rationale/use case for a feature. I'd like to keep CC:T as minimal as possible, so I like have a solid justification for each feature.
+ - Some rationale/use case for a feature. My general approach to designing new features is to ask yourself "what issue are we trying to solve" and _then_ "is this the best way to solve this issue?".

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+## A quick checklist
+ - If there's a existing issue, please link to it. If not, provide fill out the same information you would in a normal issue - reproduction steps for bugs, rationale for use-case.
+ - If you're working on CraftOS, try to write a few test cases so we can ensure everything continues to work in the future. Tests live in `src/test/resources/test-rom/spec` and can be run with `./gradlew check`.

.gitignore

@@ -15,3 +15,9 @@
 .idea
 .gradle
 *.DS_Store
+
+.classpath
+.project
+.settings/
+bin/
+*.launch

.luacheckrc

@@ -17,7 +17,8 @@ ignore = {
 -- are largely unsupported.
 include_files = {
     'src/main/resources/assets/computercraft/lua/rom',
-    'src/main/resources/assets/computercraft/lua/bios.lua'
+    'src/main/resources/assets/computercraft/lua/bios.lua',
+    'src/test/resources/test-rom',
 }
 
 files['src/main/resources/assets/computercraft/lua/bios.lua'] = {

.travis.yml

@@ -11,4 +11,4 @@ cache:
     - $HOME/.gradle/wrapper/s
 
 jdk:
-    - oraclejdk8
+    - openjdk8

README.md

@@ -1,30 +1,30 @@
 # ![CC: Tweaked](logo.png)
-[![Build Status](https://travis-ci.org/SquidDev-CC/CC-Tweaked.svg?branch=master)](https://travis-ci.org/SquidDev-CC/CC-Tweaked)
+[![Current build status](https://travis-ci.org/SquidDev-CC/CC-Tweaked.svg?branch=master)](https://travis-ci.org/SquidDev-CC/CC-Tweaked "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,
 turtles and more to Minecraft.
 
 ## What?
 ComputerCraft has always held a fond place in my heart: it's the mod which really got me into Minecraft, and it's the
-mod which has kept me playing it for many years. However, development of the original mod has slowed, as the original 
+mod which has kept me playing it for many years. However, development of the original mod has slowed, as the original
-developers have had less time to work on the mod, and moved onto other projects and commitments. 
+developers have had less time to work on the mod, and moved onto other projects and commitments.
 
-CC:Tweaked (or CC:T for short) is an attempt to continue ComputerCraft's legacy. It's not intended to be a competitor
+CC: Tweaked (or CC:T for short) is an attempt to continue ComputerCraft's legacy. It's not intended to be a competitor
 to CC, nor do I want to take it in a vastly different direction to the original mod. Instead, CC:T focuses on making the
 ComputerCraft experience as _solid_ as possible, ironing out any wrinkles that may have developed over time.
 
 ## Features
-CC: Tweaked contains all the features of the latest version of ComputerCraft, as well as numerous fixes, performance 
+CC: Tweaked contains all the features of the latest version of ComputerCraft, as well as numerous fixes, performance
 improvements and several nifty additions. I'd recommend checking out [the releases page](https://github.com/SquidDev-CC/CC-Tweaked/releases)
 to see the full set of changes, but here's a couple of the more interesting additions:
 
- - Improvements to the `http` library, including websockets, support for other HTTP methods (`PUT`, `DELETE`, etc...) 
+ - Improvements to the `http` library, including websockets, support for other HTTP methods (`PUT`, `DELETE`, etc...)
    and configurable limits on HTTP usage.
  - Full-block wired modems, allowing one to wrap non-solid peripherals (such as turtles, or chests if Plethora is
-   installed).   
+   installed).
  - Pocket computers can be held like maps, allowing you to view the screen without entering a GUI.
  - Printed pages and books can be placed in item frames and held like maps.
- - Several profiling and administration tools for server owners, via the `/computercraft` command. This allows operators 
+ - Several profiling and administration tools for server owners, via the `/computercraft` command. This allows operators
    to track which computers are hogging resources, turn on and shutdown multiple computers at once and interact with
    computers remotely.
  - Closer emulation of standard Lua, adding the `debug` and `io` libraries. This also enables seeking within binary
@@ -41,7 +41,35 @@ Any contribution is welcome, be that using the mod, reporting bugs or contributi
 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 setupDecompWorkspace`
+ - **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`.
+
+## 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.
+
+I'd generally recommend you don't contact me directly (email, DM, etc...) unless absolutely necessary (i.e. in order to
+report exploits). You'll get a far quicker response if you ask the whole community!
+
+## Using
+If you want to depend on CC: Tweaked, we have a maven repo. However, you should be wary that some functionality is only
+exposed by CC:T's API and not vanilla ComputerCraft. If you wish to support all variations of ComputerCraft, I recommend
+using [cc.crzd.me's maven](https://cc.crzd.me/maven/) instead.
+
+```groovy
+dependencies {
+  maven { url 'https://squiddev.cc/maven/' }
+}
+
+dependencies {
+  implementation "org.squiddev:cc-tweaked-${mc_version}:${cct_version}"
+}
+```
+
+You should also be careful to only use classes within the `dan200.computercraft.api` package. Non-API classes are
+subject to change at any point. If you depend on functionality outside the API, file an issue, and we can look into
+exposing more features.

build.gradle

@@ -1,62 +1,86 @@
-
-// For those who want the bleeding edge
 buildscript {
     repositories {
         jcenter()
+        mavenCentral()
         maven {
             name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            url = "https://files.minecraftforge.net/maven"
         }
     }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.134'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
         classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
 }
 
 plugins {
-    id 'com.matthewprenger.cursegradle' version '1.0.10'
+    id "checkstyle"
+    id "com.github.hierynomus.license" version "0.15.0"
+    id "com.matthewprenger.cursegradle" version "1.3.0"
+    id "com.github.breadmoirai.github-release" version "2.2.4"
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 
-def mc_version = "1.12.2"
+version = mod_version
-def main_version = "1.81.1"
-version = "${mc_version}-${main_version}"
 
 group = "org.squiddev"
-archivesBaseName = "cc-tweaked"
+archivesBaseName = "cc-tweaked-${mc_version}"
 
 minecraft {
-    version = "${mc_version}-14.23.4.2749"
+    runs {
-    runDir = "run"
+        client {
-    replace '${version}', main_version
+            workingDirectory project.file('run')
+            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'debug'
 
-    // the mappings can be changed at any time, and must be in the following format.
+            mods {
-    // snapshot_YYYYMMDD   snapshot are built nightly.
+                computercraft {
-    // stable_#            stables are built at the discretion of the MCP team.
+                    source sourceSets.main
-    // Use non-default mappings at your own risk. they may not allways work.
+                }
-    // simply re-run your setup task after changing the mappings to update your workspace.
+            }
-    mappings = "snapshot_20180724"
+        }
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+
+        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')
 }
 
 repositories {
     maven {
-        name = "JEI"
+        name "JEI"
-        url  = "http://dvs1.progwml6.com/files/maven"
+        url "https://dvs1.progwml6.com/files/maven"
     }
     maven {
-        name = "squiddev"
+        name "SquidDev"
-        url = "https://squiddev.cc/maven"
+        url "https://squiddev.cc/maven"
+    }
+    ivy {
+        name "Charset"
+        artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]"
+    }
+    maven {
+        name "Amadornes"
+        url "https://maven.amadornes.com/"
     }
-
-    ivy { artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]" }
 }
 
 configurations {
@@ -66,18 +90,35 @@ configurations {
 }
 
 dependencies {
-    deobfProvided "mezz.jei:jei_1.12.2:4.8.5.159:api"
+    checkstyle "com.puppycrawl.tools:checkstyle:8.21"
-    deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
 
-    runtime "mezz.jei:jei_1.12.2:4.8.5.159"
+    minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
+
+    compileOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.7:api")
+    // deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
+    // deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
+
+    runtimeOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.7")
 
     shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'
 
-    testCompile 'junit:junit:4.11'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 
     deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
 }
 
+sourceSets {
+    main {
+        java {
+            exclude 'dan200/computercraft/shared/integration/mcmp'
+            exclude 'dan200/computercraft/shared/integration/charset'
+        }
+    }
+}
+
+// Compile tasks
+
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
@@ -86,7 +127,13 @@ jar {
     dependsOn javadoc
 
     manifest {
-        attributes('FMLAT': 'computercraft_at.cfg')
+        attributes(["Specification-Title": "computercraft",
+                    "Specification-Vendor": "SquidDev",
+                    "Specification-Version": "1",
+                    "Implementation-Title": "CC: Tweaked",
+                    "Implementation-Version": "${mod_version}",
+                    "Implementation-Vendor" :"SquidDev",
+                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
     }
 
     from (sourceSets.main.allSource) {
@@ -96,12 +143,22 @@ jar {
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
+[compileJava, compileTestJava].forEach {
+    it.configure {
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
+    }
+}
+
+
+
 import java.nio.charset.StandardCharsets
 import java.nio.file.*
 import java.util.zip.*
 
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonElement
+import com.hierynomus.gradle.license.tasks.LicenseCheck
+import com.hierynomus.gradle.license.tasks.LicenseFormat
 import org.ajoberstar.grgit.Grgit
 import proguard.gradle.ProGuardTask
 
@@ -124,13 +181,17 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
     dontobfuscate; dontoptimize; keepattributes; keepparameternames
 
     // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'assets/computercraft/lua**'
+    keepdirectories 'data/computercraft/lua**'
 
     // Preserve ComputerCraft classes - we only want to strip shadowed files.
     keep 'class dan200.computercraft.** { *; }'
 
     // Preserve the constructors in Cobalt library class, as we init them via reflection
     keepclassmembers 'class org.squiddev.cobalt.lib.** { <init>(...); }'
+
+    // 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) {
@@ -146,10 +207,10 @@ task proguardMove(dependsOn: proguard) {
     }
 }
 
-reobfJar.dependsOn proguardMove
+
 
 processResources {
-    inputs.property "version", main_version
+    inputs.property "version", mod_version
     inputs.property "mcversion", mc_version
 
     def hash = 'none'
@@ -168,21 +229,21 @@ processResources {
     inputs.property "commithash", hash
 
     from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
+        include 'META-INF/mods.toml'
-        include 'assets/computercraft/lua/rom/help/credits.txt'
+        include 'data/computercraft/lua/rom/help/credits.txt'
 
-        expand 'version': main_version,
+        expand 'version': mod_version,
                'mcversion': mc_version,
                'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+        exclude 'META-INF/mods.toml'
-        exclude 'assets/computercraft/lua/rom/help/credits.txt'
+        exclude 'data/computercraft/lua/rom/help/credits.txt'
     }
 }
 
-task compressJson(dependsOn: extractAnnotationsJar) {
+task compressJson(dependsOn: jar) {
     group "compact"
     description "Minifies all JSON files, stripping whitespace"
 
@@ -197,6 +258,7 @@ task compressJson(dependsOn: extractAnnotationsJar) {
         // Copy over all files in the current jar to the new one, running json files from GSON. As pretty printing
         // is turned off, they should be minified.
         new ZipFile(jarPath).withCloseable { inJar ->
+            tempPath.getParentFile().mkdirs()
             new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(tempPath))).withCloseable { outJar ->
                 inJar.entries().each { entry ->
                     if(entry.directory) {
@@ -224,12 +286,105 @@ task compressJson(dependsOn: extractAnnotationsJar) {
 
 assemble.dependsOn compressJson
 
+// Check tasks
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "skipped", "failed"
+    }
+}
+
+license {
+    mapping("java", "SLASHSTAR_STYLE")
+    strictCheck true
+
+    ext.year = Calendar.getInstance().get(Calendar.YEAR)
+}
+
+[licenseMain, licenseFormatMain].forEach {
+    it.configure {
+        include("**/*.java")
+        exclude("dan200/computercraft/api/**")
+        header rootProject.file('config/license/main.txt')
+    }
+}
+
+[licenseTest, licenseFormatTest].forEach {
+    it.configure {
+        include("**/*.java")
+        header rootProject.file('config/license/main.txt')
+    }
+}
+
+gradle.projectsEvaluated {
+    tasks.withType(LicenseFormat) {
+        outputs.upToDateWhen { false }
+    }
+}
+
+
+task licenseAPI(type: LicenseCheck);
+task licenseFormatAPI(type: LicenseFormat);
+[licenseAPI, licenseFormatAPI].forEach {
+    it.configure {
+        source = sourceSets.main.java
+        include("dan200/computercraft/api/**")
+        header rootProject.file('config/license/api.txt')
+    }
+}
+
+// Upload tasks
+
+task checkRelease {
+    group "upload"
+    description "Verifies that everything is ready for a release"
+
+    inputs.property "version", mod_version
+    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.txt")
+    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+
+    doLast {
+        def ok = true
+
+        // Check we're targetting the current version
+        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
+        if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
+            ok = false
+            project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
+        }
+
+        // Check "read more" exists and trim it
+        def idx = whatsnew.findIndexOf { it == 'Type "help changelog" to see the full version history.' }
+        if (idx == -1) {
+            ok = false
+            project.logger.error("Must mention the changelog in whatsnew.txt")
+        } else {
+            whatsnew = whatsnew.getAt(0 ..< idx)
+        }
+
+        // Check whatsnew and changelog match.
+        def versionChangelog = "# " + whatsnew.join("\n")
+        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
+        if (!changelog.startsWith(versionChangelog)) {
+            ok = false
+            project.logger.error("whatsnew and changelog are not in sync")
+        }
+
+        if (!ok) throw new IllegalStateException("Could not check release")
+    }
+}
+
 curseforge {
     apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
     project {
         id = '282001'
         releaseType = 'release'
-        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${project.version})."
+        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
+
+        relations {
+            incompatible "computercraft"
+        }
     }
 }
 
@@ -237,7 +392,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            artifact sourceJar
+            // artifact sourceJar
         }
     }
 }
@@ -257,22 +412,22 @@ uploadArchives {
                 pom.project {
                     name 'CC: Tweaked'
                     packaging 'jar'
-                    description 'A fork of ComputerCraft which aims to provide earlier access to the more experimental and in-development features of the mod.'
+                    description 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
                     url 'https://github.com/SquidDev-CC/CC-Tweaked'
 
                     scm {
-                        url 'https://github.com/dan200/ComputerCraft.git'
+                        url 'https://github.com/SquidDev-CC/CC-Tweaked.git'
                     }
 
                     issueManagement {
                         system 'github'
-                        url 'https://github.com/dan200/ComputerCraft/issues'
+                        url 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
                     }
 
                     licenses {
                         license {
                             name 'ComputerCraft Public License, Version 1.0'
-                            url 'https://github.com/dan200/ComputerCraft/blob/master/LICENSE'
+                            url 'https://github.com/SquidDev-CC/CC-Tweaked/blob/master/LICENSE'
                             distribution 'repo'
                         }
                     }
@@ -286,11 +441,27 @@ uploadArchives {
     }
 }
 
-gradle.projectsEvaluated {
+githubRelease {
-    tasks.withType(JavaCompile) {
+    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
-        options.compilerArgs << "-Xlint"
+    owner 'SquidDev-CC'
+    repo 'CC-Tweaked'
+    targetCommitish { Grgit.open(dir: '.').branch.current().name }
+
+    tagName "v${mc_version}-${mod_version}"
+    releaseName "[${mc_version}] ${mod_version}"
+    body {
+        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+            .readLines()
+            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
+            .join("\n").trim()
     }
+    prerelease false
 }
 
-runClient.outputs.upToDateWhen { false }
+def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
-runServer.outputs.upToDateWhen { false }
+uploadTasks.forEach { tasks.getByName(it).dependsOn checkRelease }
+
+task uploadAll(dependsOn: uploadTasks) {
+    group "upload"
+    description "Uploads to all repositories (Maven, Curse, GitHub release)"
+}

config/checkstyle/checkstyle.xml

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

config/checkstyle/suppressions.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <!-- All the config options and method fields. -->
+    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
+    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />
+</suppressions>

config/license/api.txt

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

config/license/main.txt

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

gradle.properties

@@ -0,0 +1,7 @@
+# Mod properties
+mod_version=1.84.1
+
+# Minecraft properties
+mc_version=1.14.4
+forge_version=28.0.45
+mappings_version=20190806-1.14.3

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.3-bin.zip

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'cc-tweaked'
+rootProject.name = "cc-tweaked-${mc_version}"

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

@@ -7,115 +7,50 @@
 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.ApiFactories;
 import dan200.computercraft.core.apis.http.websocket.Websocket;
-import dan200.computercraft.core.filesystem.ComboMount;
+import dan200.computercraft.core.filesystem.ResourceMount;
-import dan200.computercraft.core.filesystem.FileMount;
+import dan200.computercraft.shared.Config;
-import dan200.computercraft.core.filesystem.JarMount;
-import dan200.computercraft.core.terminal.Terminal;
-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.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.core.ServerComputer;
 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.ItemDiskExpanded;
+import dan200.computercraft.shared.media.items.ItemDisk;
-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.network.NetworkHandler;
+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.diskdrive.TileDiskDrive;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockWiredModemFull;
-import dan200.computercraft.shared.peripheral.modem.wired.ItemCable;
+import dan200.computercraft.shared.peripheral.modem.wired.ItemBlockCable;
-import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem;
+import dan200.computercraft.shared.peripheral.modem.wireless.BlockWirelessModem;
-import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem;
+import dan200.computercraft.shared.peripheral.monitor.BlockMonitor;
-import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
+import dan200.computercraft.shared.peripheral.printer.BlockPrinter;
-import dan200.computercraft.shared.peripheral.printer.TilePrinter;
+import dan200.computercraft.shared.peripheral.speaker.BlockSpeaker;
 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.ICCTurtleProxy;
-import dan200.computercraft.shared.proxy.IComputerCraftProxy;
 import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
+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 dan200.computercraft.shared.util.CreativeTabMain;
+import net.minecraft.resources.IReloadableResourceManager;
-import dan200.computercraft.shared.util.IDAssigner;
+import net.minecraft.util.ResourceLocation;
-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.EnumHand;
-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.FMLCommonHandler;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.server.ServerLifecycleHooks;
-import net.minecraftforge.fml.common.event.*;
+import org.apache.logging.log4j.LogManager;
-import net.minecraftforge.fml.relauncher.Side;
 import org.apache.logging.log4j.Logger;
 
-import java.io.*;
+import java.io.IOException;
-import java.net.MalformedURLException;
+import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.List;
+import java.util.concurrent.TimeUnit;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
-@Mod(
+@Mod( ComputerCraft.MOD_ID )
-    modid = ComputerCraft.MOD_ID, name = "CC: Tweaked", version = "${version}",
+public final class ComputerCraft
-    guiFactory = "dan200.computercraft.client.gui.GuiConfigCC$Factory",
-    dependencies = "required:forge@[14.23.4.2746,)"
-)
-public class ComputerCraft
 {
     public static final String MOD_ID = "computercraft";
 
-    // GUI IDs
+    public static final int DATAFIXER_VERSION = 0;
-    public static final int diskDriveGUIID = 100;
-    public static final int computerGUIID = 101;
-    public static final int printerGUIID = 102;
-    public static final int turtleGUIID = 103;
-    // ComputerCraftEdu uses ID 104
-    public static final int printoutGUIID = 105;
-    public static final int pocketComputerGUIID = 106;
-    public static final int viewComputerGUIID = 110;
 
     // Configuration options
     public static final String[] DEFAULT_HTTP_WHITELIST = new String[] { "*" };
@@ -133,9 +68,12 @@ public class ComputerCraft
     public static boolean disable_lua51_features = false;
     public static String default_computer_settings = "";
     public static boolean debug_enable = true;
-    public static int computer_threads = 1;
     public static boolean logPeripheralErrors = false;
 
+    public static int computer_threads = 1;
+    public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
+    public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
+
     public static boolean http_enable = true;
     public static boolean http_websocket_enable = true;
     public static AddressPredicate http_whitelist = new AddressPredicate( DEFAULT_HTTP_WHITELIST );
@@ -172,48 +110,56 @@ public class ComputerCraft
     public static final int terminalHeight_pocketComputer = 20;
 
     // Blocks and Items
-    public static class Blocks
+    public static final class Blocks
     {
-        public static BlockComputer computer;
+        public static BlockComputer computerNormal;
-        public static BlockCommandComputer commandComputer;
+        public static BlockComputer computerAdvanced;
+        public static BlockComputer computerCommand;
 
-        public static BlockTurtle turtle;
+        public static BlockTurtle turtleNormal;
-        public static BlockTurtle turtleExpanded;
         public static BlockTurtle turtleAdvanced;
 
-        public static BlockPeripheral peripheral;
+        public static BlockSpeaker speaker;
-        public static BlockCable cable;
+        public static BlockDiskDrive diskDrive;
-        public static BlockAdvancedModem advancedModem;
+        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 BlockCable cable;
     }
 
-    public static class Items
+    public static final class Items
     {
-        public static ItemComputer computer;
+        public static ItemComputer computerNormal;
-        public static ItemCommandComputer commandComputer;
+        public static ItemComputer computerAdvanced;
+        public static ItemComputer computerCommand;
 
-        public static ItemTurtleLegacy turtle;
+        public static ItemPocketComputer pocketComputerNormal;
-        public static ItemTurtleNormal turtleExpanded;
+        public static ItemPocketComputer pocketComputerAdvanced;
-        public static ItemTurtleAdvanced turtleAdvanced;
 
-        public static ItemPocketComputer pocketComputer;
+        public static ItemTurtle turtleNormal;
+        public static ItemTurtle turtleAdvanced;
 
-        public static ItemDiskLegacy disk;
+        public static ItemDisk disk;
-        public static ItemDiskExpanded diskExpanded;
         public static ItemTreasureDisk treasureDisk;
 
-        public static ItemPrintout printout;
+        public static ItemPrintout printedPage;
+        public static ItemPrintout printedPages;
+        public static ItemPrintout printedBook;
 
-        public static ItemPeripheral peripheral;
+        public static ItemBlockCable.Cable cable;
-        public static ItemAdvancedModem advancedModem;
+        public static ItemBlockCable.WiredModem wiredModem;
-        public static ItemCable cable;
-        public static ItemBlock wiredModemFull;
     }
 
-    public static class TurtleUpgrades
+    public static final class TurtleUpgrades
     {
-        public static TurtleModem wirelessModem;
+        public static TurtleModem wirelessModemNormal;
-        public static TurtleModem advancedModem;
+        public static TurtleModem wirelessModemAdvanced;
         public static TurtleSpeaker speaker;
 
         public static TurtleCraftingTable craftingTable;
@@ -224,99 +170,23 @@ public class ComputerCraft
         public static TurtleHoe diamondHoe;
     }
 
-    public static class PocketUpgrades
+    public static final class PocketUpgrades
     {
-        public static PocketModem wirelessModem;
+        public static PocketModem wirelessModemNormal;
-        public static PocketModem advancedModem;
+        public static PocketModem wirelessModemAdvanced;
         public static PocketSpeaker speaker;
-
-        @Deprecated
-        public static PocketSpeaker pocketSpeaker;
-    }
-
-    @Deprecated
-    public static class Upgrades
-    {
-        public static TurtleModem advancedModem;
     }
 
     // Registries
     public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
     public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
 
-    // Creative
-    public static CreativeTabMain mainCreativeTab;
-
     // Logging
-    public static Logger log;
+    public static final Logger log = LogManager.getLogger( MOD_ID );
 
-    // Peripheral providers. This is still here to ensure compatibility with Plethora and Computronics
+    public ComputerCraft()
-    public static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
-
-    // Implementation
-    @Mod.Instance( value = ComputerCraft.MOD_ID )
-    public static ComputerCraft instance;
-
-    @SidedProxy(
-        clientSide = "dan200.computercraft.client.proxy.ComputerCraftProxyClient",
-        serverSide = "dan200.computercraft.shared.proxy.ComputerCraftProxyCommon"
-    )
-    private static IComputerCraftProxy proxy;
-
-    @SidedProxy(
-        clientSide = "dan200.computercraft.client.proxy.CCTurtleProxyClient",
-        serverSide = "dan200.computercraft.shared.proxy.CCTurtleProxyCommon"
-    )
-    private static ICCTurtleProxy turtleProxy;
-
-    @Mod.EventHandler
-    public void preInit( FMLPreInitializationEvent event )
     {
-        log = event.getModLog();
+        Config.load();
-
-        // Load config
-        Config.load( event.getSuggestedConfigurationFile() );
-
-        // Setup network
-        NetworkHandler.setup();
-
-        proxy.preInit();
-        turtleProxy.preInit();
-    }
-
-    @Mod.EventHandler
-    public void init( FMLInitializationEvent event )
-    {
-        proxy.init();
-        turtleProxy.init();
-    }
-
-    @Mod.EventHandler
-    public void onServerStarting( FMLServerStartingEvent event )
-    {
-        proxy.initServer( event.getServer() );
-    }
-
-    @Mod.EventHandler
-    public void onServerStart( FMLServerStartedEvent event )
-    {
-        if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
-        {
-            ComputerCraft.serverComputerRegistry.reset();
-            WirelessNetwork.resetNetworks();
-            Tracking.reset();
-        }
-    }
-
-    @Mod.EventHandler
-    public void onServerStopped( FMLServerStoppedEvent event )
-    {
-        if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
-        {
-            ComputerCraft.serverComputerRegistry.reset();
-            WirelessNetwork.resetNetworks();
-            Tracking.reset();
-        }
     }
 
     public static String getVersion()
@@ -324,411 +194,23 @@ public class ComputerCraft
         return "${version}";
     }
 
-    public static void openDiskDriveGUI( EntityPlayer player, TileDiskDrive drive )
+    static IMount createResourceMount( String domain, String subPath )
     {
-        BlockPos pos = drive.getPos();
+        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
-        player.openGui( ComputerCraft.instance, ComputerCraft.diskDriveGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
+        ResourceMount mount = new ResourceMount( domain, subPath, manager );
+        return mount.exists( "" ) ? mount : null;
     }
 
-    public static void openComputerGUI( EntityPlayer player, TileComputer computer )
+    public static InputStream getResourceFile( String domain, String subPath )
-    {
-        BlockPos pos = computer.getPos();
-        player.openGui( ComputerCraft.instance, ComputerCraft.computerGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
-    }
-
-    public static void openPrinterGUI( EntityPlayer player, TilePrinter printer )
-    {
-        BlockPos pos = printer.getPos();
-        player.openGui( ComputerCraft.instance, ComputerCraft.printerGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
-    }
-
-    public static void openTurtleGUI( EntityPlayer player, TileTurtle turtle )
-    {
-        BlockPos pos = turtle.getPos();
-        player.openGui( instance, ComputerCraft.turtleGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
-    }
-
-    public static void openPrintoutGUI( EntityPlayer player, EnumHand hand )
-    {
-        player.openGui( ComputerCraft.instance, ComputerCraft.printoutGUIID, player.getEntityWorld(), hand.ordinal(), 0, 0 );
-    }
-
-    public static void openPocketComputerGUI( EntityPlayer player, EnumHand hand )
-    {
-        player.openGui( ComputerCraft.instance, ComputerCraft.pocketComputerGUIID, player.getEntityWorld(), hand.ordinal(), 0, 0 );
-    }
-
-    public static void openComputerGUI( EntityPlayer player, ServerComputer computer )
-    {
-        ComputerFamily family = computer.getFamily();
-        int width = 0, height = 0;
-        Terminal terminal = computer.getTerminal();
-        if( terminal != null )
-        {
-            width = terminal.getWidth();
-            height = terminal.getHeight();
-        }
-
-        // Pack useful terminal information into the various coordinate bits.
-        // These are extracted in ComputerCraftProxyCommon.getClientGuiElement
-        player.openGui( ComputerCraft.instance, ComputerCraft.viewComputerGUIID, player.getEntityWorld(),
-            computer.getInstanceID(), family.ordinal(), (width & 0xFFFF) << 16 | (height & 0xFFFF)
-        );
-    }
-
-    private static File getBaseDir()
-    {
-        return FMLCommonHandler.instance().getMinecraftServerInstance().getDataDirectory();
-    }
-
-    private static File getResourcePackDir()
-    {
-        return new File( getBaseDir(), "resourcepacks" );
-    }
-
-    public static boolean canPlayerUseCommands( EntityPlayer player )
-    {
-        MinecraftServer server = player.getServer();
-        if( server != null )
-        {
-            return server.getPlayerList().canSendCommands( player.getGameProfile() );
-        }
-        return false;
-    }
-
-    @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 new FileMount( new File( getWorldDir(), subPath ), capacity );
+            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
         }
-        catch( Exception e )
+        catch( IOException ignored )
         {
             return null;
         }
     }
-
-    @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 jar
-        File modJar = getContainingJar( modClass );
-        if( modJar != null )
-        {
-            try
-            {
-                mounts.add( new JarMount( modJar, subPath ) );
-            }
-            catch( IOException | RuntimeException e )
-            {
-                ComputerCraft.log.error( "Could not load mount from mod jar", e );
-            }
-        }
-
-        // Mount from resource packs
-        File resourcePackDir = getResourcePackDir();
-        if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
-        {
-            String[] resourcePacks = resourcePackDir.list();
-            for( String resourcePackName : resourcePacks )
-            {
-                try
-                {
-                    File resourcePack = new File( resourcePackDir, resourcePackName );
-                    if( !resourcePack.isDirectory() )
-                    {
-                        // Mount a resource pack from a jar
-                        mounts.add( new JarMount( resourcePack, subPath ) );
-                    }
-                    else
-                    {
-                        // Mount a resource pack from a folder
-                        File subResource = new File( resourcePack, subPath );
-                        if( subResource.exists() ) mounts.add( new FileMount( subResource, 0 ) );
-                    }
-                }
-                catch( IOException | RuntimeException e )
-                {
-                    ComputerCraft.log.error( "Could not load resource pack '" + resourcePackName + "'", e );
-                }
-            }
-        }
-
-        // 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 );
-    }
-    //endregion
 }

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

@@ -0,0 +1,141 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft;
+
+import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
+import dan200.computercraft.api.filesystem.IMount;
+import dan200.computercraft.api.filesystem.IWritableMount;
+import dan200.computercraft.api.lua.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.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.tileentity.TileEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockReader;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.LazyOptional;
+
+import javax.annotation.Nonnull;
+import java.io.File;
+
+public final class ComputerCraftAPIImpl implements IComputerCraftAPI
+{
+    public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
+
+    private ComputerCraftAPIImpl()
+    {
+    }
+
+    @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 )
+    {
+        return ComputerCraft.createResourceMount( domain, subPath );
+    }
+
+    @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

@@ -0,0 +1,79 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api;
+
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleUpgradeType;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IItemProvider;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Util;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A base class for {@link ITurtleUpgrade}s.
+ *
+ * One does not have to use this, but it does provide a convenient template.
+ */
+public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
+{
+    private final ResourceLocation id;
+    private final TurtleUpgradeType type;
+    private final String adjective;
+    private final ItemStack stack;
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, ItemStack stack )
+    {
+        this.id = id;
+        this.type = type;
+        this.adjective = adjective;
+        this.stack = stack;
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, String adjective, IItemProvider item )
+    {
+        this( id, type, adjective, new ItemStack( item ) );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, ItemStack stack )
+    {
+        this( id, type, Util.makeTranslationKey( "upgrade", id ) + ".adjective", stack );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, TurtleUpgradeType type, IItemProvider item )
+    {
+        this( id, type, new ItemStack( item ) );
+    }
+
+    @Nonnull
+    @Override
+    public final ResourceLocation getUpgradeID()
+    {
+        return id;
+    }
+
+    @Nonnull
+    @Override
+    public final String getUnlocalisedAdjective()
+    {
+        return adjective;
+    }
+
+    @Nonnull
+    @Override
+    public final TurtleUpgradeType getType()
+    {
+        return type;
+    }
+
+    @Nonnull
+    @Override
+    public final ItemStack getCraftingItem()
+    {
+        return stack;
+    }
+}

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

@@ -17,18 +17,17 @@ 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.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.lang.reflect.Method;
 
 /**
  * The static entry point to the ComputerCraft API.
@@ -37,28 +36,10 @@ import java.lang.reflect.Method;
  */
 public final class ComputerCraftAPI
 {
-    public static boolean isInstalled()
-    {
-        findCC();
-        return computerCraft != null;
-    }
-
     @Nonnull
     public static String getInstalledVersion()
     {
-        findCC();
+        return getInstance().getInstalledVersion();
-        if( computerCraft_getVersion != null )
-        {
-            try
-            {
-                return (String) computerCraft_getVersion.invoke( null );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
-        return "";
     }
 
     @Nonnull
@@ -82,19 +63,7 @@ public final class ComputerCraftAPI
      */
     public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
     {
-        findCC();
+        return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
-        if( computerCraft_createUniqueNumberedSaveDir != null )
-        {
-            try
-            {
-                return (Integer) computerCraft_createUniqueNumberedSaveDir.invoke( null, world, parentSubPath );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
-        return -1;
     }
 
     /**
@@ -118,78 +87,66 @@ public final class ComputerCraftAPI
     @Nullable
     public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
     {
-        findCC();
+        return getInstance().createSaveDirMount( world, subPath, capacity );
-        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 IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a resource folder
+     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a
-     * onto a computer's file system.
+     * resource folder onto a computer's file system.
      *
-     * The files in this mount will be a combination of files in the specified mod jar, and resource packs that contain
+     * 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 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 domain   The domain under which to look for resources. eg: "mymod".
+     * @param subPath The subPath under which to look for resources. eg: "lua/myfiles".
-     * @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.
-     * @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 Class<?> modClass, @Nonnull String domain, @Nonnull String subPath )
+    public static IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
     {
-        findCC();
+        return getInstance().createResourceMount( domain, subPath );
-        if( computerCraft_createResourceMount != null )
+    }
-        {
+
-            try
+    /**
-            {
+     * Creates a file system mount to a resource folder, and returns it.
-                return (IMount) computerCraft_createResourceMount.invoke( null, modClass, domain, subPath );
+     *
-            }
+     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a
-            catch( Exception e )
+     * resource folder onto a computer's file system.
-            {
+     *
-                // It failed
+     * 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.
-        }
+     *
-        return null;
+     * @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 );
     }
 
     /**
      * Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
      *
      * @param provider The peripheral provider to register.
-     * @see dan200.computercraft.api.peripheral.IPeripheral
+     * @see IPeripheral
-     * @see dan200.computercraft.api.peripheral.IPeripheralProvider
+     * @see IPeripheralProvider
      */
     public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
     {
-        findCC();
+        getInstance().registerPeripheralProvider( provider );
-        if( computerCraft_registerPeripheralProvider != null )
-        {
-            try
-            {
-                computerCraft_registerPeripheralProvider.invoke( null, provider );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
     }
 
     /**
@@ -198,47 +155,22 @@ public final class ComputerCraftAPI
      * this during the load() method of your mod.
      *
      * @param upgrade The turtle upgrade to register.
-     * @see dan200.computercraft.api.turtle.ITurtleUpgrade
+     * @see ITurtleUpgrade
      */
     public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
     {
-        if( upgrade != null )
+        getInstance().registerTurtleUpgrade( upgrade );
-        {
-            findCC();
-            if( computerCraft_registerTurtleUpgrade != null )
-            {
-                try
-                {
-                    computerCraft_registerTurtleUpgrade.invoke( null, upgrade );
-                }
-                catch( Exception e )
-                {
-                    // It failed
-                }
-            }
-        }
     }
 
     /**
      * Registers a bundled redstone provider to provide bundled redstone output for blocks.
      *
      * @param provider The bundled redstone provider to register.
-     * @see dan200.computercraft.api.redstone.IBundledRedstoneProvider
+     * @see IBundledRedstoneProvider
      */
     public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
     {
-        findCC();
+        getInstance().registerBundledRedstoneProvider( provider );
-        if( computerCraft_registerBundledRedstoneProvider != null )
-        {
-            try
-            {
-                computerCraft_registerBundledRedstoneProvider.invoke( null, provider );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
     }
 
     /**
@@ -249,85 +181,27 @@ public final class ComputerCraftAPI
      * @param side  The side to extract the bundled redstone output from.
      * @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned.
      * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
-     * @see dan200.computercraft.api.redstone.IBundledRedstoneProvider
+     * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
-        findCC();
+        return getInstance().getBundledRedstoneOutput( world, pos, side );
-        if( computerCraft_getDefaultBundledRedstoneOutput != null )
-        {
-            try
-            {
-                return (Integer) computerCraft_getDefaultBundledRedstoneOutput.invoke( null, world, pos, side );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
-        return -1;
     }
 
     /**
      * Registers a media provider to provide {@link IMedia} implementations for Items
      *
      * @param provider The media provider to register.
-     * @see dan200.computercraft.api.media.IMediaProvider
+     * @see IMediaProvider
      */
     public static void registerMediaProvider( @Nonnull IMediaProvider provider )
     {
-        findCC();
+        getInstance().registerMediaProvider( provider );
-        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 dan200.computercraft.api.permissions.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 )
     {
-        findCC();
+        getInstance().registerPocketUpgrade( upgrade );
-        if( computerCraft_registerPocketUpgrade != null )
-        {
-            try
-            {
-                computerCraft_registerPocketUpgrade.invoke( null, upgrade );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
     }
 
     /**
@@ -337,36 +211,12 @@ public final class ComputerCraftAPI
      */
     public static IPacketNetwork getWirelessNetwork()
     {
-        findCC();
+        return getInstance().getWirelessNetwork();
-        if( computerCraft_getWirelessNetwork != null )
-        {
-            try
-            {
-                return (IPacketNetwork) computerCraft_getWirelessNetwork.invoke( null );
-            }
-            catch( Exception e )
-            {
-                // It failed;
-            }
-        }
-
-        return null;
     }
 
-    public static void registerAPIFactory( @Nonnull ILuaAPIFactory upgrade )
+    public static void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
     {
-        findCC();
+        getInstance().registerAPIFactory( factory );
-        if( computerCraft_registerAPIFactory != null )
-        {
-            try
-            {
-                computerCraft_registerAPIFactory.invoke( null, upgrade );
-            }
-            catch( Exception e )
-            {
-                // It failed
-            }
-        }
     }
 
     /**
@@ -379,22 +229,7 @@ public final class ComputerCraftAPI
     @Nonnull
     public static IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
     {
-        findCC();
+        return getInstance().createWiredNodeForElement( element );
-        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" );
-        }
     }
 
     /**
@@ -406,118 +241,64 @@ public final class ComputerCraftAPI
      * @return The element's node
      * @see IWiredElement#getNode()
      */
-    @Nullable
+    @Nonnull
-    public static IWiredElement getWiredElementAt( @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
-        findCC();
+        return getInstance().getWiredElementAt( world, pos, side );
-        if( computerCraft_getWiredElementAt != null )
-        {
-            try
-            {
-                return (IWiredElement) computerCraft_getWiredElementAt.invoke( null, world, pos, side );
-            }
-            catch( ReflectiveOperationException ignored )
-            {
-            }
-        }
-
-        return null;
     }
 
-    // The functions below here are private, and are used to interface with the non-API ComputerCraft classes.
+    private static IComputerCraftAPI instance;
-    // 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.
 
-    private static void findCC()
+    @Nonnull
+    private static IComputerCraftAPI getInstance()
     {
-        if( !ccSearched )
+        if( instance != null ) return instance;
-        {
-            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.out.println( "ComputerCraftAPI: ComputerCraft not found." );
-            }
-            finally
-            {
-                ccSearched = true;
-            }
-        }
-    }
 
-    private static Method findCCMethod( String name, Class<?>[] args )
-    {
         try
         {
-            return computerCraft != null ? computerCraft.getMethod( name, args ) : null;
+            return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
+                .getField( "INSTANCE" ).get( null );
         }
-        catch( NoSuchMethodException e )
+        catch( ReflectiveOperationException e )
         {
-            System.out.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." );
+            throw new IllegalStateException( "Cannot find ComputerCraft API", e );
-            return null;
         }
     }
 
-    private static boolean ccSearched = false;
+    public interface IComputerCraftAPI
-    private static Class<?> computerCraft = null;
+    {
-    private static Method computerCraft_getVersion = null;
+        @Nonnull
-    private static Method computerCraft_createUniqueNumberedSaveDir = null;
+        String getInstalledVersion();
-    private static Method computerCraft_createSaveDirMount = null;
+
-    private static Method computerCraft_createResourceMount = null;
+        int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
-    private static Method computerCraft_registerPeripheralProvider = null;
+
-    private static Method computerCraft_registerTurtleUpgrade = null;
+        @Nullable
-    private static Method computerCraft_registerBundledRedstoneProvider = null;
+        IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
-    private static Method computerCraft_getDefaultBundledRedstoneOutput = null;
+
-    private static Method computerCraft_registerMediaProvider = null;
+        @Nullable
-    private static Method computerCraft_registerPermissionProvider = null;
+        IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
-    private static Method computerCraft_registerPocketUpgrade = null;
+
-    private static Method computerCraft_getWirelessNetwork = null;
+        void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
-    private static Method computerCraft_registerAPIFactory = null;
+
-    private static Method computerCraft_createWiredNodeForElement = null;
+        void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
-    private static Method computerCraft_getWiredElementAt = null;
+
+        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 );
+    }
 }

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

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

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

@@ -90,7 +90,6 @@ public interface IMount
      * @throws IOException If the file does not exist, or could not be opened.
      */
     @Nonnull
-    @SuppressWarnings( "deprecation" )
     default ReadableByteChannel openChannelForRead( @Nonnull String path ) throws IOException
     {
         return Channels.newChannel( openForRead( path ) );

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

@@ -67,7 +67,6 @@ public interface IWritableMount extends IMount
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    @SuppressWarnings( "deprecation" )
     default WritableByteChannel openChannelForWrite( @Nonnull String path ) throws IOException
     {
         return Channels.newChannel( openForWrite( path ) );
@@ -94,7 +93,6 @@ public interface IWritableMount extends IMount
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    @SuppressWarnings( "deprecation" )
     default WritableByteChannel openChannelForAppend( @Nonnull String path ) throws IOException
     {
         return Channels.newChannel( openForAppend( path ) );

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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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/ILuaAPIFactory.java

@@ -17,6 +17,7 @@ import javax.annotation.Nullable;
  * @see ILuaAPI
  * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
+@FunctionalInterface
 public interface ILuaAPIFactory
 {
     /**

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

@@ -32,7 +32,12 @@ public interface ILuaContext
      *                              intercepted, or the computer will leak memory and end up in a broken state.
      */
     @Nonnull
-    Object[] pullEvent( @Nullable String filter ) throws LuaException, InterruptedException;
+    default Object[] pullEvent( @Nullable String filter ) throws LuaException, InterruptedException
+    {
+        Object[] results = pullEventRaw( filter );
+        if( results.length >= 1 && results[0].equals( "terminate" ) ) throw new LuaException( "Terminated", 0 );
+        return results;
+    }
 
     /**
      * The same as {@link #pullEvent(String)}, except "terminated" events are ignored. Only use this if you want to
@@ -47,7 +52,10 @@ public interface ILuaContext
      * @see #pullEvent(String)
      */
     @Nonnull
-    Object[] pullEventRaw( @Nullable String filter ) throws InterruptedException;
+    default Object[] pullEventRaw( @Nullable String filter ) throws InterruptedException
+    {
+        return yield( new Object[] { filter } );
+    }
 
     /**
      * Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to

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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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/IMedia.java

@@ -7,6 +7,7 @@
 package dan200.computercraft.api.media;
 
 import dan200.computercraft.api.filesystem.IMount;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.world.World;
@@ -16,7 +17,9 @@ import javax.annotation.Nullable;
 
 /**
  * Represents an item that can be placed in a disk drive and used by a Computer.
- * Implement this interface on your Item class to allow it to be used in the drive.
+ *
+ * Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register
+ * a {@link IMediaProvider}.
  */
 public interface IMedia
 {
@@ -43,7 +46,7 @@ public interface IMedia
 
     /**
      * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie:
-     * "Jonathon Coulton - Still Alive"
+     * "Jonathan Coulton - Still Alive"
      *
      * @param stack The {@link ItemStack} to modify.
      * @return The name, or null if this item does not represent an item with audio.
@@ -74,7 +77,7 @@ public interface IMedia
      * @param world The world in which the item and disk drive reside.
      * @return The mount, or null if this item does not represent an item with data. If the mount returned also
      * implements {@link dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
-     * @see dan200.computercraft.api.filesystem.IMount
+     * @see IMount
      * @see dan200.computercraft.api.filesystem.IWritableMount
      * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(Class, String, String)

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

@@ -23,7 +23,7 @@ public interface IMediaProvider
      * Produce an IMedia implementation from an ItemStack.
      *
      * @param stack The stack from which to extract the media information.
-     * @return An IMedia implementation, or null if the item is not something you wish to handle
+     * @return An {@link IMedia} implementation, or {@code null} if the item is not something you wish to handle
      * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
      */
     @Nullable

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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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/IComputerAccess.java

@@ -9,6 +9,8 @@ package dan200.computercraft.api.peripheral;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
+import dan200.computercraft.api.lua.ILuaContext;
+import dan200.computercraft.api.lua.ILuaTask;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -146,7 +148,7 @@ public interface IComputerAccess
      *
      *                  You may supply {@code null} to indicate that no arguments are to be supplied.
      * @throws RuntimeException If the peripheral has been detached.
-     * @see dan200.computercraft.api.peripheral.IPeripheral#callMethod
+     * @see IPeripheral#callMethod
      */
     void queueEvent( @Nonnull String event, @Nullable Object[] arguments );
 
@@ -179,8 +181,8 @@ public interface IComputerAccess
     }
 
     /**
-     * Get a reachable peripheral with the given attachement name. This is a equivalent to
+     * Get a reachable peripheral with the given attachment name. This is a equivalent to
-     * {@link #getAvailablePeripherals()}{@code .get(name)}, though may be more performant.
+     * {@link #getAvailablePeripherals()}{@code .get(name)}, though may be more efficient.
      *
      * @param name The peripheral's attached name
      * @return The reachable peripheral, or {@code null} if none can be found.
@@ -191,4 +193,23 @@ public interface IComputerAccess
     {
         return null;
     }
+
+    /**
+     * Get a {@link IWorkMonitor} for tasks your peripheral might execute on the main (server) thread.
+     *
+     * This should be used to ensure your peripheral integrates with ComputerCraft's monitoring and limiting of how much
+     * server time each computer consumes. You should not need to use this if you use
+     * {@link ILuaContext#issueMainThreadTask(ILuaTask)} - this is intended for mods with their own system for running
+     * work on the main thread.
+     *
+     * Please note that the returned implementation is <em>not</em> thread-safe, and should only be used from the main
+     * thread.
+     *
+     * @return The work monitor for the main thread, or {@code null} if this computer does not have one.
+     */
+    @Nullable
+    default IWorkMonitor getMainThreadMonitor()
+    {
+        return null;
+    }
 }

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

@@ -41,8 +41,8 @@ public interface IPeripheral
      * This is called when a lua program on an attached computer calls {@code peripheral.call()} with
      * one of the methods exposed by {@link #getMethodNames()}.
      *
-     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe
+     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe when interacting
-     * when interacting with Minecraft objects.
+     * with Minecraft objects.
      *
      * @param computer  The interface to the computer that is making the call. Remember that multiple
      *                  computers can be attached to a peripheral at once.
@@ -75,20 +75,21 @@ public interface IPeripheral
     Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException, InterruptedException;
 
     /**
-     * Is called when canAttachToSide has returned true, and a computer is attaching to the peripheral.
+     * Is called when when a computer is attaching to the peripheral.
      *
      * This will occur when a peripheral is placed next to an active computer, when a computer is turned on next to a
-     * peripheral, or when a turtle travels into a square next to a peripheral.
+     * peripheral, when a turtle travels into a square next to a peripheral, or when a wired modem adjacent to this
+     * peripheral is does any of the above.
      *
-     * Between calls to attach() and detach(), the attached computer can make method calls on the peripheral using
+     * Between calls to attach and {@link #detach}, the attached computer can make method calls on the peripheral using
      * {@code peripheral.call()}. This method can be used to keep track of which computers are attached to the
      * peripheral, or to take action when attachment occurs.
      *
-     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe
+     * Be aware that will be called from both the server thread and ComputerCraft Lua thread, and so must be thread-safe
-     * when interacting with Minecraft objects.
+     * and reentrant.
      *
-     * @param computer The interface to the computer that is being attached. Remember that multiple
+     * @param computer The interface to the computer that is being attached. Remember that multiple computers can be
-     *                 computers can be attached to a peripheral at once.
+     *                 attached to a peripheral at once.
      * @see #detach
      */
     default void attach( @Nonnull IComputerAccess computer )
@@ -96,19 +97,21 @@ public interface IPeripheral
     }
 
     /**
-     * Is called when a computer is detaching from the peripheral.
+     * Called when a computer is detaching from the peripheral.
      *
-     * This will occur when a computer shuts down, when the peripheral is removed while attached to computers,
+     * This will occur when a computer shuts down, when the peripheral is removed while attached to computers, when a
-     * or when a turtle moves away from a square attached to a peripheral. This method can be used to keep track of
+     * turtle moves away from a block attached to a peripheral, or when a wired modem adjacent to this peripheral is
-     * which computers are attached to the peripheral, or to take action when detachment
+     * detached.
-     * occurs.
      *
-     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe
+     * This method can be used to keep track of which computers are attached to the peripheral, or to take action when
-     * when interacting with Minecraft objects.
+     * detachment occurs.
      *
-     * @param computer The interface to the computer that is being detached. Remember that multiple
+     * Be aware that this will be called from both the server and ComputerCraft Lua thread, and must be thread-safe
-     *                 computers can be attached to a peripheral at once.
+     * and reentrant.
-     * @see #detach
+     *
+     * @param computer The interface to the computer that is being detached. Remember that multiple computers can be
+     *                 attached to a peripheral at once.
+     * @see #attach
      */
     default void detach( @Nonnull IComputerAccess computer )
     {

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

@@ -6,7 +6,8 @@
 
 package dan200.computercraft.api.peripheral;
 
-import net.minecraft.util.EnumFacing;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -16,6 +17,8 @@ import javax.annotation.Nullable;
 /**
  * This interface is used to create peripheral implementations for blocks.
  *
+ * If you have a {@link TileEntity} which acts as a peripheral, you may alternatively implement {@link IPeripheralTile}.
+ *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
  */
 @FunctionalInterface
@@ -31,5 +34,5 @@ public interface IPeripheralProvider
      * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
      */
     @Nullable
-    IPeripheral getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side );
+    IPeripheral getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
 }

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

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

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

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

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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -1,42 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-package dan200.computercraft.api.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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -0,0 +1,63 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.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;
+
+/**
+ * A base class for {@link IPocketUpgrade}s.
+ *
+ * One does not have to use this, but it does provide a convenient template.
+ */
+public abstract class AbstractPocketUpgrade implements IPocketUpgrade
+{
+    private final ResourceLocation id;
+    private final String adjective;
+    private final ItemStack stack;
+
+    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, ItemStack stack )
+    {
+        this.id = id;
+        this.adjective = adjective;
+        this.stack = stack;
+    }
+
+    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, IItemProvider item )
+    {
+        this( id, adjective, new ItemStack( item ) );
+    }
+
+    protected AbstractPocketUpgrade( ResourceLocation id, IItemProvider item )
+    {
+        this( id, Util.makeTranslationKey( "upgrade", id ) + ".adjective", new ItemStack( item ) );
+    }
+
+    @Nonnull
+    @Override
+    public final ResourceLocation getUpgradeID()
+    {
+        return id;
+    }
+
+    @Nonnull
+    @Override
+    public final String getUnlocalisedAdjective()
+    {
+        return adjective;
+    }
+
+    @Nonnull
+    @Override
+    public final ItemStack getCraftingItem()
+    {
+        return stack;
+    }
+}

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

@@ -8,7 +8,7 @@ package dan200.computercraft.api.pocket;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
 import net.minecraft.entity.Entity;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ResourceLocation;
 
 import javax.annotation.Nonnull;
@@ -23,7 +23,9 @@ public interface IPocketAccess
     /**
      * Gets the entity holding this item.
      *
-     * @return The holding entity. This may be {@code null}.
+     * This must be called on the server thread.
+     *
+     * @return The holding entity, or {@code null} if none exists.
      */
     @Nullable
     Entity getEntity();
@@ -73,7 +75,7 @@ public interface IPocketAccess
      * @see #updateUpgradeNBTData()
      */
     @Nonnull
-    NBTTagCompound getUpgradeNBTData();
+    CompoundNBT getUpgradeNBTData();
 
     /**
      * Mark the upgrade-specific NBT as dirty.

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

@@ -19,7 +19,7 @@ import javax.annotation.Nullable;
 /**
  * Additional peripherals for pocket computers.
  *
- * This is similar to {@link dan200.computercraft.api.turtle.ITurtleUpgrade}.
+ * This is similar to {@link ITurtleUpgrade}.
  */
 public interface IPocketUpgrade
 {
@@ -54,6 +54,9 @@ public interface IPocketUpgrade
      * pocket computer which holds this upgrade. This item stack is also used to determine the upgrade given by
      * {@code pocket.equip()}/{@code pocket.unequip()}.
      *
+     * Ideally this should be constant over a session. It is recommended that you cache
+     * the item too, in order to prevent constructing it every time the method is called.
+     *
      * @return The item stack used for crafting. This can be {@link ItemStack#EMPTY} if crafting is disabled.
      */
     @Nonnull

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

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

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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -11,8 +11,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.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -54,8 +54,7 @@ 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. Note this will not check
+     * was cancelled.
-     * {@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 );
@@ -84,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(EnumFacing)
+     * @see #setDirection(Direction)
      */
     @Nonnull
-    EnumFacing getDirection();
+    Direction getDirection();
 
     /**
      * Set the direction the turtle is facing. Note that this will not play a rotation animation, you will also need to
@@ -96,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 EnumFacing dir );
+    void setDirection( @Nonnull Direction dir );
 
     /**
      * Get the currently selected slot in the turtle's inventory.
@@ -145,7 +144,9 @@ public interface ITurtleAccess
     GameProfile getOwningPlayer();
 
     /**
-     * Get the inventory of this turtle
+     * Get the inventory of this turtle.
+     *
+     * Note: this inventory should only be accessed and modified on the server thread.
      *
      * @return This turtle's inventory
      * @see #getItemHandler()
@@ -156,6 +157,8 @@ public interface ITurtleAccess
     /**
      * Get the inventory of this turtle as an {@link IItemHandlerModifiable}.
      *
+     * Note: this inventory should only be accessed and modified on the server thread.
+     *
      * @return This turtle's inventory
      * @see #getInventory()
      * @see IItemHandlerModifiable
@@ -291,7 +294,7 @@ public interface ITurtleAccess
      * @see #updateUpgradeNBTData(TurtleSide)
      */
     @Nonnull
-    NBTTagCompound getUpgradeNBTData( @Nullable TurtleSide side );
+    CompoundNBT 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

@@ -10,15 +10,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.block.model.IBakedModel;
+import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
@@ -44,17 +44,6 @@ 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.
      *
@@ -79,6 +68,9 @@ public interface ITurtleUpgrade
      * with to create a turtle which holds this upgrade. This item stack is also used
      * to determine the upgrade given by {@code turtle.equip()}
      *
+     * Ideally this should be constant over a session. It is recommended that you cache
+     * the item too, in order to prevent constructing it every time the method is called.
+     *
      * @return The item stack to craft with, or {@link ItemStack#EMPTY} if it cannot be crafted.
      */
     @Nonnull
@@ -106,8 +98,8 @@ public interface ITurtleUpgrade
      * Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called
      * by the turtle, and the tool is required to do some work.
      *
-     * Conforming implementations should fire {@link BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig}for digging,
+     * Conforming implementations should fire {@link BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig} for
-     * {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
+     * digging, {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
      *
      * @param turtle    Access to the turtle that the tool resides on.
      * @param side      Which side of the turtle (left or right) the tool resides on.
@@ -121,7 +113,7 @@ public interface ITurtleUpgrade
      * to be called.
      */
     @Nonnull
-    default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull EnumFacing direction )
+    default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction )
     {
         return TurtleCommandResult.failure();
     }
@@ -130,7 +122,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.block.model.ModelManager#getModel(ModelResourceLocation)} or any other
+     * {@link net.minecraft.client.renderer.model.ModelManager#getModel(ModelResourceLocation)} or any other
      * source.
      *
      * @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!
@@ -139,7 +131,7 @@ public interface ITurtleUpgrade
      * a transformation of {@code null} has the same effect as the identify matrix.
      */
     @Nonnull
-    @SideOnly( Side.CLIENT )
+    @OnlyIn( Dist.CLIENT )
     Pair<IBakedModel, Matrix4f> getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
 
     /**

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

@@ -6,7 +6,7 @@
 
 package dan200.computercraft.api.turtle;
 
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -15,7 +15,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, EnumFacing)
+ * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
  */
 public final class TurtleCommandResult
 {

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

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

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

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

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

@@ -11,7 +11,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.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.player.AttackEntityEvent;
 
@@ -21,7 +21,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, EnumFacing)},
+ * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)},
  * as the base {@code turtle.attack()} command does not fire it.
  *
  * Note that such commands should also fire {@link AttackEntityEvent}, so you do not need to listen to both.

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

@@ -12,14 +12,13 @@ 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.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fml.common.eventhandler.Cancelable;
 
 import javax.annotation.Nonnull;
 import java.util.Map;
@@ -37,7 +36,6 @@ import java.util.Objects;
  * Be aware that some events (such as {@link TurtleInventoryEvent}) do not necessarily interact
  * with a block, simply objects within that block space.
  */
-@Cancelable
 public abstract class TurtleBlockEvent extends TurtlePlayerEvent
 {
     private final World world;
@@ -77,21 +75,20 @@ 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, EnumFacing)},
+     * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)},
      * as the base {@code turtle.dig()} command does not fire it.
      *
      * Note that such commands should also fire {@link BlockEvent.BreakEvent}, so you do not need to listen to both.
      *
      * @see TurtleAction#DIG
      */
-    @Cancelable
     public static class Dig extends TurtleBlockEvent
     {
-        private final IBlockState block;
+        private final BlockState block;
         private final ITurtleUpgrade upgrade;
         private final TurtleSide side;
 
-        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
+        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block, @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
         {
             super( turtle, TurtleAction.DIG, player, world, pos );
 
@@ -109,7 +106,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The block which is going to be broken.
          */
         @Nonnull
-        public IBlockState getBlock()
+        public BlockState getBlock()
         {
             return block;
         }
@@ -142,7 +139,6 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#MOVE
      */
-    @Cancelable
     public static class Move extends TurtleBlockEvent
     {
         public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
@@ -156,7 +152,6 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#PLACE
      */
-    @Cancelable
     public static class Place extends TurtleBlockEvent
     {
         private final ItemStack stack;
@@ -188,13 +183,12 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#INSPECT
      */
-    @Cancelable
     public static class Inspect extends TurtleBlockEvent
     {
-        private final IBlockState state;
+        private final BlockState state;
         private final Map<String, Object> data;
 
-        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Map<String, Object> data )
+        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull Map<String, Object> data )
         {
             super( turtle, TurtleAction.INSPECT, player, world, pos );
 
@@ -210,7 +204,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The inspected block state.
          */
         @Nonnull
-        public IBlockState getState()
+        public BlockState getState()
         {
             return state;
         }
@@ -229,7 +223,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
         /**
          * Add new information to the inspection result. Note this will override fields with the same name.
          *
-         * @param newData The data to add. Note all values should be convertable to Lua (see
+         * @param newData The data to add. Note all values should be convertible to Lua (see
          *                {@link dan200.computercraft.api.peripheral.IPeripheral#callMethod(IComputerAccess, ILuaContext, int, Object[])}).
          */
         public void addData( @Nonnull Map<String, ?> newData )

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

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

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

@@ -0,0 +1,73 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.turtle.event;
+
+import dan200.computercraft.api.lua.ILuaContext;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Fired when a turtle gathers data on an item in its inventory.
+ *
+ * You may prevent items being inspected, or add additional information to the result. Be aware that this is fired on
+ * the computer thread, and so any operations on it must be thread safe.
+ *
+ * @see TurtleAction#INSPECT_ITEM
+ */
+public class TurtleInspectItemEvent extends TurtleActionEvent
+{
+    private final ItemStack stack;
+    private final Map<String, Object> data;
+
+    public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data )
+    {
+        super( turtle, TurtleAction.INSPECT_ITEM );
+
+        Objects.requireNonNull( stack, "stack cannot be null" );
+        Objects.requireNonNull( data, "data cannot be null" );
+        this.stack = stack;
+        this.data = data;
+    }
+
+    /**
+     * The item which is currently being inspected.
+     *
+     * @return The item stack which is being inspected. This should <b>not</b> be modified.
+     */
+    @Nonnull
+    public ItemStack getStack()
+    {
+        return stack;
+    }
+
+    /**
+     * Get the "inspection data" from this item, which will be returned to the user.
+     *
+     * @return This items's inspection data.
+     */
+    @Nonnull
+    public Map<String, Object> getData()
+    {
+        return data;
+    }
+
+    /**
+     * Add new information to the inspection result. Note this will override fields with the same name.
+     *
+     * @param newData The data to add. Note all values should be convertible to Lua (see
+     *                {@link dan200.computercraft.api.peripheral.IPeripheral#callMethod(IComputerAccess, ILuaContext, int, Object[])}).
+     */
+    public void addData( @Nonnull Map<String, ?> newData )
+    {
+        Objects.requireNonNull( newData, "newData cannot be null" );
+        data.putAll( newData );
+    }
+}

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

@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.fml.common.eventhandler.Cancelable;
 import net.minecraftforge.items.IItemHandler;
 
 import javax.annotation.Nonnull;
@@ -21,7 +20,6 @@ import java.util.Objects;
 /**
  * Fired when a turtle attempts to interact with an inventory.
  */
-@Cancelable
 public abstract class TurtleInventoryEvent extends TurtleBlockEvent
 {
     private final IItemHandler handler;
@@ -48,7 +46,6 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      *
      * @see TurtleAction#SUCK
      */
-    @Cancelable
     public static class Suck extends TurtleInventoryEvent
     {
         public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
@@ -62,7 +59,6 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      *
      * @see TurtleAction#DROP
      */
-    @Cancelable
     public static class Drop extends TurtleInventoryEvent
     {
         private final ItemStack stack;
@@ -78,13 +74,12 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
         /**
          * The item which will be inserted into the inventory/dropped on the ground.
          *
-         * Note that this is a copy of the original stack, and so should not be modified, as that will have no effect.
+         * @return The item stack which will be dropped. This should <b>not</b> be modified.
-         *
-         * @return The item stack which will be dropped.
          */
+        @Nonnull
         public ItemStack getStack()
         {
-            return stack.copy();
+            return stack;
         }
     }
 }

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

@@ -0,0 +1,90 @@
+/*
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
+ */
+package dan200.computercraft.api.turtle.event;
+
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import net.minecraft.item.ItemStack;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Objects;
+
+/**
+ * Fired when a turtle attempts to refuel from an item.
+ *
+ * One may use {@link #setCanceled(boolean, String)} to prevent refueling from this specific item. Additionally, you
+ * may use {@link #setHandler(Handler)} to register a custom fuel provider.
+ */
+public class TurtleRefuelEvent extends TurtleActionEvent
+{
+    private final ItemStack stack;
+    private Handler handler;
+
+    public TurtleRefuelEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack )
+    {
+        super( turtle, TurtleAction.REFUEL );
+
+        Objects.requireNonNull( turtle, "turtle cannot be null" );
+        this.stack = stack;
+    }
+
+    /**
+     * Get the stack we are attempting to refuel from.
+     *
+     * Do not modify the returned stack - all modifications should be done within the {@link Handler}.
+     *
+     * @return The stack to refuel from.
+     */
+    public ItemStack getStack()
+    {
+        return stack;
+    }
+
+    /**
+     * Get the refuel handler for this stack.
+     *
+     * @return The refuel handler, or {@code null} if none has currently been set.
+     * @see #setHandler(Handler)
+     */
+    @Nullable
+    public Handler getHandler()
+    {
+        return handler;
+    }
+
+    /**
+     * Set the refuel handler for this stack.
+     *
+     * You should call this if you can actually refuel from this item, and ideally only if there are no existing
+     * handlers.
+     *
+     * @param handler The new refuel handler.
+     * @see #getHandler()
+     */
+    public void setHandler( @Nullable Handler handler )
+    {
+        this.handler = handler;
+    }
+
+    /**
+     * Handles refuelling a turtle from a specific item.
+     */
+    @FunctionalInterface
+    public interface Handler
+    {
+        /**
+         * Refuel a turtle using an item.
+         *
+         * @param turtle The turtle to refuel.
+         * @param stack  The stack to refuel with.
+         * @param slot   The slot the stack resides within. This may be used to modify the inventory afterwards.
+         * @param limit  The maximum number of refuel operations to perform. This will often correspond to the number of
+         *               items to consume.
+         * @return The amount of fuel gained.
+         */
+        int refuel( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit );
+    }
+}

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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -1,10 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-
-@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

@@ -8,186 +8,161 @@ package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.render.TurtleModelLoader;
-import dan200.computercraft.shared.media.items.ItemDiskLegacy;
+import dan200.computercraft.shared.common.IColouredItem;
-import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
+import dan200.computercraft.shared.media.items.ItemDisk;
+import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.model.IUnbakedModel;
-import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
-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.IModel;
+import net.minecraftforge.client.model.BasicState;
 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 javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.Map;
 
 /**
  * Registers textures and models for items.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
-public class ClientRegistry
+public final class ClientRegistry
 {
-    private static final String[] EXTRA_MODELS = {
+    private static final String[] EXTRA_MODELS = new String[] {
-        "turtle_modem_off_left",
+        "turtle_modem_normal_off_left",
-        "turtle_modem_on_left",
+        "turtle_modem_normal_on_left",
-        "turtle_modem_off_right",
+        "turtle_modem_normal_off_right",
-        "turtle_modem_on_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_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_white",
+        "turtle_colour",
         "turtle_elf_overlay",
     };
 
+    private static final String[] EXTRA_TEXTURES = new String[] {
+        // TODO: Gather these automatically from the model. I'm unable to get this working with Forge's current
+        //  model loading code.
+        "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 )
     {
-        // Load all textures for the extra models
+        /*
-        TextureMap map = event.getMap();
+        IResourceManager manager = Minecraft.getInstance().getResourceManager();
-        for( String upgrade : EXTRA_MODELS )
+        for( String extra : EXTRA_TEXTURES )
         {
-            IModel model = ModelLoaderRegistry.getModelOrMissing( new ResourceLocation( "computercraft", "block/" + upgrade ) );
+            // TODO: event.getMap().registerSprite( manager, new ResourceLocation( ComputerCraft.MOD_ID, extra ) );
-            for( ResourceLocation texture : model.getTextures() ) map.registerSprite( texture );
         }
+        */
     }
 
     @SubscribeEvent
     public static void onModelBakeEvent( ModelBakeEvent event )
     {
         // Load all extra models
-        for( String model : EXTRA_MODELS ) loadBlockModel( event, model );
+        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" ) ) )
+        );
     }
 
     @SubscribeEvent
     public static void onItemColours( ColorHandlerEvent.Item event )
     {
-        event.getItemColors().registerItemColorHandler(
+        if( ComputerCraft.Items.disk == null || ComputerCraft.Blocks.turtleNormal == null )
-            ( stack, layer ) -> layer == 0 ? 0xFFFFFF : ((ItemDiskLegacy) stack.getItem()).getColour( stack ),
+        {
-            ComputerCraft.Items.disk, ComputerCraft.Items.diskExpanded
+            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 ) -> {
+        event.getItemColors().register( ( stack, layer ) -> {
             switch( layer )
             {
                 case 0:
                 default:
                     return 0xFFFFFF;
-                case 1:
+                case 1: // Frame colour
+                    return IColouredItem.getColourBasic( stack );
+                case 2: // Light colour
                 {
-                    // Frame colour
+                    int light = ItemPocketComputer.getLightState( stack );
-                    int colour = ComputerCraft.Items.pocketComputer.getColour( stack );
+                    return light == -1 ? Colour.Black.getHex() : light;
-                    return colour == -1 ? 0xFFFFFF : colour;
-                }
-                case 2:
-                {
-                    // Light colour
-                    int colour = ComputerCraft.Items.pocketComputer.getLightState( stack );
-                    return colour == -1 ? Colour.Black.getHex() : colour;
                 }
             }
-        }, ComputerCraft.Items.pocketComputer );
+        }, ComputerCraft.Items.pocketComputerNormal, ComputerCraft.Items.pocketComputerAdvanced );
 
         // Setup turtle colours
-        event.getItemColors().registerItemColorHandler( ( stack, tintIndex ) -> {
+        event.getItemColors().register(
-            if( tintIndex == 0 )
+            ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            {
+            ComputerCraft.Blocks.turtleNormal, ComputerCraft.Blocks.turtleAdvanced
-                ItemTurtleBase turtle = (ItemTurtleBase) stack.getItem();
-                int colour = turtle.getColour( stack );
-                if( colour != -1 ) return colour;
-            }
-
-            return 0xFFFFFF;
-        }, ComputerCraft.Blocks.turtle, ComputerCraft.Blocks.turtleExpanded, ComputerCraft.Blocks.turtleAdvanced );
-    }
-
-    private static void registerItemModel( Item item, int damage, String name )
-    {
-        ResourceLocation location = new ResourceLocation( ComputerCraft.MOD_ID, name );
-        final ModelResourceLocation res = new ModelResourceLocation( location, "inventory" );
-        ModelBakery.registerItemVariants( item, location );
-        ModelLoader.setCustomModelResourceLocation( item, damage, res );
-    }
-
-    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 );
+    private static IBakedModel bake( ModelLoader loader, IUnbakedModel model )
+    {
+        model.getTextures( loader::getUnbakedModel, new HashSet<>() );
+
+        return model.bake(
+            loader,
+            ModelLoader.defaultTextureGetter(),
+            new BasicState( model.getDefaultState(), false ), DefaultVertexFormats.BLOCK
+        );
     }
 }

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

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

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

@@ -7,12 +7,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 = Side.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class FrameInfo
 {
     private static int tick;

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

@@ -6,11 +6,11 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 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.Tessellator;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -19,7 +19,7 @@ import org.lwjgl.opengl.GL11;
 
 import java.util.Arrays;
 
-public class FixedWidthFontRenderer
+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" );
@@ -39,7 +39,7 @@ public class FixedWidthFontRenderer
 
     private FixedWidthFontRenderer()
     {
-        m_textureManager = Minecraft.getMinecraft().getTextureManager();
+        m_textureManager = Minecraft.getInstance().getTextureManager();
     }
 
     private static void greyscaleify( double[] rgb )
@@ -93,7 +93,7 @@ public class FixedWidthFontRenderer
 
     private boolean isGreyScale( int colour )
     {
-        return (colour == 0 || colour == 15 || colour == 7 || colour == 8);
+        return colour == 0 || colour == 15 || colour == 7 || colour == 8;
     }
 
     public void drawStringBackgroundPart( int x, int y, TextBuffer backgroundColour, double leftMarginSize, double rightMarginSize, boolean greyScale, Palette p )
@@ -129,9 +129,9 @@ public class FixedWidthFontRenderer
             }
             drawQuad( renderer, x + i * FONT_WIDTH, y, colour, FONT_WIDTH, p, greyScale );
         }
-        GlStateManager.disableTexture2D();
+        GlStateManager.disableTexture();
         tessellator.draw();
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
     }
 
     public void drawStringTextPart( int x, int y, TextBuffer s, TextBuffer textColour, boolean greyScale, Palette p )
@@ -195,6 +195,6 @@ public class FixedWidthFontRenderer
     public void bindFont()
     {
         m_textureManager.bindTexture( FONT );
-        GlStateManager.glTexParameteri( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
+        GlStateManager.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
     }
 }

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

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

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

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

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

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

@@ -1,24 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. 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;
-
-public class GuiPocketComputer extends GuiComputer
-{
-    public GuiPocketComputer( ContainerHeldItem container )
-    {
-        super(
-            container,
-            ComputerCraft.Items.pocketComputer.getFamily( container.getStack() ),
-            ComputerCraft.Items.pocketComputer.createClientComputer( container.getStack() ),
-            ComputerCraft.terminalWidth_pocketComputer,
-            ComputerCraft.terminalHeight_pocketComputer
-        );
-    }
-}

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

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

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

@@ -6,18 +6,18 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.core.terminal.TextBuffer;
-import dan200.computercraft.shared.media.inventory.ContainerHeldItem;
+import dan200.computercraft.shared.common.ContainerHeldItem;
 import dan200.computercraft.shared.media.items.ItemPrintout;
-import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.player.PlayerInventory;
-import org.lwjgl.input.Mouse;
+import net.minecraft.util.text.ITextComponent;
-
+import org.lwjgl.glfw.GLFW;
-import java.io.IOException;
 
 import static dan200.computercraft.client.render.PrintoutRenderer.*;
 
-public class GuiPrintout extends GuiContainer
+public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
 {
     private final boolean m_book;
     private final int m_pages;
@@ -25,9 +25,11 @@ public class GuiPrintout extends GuiContainer
     private final TextBuffer[] m_colours;
     private int m_page;
 
-    public GuiPrintout( ContainerHeldItem container )
+    public GuiPrintout( ContainerHeldItem container, PlayerInventory player, ITextComponent title )
     {
-        super( container );
+        super( container, player, title );
+
+        ySize = Y_SIZE;
 
         String[] text = ItemPrintout.getText( container.getStack() );
         m_text = new TextBuffer[text.length];
@@ -39,75 +41,70 @@ public class GuiPrintout extends GuiContainer
 
         m_page = 0;
         m_pages = Math.max( m_text.length / ItemPrintout.LINES_PER_PAGE, 1 );
-        m_book = ItemPrintout.getType( container.getStack() ) == ItemPrintout.Type.Book;
+        m_book = ((ItemPrintout) container.getStack().getItem()).getType() == ItemPrintout.Type.BOOK;
     }
 
     @Override
-    public boolean doesGuiPauseGame()
+    public boolean keyPressed( int key, int scancode, int modifiers )
     {
+        if( super.keyPressed( key, scancode, modifiers ) ) return true;
+
+        if( key == GLFW.GLFW_KEY_RIGHT )
+        {
+            if( m_page < m_pages - 1 ) m_page++;
+            return true;
+        }
+
+        if( key == GLFW.GLFW_KEY_LEFT )
+        {
+            if( m_page > 0 ) m_page--;
+            return true;
+        }
+
         return false;
     }
 
     @Override
-    protected void keyTyped( char c, int k ) throws IOException
+    public boolean mouseScrolled( double x, double y, double delta )
     {
-        super.keyTyped( c, k );
+        if( super.mouseScrolled( x, y, delta ) ) return true;
-
+        if( delta < 0 )
-        if( k == 205 )
         {
-            // Right
+            // Scroll up goes to the next page
             if( m_page < m_pages - 1 ) m_page++;
+            return true;
         }
-        else if( k == 203 )
+
+        if( delta > 0 )
         {
-            // Left
+            // Scroll down goes to the previous page
             if( m_page > 0 ) m_page--;
+            return true;
         }
+
+        return false;
     }
 
     @Override
-    public void handleMouseInput() throws IOException
+    public void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
     {
-        super.handleMouseInput();
-
-        int mouseWheelChange = Mouse.getEventDWheel();
-        if( mouseWheelChange < 0 )
-        {
-            // Up
-            if( m_page < m_pages - 1 ) m_page++;
-        }
-        else if( mouseWheelChange > 0 )
-        {
-            // Down
-            if( m_page > 0 ) m_page--;
-        }
-    }
-
-    @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 f )
-    {
-        // Draw background
-        zLevel = zLevel - 1;
-        drawDefaultBackground();
-        zLevel = zLevel + 1;
-
         // Draw the printout
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.enableDepthTest();
 
-        int startY = (height - Y_SIZE) / 2;
+        drawBorder( guiLeft, guiTop, blitOffset, m_page, m_pages, m_book );
-        int startX = (width - X_SIZE) / 2;
+        drawText( guiLeft + X_TEXT_MARGIN, guiTop + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
+    }
 
-        drawBorder( startX, startY, zLevel, m_page, m_pages, m_book );
+    @Override
-        drawText( startX + X_TEXT_MARGIN, startY + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
+    public void render( 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++;
+
+        super.render( mouseX, mouseY, partialTicks );
+        renderHoveredToolTip( mouseX, mouseY );
     }
 }

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

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

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

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

@@ -6,415 +6,366 @@
 
 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.computer.core.IComputerContainer;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.util.ChatAllowedCharacters;
+import net.minecraft.client.renderer.Tessellator;
-import org.lwjgl.input.Keyboard;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import org.lwjgl.input.Mouse;
+import net.minecraft.util.SharedConstants;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.opengl.GL11;
 
-import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.function.Supplier;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.BACKGROUND;
 
-public class WidgetTerminal extends Widget
+public class WidgetTerminal implements IGuiEventListener
 {
     private static final float TERMINATE_TIME = 0.5f;
 
-    private final IComputerContainer m_computer;
+    private final Minecraft client;
 
-    private float m_terminateTimer;
+    private boolean focused;
-    private float m_rebootTimer;
-    private float m_shutdownTimer;
 
-    private int m_lastClickButton;
+    private final Supplier<ClientComputer> computer;
-    private int m_lastClickX;
+    private final int termWidth;
-    private int m_lastClickY;
+    private final int termHeight;
 
-    private boolean m_focus;
+    private float terminateTimer = -1;
-    private boolean m_allowFocusLoss;
+    private float rebootTimer = -1;
+    private float shutdownTimer = -1;
 
-    private int m_leftMargin;
+    private int lastMouseButton = -1;
-    private int m_rightMargin;
+    private int lastMouseX = -1;
-    private int m_topMargin;
+    private int lastMouseY = -1;
-    private int m_bottomMargin;
 
-    private ArrayList<Integer> m_keysDown;
+    private final int leftMargin;
+    private final int rightMargin;
+    private final int topMargin;
+    private final int bottomMargin;
 
-    public WidgetTerminal( int x, int y, int termWidth, int termHeight, IComputerContainer computer, int leftMargin, int rightMargin, int topMargin, int bottomMargin )
+    private final BitSet keysDown = new BitSet( 256 );
+
+    public WidgetTerminal( Minecraft client, Supplier<ClientComputer> computer, int termWidth, int termHeight, int leftMargin, int rightMargin, int topMargin, int bottomMargin )
     {
-        super(
+        this.client = client;
-            x, y,
+        this.computer = computer;
-            leftMargin + rightMargin + termWidth * FixedWidthFontRenderer.FONT_WIDTH,
+        this.termWidth = termWidth;
-            topMargin + bottomMargin + termHeight * FixedWidthFontRenderer.FONT_HEIGHT
+        this.termHeight = termHeight;
-        );
+        this.leftMargin = leftMargin;
-
+        this.rightMargin = rightMargin;
-        m_computer = computer;
+        this.topMargin = topMargin;
-        m_terminateTimer = 0.0f;
+        this.bottomMargin = bottomMargin;
-        m_rebootTimer = 0.0f;
-        m_shutdownTimer = 0.0f;
-
-        m_lastClickButton = -1;
-        m_lastClickX = -1;
-        m_lastClickY = -1;
-
-        m_focus = false;
-        m_allowFocusLoss = true;
-
-        m_leftMargin = leftMargin;
-        m_rightMargin = rightMargin;
-        m_topMargin = topMargin;
-        m_bottomMargin = bottomMargin;
-
-        m_keysDown = new ArrayList<>();
-    }
-
-    public void setAllowFocusLoss( boolean allowFocusLoss )
-    {
-        m_allowFocusLoss = allowFocusLoss;
-        m_focus = m_focus || !allowFocusLoss;
     }
 
     @Override
-    public boolean onKeyTyped( char ch, int key )
+    public boolean charTyped( char ch, int modifiers )
     {
-        if( m_focus )
+        if( ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255 ) // printable chars in byte range
         {
-            // Ctrl+V for paste
+            // Queue the "char" event
-            if( ch == 22 )
+            queueEvent( "char", Character.toString( ch ) );
+        }
+
+        return true;
+    }
+
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        if( key == GLFW.GLFW_KEY_ESCAPE ) return false;
+        if( (modifiers & GLFW.GLFW_MOD_CONTROL) != 0 )
+        {
+            switch( key )
             {
-                String clipboard = GuiScreen.getClipboardString();
+                case GLFW.GLFW_KEY_T:
-                if( clipboard != null )
+                    if( terminateTimer < 0 ) terminateTimer = 0;
-                {
+                    return true;
-                    // Clip to the first occurance of \r or \n
+                case GLFW.GLFW_KEY_S:
-                    int newLineIndex1 = clipboard.indexOf( "\r" );
+                    if( shutdownTimer < 0 ) shutdownTimer = 0;
-                    int newLineIndex2 = clipboard.indexOf( "\n" );
+                    return true;
-                    if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
+                case GLFW.GLFW_KEY_R:
-                    {
+                    if( rebootTimer < 0 ) rebootTimer = 0;
-                        clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
+                    return true;
-                    }
-                    else if( newLineIndex1 >= 0 )
-                    {
-                        clipboard = clipboard.substring( 0, newLineIndex1 );
-                    }
-                    else if( newLineIndex2 >= 0 )
-                    {
-                        clipboard = clipboard.substring( 0, newLineIndex2 );
-                    }
 
-                    // Filter the string
+                case GLFW.GLFW_KEY_V:
-                    clipboard = ChatAllowedCharacters.filterAllowedCharacters( clipboard );
+                    // Ctrl+V for paste
-
+                    String clipboard = client.keyboardListener.getClipboardString();
-                    if( !clipboard.isEmpty() )
+                    if( clipboard != null )
                     {
-                        // Clip to 512 characters
+                        // Clip to the first occurrence of \r or \n
-                        if( clipboard.length() > 512 )
+                        int newLineIndex1 = clipboard.indexOf( "\r" );
+                        int newLineIndex2 = clipboard.indexOf( "\n" );
+                        if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
                         {
-                            clipboard = clipboard.substring( 0, 512 );
+                            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 );
                         }
 
-                        // Queue the "paste" event
+                        // Filter the string
-                        queueEvent( "paste", new Object[] {
+                        clipboard = SharedConstants.filterAllowedCharacters( clipboard );
-                            clipboard
+                        if( !clipboard.isEmpty() )
-                        } );
+                        {
-                    }
+                            // Clip to 512 characters and queue the event
-                }
+                            if( clipboard.length() > 512 ) clipboard = clipboard.substring( 0, 512 );
-                return true;
+                            queueEvent( "paste", clipboard );
-            }
+                        }
 
-            // Regular keys normally
+                        return true;
-            if( m_terminateTimer <= 0.0f && m_rebootTimer <= 0.0f && m_shutdownTimer <= 0.0f )
+                    }
+            }
+        }
+
+        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 );
+        }
+
+        return true;
+    }
+
+    @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 )
             {
-                boolean repeat = Keyboard.isRepeatEvent();
+                computer.mouseUp( lastMouseButton + 1, charX + 1, charY + 1 );
-                boolean handled = false;
+                lastMouseButton = -1;
-                if( key > 0 )
-                {
-                    if( !repeat )
-                    {
-                        m_keysDown.add( key );
-                    }
-
-                    // Queue the "key" event
-                    queueEvent( "key", new Object[] {
-                        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;
             }
+
+            lastMouseX = charX;
+            lastMouseY = charY;
         }
 
         return false;
     }
 
     @Override
-    public void mouseClicked( int mouseX, int mouseY, int button )
+    public boolean mouseDragged( double mouseX, double mouseY, int button, double v2, double v3 )
     {
-        if( mouseX >= getXPosition() && mouseX < getXPosition() + getWidth() &&
+        ClientComputer computer = this.computer.get();
-            mouseY >= getYPosition() && mouseY < getYPosition() + getHeight() )
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 ) return false;
+
+        Terminal term = computer.getTerminal();
+        if( term != null )
         {
-            if( !m_focus && button == 0 )
+            int charX = (int) (mouseX / FixedWidthFontRenderer.FONT_WIDTH);
-            {
+            int charY = (int) (mouseY / FixedWidthFontRenderer.FONT_HEIGHT);
-                m_focus = true;
+            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            }
+            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            if( m_focus )
+            computer.mouseDrag( button + 1, charX + 1, charY + 1 );
-            {
-                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() + m_leftMargin)) / FixedWidthFontRenderer.FONT_WIDTH;
-                        int charY = (mouseY - (getYPosition() + m_topMargin)) / FixedWidthFontRenderer.FONT_HEIGHT;
-                        charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-                        charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-                        computer.queueEvent( "mouse_click", new Object[] {
+            lastMouseX = charX;
-                            button + 1, charX + 1, charY + 1
+            lastMouseY = charY;
-                        } );
+            lastMouseButton = button;
-
-                        m_lastClickButton = button;
-                        m_lastClickX = charX;
-                        m_lastClickY = charY;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if( m_focus && button == 0 && m_allowFocusLoss )
-            {
-                m_focus = false;
-            }
         }
+
+        return false;
     }
 
     @Override
-    public boolean onKeyboardInput()
+    public boolean mouseScrolled( double mouseX, double mouseY, double delta )
     {
-        boolean handled = false;
+        ClientComputer computer = this.computer.get();
-        for( int i = m_keysDown.size() - 1; i >= 0; --i )
+        if( computer == null || !computer.isColour() || delta == 0 ) return false;
+
+        Terminal term = computer.getTerminal();
+        if( term != null )
         {
-            int key = m_keysDown.get( i );
+            int charX = (int) (mouseX / FixedWidthFontRenderer.FONT_WIDTH);
-            if( !Keyboard.isKeyDown( key ) )
+            int charY = (int) (mouseY / FixedWidthFontRenderer.FONT_HEIGHT);
-            {
+            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-                m_keysDown.remove( i );
+            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
-                if( m_focus )
+
-                {
+            computer.mouseScroll( delta < 0 ? 1 : -1, charX + 1, charY + 1 );
-                    // Queue the "key_up" event
+
-                    queueEvent( "key_up", new Object[] {
+            lastMouseX = charX;
-                        key
+            lastMouseY = charY;
-                    } );
-                    handled = true;
-                }
-            }
         }
 
-        return handled;
+        return true;
     }
 
-    @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() + m_leftMargin)) / FixedWidthFontRenderer.FONT_WIDTH;
-                int charY = (mouseY - (getYPosition() + m_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.queueEvent( "mouse_up", new Object[] {
-                            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.queueEvent( "mouse_scroll", new Object[] {
-                            1, charX + 1, charY + 1
-                        } );
-                    }
-                    else if( wheelChange > 0 )
-                    {
-                        computer.queueEvent( "mouse_scroll", new Object[] {
-                            -1, charX + 1, charY + 1
-                        } );
-                    }
-
-                    if( m_lastClickButton >= 0 && (charX != m_lastClickX || charY != m_lastClickY) )
-                    {
-                        computer.queueEvent( "mouse_drag", new Object[] {
-                            m_lastClickButton + 1, charX + 1, charY + 1
-                        } );
-                        m_lastClickX = charX;
-                        m_lastClickY = charY;
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
     public void update()
     {
-        // Handle special keys
+        if( terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME )
-        if( m_focus && (Keyboard.isKeyDown( 29 ) || Keyboard.isKeyDown( 157 )) )
         {
-            // Ctrl+T for terminate
+            queueEvent( "terminate" );
-            if( Keyboard.isKeyDown( 20 ) )
-            {
-                if( m_terminateTimer < TERMINATE_TIME )
-                {
-                    m_terminateTimer = m_terminateTimer + 0.05f;
-                    if( m_terminateTimer >= TERMINATE_TIME )
-                    {
-                        queueEvent( "terminate" );
-                    }
-                }
-            }
-            else
-            {
-                m_terminateTimer = 0.0f;
-            }
-
-            // Ctrl+R for reboot
-            if( Keyboard.isKeyDown( 19 ) )
-            {
-                if( m_rebootTimer < TERMINATE_TIME )
-                {
-                    m_rebootTimer = 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 = 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
+
+        if( shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (shutdownTimer += 0.05f) > TERMINATE_TIME )
         {
-            m_terminateTimer = 0.0f;
+            ClientComputer computer = this.computer.get();
-            m_rebootTimer = 0.0f;
+            if( computer != null ) computer.shutdown();
-            m_shutdownTimer = 0.0f;
+        }
+
+        if( rebootTimer >= 0 && rebootTimer < TERMINATE_TIME && (rebootTimer += 0.05f) > TERMINATE_TIME )
+        {
+            ClientComputer computer = this.computer.get();
+            if( computer != null ) computer.reboot();
         }
     }
 
     @Override
-    public void draw( Minecraft mc, int xOrigin, int yOrigin, int mouseX, int mouseY )
+    public boolean changeFocus( boolean reversed )
     {
-        int startX = xOrigin + getXPosition();
+        if( focused )
-        int startY = yOrigin + getYPosition();
+        {
+            // When blurring, we should make all keys go up
+            for( int key = 0; key < keysDown.size(); key++ )
+            {
+                if( keysDown.get( key ) ) queueEvent( "key_up", key );
+            }
+            keysDown.clear();
 
-        synchronized( m_computer )
+            // 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
-            IComputer computer = m_computer.getComputer();
+            ClientComputer computer = this.computer.get();
-            Terminal terminal = (computer != null) ? computer.getTerminal() : null;
+            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 = m_focus && terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink();
+                boolean tblink = terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink();
                 int tw = terminal.getWidth();
                 int th = terminal.getHeight();
                 int tx = terminal.getCursorX();
                 int ty = terminal.getCursorY();
 
-                int x = startX + m_leftMargin;
-                int y = startY + m_topMargin;
-
                 // Draw margins
                 TextBuffer emptyLine = new TextBuffer( ' ', tw );
-                if( m_topMargin > 0 )
+                if( topMargin > 0 )
                 {
-                    fontRenderer.drawString( emptyLine, x, startY, terminal.getTextColourLine( 0 ), terminal.getBackgroundColourLine( 0 ), m_leftMargin, m_rightMargin, greyscale, palette );
+                    fontRenderer.drawString( emptyLine, originX, originY - topMargin,
+                        terminal.getTextColourLine( 0 ), terminal.getBackgroundColourLine( 0 ),
+                        leftMargin, rightMargin, greyscale, palette );
                 }
-                if( m_bottomMargin > 0 )
+
+                if( bottomMargin > 0 )
                 {
-                    fontRenderer.drawString( emptyLine, x, startY + 2 * m_bottomMargin + (th - 1) * FixedWidthFontRenderer.FONT_HEIGHT, terminal.getTextColourLine( th - 1 ), terminal.getBackgroundColourLine( th - 1 ), m_leftMargin, m_rightMargin, greyscale, palette );
+                    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, x, y, colour, backgroundColour, m_leftMargin, m_rightMargin, greyscale, palette );
+                    fontRenderer.drawString( text, originX, y, colour, backgroundColour, leftMargin, rightMargin, greyscale, palette );
                     y += FixedWidthFontRenderer.FONT_HEIGHT;
                 }
 
@@ -425,8 +376,8 @@ public class WidgetTerminal extends Widget
 
                     fontRenderer.drawString(
                         cursor,
-                        x + FixedWidthFontRenderer.FONT_WIDTH * tx,
+                        originX + FixedWidthFontRenderer.FONT_WIDTH * tx,
-                        startY + m_topMargin + FixedWidthFontRenderer.FONT_HEIGHT * ty,
+                        originY + FixedWidthFontRenderer.FONT_HEIGHT * ty,
                         cursorColour, null,
                         0, 0,
                         greyscale,
@@ -437,16 +388,29 @@ public class WidgetTerminal extends Widget
             else
             {
                 // Draw a black background
-                mc.getTextureManager().bindTexture( BACKGROUND );
                 Colour black = Colour.Black;
-                GlStateManager.color( black.getR(), black.getG(), black.getB(), 1.0f );
+                GlStateManager.color4f( black.getR(), black.getG(), black.getB(), 1.0f );
                 try
                 {
-                    drawTexturedModalRect( startX, startY, 0, 0, getWidth(), getHeight() );
+                    int x = originX - leftMargin;
+                    int y = originY - rightMargin;
+                    int width = termWidth * FixedWidthFontRenderer.FONT_WIDTH + leftMargin + rightMargin;
+                    int height = termHeight * FixedWidthFontRenderer.FONT_HEIGHT + topMargin + bottomMargin;
+
+                    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
                 {
-                    GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+                    GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
                 }
             }
         }
@@ -454,19 +418,13 @@ public class WidgetTerminal extends Widget
 
     private void queueEvent( String event )
     {
-        IComputer computer = m_computer.getComputer();
+        ClientComputer computer = this.computer.get();
-        if( computer != null )
+        if( computer != null ) computer.queueEvent( event );
-        {
-            computer.queueEvent( event );
-        }
     }
 
-    private void queueEvent( String event, Object[] args )
+    private void queueEvent( String event, Object... args )
     {
-        IComputer computer = m_computer.getComputer();
+        ClientComputer computer = this.computer.get();
-        if( computer != null )
+        if( computer != null ) computer.queueEvent( event, args );
-        {
-            computer.queueEvent( event, args );
-        }
     }
 }

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

@@ -0,0 +1,98 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 )
+    {
+        return listener.mouseScrolled( x, y, 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;
+    }
+}

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

@@ -1,24 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-
-package dan200.computercraft.client.proxy;
-
-import dan200.computercraft.client.render.TileEntityTurtleRenderer;
-import dan200.computercraft.shared.proxy.CCTurtleProxyCommon;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
-
-public class CCTurtleProxyClient extends CCTurtleProxyCommon
-{
-    @Override
-    public void init()
-    {
-        super.init();
-
-        // Setup renderers
-        ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
-    }
-}

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

@@ -7,53 +7,68 @@
 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.shared.command.CommandCopy;
+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.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
+import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
-import net.minecraftforge.client.ClientCommandHandler;
+import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
+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.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.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.relauncher.Side;
 
-public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
+public final class ComputerCraftProxyClient
 {
-    @Override
+    @SubscribeEvent
-    public void preInit()
+    public static void setupClient( FMLClientSetupEvent event )
     {
-        super.preInit();
+        registerContainers();
 
-        // Register any client-specific commands
+        // Setup TESRs
-        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() );
     }
 
-    @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
+    private static void registerContainers()
-    public static class ForgeHandlers
+    {
+        // 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 )
+    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

@@ -0,0 +1,90 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.client.render;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
+import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
+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.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 org.lwjgl.opengl.GL11;
+
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+public final class CableHighlightRenderer
+{
+    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;
+
+        BlockRayTraceResult hit = (BlockRayTraceResult) event.getTarget();
+        BlockPos pos = hit.getPos();
+        World world = event.getInfo().getRenderViewEntity().getEntityWorld();
+        ActiveRenderInfo info = event.getInfo();
+
+        BlockState state = world.getBlockState( pos );
+
+        // 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;
+        }
+
+        event.setCanceled( true );
+
+        Minecraft mc = Minecraft.getInstance();
+
+        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.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 );
+
+        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.popMatrix();
+        GlStateManager.matrixMode( GL11.GL_MODELVIEW );
+        GlStateManager.depthMask( true );
+        GlStateManager.enableTexture();
+        GlStateManager.disableBlend();
+    }
+}

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

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

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

@@ -6,38 +6,41 @@
 
 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.GlStateManager;
+import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.RenderItem;
+import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.ForgeHooksClient;
+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.FONT_HEIGHT;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
-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 = Side.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class ItemPocketRenderer extends ItemMapLikeRenderer
 {
+    private static final int MARGIN = 2;
+    private static final int FRAME = 12;
+    private static final int LIGHT_HEIGHT = 8;
+
     private static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
 
     private ItemPocketRenderer()
@@ -57,116 +60,195 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     @Override
     protected void renderItem( ItemStack stack )
     {
-        // Setup various transformations. Note that these are partially adapated from the corresponding method
+        ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
-        // in ItemRenderer
+        Terminal terminal = computer == null ? null : computer.getTerminal();
-        GlStateManager.disableLighting();
-
-        GlStateManager.rotate( 180f, 0f, 1f, 0f );
-        GlStateManager.rotate( 180f, 0f, 0f, 1f );
-        GlStateManager.scale( 0.5, 0.5, 0.5 );
-
-        ItemPocketComputer pocketComputer = ComputerCraft.Items.pocketComputer;
-        ClientComputer computer = pocketComputer.createClientComputer( stack );
 
+        int termWidth, termHeight;
+        if( terminal == null )
         {
-            // First render the background item. We use the item's model rather than a direct texture as this ensures
+            termWidth = ComputerCraft.terminalWidth_pocketComputer;
-            // we display the pocket light and other such decorations.
+            termHeight = ComputerCraft.terminalHeight_pocketComputer;
-            GlStateManager.pushMatrix();
+        }
-
+        else
-            GlStateManager.scale( 1.0f, -1.0f, 1.0f );
+        {
-
+            termWidth = terminal.getWidth();
-            Minecraft minecraft = Minecraft.getMinecraft();
+            termHeight = terminal.getHeight();
-            TextureManager textureManager = minecraft.getTextureManager();
-            RenderItem renderItem = minecraft.getRenderItem();
-
-            // Copy of RenderItem#renderItemModelIntoGUI but without the translation or scaling
-            textureManager.bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-            textureManager.getTexture( TextureMap.LOCATION_BLOCKS_TEXTURE ).setBlurMipmap( false, false );
-
-            GlStateManager.enableRescaleNormal();
-            GlStateManager.enableAlpha();
-            GlStateManager.alphaFunc( GL11.GL_GREATER, 0.1F );
-            GlStateManager.enableBlend();
-            GlStateManager.blendFunc( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA );
-            GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-
-            IBakedModel bakedmodel = renderItem.getItemModelWithOverrides( stack, null, null );
-            bakedmodel = ForgeHooksClient.handleCameraTransforms( bakedmodel, ItemCameraTransforms.TransformType.GUI, false );
-            renderItem.renderItem( stack, bakedmodel );
-
-            GlStateManager.disableAlpha();
-            GlStateManager.disableRescaleNormal();
-
-            GlStateManager.popMatrix();
         }
 
-        // If we've a computer and terminal then attempt to render it.
+        int width = termWidth * FONT_WIDTH + MARGIN * 2;
-        if( computer != null )
+        int height = termHeight * FONT_HEIGHT + MARGIN * 2;
+
+        // Setup various transformations. Note that these are partially adapted from the corresponding method
+        // in ItemRenderer
+        GlStateManager.pushMatrix();
+
+        GlStateManager.disableLighting();
+        GlStateManager.disableDepthTest();
+
+        GlStateManager.rotatef( 180f, 0f, 1f, 0f );
+        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
+        GlStateManager.scalef( 0.5f, 0.5f, 0.5f );
+
+        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 );
+
+        // Render the main frame
+        ItemPocketComputer item = (ItemPocketComputer) stack.getItem();
+        ComputerFamily family = item.getFamily();
+        int frameColour = item.getColour( stack );
+        renderFrame( family, frameColour, width, height );
+
+        // Render the light
+        int lightColour = ItemPocketComputer.getLightState( stack );
+        if( lightColour == -1 ) lightColour = Colour.Black.getHex();
+        renderLight( lightColour, width, height );
+
+        if( computer != null && terminal != null )
         {
-            Terminal terminal = computer.getTerminal();
+            // If we've a computer and terminal then attempt to render it.
-            if( terminal != null )
+            renderTerminal( terminal, !computer.isColour(), width, height );
+        }
+        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();
+        }
+
+        GlStateManager.enableDepthTest();
+        GlStateManager.enableLighting();
+        GlStateManager.popMatrix();
+    }
+
+    private static void renderFrame( ComputerFamily family, int colour, int width, int height )
+    {
+
+        Minecraft.getInstance().getTextureManager().bindTexture( colour != -1
+            ? BACKGROUND_COLOUR
+            : family == ComputerFamily.Normal ? BACKGROUND_NORMAL : BACKGROUND_ADVANCED
+        );
+
+        float r = ((colour >>> 16) & 0xFF) / 255.0f;
+        float g = ((colour >>> 8) & 0xFF) / 255.0f;
+        float b = (colour & 0xFF) / 255.0f;
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR );
+
+        // Top left, middle, right
+        renderTexture( buffer, -FRAME, -FRAME, 12, 28, FRAME, FRAME, r, g, b );
+        renderTexture( buffer, 0, -FRAME, 0, 0, width, FRAME, r, g, b );
+        renderTexture( buffer, width, -FRAME, 24, 28, FRAME, FRAME, r, g, b );
+
+        // Left and bright border
+        renderTexture( buffer, -FRAME, 0, 0, 28, FRAME, height, r, g, b );
+        renderTexture( buffer, width, 0, 36, 28, FRAME, height, r, g, b );
+
+        // Bottom left, middle, right. We do this in three portions: the top inner corners, an extended region for
+        // lights, and then the bottom outer corners.
+        renderTexture( buffer, -FRAME, height, 12, 40, FRAME, FRAME / 2, r, g, b );
+        renderTexture( buffer, 0, height, 0, 12, width, FRAME / 2, r, g, b );
+        renderTexture( buffer, width, height, 24, 40, FRAME, FRAME / 2, r, g, b );
+
+        renderTexture( buffer, -FRAME, height + FRAME / 2, 12, 44, FRAME, LIGHT_HEIGHT, FRAME, 4, r, g, b );
+        renderTexture( buffer, 0, height + FRAME / 2, 0, 16, width, LIGHT_HEIGHT, FRAME, 4, r, g, b );
+        renderTexture( buffer, width, height + FRAME / 2, 24, 44, FRAME, LIGHT_HEIGHT, FRAME, 4, r, g, b );
+
+        renderTexture( buffer, -FRAME, height + LIGHT_HEIGHT + FRAME / 2, 12, 40 + FRAME / 2, FRAME, FRAME / 2, r, g, b );
+        renderTexture( buffer, 0, height + LIGHT_HEIGHT + FRAME / 2, 0, 12 + FRAME / 2, width, FRAME / 2, r, g, b );
+        renderTexture( buffer, width, height + LIGHT_HEIGHT + FRAME / 2, 24, 40 + FRAME / 2, FRAME, FRAME / 2, r, g, b );
+
+        tessellator.draw();
+    }
+
+    private static void renderLight( int colour, int width, int height )
+    {
+        GlStateManager.enableBlend();
+        GlStateManager.disableTexture();
+
+        float r = ((colour >>> 16) & 0xFF) / 255.0f;
+        float g = ((colour >>> 8) & 0xFF) / 255.0f;
+        float b = (colour & 0xFF) / 255.0f;
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR );
+        buffer.pos( width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
+        buffer.pos( width, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
+        buffer.pos( width, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
+        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++ )
             {
-                synchronized( terminal )
+                TextBuffer text = terminal.getLine( line );
-                {
+                TextBuffer colour = terminal.getTextColourLine( line );
-                    GlStateManager.pushMatrix();
+                TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
-                    GlStateManager.disableDepth();
+                fontRenderer.drawString(
+                    text, MARGIN, MARGIN + line * FONT_HEIGHT,
+                    colour, backgroundColour, MARGIN, MARGIN, greyscale, palette
+                );
+            }
 
-                    // Reset the position to be at the top left corner of the pocket computer
+            // And render the cursor;
-                    // Note we translate towards the screen slightly too.
+            int tx = terminal.getCursorX(), ty = terminal.getCursorY();
-                    GlStateManager.translate( -8 / 16.0, -8 / 16.0, 0.5 / 16.0 );
+            if( terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink() &&
-                    // Translate to the top left of the screen.
+                tx >= 0 && ty >= 0 && tx < termWidth && ty < termHeight )
-                    GlStateManager.translate( 4 / 16.0, 3 / 16.0, 0 );
+            {
-
+                TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
-                    // Work out the scaling required to resize the terminal in order to fit on the computer
+                fontRenderer.drawString(
-                    final int margin = 2;
+                    new TextBuffer( '_', 1 ), MARGIN + FONT_WIDTH * tx, MARGIN + FONT_HEIGHT * ty,
-                    int tw = terminal.getWidth();
+                    cursorColour, null, 0, 0, greyscale, palette
-                    int th = terminal.getHeight();
+                );
-                    int width = tw * FONT_WIDTH + margin * 2;
-                    int height = th * FONT_HEIGHT + margin * 2;
-                    int max = Math.max( height, width );
-
-                    // The grid is 8 * 8 wide, so we start with a base of 1/2 (8 / 16).
-                    double scale = 1.0 / 2.0 / max;
-                    GlStateManager.scale( scale, scale, scale );
-
-                    // The margin/start positions are determined in order for the terminal to be centred.
-                    int startX = (max - width) / 2 + margin;
-                    int startY = (max - height) / 2 + margin;
-
-                    FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
-                    boolean greyscale = !computer.isColour();
-                    Palette palette = terminal.getPalette();
-
-                    // Render the actual text
-                    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, startX, startY + 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 < tw && ty < th )
-                    {
-                        TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
-                        fontRenderer.drawString(
-                            new TextBuffer( '_', 1 ), startX + FONT_WIDTH * tx, startY + FONT_HEIGHT * ty,
-                            cursorColour, null, 0, 0, greyscale, palette
-                        );
-                    }
-
-                    GlStateManager.enableDepth();
-                    GlStateManager.popMatrix();
-                }
             }
         }
+    }
 
-        GlStateManager.enableLighting();
+    private static void renderTexture( BufferBuilder builder, int x, int y, int textureX, int textureY, int width, int height, float r, float g, float b )
+    {
+        renderTexture( builder, x, y, textureX, textureY, width, height, width, height, r, g, b );
+    }
+
+    private static void renderTexture( BufferBuilder builder, int x, int y, int textureX, int textureY, int width, int height, int textureWidth, int textureHeight, float r, float g, float b )
+    {
+        float scale = 1 / 255.0f;
+        builder.pos( x, y + height, 0 ).tex( textureX * scale, (textureY + textureHeight) * scale ).color( r, g, b, 1.0f ).endVertex();
+        builder.pos( x + width, y + height, 0 ).tex( (textureX + textureWidth) * scale, (textureY + textureHeight) * scale ).color( r, g, b, 1.0f ).endVertex();
+        builder.pos( x + width, y, 0 ).tex( (textureX + textureWidth) * scale, textureY * scale ).color( r, g, b, 1.0f ).endVertex();
+        builder.pos( x, y, 0 ).tex( textureX * scale, textureY * scale ).color( r, g, b, 1.0f ).endVertex();
     }
 }

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

@@ -6,15 +6,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;
@@ -23,9 +23,9 @@ import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAG
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENGTH;
 
 /**
- * Emulates map and item-frame rendering for prinouts
+ * Emulates map and item-frame rendering for printouts
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
 {
     private static final ItemPrintoutRenderer INSTANCE = new ItemPrintoutRenderer();
@@ -38,10 +38,9 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     public static void onRenderInHand( RenderSpecificHandEvent event )
     {
         ItemStack stack = event.getItemStack();
-        if( stack.getItem() != ComputerCraft.Items.printout ) return;
+        if( !(stack.getItem() instanceof ItemPrintout) ) return;
 
         event.setCanceled( true );
-
         INSTANCE.renderItemFirstPerson( event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack() );
     }
 
@@ -49,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 ItemRenderer.renderMapFirstPerson
+        // in FirstPersonRenderer.renderFirstPersonMap
         GlStateManager.disableLighting();
 
-        GlStateManager.rotate( 180f, 0f, 1f, 0f );
+        GlStateManager.rotatef( 180f, 0f, 1f, 0f );
-        GlStateManager.rotate( 180f, 0f, 0f, 1f );
+        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
-        GlStateManager.scale( 0.42f, 0.42f, -0.42f );
+        GlStateManager.scalef( 0.42f, 0.42f, -0.42f );
-        GlStateManager.translate( -0.5f, -0.48f, 0.0f );
+        GlStateManager.translatef( -0.5f, -0.48f, 0.0f );
 
         drawPrintout( stack );
 
@@ -66,17 +65,17 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     public static void onRenderInFrame( RenderItemInFrameEvent event )
     {
         ItemStack stack = event.getItem();
-        if( stack.getItem() != ComputerCraft.Items.printout ) return;
+        if( !(stack.getItem() instanceof ItemPrintout) ) return;
 
         event.setCanceled( true );
 
         GlStateManager.disableLighting();
 
         // Move a little bit forward to ensure we're not clipping with the frame
-        GlStateManager.translate( 0.0f, 0.0f, -0.001f );
+        GlStateManager.translatef( 0.0f, 0.0f, -0.001f );
-        GlStateManager.rotate( 180f, 0f, 0f, 1f );
+        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
-        GlStateManager.scale( 0.95f, 0.95f, -0.95f );
+        GlStateManager.scalef( 0.95f, 0.95f, -0.95f );
-        GlStateManager.translate( -0.5f, -0.5f, 0.0f );
+        GlStateManager.translatef( -0.5f, -0.5f, 0.0f );
 
         drawPrintout( stack );
 
@@ -87,7 +86,7 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
     private static void drawPrintout( ItemStack stack )
     {
         int pages = ItemPrintout.getPageCount( stack );
-        boolean book = ItemPrintout.getType( stack ) == ItemPrintout.Type.Book;
+        boolean book = ((ItemPrintout) stack.getItem()).getType() == 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;
@@ -108,8 +107,8 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
 
         // Scale the printout to fit correctly.
         double scale = 1.0 / max;
-        GlStateManager.scale( scale, scale, scale );
+        GlStateManager.scaled( scale, scale, scale );
-        GlStateManager.translate( (max - width) / 2.0f, (max - height) / 2.0f, 0.0f );
+        GlStateManager.translated( (max - width) / 2.0, (max - height) / 2.0, 0.0 );
 
         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

@@ -6,10 +6,10 @@
 
 package dan200.computercraft.client.render;
 
-import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraftforge.client.model.pipeline.IVertexConsumer;
 import net.minecraftforge.client.model.pipeline.LightUtil;
 import net.minecraftforge.client.model.pipeline.VertexTransformer;
@@ -94,7 +94,7 @@ public final class ModelTransformer
         private final Point3f[] before = new Point3f[4];
         private final Point3f[] after = new Point3f[4];
 
-        public NormalAwareTransformer( IVertexConsumer parent, Matrix4f positionMatrix, Matrix4f normalMatrix )
+        NormalAwareTransformer( IVertexConsumer parent, Matrix4f positionMatrix, Matrix4f normalMatrix )
         {
             super( parent );
             this.positionMatrix = positionMatrix;
@@ -102,7 +102,7 @@ public final class ModelTransformer
         }
 
         @Override
-        public void setQuadOrientation( @Nonnull EnumFacing orientation )
+        public void setQuadOrientation( @Nonnull Direction orientation )
         {
             super.setQuadOrientation( orientation == null ? orientation : TRSRTransformation.rotate( positionMatrix, orientation ) );
         }
@@ -180,14 +180,14 @@ public final class ModelTransformer
      *
      * This also provides the ability to swap vertices through {@link #swap(int, int)} to allow reordering.
      */
-    private static class BakedQuadBuilder implements IVertexConsumer
+    private static final class BakedQuadBuilder implements IVertexConsumer
     {
         private final VertexFormat format;
 
         private final int[] vertexData;
         private int vertexIndex = 0, elementIndex = 0;
 
-        private EnumFacing orientation;
+        private Direction orientation;
         private int quadTint;
         private boolean diffuse;
         private TextureAtlasSprite texture;
@@ -195,7 +195,7 @@ public final class ModelTransformer
         private BakedQuadBuilder( VertexFormat format )
         {
             this.format = format;
-            this.vertexData = new int[format.getSize()];
+            vertexData = new int[format.getSize()];
         }
 
         @Nonnull
@@ -208,11 +208,11 @@ public final class ModelTransformer
         @Override
         public void setQuadTint( int tint )
         {
-            this.quadTint = tint;
+            quadTint = tint;
         }
 
         @Override
-        public void setQuadOrientation( @Nonnull EnumFacing orientation )
+        public void setQuadOrientation( @Nonnull Direction orientation )
         {
             this.orientation = orientation;
         }

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

@@ -0,0 +1,117 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+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.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.Direction;
+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 org.lwjgl.opengl.GL11;
+
+import java.util.EnumSet;
+
+import static net.minecraft.util.Direction.*;
+
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+public final class MonitorHighlightRenderer
+{
+    private static final float EXPAND = 0.002f;
+
+    private MonitorHighlightRenderer()
+    {
+    }
+
+    @SubscribeEvent
+    public static void drawHighlight( DrawBlockHighlightEvent event )
+    {
+        if( event.getTarget().getType() != RayTraceResult.Type.BLOCK || event.getInfo().getRenderViewEntity().isSneaking() )
+        {
+            return;
+        }
+
+        World world = event.getInfo().getRenderViewEntity().getEntityWorld();
+        BlockPos pos = ((BlockRayTraceResult) event.getTarget()).getPos();
+
+        TileEntity tile = world.getTileEntity( pos );
+        if( !(tile instanceof TileMonitor) ) return;
+
+        TileMonitor monitor = (TileMonitor) tile;
+        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();
+        faces.remove( front );
+        if( monitor.getXIndex() != 0 ) faces.remove( monitor.getRight().getOpposite() );
+        if( monitor.getXIndex() != monitor.getWidth() - 1 ) faces.remove( monitor.getRight() );
+        if( monitor.getYIndex() != 0 ) faces.remove( monitor.getDown().getOpposite() );
+        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.depthMask( false );
+        GlStateManager.pushMatrix();
+
+        Vec3d cameraPos = event.getInfo().getProjectedView();
+        GlStateManager.translated( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );
+
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder buffer = tessellator.getBuffer();
+        buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR );
+
+        // I wish I could think of a better way to do this
+        if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( buffer, 0, 0, 0, UP );
+        if( faces.contains( SOUTH ) || faces.contains( WEST ) ) line( buffer, 0, 0, 1, UP );
+        if( faces.contains( NORTH ) || faces.contains( EAST ) ) line( buffer, 1, 0, 0, UP );
+        if( faces.contains( SOUTH ) || faces.contains( EAST ) ) line( buffer, 1, 0, 1, UP );
+        if( faces.contains( NORTH ) || faces.contains( DOWN ) ) line( buffer, 0, 0, 0, EAST );
+        if( faces.contains( SOUTH ) || faces.contains( DOWN ) ) line( buffer, 0, 0, 1, EAST );
+        if( faces.contains( NORTH ) || faces.contains( UP ) ) line( buffer, 0, 1, 0, EAST );
+        if( faces.contains( SOUTH ) || faces.contains( UP ) ) line( buffer, 0, 1, 1, EAST );
+        if( faces.contains( WEST ) || faces.contains( DOWN ) ) line( buffer, 0, 0, 0, SOUTH );
+        if( faces.contains( EAST ) || faces.contains( DOWN ) ) line( buffer, 1, 0, 0, SOUTH );
+        if( faces.contains( WEST ) || faces.contains( UP ) ) line( buffer, 0, 1, 0, SOUTH );
+        if( faces.contains( EAST ) || faces.contains( UP ) ) line( buffer, 1, 1, 0, SOUTH );
+
+        tessellator.draw();
+
+        GlStateManager.popMatrix();
+        GlStateManager.depthMask( true );
+        GlStateManager.enableTexture();
+        GlStateManager.disableBlend();
+    }
+
+    private static void line( BufferBuilder buffer, int x, int y, int z, Direction direction )
+    {
+        double minX = x == 0 ? -EXPAND : 1 + EXPAND;
+        double minY = y == 0 ? -EXPAND : 1 + EXPAND;
+        double minZ = z == 0 ? -EXPAND : 1 + EXPAND;
+
+        buffer.pos( minX, minY, minZ ).color( 0, 0, 0, 0.4f ).endVertex();
+        buffer.pos(
+            minX + direction.getXOffset() * (1 + EXPAND * 2),
+            minY + direction.getYOffset() * (1 + EXPAND * 2),
+            minZ + direction.getZOffset() * (1 + EXPAND * 2)
+        ).color( 0, 0, 0, 0.4f ).endVertex();
+    }
+}

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

@@ -6,12 +6,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.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
@@ -20,7 +22,7 @@ import org.lwjgl.opengl.GL11;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
 
-public class PrintoutRenderer
+public final class PrintoutRenderer
 {
     private static final ResourceLocation BG = new ResourceLocation( "computercraft", "textures/gui/printout.png" );
     private static final double BG_SIZE = 256.0;
@@ -58,6 +60,8 @@ public class PrintoutRenderer
     private static final int COVER_Y = Y_SIZE;
     private static final int COVER_X = X_SIZE + 4 * X_FOLD_SIZE;
 
+    private PrintoutRenderer() {}
+
     public static void drawText( int x, int y, int start, TextBuffer[] text, TextBuffer[] colours )
     {
         FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
@@ -70,9 +74,10 @@ public class PrintoutRenderer
 
     public static void drawText( int x, int y, int start, String[] text, String[] colours )
     {
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableBlend();
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
+        GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
 
         FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
 
@@ -84,11 +89,12 @@ public class PrintoutRenderer
 
     public static void drawBorder( double x, double y, double z, int page, int pages, boolean isBook )
     {
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableBlend();
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
+        GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
 
-        Minecraft.getMinecraft().getTextureManager().bindTexture( BG );
+        Minecraft.getInstance().getTextureManager().bindTexture( BG );
 
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();

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

@@ -1,222 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-
-package dan200.computercraft.client.render;
-
-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.CableBounds;
-import dan200.computercraft.shared.util.WorldUtil;
-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.RayTraceResult;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.DrawBlockHighlightEvent;
-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 = Side.CLIENT )
-public final class RenderOverlayCable
-{
-    private static final float EXPAND = 0.002f;
-    private static final double MIN = CableBounds.MIN - EXPAND;
-    private static final double MAX = CableBounds.MAX + EXPAND;
-
-    private RenderOverlayCable()
-    {
-    }
-
-    @SubscribeEvent
-    public static void drawHighlight( DrawBlockHighlightEvent event )
-    {
-        if( event.getTarget().typeOfHit != RayTraceResult.Type.BLOCK ) return;
-
-        BlockPos pos = event.getTarget().getBlockPos();
-        World world = event.getPlayer().getEntityWorld();
-
-        IBlockState state = world.getBlockState( pos );
-        if( state.getBlock() != ComputerCraft.Blocks.cable ) return;
-
-        state = state.getActualState( world, pos );
-
-        event.setCanceled( true );
-        PeripheralType type = ComputerCraft.Blocks.cable.getPeripheralType( state );
-
-        GlStateManager.enableBlend();
-        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.pushMatrix();
-
-        {
-            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() );
-        }
-
-        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.depthMask( true );
-        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/TileEntityCableRenderer.java

@@ -6,86 +6,94 @@
 
 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.BlockCableModemVariant;
+import dan200.computercraft.shared.peripheral.modem.wired.CableModemVariant;
-import dan200.computercraft.shared.peripheral.modem.wired.CableBounds;
+import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 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.block.model.IBakedModel;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 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.MinecraftForgeClient;
+import net.minecraftforge.client.model.data.EmptyModelData;
 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 TileEntitySpecialRenderer<TileCable>
+public class TileEntityCableRenderer extends TileEntityRenderer<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, float alpha )
+    public void render( @Nonnull TileCable te, double x, double y, double z, float partialTicks, int destroyStage )
     {
         if( destroyStage < 0 ) return;
 
         BlockPos pos = te.getPos();
 
-        Minecraft mc = Minecraft.getMinecraft();
+        Minecraft mc = Minecraft.getInstance();
 
         RayTraceResult hit = mc.objectMouseOver;
-        if( hit == null || !hit.getBlockPos().equals( pos ) ) return;
+        if( hit == null || hit.getType() != RayTraceResult.Type.BLOCK || !((BlockRayTraceResult) hit).getPos().equals( pos ) )
-
+        {
-        if( MinecraftForgeClient.getRenderPass() != 0 ) return;
+            return;
+        }
 
         World world = te.getWorld();
-        IBlockState state = world.getBlockState( pos );
+        BlockState state = world.getBlockState( pos );
         Block block = state.getBlock();
         if( block != ComputerCraft.Blocks.cable ) return;
 
-        state = state.getActualState( world, pos );
+        state = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getHitVec().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
-        if( te.getPeripheralType() != PeripheralType.Cable && WorldUtil.isVecInsideInclusive( CableBounds.getModemBounds( state ), hit.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) ) )
+            ? block.getDefaultState().with( BlockCable.MODEM, state.get( BlockCable.MODEM ) )
-        {
+            : state.with( BlockCable.MODEM, CableModemVariant.None );
-            state = block.getDefaultState().withProperty( BlockCable.Properties.MODEM, state.getValue( BlockCable.Properties.MODEM ) );
-        }
-        else
-        {
-            state = state.withProperty( BlockCable.Properties.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();
 
-        ForgeHooksClient.setRenderLayer( block.getRenderLayer() );
+        mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModel(
-
-        // 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 ),
+            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos, 0 ),
-            state, pos, buffer, true
+            state, pos, buffer, true, random, state.getPositionRandom( pos ), EmptyModelData.INSTANCE
         );
 
         ForgeHooksClient.setRenderLayer( BlockRenderLayer.SOLID );
@@ -97,30 +105,30 @@ public class TileEntityCableRenderer extends TileEntitySpecialRenderer<TileCable
     }
 
     /**
-     * @see RenderGlobal#preRenderDamagedBlocks()
+     * @see WorldRenderer#preRenderDamagedBlocks()
      */
     private void preRenderDamagedBlocks()
     {
         GlStateManager.disableLighting();
 
         GlStateManager.enableBlend();
-        GlStateManager.tryBlendFuncSeparate( GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
+        GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
         GlStateManager.enableBlend();
-        GlStateManager.color( 1.0F, 1.0F, 1.0F, 0.5F );
+        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 0.5F );
-        GlStateManager.doPolygonOffset( -3.0F, -3.0F );
+        GlStateManager.polygonOffset( -3.0F, -3.0F );
         GlStateManager.enablePolygonOffset();
         GlStateManager.alphaFunc( 516, 0.1F );
-        GlStateManager.enableAlpha();
+        GlStateManager.enableAlphaTest();
         GlStateManager.pushMatrix();
     }
 
     /**
-     * @see RenderGlobal#postRenderDamagedBlocks()
+     * @see WorldRenderer#postRenderDamagedBlocks()
      */
     private void postRenderDamagedBlocks()
     {
-        GlStateManager.disableAlpha();
+        GlStateManager.disableAlphaTest();
-        GlStateManager.doPolygonOffset( 0.0F, 0.0F );
+        GlStateManager.polygonOffset( 0.0F, 0.0F );
         GlStateManager.disablePolygonOffset();
         GlStateManager.disablePolygonOffset();
         GlStateManager.depthMask( true );

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

@@ -6,6 +6,8 @@
 
 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;
@@ -17,19 +19,17 @@ 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.TileEntitySpecialRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import org.lwjgl.opengl.GL11;
 
-public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMonitor>
+public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
 {
     @Override
-    public void render( TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i, float f2 )
+    public void render( TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i )
     {
         if( tileEntity != null )
         {
@@ -37,7 +37,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
         }
     }
 
-    private void renderMonitorAt( TileMonitor monitor, double posX, double posY, double posZ, float f, int i )
+    private static void renderMonitorAt( TileMonitor monitor, double posX, double posY, double posZ, float f, int i )
     {
         // Render from the origin monitor
         ClientMonitor originTerminal = monitor.getClientMonitor();
@@ -64,8 +64,8 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
         posZ += originPos.getZ() - monitorPos.getZ();
 
         // Determine orientation
-        EnumFacing dir = origin.getDirection();
+        Direction dir = origin.getDirection();
-        EnumFacing front = origin.getFront();
+        Direction front = origin.getFront();
         float yaw = dir.getHorizontalAngle();
         float pitch = DirectionUtil.toPitchAngle( front );
 
@@ -73,19 +73,19 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
         try
         {
             // Setup initial transform
-            GlStateManager.translate( posX + 0.5, posY + 0.5, posZ + 0.5 );
+            GlStateManager.translated( posX + 0.5, posY + 0.5, posZ + 0.5 );
-            GlStateManager.rotate( -yaw, 0.0f, 1.0f, 0.0f );
+            GlStateManager.rotatef( -yaw, 0.0f, 1.0f, 0.0f );
-            GlStateManager.rotate( pitch, 1.0f, 0.0f, 0.0f );
+            GlStateManager.rotatef( pitch, 1.0f, 0.0f, 0.0f );
-            GlStateManager.translate(
+            GlStateManager.translated(
                 -0.5 + TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN,
-                (origin.getHeight() - 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);
 
             // Get renderers
-            Minecraft mc = Minecraft.getMinecraft();
+            Minecraft mc = Minecraft.getInstance();
             Tessellator tessellator = Tessellator.getInstance();
             BufferBuilder renderer = tessellator.getBuffer();
 
@@ -94,9 +94,9 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
 
             // Draw the contents
             GlStateManager.depthMask( false );
-            OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, 0xFF, 0xFF );
+            GLX.glMultiTexCoord2f( GLX.GL_TEXTURE1, 0xFFFF, 0xFFFF );
             GlStateManager.disableLighting();
-            mc.entityRenderer.disableLightmap();
+            mc.gameRenderer.disableLightmap();
             try
             {
                 Terminal terminal = originTerminal.getTerminal();
@@ -124,14 +124,14 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                     {
                         double xScale = xSize / (width * FixedWidthFontRenderer.FONT_WIDTH);
                         double yScale = ySize / (height * FixedWidthFontRenderer.FONT_HEIGHT);
-                        GlStateManager.scale( xScale, -yScale, 1.0 );
+                        GlStateManager.scaled( xScale, -yScale, 1.0 );
 
                         // Draw background
                         mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
                         if( redraw )
                         {
                             // Build background display list
-                            GlStateManager.glNewList( originTerminal.renderDisplayLists[0], GL11.GL_COMPILE );
+                            GlStateManager.newList( originTerminal.renderDisplayLists[0], GL11.GL_COMPILE );
                             try
                             {
                                 double marginXSize = TileMonitor.RENDER_MARGIN / xScale;
@@ -142,10 +142,10 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                                 GlStateManager.pushMatrix();
                                 try
                                 {
-                                    GlStateManager.scale( 1.0, marginSquash, 1.0 );
+                                    GlStateManager.scaled( 1.0, marginSquash, 1.0 );
-                                    GlStateManager.translate( 0.0, -marginYSize / marginSquash, 0.0 );
+                                    GlStateManager.translated( 0.0, -marginYSize / marginSquash, 0.0 );
                                     fontRenderer.drawStringBackgroundPart( 0, 0, terminal.getBackgroundColourLine( 0 ), marginXSize, marginXSize, greyscale, palette );
-                                    GlStateManager.translate( 0.0, (marginYSize + height * FixedWidthFontRenderer.FONT_HEIGHT) / marginSquash, 0.0 );
+                                    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
@@ -167,18 +167,18 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                             }
                             finally
                             {
-                                GlStateManager.glEndList();
+                                GlStateManager.endList();
                             }
                         }
                         GlStateManager.callList( originTerminal.renderDisplayLists[0] );
-                        GlStateManager.resetColor();
+                        GlStateManager.clearCurrentColor();
 
                         // Draw text
                         fontRenderer.bindFont();
                         if( redraw )
                         {
                             // Build text display list
-                            GlStateManager.glNewList( originTerminal.renderDisplayLists[1], GL11.GL_COMPILE );
+                            GlStateManager.newList( originTerminal.renderDisplayLists[1], GL11.GL_COMPILE );
                             try
                             {
                                 // Lines
@@ -195,18 +195,18 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                             }
                             finally
                             {
-                                GlStateManager.glEndList();
+                                GlStateManager.endList();
                             }
                         }
                         GlStateManager.callList( originTerminal.renderDisplayLists[1] );
-                        GlStateManager.resetColor();
+                        GlStateManager.clearCurrentColor();
 
                         // Draw cursor
                         fontRenderer.bindFont();
                         if( redraw )
                         {
                             // Build cursor display list
-                            GlStateManager.glNewList( originTerminal.renderDisplayLists[2], GL11.GL_COMPILE );
+                            GlStateManager.newList( originTerminal.renderDisplayLists[2], GL11.GL_COMPILE );
                             try
                             {
                                 // Cursor
@@ -227,13 +227,13 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                             }
                             finally
                             {
-                                GlStateManager.glEndList();
+                                GlStateManager.endList();
                             }
                         }
                         if( FrameInfo.getGlobalCursorBlink() )
                         {
                             GlStateManager.callList( originTerminal.renderDisplayLists[2] );
-                            GlStateManager.resetColor();
+                            GlStateManager.clearCurrentColor();
                         }
                     }
                     finally
@@ -262,7 +262,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
             finally
             {
                 GlStateManager.depthMask( true );
-                mc.entityRenderer.enableLightmap();
+                mc.gameRenderer.enableLightmap();
                 GlStateManager.enableLighting();
             }
 
@@ -285,7 +285,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
         }
         finally
         {
-            GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+            GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
             GlStateManager.popMatrix();
         }
     }

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

@@ -6,48 +6,53 @@
 
 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.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelManager;
+import net.minecraft.client.renderer.model.ModelManager;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.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 TileEntitySpecialRenderer<TileTurtle>
+public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
 {
-    private static final ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle", "inventory" );
+    private static final ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_normal", "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_white", "inventory" );
+    private static final ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_colour", "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 f, int i, float f2 )
+    public void render( TileTurtle tileEntity, double posX, double posY, double posZ, float partialTicks, int breaking )
     {
-        if( tileEntity != null ) renderTurtleAt( tileEntity, posX, posY, posZ, f, i );
+        if( tileEntity != null ) renderTurtleAt( tileEntity, posX, posY, posZ, partialTicks );
     }
 
     public static ModelResourceLocation getTurtleModel( ComputerFamily family, boolean coloured )
@@ -78,49 +83,44 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
         }
     }
 
-    private void renderTurtleAt( TileTurtle turtle, double posX, double posY, double posZ, float f, int i )
+    private void renderTurtleAt( TileTurtle turtle, double posX, double posY, double posZ, float partialTicks )
     {
         // Render the label
         String label = turtle.createProxy().getLabel();
-        if( label != null && rendererDispatcher.cameraHitResult != null && turtle.getPos().equals( rendererDispatcher.cameraHitResult.getBlockPos() ) )
+        RayTraceResult hit = rendererDispatcher.cameraHitResult;
+        if( label != null && hit.getType() == RayTraceResult.Type.BLOCK && turtle.getPos().equals( ((BlockRayTraceResult) hit).getPos() ) )
         {
             setLightmapDisabled( true );
-            EntityRenderer.drawNameplate(
+            GameRenderer.drawNameplate(
                 getFontRenderer(), label,
                 (float) posX + 0.5F, (float) posY + 1.2F, (float) posZ + 0.5F, 0,
-                rendererDispatcher.entityYaw, rendererDispatcher.entityPitch, false, false
+                rendererDispatcher.renderInfo.getYaw(), rendererDispatcher.renderInfo.getPitch(), false
             );
             setLightmapDisabled( false );
         }
 
-        IBlockState state = turtle.getWorld().getBlockState( turtle.getPos() );
         GlStateManager.pushMatrix();
         try
         {
+            BlockState state = turtle.getBlockState();
             // Setup the transform
-            Vec3d offset;
+            Vec3d offset = turtle.getRenderOffset( partialTicks );
-            float yaw;
+            float yaw = turtle.getRenderYaw( partialTicks );
-            offset = turtle.getRenderOffset( f );
+            GlStateManager.translated( posX + offset.x, posY + offset.y, posZ + offset.z );
-            yaw = turtle.getRenderYaw( f );
-            GlStateManager.translate( posX + offset.x, posY + offset.y, posZ + offset.z );
-
             // Render the turtle
-            GlStateManager.translate( 0.5f, 0.5f, 0.5f );
+            GlStateManager.translatef( 0.5f, 0.5f, 0.5f );
-            GlStateManager.rotate( 180.0f - yaw, 0.0f, 1.0f, 0.0f );
+            GlStateManager.rotatef( 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.scale( 1.0f, -1.0f, 1.0f );
+                GlStateManager.scalef( 1.0f, -1.0f, 1.0f );
                 GlStateManager.cullFace( GlStateManager.CullFace.FRONT );
             }
-            GlStateManager.translate( -0.5f, -0.5f, -0.5f );
+            GlStateManager.translatef( -0.5f, -0.5f, -0.5f );
             // Render the turtle
-            int colour;
+            int colour = turtle.getColour();
-            ComputerFamily family;
+            ComputerFamily family = turtle.getFamily();
-            ResourceLocation overlay;
+            ResourceLocation overlay = turtle.getOverlay();
-            colour = turtle.getColour();
-            family = turtle.getFamily();
-            overlay = turtle.getOverlay();
 
             renderModel( state, getTurtleModel( family, colour != -1 ), colour == -1 ? null : new int[] { colour } );
 
@@ -146,8 +146,8 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
             }
 
             // Render the upgrades
-            renderUpgrade( state, turtle, TurtleSide.Left, f );
+            renderUpgrade( state, turtle, TurtleSide.Left, partialTicks );
-            renderUpgrade( state, turtle, TurtleSide.Right, f );
+            renderUpgrade( state, turtle, TurtleSide.Right, partialTicks );
         }
         finally
         {
@@ -156,7 +156,7 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
         }
     }
 
-    private void renderUpgrade( IBlockState state, TileTurtle turtle, TurtleSide side, float f )
+    private void renderUpgrade( BlockState state, TileTurtle turtle, TurtleSide side, float f )
     {
         ITurtleUpgrade upgrade = turtle.getUpgrade( side );
         if( upgrade != null )
@@ -165,9 +165,9 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
             try
             {
                 float toolAngle = turtle.getToolRenderAngle( side, f );
-                GlStateManager.translate( 0.0f, 0.5f, 0.5f );
+                GlStateManager.translatef( 0.0f, 0.5f, 0.5f );
-                GlStateManager.rotate( -toolAngle, 1.0f, 0.0f, 0.0f );
+                GlStateManager.rotatef( -toolAngle, 1.0f, 0.0f, 0.0f );
-                GlStateManager.translate( 0.0f, -0.5f, -0.5f );
+                GlStateManager.translatef( 0.0f, -0.5f, -0.5f );
 
                 Pair<IBakedModel, Matrix4f> pair = upgrade.getModel( turtle.getAccess(), side );
                 if( pair != null )
@@ -189,26 +189,26 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
         }
     }
 
-    private void renderModel( IBlockState state, ModelResourceLocation modelLocation, int[] tints )
+    private void renderModel( BlockState state, ModelResourceLocation modelLocation, int[] tints )
     {
-        Minecraft mc = Minecraft.getMinecraft();
+        Minecraft mc = Minecraft.getInstance();
-        ModelManager modelManager = mc.getRenderItem().getItemModelMesher().getModelManager();
+        ModelManager modelManager = mc.getItemRenderer().getItemModelMesher().getModelManager();
         renderModel( state, modelManager.getModel( modelLocation ), tints );
     }
 
-    private void renderModel( IBlockState state, IBakedModel model, int[] tints )
+    private void renderModel( BlockState state, IBakedModel model, int[] tints )
     {
-        Minecraft mc = Minecraft.getMinecraft();
+        Random random = new Random( 0 );
         Tessellator tessellator = Tessellator.getInstance();
-        mc.getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
+        rendererDispatcher.textureManager.bindTexture( AtlasTexture.LOCATION_BLOCKS_TEXTURE );
-        renderQuads( tessellator, model.getQuads( state, null, 0 ), tints );
+        renderQuads( tessellator, model.getQuads( state, null, random, EmptyModelData.INSTANCE ), tints );
-        for( EnumFacing facing : EnumFacing.VALUES )
+        for( Direction facing : DirectionUtil.FACINGS )
         {
-            renderQuads( tessellator, model.getQuads( state, facing, 0 ), tints );
+            renderQuads( tessellator, model.getQuads( state, facing, random, EmptyModelData.INSTANCE ), tints );
         }
     }
 
-    private void renderQuads( Tessellator tessellator, List<BakedQuad> quads, int[] tints )
+    private static void renderQuads( Tessellator tessellator, List<BakedQuad> quads, int[] tints )
     {
         BufferBuilder buffer = tessellator.getBuffer();
         VertexFormat format = DefaultVertexFormats.ITEM;

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

@@ -6,26 +6,29 @@
 
 package dan200.computercraft.client.render;
 
-import com.google.common.collect.ImmutableMap;
 import dan200.computercraft.ComputerCraft;
-import net.minecraft.client.renderer.block.model.IBakedModel;
+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.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.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 class TurtleModelLoader implements ICustomModelLoader
+public final class TurtleModelLoader implements ICustomModelLoader
 {
-    private static final ResourceLocation NORMAL_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle" );
+    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/advanced_turtle" );
+    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_white" );
+    private static final ResourceLocation COLOUR_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle_colour" );
 
     public static final TurtleModelLoader INSTANCE = new TurtleModelLoader();
 
@@ -42,80 +45,60 @@ public class TurtleModelLoader implements ICustomModelLoader
     public boolean accepts( @Nonnull ResourceLocation name )
     {
         return name.getNamespace().equals( ComputerCraft.MOD_ID )
-            && (name.getPath().equals( "turtle" ) || name.getPath().equals( "turtle_advanced" ));
+            && (name.getPath().equals( "item/turtle_normal" ) || name.getPath().equals( "item/turtle_advanced" ));
     }
 
     @Nonnull
     @Override
-    public IModel loadModel( @Nonnull ResourceLocation name ) throws Exception
+    public IUnbakedModel loadModel( @Nonnull ResourceLocation name )
     {
         if( name.getNamespace().equals( ComputerCraft.MOD_ID ) )
         {
-            IModel colourModel = ModelLoaderRegistry.getModel( COLOUR_TURTLE_MODEL );
             switch( name.getPath() )
             {
-                case "turtle":
+                case "item/turtle_normal":
-                    return new TurtleModel( ModelLoaderRegistry.getModel( NORMAL_TURTLE_MODEL ), colourModel );
+                    return new TurtleModel( NORMAL_TURTLE_MODEL );
-                case "turtle_advanced":
+                case "item/turtle_advanced":
-                    return new TurtleModel( ModelLoaderRegistry.getModel( ADVANCED_TURTLE_MODEL ), colourModel );
+                    return new TurtleModel( ADVANCED_TURTLE_MODEL );
             }
         }
 
         throw new IllegalStateException( "Loader does not accept " + name );
     }
 
-    private static class TurtleModel implements IModel
+    private static final class TurtleModel implements IUnbakedModel
     {
-        private final IModel family;
+        private final ResourceLocation family;
-        private final IModel colour;
 
-        private TurtleModel( IModel family, IModel colour )
+        private TurtleModel( ResourceLocation family )
         {
             this.family = family;
-            this.colour = colour;
         }
 
         @Nonnull
         @Override
-        public IBakedModel bake( @Nonnull IModelState state, @Nonnull VertexFormat format, @Nonnull Function<ResourceLocation, TextureAtlasSprite> function )
+        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 )
         {
             return new TurtleSmartItemModel(
-                family.bake( state, format, function ),
+                bakery.getBakedModel( family, sprite, spriteGetter, format ),
-                colour.bake( state, format, function )
+                bakery.getBakedModel( COLOUR_TURTLE_MODEL, sprite, spriteGetter, format )
             );
         }
-
-        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

@@ -6,20 +6,18 @@
 
 package dan200.computercraft.client.render;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
-import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.model.ItemOverrideList;
-import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
+import net.minecraftforge.client.model.data.EmptyModelData;
+import net.minecraftforge.client.model.data.IModelData;
 
 import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public class TurtleMultiModel implements IBakedModel
 {
@@ -30,8 +28,8 @@ public class TurtleMultiModel implements IBakedModel
     private final Matrix4f m_leftUpgradeTransform;
     private final IBakedModel m_rightUpgradeModel;
     private final Matrix4f m_rightUpgradeTransform;
-    private List<BakedQuad> m_generalQuads;
+    private List<BakedQuad> m_generalQuads = null;
-    private Map<EnumFacing, List<BakedQuad>> m_faceQuads;
+    private Map<Direction, List<BakedQuad>> m_faceQuads = new EnumMap<>( Direction.class );
 
     public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, Matrix4f generalTransform, IBakedModel leftUpgradeModel, Matrix4f leftUpgradeTransform, IBakedModel rightUpgradeModel, Matrix4f rightUpgradeTransform )
     {
@@ -43,13 +41,19 @@ public class TurtleMultiModel implements IBakedModel
         m_rightUpgradeModel = rightUpgradeModel;
         m_rightUpgradeTransform = rightUpgradeTransform;
         m_generalTransform = generalTransform;
-        m_generalQuads = null;
-        m_faceQuads = new HashMap<>();
     }
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, long rand )
+    @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 )
     {
         if( side != null )
         {
@@ -63,17 +67,13 @@ public class TurtleMultiModel implements IBakedModel
         }
     }
 
-    private List<BakedQuad> buildQuads( IBlockState state, EnumFacing side, long rand )
+    private List<BakedQuad> buildQuads( BlockState state, Direction side, Random rand )
     {
         ArrayList<BakedQuad> quads = new ArrayList<>();
-        ModelTransformer.transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand ), m_generalTransform );
+        ModelTransformer.transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
         if( m_overlayModel != null )
         {
-            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
+            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
-        }
-        if( m_overlayModel != null )
-        {
-            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
         }
         if( m_leftUpgradeModel != null )
         {
@@ -83,7 +83,7 @@ public class TurtleMultiModel implements IBakedModel
                 upgradeTransform = new Matrix4f( m_generalTransform );
                 upgradeTransform.mul( m_leftUpgradeTransform );
             }
-            ModelTransformer.transformQuadsTo( quads, m_leftUpgradeModel.getQuads( state, side, rand ), upgradeTransform );
+            ModelTransformer.transformQuadsTo( quads, m_leftUpgradeModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
         }
         if( m_rightUpgradeModel != null )
         {
@@ -93,7 +93,7 @@ public class TurtleMultiModel implements IBakedModel
                 upgradeTransform = new Matrix4f( m_generalTransform );
                 upgradeTransform.mul( m_rightUpgradeTransform );
             }
-            ModelTransformer.transformQuadsTo( quads, m_rightUpgradeModel.getQuads( state, side, rand ), upgradeTransform );
+            ModelTransformer.transformQuadsTo( quads, m_rightUpgradeModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
         }
         quads.trimToSize();
         return quads;
@@ -119,6 +119,7 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
+    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return m_baseModel.getParticleTexture();
@@ -127,7 +128,7 @@ public class TurtleMultiModel implements IBakedModel
     @Nonnull
     @Override
     @Deprecated
-    public ItemCameraTransforms getItemCameraTransforms()
+    public net.minecraft.client.renderer.model.ItemCameraTransforms getItemCameraTransforms()
     {
         return m_baseModel.getItemCameraTransforms();
     }
@@ -136,6 +137,6 @@ public class TurtleMultiModel implements IBakedModel
     @Override
     public ItemOverrideList getOverrides()
     {
-        return ItemOverrideList.NONE;
+        return ItemOverrideList.EMPTY;
     }
 }

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

@@ -9,26 +9,27 @@ 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.ItemTurtleBase;
+import dan200.computercraft.shared.turtle.items.ItemTurtle;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.model.*;
+import net.minecraft.client.renderer.model.*;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 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 +107,13 @@ public class TurtleSmartItemModel implements IBakedModel
         this.colourModel = colourModel;
 
         m_cachedModels = new HashMap<>();
-        m_overrides = new ItemOverrideList( new ArrayList<>() )
+        m_overrides = new ItemOverrideList()
         {
             @Nonnull
             @Override
-            public IBakedModel handleItemState( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity )
+            public IBakedModel getModelWithOverrides( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable LivingEntity entity )
             {
-                ItemTurtleBase turtle = (ItemTurtleBase) stack.getItem();
+                ItemTurtle turtle = (ItemTurtle) stack.getItem();
                 int colour = turtle.getColour( stack );
                 ITurtleUpgrade leftUpgrade = turtle.getUpgrade( stack, TurtleSide.Left );
                 ITurtleUpgrade rightUpgrade = turtle.getUpgrade( stack, TurtleSide.Right );
@@ -138,15 +139,15 @@ public class TurtleSmartItemModel implements IBakedModel
 
     private IBakedModel buildModel( TurtleModelCombination combo )
     {
-        Minecraft mc = Minecraft.getMinecraft();
+        Minecraft mc = Minecraft.getInstance();
-        ModelManager modelManager = mc.getRenderItem().getItemModelMesher().getModelManager();
+        ModelManager modelManager = mc.getItemRenderer().getItemModelMesher().getModelManager();
         ModelResourceLocation overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.m_overlay, combo.m_christmas );
 
         IBakedModel baseModel = combo.m_colour ? colourModel : familyModel;
-        IBakedModel overlayModel = (overlayModelLocation != null) ? modelManager.getModel( overlayModelLocation ) : null;
+        IBakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel( overlayModelLocation ) : null;
         Matrix4f transform = combo.m_flip ? s_flip : s_identity;
-        Pair<IBakedModel, Matrix4f> leftModel = (combo.m_leftUpgrade != null) ? combo.m_leftUpgrade.getModel( null, TurtleSide.Left ) : null;
+        Pair<IBakedModel, Matrix4f> leftModel = combo.m_leftUpgrade != null ? combo.m_leftUpgrade.getModel( null, TurtleSide.Left ) : null;
-        Pair<IBakedModel, Matrix4f> rightModel = (combo.m_rightUpgrade != null) ? combo.m_rightUpgrade.getModel( null, TurtleSide.Right ) : null;
+        Pair<IBakedModel, Matrix4f> rightModel = combo.m_rightUpgrade != null ? combo.m_rightUpgrade.getModel( null, TurtleSide.Right ) : null;
         if( leftModel != null && rightModel != null )
         {
             return new TurtleMultiModel( baseModel, overlayModel, transform, leftModel.getLeft(), leftModel.getRight(), rightModel.getLeft(), rightModel.getRight() );
@@ -167,11 +168,20 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing facing, long rand )
+    @Deprecated
+    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random 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()
     {
@@ -192,6 +202,7 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
+    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return familyModel.getParticleTexture();

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

@@ -12,6 +12,7 @@ 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;
 
@@ -20,7 +21,7 @@ import java.util.regex.Pattern;
  */
 public class AddressPredicate
 {
-    private static class HostRange
+    private static final class HostRange
     {
         private final byte[] min;
         private final byte[] max;
@@ -50,6 +51,11 @@ 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<>();
@@ -69,7 +75,10 @@ public class AddressPredicate
                 }
                 catch( NumberFormatException e )
                 {
-                    ComputerCraft.log.warn( "Cannot parse CIDR size from {} ({})", filter, prefixSizeStr );
+                    ComputerCraft.log.error(
+                        "Malformed http whitelist/blacklist entry '{}': Cannot extract size of CIDR mask from '{}'.",
+                        filter, prefixSizeStr
+                    );
                     continue;
                 }
 
@@ -80,7 +89,10 @@ public class AddressPredicate
                 }
                 catch( IllegalArgumentException e )
                 {
-                    ComputerCraft.log.warn( "Cannot parse IP address from {} ({})", filter, addressStr );
+                    ComputerCraft.log.error(
+                        "Malformed http whitelist/blacklist entry '{}': Cannot extract IP address from '{}'.",
+                        filter, prefixSizeStr
+                    );
                     continue;
                 }
 

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

@@ -6,13 +6,13 @@
 
 package dan200.computercraft.core.apis;
 
-import com.google.common.base.Preconditions;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 
 public final class ApiFactories
 {
@@ -23,9 +23,9 @@ public final class ApiFactories
     private static final Collection<ILuaAPIFactory> factories = new LinkedHashSet<>();
     private static final Collection<ILuaAPIFactory> factoriesView = Collections.unmodifiableCollection( factories );
 
-    public static void register( @Nonnull ILuaAPIFactory factory )
+    public static synchronized void register( @Nonnull ILuaAPIFactory factory )
     {
-        Preconditions.checkNotNull( factory, "provider cannot be null" );
+        Objects.requireNonNull( factory, "provider cannot be null" );
         factories.add( factory );
     }
 

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

@@ -6,12 +6,10 @@
 
 package dan200.computercraft.core.apis;
 
-import com.google.common.base.Preconditions;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.peripheral.IComputerAccess;
-import dan200.computercraft.core.computer.Computer;
+import dan200.computercraft.api.peripheral.IWorkMonitor;
-import dan200.computercraft.core.computer.IComputerOwned;
 import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.filesystem.FileSystemException;
 
@@ -21,22 +19,22 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-public abstract class ComputerAccess implements IComputerAccess, IComputerOwned
+public abstract class ComputerAccess implements IComputerAccess
 {
     private final IAPIEnvironment m_environment;
     private final Set<String> m_mounts = new HashSet<>();
 
-    protected ComputerAccess( IAPIEnvironment m_environment )
+    protected ComputerAccess( IAPIEnvironment environment )
     {
-        this.m_environment = m_environment;
+        this.m_environment = environment;
     }
 
     public void unmountAll()
     {
         FileSystem fileSystem = m_environment.getFileSystem();
-        for( String m_mount : m_mounts )
+        for( String mount : m_mounts )
         {
-            fileSystem.unmount( m_mount );
+            fileSystem.unmount( mount );
         }
         m_mounts.clear();
     }
@@ -122,15 +120,15 @@ public abstract class ComputerAccess implements IComputerAccess, IComputerOwned
     @Override
     public void queueEvent( @Nonnull final String event, final Object[] arguments )
     {
-        Preconditions.checkNotNull( event, "event cannot be null" );
+        Objects.requireNonNull( event, "event cannot be null" );
         m_environment.queueEvent( event, arguments );
     }
 
     @Nullable
     @Override
-    public Computer getComputer()
+    public IWorkMonitor getMainThreadMonitor()
     {
-        return m_environment.getComputer();
+        return m_environment.getMainThreadMonitor();
     }
 
     private String findFreeLocation( String desiredLoc )

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

@@ -34,18 +34,16 @@ public class FSAPI implements ILuaAPI
     private IAPIEnvironment m_env;
     private FileSystem m_fileSystem;
 
-    public FSAPI( IAPIEnvironment _env )
+    public FSAPI( IAPIEnvironment env )
     {
-        m_env = _env;
+        m_env = env;
         m_fileSystem = null;
     }
 
     @Override
     public String[] getNames()
     {
-        return new String[] {
+        return new String[] { "fs" };
-            "fs"
-        };
     }
 
     @Override
@@ -353,10 +351,8 @@ public class FSAPI implements ILuaAPI
                 return new Object[] { FileSystem.getDirectory( path ) };
             }
             default:
-            {
+                assert false;
-                assert (false);
                 return null;
-            }
         }
     }
 }

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

@@ -42,9 +42,7 @@ public class HTTPAPI implements ILuaAPI
     @Override
     public String[] getNames()
     {
-        return new String[] {
+        return new String[] { "http" };
-            "http"
-        };
     }
 
     @Override
@@ -83,6 +81,7 @@ public class HTTPAPI implements ILuaAPI
     }
 
     @Override
+    @SuppressWarnings( "resource" )
     public Object[] callMethod( @Nonnull ILuaContext context, int method, @Nonnull Object[] args ) throws LuaException
     {
         switch( method )
@@ -95,7 +94,7 @@ public class HTTPAPI implements ILuaAPI
 
                 if( args.length >= 1 && args[0] instanceof Map )
                 {
-                    Map<?, ?> options = (Map) args[0];
+                    Map<?, ?> options = (Map<?, ?>) args[0];
                     address = getStringField( options, "url" );
                     postString = optStringField( options, "body", null );
                     headerTable = optTableField( options, "headers", Collections.emptyMap() );
@@ -135,7 +134,6 @@ public class HTTPAPI implements ILuaAPI
                 try
                 {
                     URI uri = HttpRequest.checkUri( address );
-
                     HttpRequest request = new HttpRequest( requests, m_apiEnvironment, address, postString, headers, binary, redirect );
 
                     long requestBody = request.body().readableBytes() + HttpRequest.getHeaderSize( headers );
@@ -199,9 +197,7 @@ public class HTTPAPI implements ILuaAPI
                 }
             }
             default:
-            {
                 return null;
-            }
         }
     }
 
@@ -209,14 +205,14 @@ public class HTTPAPI implements ILuaAPI
     private static HttpHeaders getHeaders( @Nonnull Map<?, ?> headerTable ) throws LuaException
     {
         HttpHeaders headers = new DefaultHttpHeaders();
-        for( Object key : headerTable.keySet() )
+        for( Map.Entry<?, ?> entry : headerTable.entrySet() )
         {
-            Object value = headerTable.get( key );
+            Object value = entry.getValue();
-            if( key instanceof String && value instanceof String )
+            if( entry.getKey() instanceof String && value instanceof String )
             {
                 try
                 {
-                    headers.add( (String) key, value );
+                    headers.add( (String) entry.getKey(), value );
                 }
                 catch( IllegalArgumentException e )
                 {

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

@@ -7,9 +7,9 @@
 package dan200.computercraft.core.apis;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.core.computer.Computer;
+import dan200.computercraft.api.peripheral.IWorkMonitor;
+import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.core.computer.IComputerEnvironment;
-import dan200.computercraft.core.computer.IComputerOwned;
 import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.tracking.TrackingField;
@@ -17,28 +17,22 @@ import dan200.computercraft.core.tracking.TrackingField;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public interface IAPIEnvironment extends IComputerOwned
+public interface IAPIEnvironment
 {
-    String[] SIDE_NAMES = new String[] {
+    @FunctionalInterface
-        "bottom", "top", "back", "front", "right", "left",
-    };
-
-    int SIDE_COUNT = 6;
-
     interface IPeripheralChangeListener
     {
-        void onPeripheralChanged( int side, @Nullable IPeripheral newPeripheral );
+        void onPeripheralChanged( ComputerSide side, @Nullable IPeripheral newPeripheral );
     }
 
-    @Nonnull
-    @Override
-    Computer getComputer();
-
     int getComputerID();
 
     @Nonnull
     IComputerEnvironment getComputerEnvironment();
 
+    @Nonnull
+    IWorkMonitor getMainThreadMonitor();
+
     @Nonnull
     Terminal getTerminal();
 
@@ -50,22 +44,22 @@ public interface IAPIEnvironment extends IComputerOwned
 
     void queueEvent( String event, Object[] args );
 
-    void setOutput( int side, int output );
+    void setOutput( ComputerSide side, int output );
 
-    int getOutput( int side );
+    int getOutput( ComputerSide side );
 
-    int getInput( int side );
+    int getInput( ComputerSide side );
 
-    void setBundledOutput( int side, int output );
+    void setBundledOutput( ComputerSide side, int output );
 
-    int getBundledOutput( int side );
+    int getBundledOutput( ComputerSide side );
 
-    int getBundledInput( int side );
+    int getBundledInput( ComputerSide side );
 
     void setPeripheralChangeListener( @Nullable IPeripheralChangeListener listener );
 
     @Nullable
-    IPeripheral getPeripheral( int side );
+    IPeripheral getPeripheral( ComputerSide side );
 
     String getLabel();
 

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

@@ -10,6 +10,7 @@ package dan200.computercraft.core.apis;
  * This exists purely to ensure binary compatibility.
  *
  * @see dan200.computercraft.api.lua.ILuaAPI
+ * @deprecated Use the version in the public API. Only exists for compatibility with CCEmuX.
  */
 @Deprecated
 public interface ILuaAPI extends dan200.computercraft.api.lua.ILuaAPI

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

@@ -0,0 +1,281 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.core.apis;
+
+import dan200.computercraft.api.lua.LuaException;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.TextStyle;
+import java.time.temporal.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.LongUnaryOperator;
+
+final class LuaDateTime
+{
+    private LuaDateTime()
+    {
+    }
+
+    static void format( DateTimeFormatterBuilder formatter, String format, ZoneOffset offset ) throws LuaException
+    {
+        for( int i = 0; i < format.length(); )
+        {
+            char c;
+            switch( c = format.charAt( i++ ) )
+            {
+                case '\n':
+                    formatter.appendLiteral( '\n' );
+                    break;
+                default:
+                    formatter.appendLiteral( c );
+                    break;
+                case '%':
+                    if( i >= format.length() ) break;
+                    switch( c = format.charAt( i++ ) )
+                    {
+                        default:
+                            throw new LuaException( "bad argument #1: invalid conversion specifier '%" + c + "'" );
+
+                        case '%':
+                            formatter.appendLiteral( '%' );
+                            break;
+                        case 'a':
+                            formatter.appendText( ChronoField.DAY_OF_WEEK, TextStyle.SHORT );
+                            break;
+                        case 'A':
+                            formatter.appendText( ChronoField.DAY_OF_WEEK, TextStyle.FULL );
+                            break;
+                        case 'b':
+                        case 'h':
+                            formatter.appendText( ChronoField.MONTH_OF_YEAR, TextStyle.SHORT );
+                            break;
+                        case 'B':
+                            formatter.appendText( ChronoField.MONTH_OF_YEAR, TextStyle.FULL );
+                            break;
+                        case 'c':
+                            format( formatter, "%a %b %e %H:%M:%S %Y", offset );
+                            break;
+                        case 'C':
+                            formatter.appendValueReduced( CENTURY, 2, 2, 0 );
+                            break;
+                        case 'd':
+                            formatter.appendValue( ChronoField.DAY_OF_MONTH, 2 );
+                            break;
+                        case 'D':
+                        case 'x':
+                            format( formatter, "%m/%d/%y", offset );
+                            break;
+                        case 'e':
+                            formatter.padNext( 2 ).appendValue( ChronoField.DAY_OF_MONTH );
+                            break;
+                        case 'F':
+                            format( formatter, "%Y-%m-%d", offset );
+                            break;
+                        case 'g':
+                            formatter.appendValueReduced( IsoFields.WEEK_BASED_YEAR, 2, 2, 0 );
+                            break;
+                        case 'G':
+                            formatter.appendValue( IsoFields.WEEK_BASED_YEAR );
+                            break;
+                        case 'H':
+                            formatter.appendValue( ChronoField.HOUR_OF_DAY, 2 );
+                            break;
+                        case 'I':
+                            formatter.appendValue( ChronoField.HOUR_OF_AMPM );
+                            break;
+                        case 'j':
+                            formatter.appendValue( ChronoField.DAY_OF_YEAR, 3 );
+                            break;
+                        case 'm':
+                            formatter.appendValue( ChronoField.MONTH_OF_YEAR, 2 );
+                            break;
+                        case 'M':
+                            formatter.appendValue( ChronoField.MINUTE_OF_HOUR, 2 );
+                            break;
+                        case 'n':
+                            formatter.appendLiteral( '\n' );
+                            break;
+                        case 'p':
+                            formatter.appendText( ChronoField.AMPM_OF_DAY );
+                            break;
+                        case 'r':
+                            format( formatter, "%I:%M:%S %p", offset );
+                            break;
+                        case 'R':
+                            format( formatter, "%H:%M", offset );
+                            break;
+                        case 'S':
+                            formatter.appendValue( ChronoField.SECOND_OF_MINUTE, 2 );
+                            break;
+                        case 't':
+                            formatter.appendLiteral( '\t' );
+                            break;
+                        case 'T':
+                        case 'X':
+                            format( formatter, "%H:%M:%S", offset );
+                            break;
+                        case 'u':
+                            formatter.appendValue( ChronoField.DAY_OF_WEEK );
+                            break;
+                        case 'U':
+                            formatter.appendValue( ChronoField.ALIGNED_WEEK_OF_YEAR, 2 );
+                            break;
+                        case 'V':
+                            formatter.appendValue( IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2 );
+                            break;
+                        case 'w':
+                            formatter.appendValue( ZERO_WEEK );
+                            break;
+                        case 'W':
+                            formatter.appendValue( WeekFields.ISO.weekOfYear(), 2 );
+                            break;
+                        case 'y':
+                            formatter.appendValueReduced( ChronoField.YEAR, 2, 2, 0 );
+                            break;
+                        case 'Y':
+                            formatter.appendValue( ChronoField.YEAR );
+                            break;
+                        case 'z':
+                            formatter.appendOffset( "+HHMM", "+0000" );
+                            break;
+                        case 'Z':
+                            formatter.appendChronologyId();
+                            break;
+                    }
+            }
+        }
+    }
+
+    static long fromTable( Map<?, ?> table ) throws LuaException
+    {
+        int year = getField( table, "year", -1 );
+        int month = getField( table, "month", -1 );
+        int day = getField( table, "day", -1 );
+        int hour = getField( table, "hour", 12 );
+        int minute = getField( table, "min", 12 );
+        int second = getField( table, "sec", 12 );
+        LocalDateTime time = LocalDateTime.of( year, month, day, hour, minute, second );
+
+        Boolean isDst = getBoolField( table, "isdst" );
+        if( isDst != null )
+        {
+            boolean requireDst = isDst;
+            for( ZoneOffset possibleOffset : ZoneOffset.systemDefault().getRules().getValidOffsets( time ) )
+            {
+                Instant instant = time.toInstant( possibleOffset );
+                if( possibleOffset.getRules().getDaylightSavings( instant ).isZero() == requireDst )
+                {
+                    return instant.getEpochSecond();
+                }
+            }
+        }
+
+        ZoneOffset offset = ZoneOffset.systemDefault().getRules().getOffset( time );
+        return time.toInstant( offset ).getEpochSecond();
+    }
+
+    static Map<String, ?> toTable( TemporalAccessor date, ZoneId offset, Instant instant )
+    {
+        HashMap<String, Object> table = new HashMap<>( 9 );
+        table.put( "year", date.getLong( ChronoField.YEAR ) );
+        table.put( "month", date.getLong( ChronoField.MONTH_OF_YEAR ) );
+        table.put( "day", date.getLong( ChronoField.DAY_OF_MONTH ) );
+        table.put( "hour", date.getLong( ChronoField.HOUR_OF_DAY ) );
+        table.put( "min", date.getLong( ChronoField.MINUTE_OF_HOUR ) );
+        table.put( "sec", date.getLong( ChronoField.SECOND_OF_MINUTE ) );
+        table.put( "wday", date.getLong( WeekFields.SUNDAY_START.dayOfWeek() ) );
+        table.put( "yday", date.getLong( ChronoField.DAY_OF_YEAR ) );
+        table.put( "isdst", offset.getRules().isDaylightSavings( instant ) );
+        return table;
+    }
+
+    private static int getField( Map<?, ?> table, String field, int def ) throws LuaException
+    {
+        Object value = table.get( field );
+        if( value instanceof Number ) return ((Number) value).intValue();
+        if( def < 0 ) throw new LuaException( "field \"" + field + "\" missing in date table" );
+        return def;
+    }
+
+    private static Boolean getBoolField( Map<?, ?> table, String field ) throws LuaException
+    {
+        Object value = table.get( field );
+        if( value instanceof Boolean || value == null ) return (Boolean) value;
+        throw new LuaException( "field \"" + field + "\" missing in date table" );
+    }
+
+    private static final TemporalField CENTURY = map( ChronoField.YEAR, ValueRange.of( 0, 6 ), x -> (x / 100) % 100 );
+    private static final TemporalField ZERO_WEEK = map( WeekFields.SUNDAY_START.dayOfWeek(), ValueRange.of( 0, 6 ), x -> x - 1 );
+
+    private static TemporalField map( TemporalField field, ValueRange range, LongUnaryOperator convert )
+    {
+        return new TemporalField()
+        {
+            private final ValueRange range = ValueRange.of( 0, 99 );
+
+            @Override
+            public TemporalUnit getBaseUnit()
+            {
+                return field.getBaseUnit();
+            }
+
+            @Override
+            public TemporalUnit getRangeUnit()
+            {
+                return field.getRangeUnit();
+            }
+
+            @Override
+            public ValueRange range()
+            {
+                return range;
+            }
+
+            @Override
+            public boolean isDateBased()
+            {
+                return field.isDateBased();
+            }
+
+            @Override
+            public boolean isTimeBased()
+            {
+                return field.isTimeBased();
+            }
+
+            @Override
+            public boolean isSupportedBy( TemporalAccessor temporal )
+            {
+                return field.isSupportedBy( temporal );
+            }
+
+            @Override
+            public ValueRange rangeRefinedBy( TemporalAccessor temporal )
+            {
+                return range;
+            }
+
+            @Override
+            public long getFrom( TemporalAccessor temporal )
+            {
+                return convert.applyAsLong( temporal.getLong( field ) );
+            }
+
+            @Override
+            @SuppressWarnings( "unchecked" )
+            public <R extends Temporal> R adjustInto( R temporal, long newValue )
+            {
+                return (R) temporal.with( field, newValue );
+            }
+        };
+    }
+}

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

@@ -12,6 +12,11 @@ import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.shared.util.StringUtil;
 
 import javax.annotation.Nonnull;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatterBuilder;
 import java.util.*;
 
 import static dan200.computercraft.core.apis.ArgumentHelper.*;
@@ -31,20 +36,20 @@ public class OSAPI implements ILuaAPI
 
     private static class Timer
     {
-        public int m_ticksLeft;
+        int m_ticksLeft;
 
-        public Timer( int ticksLeft )
+        Timer( int ticksLeft )
         {
             m_ticksLeft = ticksLeft;
         }
     }
 
-    private class Alarm implements Comparable<Alarm>
+    private static class Alarm implements Comparable<Alarm>
     {
-        public final double m_time;
+        final double m_time;
-        public final int m_day;
+        final int m_day;
 
-        public Alarm( double time, int day )
+        Alarm( double time, int day )
         {
             m_time = time;
             m_day = day;
@@ -73,9 +78,7 @@ public class OSAPI implements ILuaAPI
     @Override
     public String[] getNames()
     {
-        return new String[] {
+        return new String[] { "os" };
-            "os"
-        };
     }
 
     @Override
@@ -110,7 +113,7 @@ public class OSAPI implements ILuaAPI
             {
                 Map.Entry<Integer, Timer> entry = it.next();
                 Timer timer = entry.getValue();
-                timer.m_ticksLeft = timer.m_ticksLeft - 1;
+                timer.m_ticksLeft--;
                 if( timer.m_ticksLeft <= 0 )
                 {
                     // Queue the "timer" event
@@ -184,11 +187,12 @@ public class OSAPI implements ILuaAPI
             "day",
             "cancelTimer",
             "cancelAlarm",
-            "epoch"
+            "epoch",
+            "date",
         };
     }
 
-    private float getTimeForCalendar( Calendar c )
+    private static float getTimeForCalendar( Calendar c )
     {
         float time = c.get( Calendar.HOUR_OF_DAY );
         time += c.get( Calendar.MINUTE ) / 60.0f;
@@ -196,9 +200,9 @@ public class OSAPI implements ILuaAPI
         return time;
     }
 
-    private int getDayForCalendar( Calendar c )
+    private static int getDayForCalendar( Calendar c )
     {
-        GregorianCalendar g = (c instanceof GregorianCalendar) ? (GregorianCalendar) c : new GregorianCalendar();
+        GregorianCalendar g = c instanceof GregorianCalendar ? (GregorianCalendar) c : new GregorianCalendar();
         int year = c.get( Calendar.YEAR );
         int day = 0;
         for( int y = 1970; y < year; y++ )
@@ -209,7 +213,7 @@ public class OSAPI implements ILuaAPI
         return day;
     }
 
-    private long getEpochForCalendar( Calendar c )
+    private static long getEpochForCalendar( Calendar c )
     {
         return c.getTime().getTime();
     }
@@ -219,12 +223,9 @@ public class OSAPI implements ILuaAPI
     {
         switch( method )
         {
-            case 0:
+            case 0: // queueEvent
-            {
-                // queueEvent
                 queueLuaEvent( getString( args, 0 ), trimArray( args, 1 ) );
                 return null;
-            }
             case 1:
             {
                 // startTimer
@@ -245,29 +246,20 @@ public class OSAPI implements ILuaAPI
                 }
                 synchronized( m_alarms )
                 {
-                    int day = (time > m_time) ? m_day : (m_day + 1);
+                    int day = time > m_time ? m_day : m_day + 1;
                     m_alarms.put( m_nextAlarmToken, new Alarm( time, day ) );
                     return new Object[] { m_nextAlarmToken++ };
                 }
             }
-            case 3:
+            case 3: // shutdown
-            {
-                // shutdown
                 m_apiEnvironment.shutdown();
                 return null;
-            }
+            case 4: // reboot
-            case 4:
-            {
-                // reboot
                 m_apiEnvironment.reboot();
                 return null;
-            }
             case 5:
-            case 6:
+            case 6: // computerID/getComputerID
-            {
-                // computerID/getComputerID
                 return new Object[] { getComputerID() };
-            }
             case 7:
             {
                 // setComputerLabel
@@ -286,19 +278,19 @@ public class OSAPI implements ILuaAPI
                 }
                 return null;
             }
-            case 10:
+            case 10: // clock
-            {
-                // clock
                 synchronized( m_timers )
                 {
                     return new Object[] { m_clock * 0.05 };
                 }
-            }
             case 11:
             {
                 // time
+                Object value = args.length > 0 ? args[0] : null;
+                if( value instanceof Map ) return new Object[] { LuaDateTime.fromTable( (Map<?, ?>) value ) };
+
                 String param = optString( args, 0, "ingame" );
-                switch( param )
+                switch( param.toLowerCase( Locale.ROOT ) )
                 {
                     case "utc":
                     {
@@ -326,7 +318,7 @@ public class OSAPI implements ILuaAPI
             {
                 // day
                 String param = optString( args, 0, "ingame" );
-                switch( param )
+                switch( param.toLowerCase( Locale.ROOT ) )
                 {
                     case "utc":
                     {
@@ -356,10 +348,7 @@ public class OSAPI implements ILuaAPI
                 int token = getInt( args, 0 );
                 synchronized( m_timers )
                 {
-                    if( m_timers.containsKey( token ) )
+                    m_timers.remove( token );
-                    {
-                        m_timers.remove( token );
-                    }
                 }
                 return null;
             }
@@ -369,18 +358,14 @@ public class OSAPI implements ILuaAPI
                 int token = getInt( args, 0 );
                 synchronized( m_alarms )
                 {
-                    if( m_alarms.containsKey( token ) )
+                    m_alarms.remove( token );
-                    {
-                        m_alarms.remove( token );
-                    }
                 }
                 return null;
             }
-            case 15:
+            case 15: // epoch
             {
-                // epoch
                 String param = optString( args, 0, "ingame" );
-                switch( param )
+                switch( param.toLowerCase( Locale.ROOT ) )
                 {
                     case "utc":
                     {
@@ -398,18 +383,41 @@ public class OSAPI implements ILuaAPI
                         // Get in-game epoch
                         synchronized( m_alarms )
                         {
-                            return new Object[] {
+                            return new Object[] { m_day * 86400000 + (int) (m_time * 3600000.0f) };
-                                m_day * 86400000 + (int) (m_time * 3600000.0f)
-                            };
                         }
                     default:
                         throw new LuaException( "Unsupported operation" );
                 }
             }
-            default:
+            case 16: // date
             {
-                return null;
+                String format = optString( args, 0, "%c" );
+                long time = optLong( args, 1, Instant.now().getEpochSecond() );
+
+                Instant instant = Instant.ofEpochSecond( time );
+                ZonedDateTime date;
+                ZoneOffset offset;
+                if( format.startsWith( "!" ) )
+                {
+                    offset = ZoneOffset.UTC;
+                    date = ZonedDateTime.ofInstant( instant, offset );
+                    format = format.substring( 1 );
+                }
+                else
+                {
+                    ZoneId id = ZoneId.systemDefault();
+                    offset = id.getRules().getOffset( instant );
+                    date = ZonedDateTime.ofInstant( instant, id );
+                }
+
+                if( format.equals( "*t" ) ) return new Object[] { LuaDateTime.toTable( date, offset, instant ) };
+
+                DateTimeFormatterBuilder formatter = new DateTimeFormatterBuilder();
+                LuaDateTime.format( formatter, format, offset );
+                return new Object[] { formatter.toFormatter( Locale.ROOT ).format( date ) };
             }
+            default:
+                return null;
         }
     }