Fix changelog being out-of-sync

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,5 +1,5 @@
 # ![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.
@@ -9,7 +9,7 @@ ComputerCraft has always held a fond place in my heart: it's the mod which reall
 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.
 
-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.
 
@@ -41,13 +41,22 @@ 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
+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.
 
@@ -57,7 +66,7 @@ dependencies {
 }
 
 dependencies {
-  implementation "org.squiddev:cc-tweaked:${mc_version}-${cct_version}"
+  implementation "org.squiddev:cc-tweaked-${mc_version}:${cct_version}"
 }
 ```
 

build.gradle

@@ -4,19 +4,22 @@ buildscript {
         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:3.0.115'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.130'
         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.2.0'
+    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'
@@ -64,7 +67,7 @@ minecraft {
 repositories {
     maven {
         name "JEI"
-        url  "http://dvs1.progwml6.com/files/maven"
+        url "https://dvs1.progwml6.com/files/maven"
     }
     maven {
         name "SquidDev"
@@ -76,7 +79,7 @@ repositories {
     }
     maven {
         name "Amadornes"
-        url "http://maven.amadornes.com/"
+        url "https://maven.amadornes.com/"
     }
 }
 
@@ -87,18 +90,20 @@ configurations {
 }
 
 dependencies {
+    checkstyle "com.puppycrawl.tools:checkstyle:8.21"
+
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
-    compileOnly "mezz.jei:jei-1.13.2:5.0.0.8:api"
+    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"
 
-    deobf "mezz.jei:jei-1.13.2:5.0.0.8"
+    runtimeOnly fg.deobf("mezz.jei:jei-1.14.3:6.0.0.7")
 
     shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
+    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"
 }
@@ -112,6 +117,8 @@ sourceSets {
     }
 }
 
+// Compile tasks
+
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
@@ -122,7 +129,7 @@ jar {
     manifest {
         attributes(["Specification-Title": "computercraft",
                     "Specification-Vendor": "SquidDev",
-                    "Specification-Version": "25.0",
+                    "Specification-Version": "1",
                     "Implementation-Title": "CC: Tweaked",
                     "Implementation-Version": "${mod_version}",
                     "Implementation-Vendor" :"SquidDev",
@@ -136,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
 
@@ -164,7 +181,7 @@ 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.** { *; }'
@@ -241,6 +258,7 @@ task compressJson(dependsOn: jar) {
         // 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) {
@@ -268,12 +286,105 @@ task compressJson(dependsOn: jar) {
 
 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 = 'beta'
         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"
+        }
     }
 }
 
@@ -330,18 +441,27 @@ uploadArchives {
     }
 }
 
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
+githubRelease {
+    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
+    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 true
 }
 
-gradle.projectsEvaluated {
-    reobfJar.dependsOn proguardMove
+def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
+uploadTasks.forEach { tasks.getByName(it).dependsOn checkRelease }
 
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing" // Causes Forge build to fail << "-Werror"
-    }
+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

@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.82.0
+mod_version=1.84.0
 
 # Minecraft properties
-mc_version=1.13.2
-forge_version=25.0.100
-mappings_version=20190327-1.13.2
+mc_version=1.14.4
+forge_version=28.0.11
+mappings_version=20190721-1.14.3

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

@@ -26,7 +26,7 @@ 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.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
@@ -43,6 +43,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     {
     }
 
+    @Nonnull
     @Override
     public String getInstalledVersion()
     {
@@ -93,7 +94,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     }
 
     @Override
-    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return BundledRedstone.getDefaultOutput( world, pos, side );
     }
@@ -110,6 +111,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
         PocketUpgrades.register( upgrade );
     }
 
+    @Nonnull
     @Override
     public IPacketNetwork getWirelessNetwork()
     {
@@ -122,19 +124,18 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
         ApiFactories.register( factory );
     }
 
+    @Nonnull
     @Override
     public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
     {
         return new WiredNode( element );
     }
 
+    @Nonnull
     @Override
-    public IWiredElement getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         TileEntity tile = world.getTileEntity( pos );
-        if( tile == null ) return null;
-
-        LazyOptional<IWiredElement> element = tile.getCapability( CapabilityWiredElement.CAPABILITY, side );
-        return CapabilityWiredElement.unwrap( element );
+        return tile == null ? LazyOptional.empty() : tile.getCapability( CapabilityWiredElement.CAPABILITY, side );
     }
 }

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

@@ -1,9 +1,8 @@
 /*
- * 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
+ * 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;

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

@@ -20,10 +20,11 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -182,7 +183,7 @@ public final class ComputerCraftAPI
      * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
      * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return getInstance().getBundledRedstoneOutput( world, pos, side );
     }
@@ -240,8 +241,8 @@ public final class ComputerCraftAPI
      * @return The element's node
      * @see IWiredElement#getNode()
      */
-    @Nullable
-    public static IWiredElement getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    @Nonnull
+    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return getInstance().getWiredElementAt( world, pos, side );
     }
@@ -266,12 +267,15 @@ public final class ComputerCraftAPI
 
     public interface IComputerCraftAPI
     {
+        @Nonnull
         String getInstalledVersion();
 
         int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
 
+        @Nullable
         IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
 
+        @Nullable
         IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
 
         void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
@@ -280,18 +284,21 @@ public final class ComputerCraftAPI
 
         void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
 
-        int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side );
+        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 );
 
-        IWiredElement getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull EnumFacing side );
+        @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/peripheral/IPeripheralProvider.java

@@ -7,7 +7,7 @@
 package dan200.computercraft.api.peripheral;
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -34,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

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

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

@@ -1,9 +1,8 @@
 /*
- * 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
+ * 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;

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

@@ -1,9 +1,8 @@
 /*
- * 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
+ * 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;

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;
@@ -75,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/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/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.util.EnumFacing;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -83,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
@@ -95,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.
@@ -144,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()
@@ -155,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
@@ -290,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

@@ -13,7 +13,7 @@ import dan200.computercraft.api.turtle.event.TurtleBlockEvent;
 import net.minecraft.client.renderer.model.IBakedModel;
 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;
@@ -98,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,
-     * {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
+     * Conforming implementations should fire {@link BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig} for
+     * digging, {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
      *
      * @param turtle    Access to the turtle that the tool resides on.
      * @param side      Which side of the turtle (left or right) the tool resides on.
@@ -113,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();
     }

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/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,9 +12,9 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
-import net.minecraft.block.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;
@@ -75,7 +75,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
     /**
      * Fired when a turtle attempts to dig a block.
      *
-     * This must be fired by {@link ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, 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.
@@ -84,11 +84,11 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      */
     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 );
 
@@ -106,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;
         }
@@ -185,10 +185,10 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      */
     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 );
 
@@ -204,7 +204,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The inspected block state.
          */
         @Nonnull
-        public IBlockState getState()
+        public BlockState getState()
         {
             return state;
         }

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

@@ -1,9 +1,8 @@
 /*
- * 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
+ * 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;

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

@@ -1,9 +1,8 @@
 /*
- * 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
+ * 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;

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

@@ -12,19 +12,17 @@ import dan200.computercraft.shared.common.IColouredItem;
 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.model.IUnbakedModel;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.client.renderer.model.ModelRotation;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.ColorHandlerEvent;
 import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.client.model.BasicState;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -36,7 +34,7 @@ import java.util.Map;
 /**
  * Registers textures and models for items.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
 public final class ClientRegistry
 {
     private static final String[] EXTRA_MODELS = new String[] {
@@ -79,11 +77,13 @@ public final class ClientRegistry
     @SubscribeEvent
     public static void onTextureStitchEvent( TextureStitchEvent.Pre event )
     {
+        /*
         IResourceManager manager = Minecraft.getInstance().getResourceManager();
         for( String extra : EXTRA_TEXTURES )
         {
-            event.getMap().registerSprite( manager, new ResourceLocation( ComputerCraft.MOD_ID, extra ) );
+            // TODO: event.getMap().registerSprite( manager, new ResourceLocation( ComputerCraft.MOD_ID, extra ) );
         }
+        */
     }
 
     @SubscribeEvent
@@ -91,7 +91,7 @@ public final class ClientRegistry
     {
         // Load all extra models
         ModelLoader loader = event.getModelLoader();
-        Map<ModelResourceLocation, IBakedModel> registry = event.getModelRegistry();
+        Map<ResourceLocation, IBakedModel> registry = event.getModelRegistry();
 
         for( String model : EXTRA_MODELS )
         {
@@ -121,6 +121,12 @@ public final class ClientRegistry
     @SubscribeEvent
     public static void onItemColours( ColorHandlerEvent.Item event )
     {
+        if( ComputerCraft.Items.disk == null || ComputerCraft.Blocks.turtleNormal == null )
+        {
+            ComputerCraft.log.warn( "Block/item registration has failed. Skipping registration of item colours." );
+            return;
+        }
+
         event.getItemColors().register(
             ( stack, layer ) -> layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF,
             ComputerCraft.Items.disk
@@ -154,9 +160,9 @@ public final class ClientRegistry
         model.getTextures( loader::getUnbakedModel, new HashSet<>() );
 
         return model.bake(
-            loader::getUnbakedModel,
+            loader,
             ModelLoader.defaultTextureGetter(),
-            ModelRotation.X0_Y0, false, DefaultVertexFormats.BLOCK
+            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.GuiUtilRenderComponents;
+import net.minecraft.client.gui.NewChatGui;
+import net.minecraft.client.gui.RenderComponentsUtil;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextFormatting;
@@ -65,18 +65,18 @@ public class ClientTableFormatter implements TableFormatter
     public void writeLine( int id, ITextComponent component )
     {
         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.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.getInstance().ingameGUI.getChatGUI();
+        NewChatGui chat = Minecraft.getInstance().ingameGUI.getChatGUI();
 
         int lastHeight = lastHeights.get( table.getId() );
 

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;
@@ -129,9 +129,9 @@ public final 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 final class FixedWidthFontRenderer
     public void bindFont()
     {
         m_textureManager.bindTexture( FONT );
-        GlStateManager.texParameteri( 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,23 +6,28 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.client.gui.widgets.WidgetWrapper;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.inventory.Container;
+import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
+import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
+import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+import org.lwjgl.glfw.GLFW;
 
-public class GuiComputer extends GuiContainer
+public final class GuiComputer<T extends ContainerComputerBase> extends ContainerScreen<T>
 {
-    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/corners_normal.png" );
-    private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( "computercraft", "textures/gui/corners_advanced.png" );
-    private static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( "computercraft", "textures/gui/corners_command.png" );
+    public static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_normal.png" );
+    public static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
+    public static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
+    public static final ResourceLocation BACKGROUND_COLOUR = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
 
     private final ComputerFamily m_family;
     private final ClientComputer m_computer;
@@ -32,31 +37,47 @@ public class GuiComputer extends GuiContainer
     private WidgetTerminal terminal;
     private WidgetWrapper terminalWrapper;
 
-    public GuiComputer( Container container, ComputerFamily family, ClientComputer computer, int termWidth, int termHeight )
+    private GuiComputer(
+        T container, PlayerInventory player, ITextComponent title, int termWidth, int termHeight
+    )
     {
-        super( container );
-        m_family = family;
-        m_computer = computer;
+        super( container, player, title );
+        m_family = container.getFamily();
+        m_computer = (ClientComputer) container.getComputer();
         m_termWidth = termWidth;
         m_termHeight = termHeight;
         terminal = null;
     }
 
-    public GuiComputer( TileComputer computer )
+    public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, ITextComponent component )
     {
-        this(
-            new ContainerComputer( computer ),
-            computer.getFamily(),
-            computer.createClientComputer(),
-            ComputerCraft.terminalWidth_computer,
-            ComputerCraft.terminalHeight_computer
+        return new GuiComputer<>(
+            container, inventory, component,
+            ComputerCraft.terminalWidth_computer, ComputerCraft.terminalHeight_computer
         );
     }
 
-    @Override
-    protected void initGui()
+    public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, PlayerInventory inventory, ITextComponent component )
     {
-        mc.keyboardListener.enableRepeatEvents( true );
+        return new GuiComputer<>(
+            container, inventory, component,
+            ComputerCraft.terminalWidth_pocketComputer, ComputerCraft.terminalHeight_pocketComputer
+        );
+    }
+
+    public static GuiComputer<ContainerViewComputer> createView( ContainerViewComputer container, PlayerInventory inventory, ITextComponent component )
+    {
+        return new GuiComputer<>(
+            container, inventory, component,
+            container.getWidth(), container.getHeight()
+        );
+    }
+
+
+    @Override
+    protected void init()
+    {
+        minecraft.keyboardListener.enableRepeatEvents( true );
 
         int termPxWidth = m_termWidth * FixedWidthFontRenderer.FONT_WIDTH;
         int termPxHeight = m_termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
@@ -64,9 +85,9 @@ public class GuiComputer extends GuiContainer
         xSize = termPxWidth + 4 + 24;
         ySize = termPxHeight + 4 + 24;
 
-        super.initGui();
+        super.init();
 
-        terminal = new WidgetTerminal( mc, () -> m_computer, m_termWidth, m_termHeight, 2, 2, 2, 2 );
+        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 );
@@ -74,12 +95,12 @@ public class GuiComputer extends GuiContainer
     }
 
     @Override
-    public void onGuiClosed()
+    public void removed()
     {
-        super.onGuiClosed();
+        super.removed();
         children.remove( terminal );
         terminal = null;
-        mc.keyboardListener.enableRepeatEvents( false );
+        minecraft.keyboardListener.enableRepeatEvents( false );
     }
 
     @Override
@@ -89,6 +110,18 @@ public class GuiComputer extends GuiContainer
         terminal.update();
     }
 
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        // Forward the tab key to the terminal, rather than moving between controls.
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        {
+            return getFocused().keyPressed( key, scancode, modifiers );
+        }
+
+        return super.keyPressed( key, scancode, modifiers );
+    }
+
     @Override
     public void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
     {
@@ -107,32 +140,32 @@ public class GuiComputer extends GuiContainer
         {
             case Normal:
             default:
-                mc.getTextureManager().bindTexture( BACKGROUND_NORMAL );
+                minecraft.getTextureManager().bindTexture( BACKGROUND_NORMAL );
                 break;
             case Advanced:
-                mc.getTextureManager().bindTexture( BACKGROUND_ADVANCED );
+                minecraft.getTextureManager().bindTexture( BACKGROUND_ADVANCED );
                 break;
             case Command:
-                mc.getTextureManager().bindTexture( BACKGROUND_COMMAND );
+                minecraft.getTextureManager().bindTexture( BACKGROUND_COMMAND );
                 break;
         }
 
-        drawTexturedModalRect( startX - 12, startY - 12, 12, 28, 12, 12 );
-        drawTexturedModalRect( startX - 12, endY, 12, 40, 12, 16 );
-        drawTexturedModalRect( endX, startY - 12, 24, 28, 12, 12 );
-        drawTexturedModalRect( endX, endY, 24, 40, 12, 16 );
+        blit( startX - 12, startY - 12, 12, 28, 12, 12 );
+        blit( startX - 12, endY, 12, 40, 12, 12 );
+        blit( endX, startY - 12, 24, 28, 12, 12 );
+        blit( endX, endY, 24, 40, 12, 12 );
 
-        drawTexturedModalRect( startX, startY - 12, 0, 0, endX - startX, 12 );
-        drawTexturedModalRect( startX, endY, 0, 12, endX - startX, 16 );
+        blit( startX, startY - 12, 0, 0, endX - startX, 12 );
+        blit( startX, endY, 0, 12, endX - startX, 12 );
 
-        drawTexturedModalRect( startX - 12, startY, 0, 28, 12, endY - startY );
-        drawTexturedModalRect( endX, startY, 36, 28, 12, endY - startY );
+        blit( startX - 12, startY, 0, 28, 12, endY - startY );
+        blit( endX, startY, 36, 28, 12, endY - startY );
     }
 
     @Override
     public void render( int mouseX, int mouseY, float partialTicks )
     {
-        drawDefaultBackground();
+        renderBackground();
         super.render( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );
     }

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

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

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

@@ -1,34 +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.computer.core.ComputerFamily;
-import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
-import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-public class GuiPocketComputer extends GuiComputer
-{
-    public GuiPocketComputer( ContainerPocketComputer container )
-    {
-        super(
-            container,
-            getFamily( container.getStack() ),
-            ItemPocketComputer.createClientComputer( container.getStack() ),
-            ComputerCraft.terminalWidth_pocketComputer,
-            ComputerCraft.terminalHeight_pocketComputer
-        );
-    }
-
-    private static ComputerFamily getFamily( ItemStack stack )
-    {
-        Item item = stack.getItem();
-        return item instanceof ItemPocketComputer ? ((ItemPocketComputer) item).getFamily() : ComputerFamily.Normal;
-    }
-}

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

@@ -6,46 +6,45 @@
 
 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.renderer.GlStateManager;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
 
-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 container;
-
-    public GuiPrinter( ContainerPrinter container )
+    public GuiPrinter( ContainerPrinter container, PlayerInventory player, ITextComponent title )
     {
-        super( container );
-        this.container = container;
+        super( container, player, title );
     }
 
     @Override
     protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
     {
-        String title = container.getPrinter().getDisplayName().getString();
-        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2.0f, 6, 0x404040 );
-        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
+        String title = getTitle().getFormattedText();
+        font.drawString( title, (xSize - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
+        font.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
     }
 
     @Override
     protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
     {
         GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( BACKGROUND );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        minecraft.getTextureManager().bindTexture( BACKGROUND );
+        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
 
-        if( container.isPrinting() ) drawTexturedModalRect( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
+        if( getContainer().isPrinting() ) blit( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
     }
 
     @Override
     public void render( int mouseX, int mouseY, float partialTicks )
     {
-        drawDefaultBackground();
+        renderBackground();
         super.render( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );
     }

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

@@ -6,16 +6,18 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.ContainerHeldItem;
 import dan200.computercraft.shared.media.items.ItemPrintout;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.util.text.ITextComponent;
 import org.lwjgl.glfw.GLFW;
 
 import 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;
@@ -23,9 +25,9 @@ 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;
 
@@ -63,9 +65,9 @@ public class GuiPrintout extends GuiContainer
     }
 
     @Override
-    public boolean mouseScrolled( double delta )
+    public boolean mouseScrolled( double x, double y, double delta )
     {
-        if( super.mouseScrolled( delta ) ) return true;
+        if( super.mouseScrolled( x, y, delta ) ) return true;
         if( delta < 0 )
         {
             // Scroll up goes to the next page
@@ -90,7 +92,7 @@ public class GuiPrintout extends GuiContainer
         GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableDepthTest();
 
-        drawBorder( guiLeft, guiTop, zLevel, m_page, m_pages, m_book );
+        drawBorder( guiLeft, guiTop, blitOffset, m_page, m_pages, m_book );
         drawText( guiLeft + X_TEXT_MARGIN, guiTop + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
     }
 
@@ -98,9 +100,9 @@ public class GuiPrintout extends GuiContainer
     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.
-        zLevel--;
-        drawDefaultBackground();
-        zLevel++;
+        blitOffset--;
+        renderBackground();
+        blitOffset++;
 
         super.render( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );

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

@@ -6,18 +6,20 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.client.gui.widgets.WidgetWrapper;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.gui.screen.inventory.ContainerScreen;
+import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+import org.lwjgl.glfw.GLFW;
 
-public class GuiTurtle extends GuiContainer
+public class GuiTurtle extends ContainerScreen<ContainerTurtle>
 {
     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" );
@@ -30,29 +32,29 @@ public class GuiTurtle extends GuiContainer
     private WidgetTerminal terminal;
     private WidgetWrapper terminalWrapper;
 
-    public GuiTurtle( TileTurtle turtle, ContainerTurtle container )
+    public GuiTurtle( ContainerTurtle container, PlayerInventory player, ITextComponent title )
     {
-        super( container );
+        super( container, player, title );
 
         m_container = container;
-        m_family = turtle.getFamily();
-        m_computer = turtle.getClientComputer();
+        m_family = container.getFamily();
+        m_computer = (ClientComputer) container.getComputer();
 
         xSize = 254;
         ySize = 217;
     }
 
     @Override
-    protected void initGui()
+    protected void init()
     {
-        super.initGui();
-        mc.keyboardListener.enableRepeatEvents( true );
+        super.init();
+        minecraft.keyboardListener.enableRepeatEvents( true );
 
         int termPxWidth = ComputerCraft.terminalWidth_turtle * FixedWidthFontRenderer.FONT_WIDTH;
         int termPxHeight = ComputerCraft.terminalHeight_turtle * FixedWidthFontRenderer.FONT_HEIGHT;
 
         terminal = new WidgetTerminal(
-            mc, () -> m_computer,
+            minecraft, () -> m_computer,
             ComputerCraft.terminalWidth_turtle,
             ComputerCraft.terminalHeight_turtle,
             2, 2, 2, 2
@@ -64,11 +66,12 @@ public class GuiTurtle extends GuiContainer
     }
 
     @Override
-    public void onGuiClosed()
+    public void removed()
     {
+        super.removed();
         children.remove( terminal );
         terminal = null;
-        mc.keyboardListener.enableRepeatEvents( false );
+        minecraft.keyboardListener.enableRepeatEvents( false );
     }
 
     @Override
@@ -78,6 +81,18 @@ public class GuiTurtle extends GuiContainer
         terminal.update();
     }
 
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        // Forward the tab key to the terminal, rather than moving between controls.
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        {
+            return getFocused().keyPressed( key, scancode, modifiers );
+        }
+
+        return super.keyPressed( key, scancode, modifiers );
+    }
+
     private void drawSelectionSlot( boolean advanced )
     {
         // Draw selection slot
@@ -87,8 +102,8 @@ public class GuiTurtle extends GuiContainer
             GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
             int slotX = slot % 4;
             int slotY = slot / 4;
-            mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-            drawTexturedModalRect( guiLeft + m_container.m_turtleInvStartX - 2 + slotX * 18, guiTop + m_container.m_playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
+            minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+            blit( guiLeft + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, guiTop + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18, 0, 217, 24, 24 );
         }
     }
 
@@ -101,8 +116,8 @@ public class GuiTurtle extends GuiContainer
 
         // Draw border/inventory
         GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
 
         drawSelectionSlot( advanced );
     }
@@ -110,7 +125,7 @@ public class GuiTurtle extends GuiContainer
     @Override
     public void render( int mouseX, int mouseY, float partialTicks )
     {
-        drawDefaultBackground();
+        renderBackground();
         super.render( mouseX, mouseY, partialTicks );
         renderHoveredToolTip( mouseX, mouseY );
     }

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

@@ -6,6 +6,7 @@
 
 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;
@@ -17,7 +18,6 @@ import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.IGuiEventListener;
 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.SharedConstants;
@@ -35,6 +35,8 @@ public class WidgetTerminal implements IGuiEventListener
 
     private final Minecraft client;
 
+    private boolean focused;
+
     private final Supplier<ClientComputer> computer;
     private final int termWidth;
     private final int termHeight;
@@ -250,14 +252,23 @@ public class WidgetTerminal implements IGuiEventListener
     }
 
     @Override
-    public boolean mouseScrolled( double delta )
+    public boolean mouseScrolled( double mouseX, double mouseY, double delta )
     {
         ClientComputer computer = this.computer.get();
-        if( computer == null || !computer.isColour() ) return false;
+        if( computer == null || !computer.isColour() || delta == 0 ) return false;
 
-        if( lastMouseX >= 0 && lastMouseY >= 0 && delta != 0 )
+        Terminal term = computer.getTerminal();
+        if( term != null )
         {
-            queueEvent( "mouse_scroll", delta < 0 ? 1 : -1, lastMouseX + 1, lastMouseY + 1 );
+            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.mouseScroll( delta < 0 ? 1 : -1, charX + 1, charY + 1 );
+
+            lastMouseX = charX;
+            lastMouseY = charY;
         }
 
         return true;
@@ -284,9 +295,9 @@ public class WidgetTerminal implements IGuiEventListener
     }
 
     @Override
-    public void focusChanged( boolean focused )
+    public boolean changeFocus( boolean reversed )
     {
-        if( !focused )
+        if( focused )
         {
             // When blurring, we should make all keys go up
             for( int key = 0; key < keysDown.size(); key++ )
@@ -305,6 +316,8 @@ public class WidgetTerminal implements IGuiEventListener
 
             shutdownTimer = terminateTimer = rebootTimer = -1;
         }
+        focused = !focused;
+        return true;
     }
 
     public void draw( int originX, int originY )

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

@@ -26,15 +26,9 @@ public class WidgetWrapper implements IGuiEventListener
     }
 
     @Override
-    public void focusChanged( boolean b )
+    public boolean changeFocus( boolean b )
     {
-        listener.focusChanged( b );
-    }
-
-    @Override
-    public boolean canFocus()
-    {
-        return listener.canFocus();
+        return listener.changeFocus( b );
     }
 
     @Override
@@ -59,9 +53,9 @@ public class WidgetWrapper implements IGuiEventListener
     }
 
     @Override
-    public boolean mouseScrolled( double delta )
+    public boolean mouseScrolled( double x, double y, double delta )
     {
-        return listener.mouseScrolled( delta );
+        return listener.mouseScrolled( x, y, delta );
     }
 
     @Override

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

@@ -11,29 +11,25 @@ import dan200.computercraft.client.gui.*;
 import dan200.computercraft.client.render.TileEntityCableRenderer;
 import dan200.computercraft.client.render.TileEntityMonitorRenderer;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
-import dan200.computercraft.shared.computer.core.ClientComputer;
+import dan200.computercraft.shared.common.ContainerHeldItem;
+import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
-import dan200.computercraft.shared.network.container.*;
+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.peripheral.printer.ContainerPrinter;
+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.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
+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.ExtensionPoint;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
-import java.util.function.BiFunction;
-
 @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
 public final class ComputerCraftProxyClient
 {
@@ -50,34 +46,17 @@ public final class ComputerCraftProxyClient
 
     private static void registerContainers()
     {
-        ContainerType.registerGui( TileEntityContainerType::computer, ( packet, player ) ->
-            new GuiComputer( (TileComputer) packet.getTileEntity( player ) ) );
-        ContainerType.registerGui( TileEntityContainerType::diskDrive, GuiDiskDrive::new );
-        ContainerType.registerGui( TileEntityContainerType::printer, GuiPrinter::new );
-        ContainerType.registerGui( TileEntityContainerType::turtle, ( packet, player ) -> {
-            TileTurtle turtle = (TileTurtle) packet.getTileEntity( player );
-            return new GuiTurtle( turtle, new ContainerTurtle( player.inventory, turtle.getAccess(), turtle.getClientComputer() ) );
-        } );
+        // My IDE doesn't think so, but we do actually need these generics.
 
-        ContainerType.registerGui( PocketComputerContainerType::new, GuiPocketComputer::new );
-        ContainerType.registerGui( PrintoutContainerType::new, GuiPrintout::new );
-        ContainerType.registerGui( ViewComputerContainerType::new, ( packet, player ) -> {
-            ClientComputer computer = ComputerCraft.clientComputerRegistry.get( packet.instanceId );
-            if( computer == null )
-            {
-                ComputerCraft.clientComputerRegistry.add( packet.instanceId, computer = new ClientComputer( packet.instanceId ) );
-            }
+        ScreenManager.<ContainerComputer, GuiComputer<ContainerComputer>>registerFactory( ContainerComputer.TYPE, GuiComputer::create );
+        ScreenManager.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>registerFactory( ContainerPocketComputer.TYPE, GuiComputer::createPocket );
+        ScreenManager.registerFactory( ContainerTurtle.TYPE, GuiTurtle::new );
 
-            ContainerViewComputer container = new ContainerViewComputer( computer );
-            return new GuiComputer( container, packet.family, computer, packet.width, packet.height );
-        } );
+        ScreenManager.registerFactory( ContainerPrinter.TYPE, GuiPrinter::new );
+        ScreenManager.registerFactory( ContainerDiskDrive.TYPE, GuiDiskDrive::new );
+        ScreenManager.registerFactory( ContainerHeldItem.PRINTOUT_TYPE, GuiPrintout::new );
 
-        ModLoadingContext.get().registerExtensionPoint( ExtensionPoint.GUIFACTORY, () -> packet -> {
-            ContainerType<?> type = ContainerType.factories.get( packet.getId() ).get();
-            if( packet.getAdditionalData() != null ) type.fromBytes( packet.getAdditionalData() );
-            return ((BiFunction<ContainerType<?>, EntityPlayer, GuiContainer>) ContainerType.guiFactories.get( packet.getId() ))
-                .apply( type, Minecraft.getInstance().player );
-        } );
+        ScreenManager.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>registerFactory( ContainerViewComputer.TYPE, GuiComputer::createView );
     }
 
     @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )

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

@@ -6,17 +6,19 @@
 
 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.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.WorldRenderer;
-import net.minecraft.entity.player.EntityPlayer;
 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;
@@ -26,9 +28,9 @@ import net.minecraftforge.fml.common.Mod;
 import org.lwjgl.opengl.GL11;
 
 @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
-public final class RenderOverlayCable
+public final class CableHighlightRenderer
 {
-    private RenderOverlayCable()
+    private CableHighlightRenderer()
     {
     }
 
@@ -36,17 +38,19 @@ public final class RenderOverlayCable
      * Draw an outline for a specific part of a cable "Multipart".
      *
      * @param event The event to observe
-     * @see WorldRenderer#drawSelectionBox(EntityPlayer, RayTraceResult, int, float)
+     * @see WorldRenderer#drawSelectionBox(ActiveRenderInfo, RayTraceResult, int)
      */
     @SubscribeEvent
     public static void drawHighlight( DrawBlockHighlightEvent event )
     {
-        if( event.getTarget().type != RayTraceResult.Type.BLOCK ) return;
+        if( event.getTarget().getType() != RayTraceResult.Type.BLOCK ) return;
 
-        BlockPos pos = event.getTarget().getBlockPos();
-        World world = event.getPlayer().getEntityWorld();
+        BlockRayTraceResult hit = (BlockRayTraceResult) event.getTarget();
+        BlockPos pos = hit.getPos();
+        World world = event.getInfo().getRenderViewEntity().getEntityWorld();
+        ActiveRenderInfo info = event.getInfo();
 
-        IBlockState state = world.getBlockState( pos );
+        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 ) )
@@ -56,32 +60,31 @@ public final class RenderOverlayCable
 
         event.setCanceled( true );
 
-        EntityPlayer player = event.getPlayer();
         Minecraft mc = Minecraft.getInstance();
-        float partialTicks = event.getPartialTicks();
 
         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.disableTexture2D();
+        GlStateManager.disableTexture();
         GlStateManager.depthMask( false );
         GlStateManager.matrixMode( GL11.GL_PROJECTION );
         GlStateManager.pushMatrix();
         GlStateManager.scalef( 1.0F, 1.0F, 0.999F );
 
-        double x = player.lastTickPosX + (player.posX - player.lastTickPosX) * partialTicks;
-        double y = player.lastTickPosY + (player.posY - player.lastTickPosY) * partialTicks;
-        double z = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * partialTicks;
+        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getHitVec().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
+            ? CableShapes.getModemShape( state )
+            : CableShapes.getCableShape( state );
 
-        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ), event.getTarget().hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) )
-            ? CableShapes.getModemShape( state ) : CableShapes.getCableShape( state );
-
-        WorldRenderer.drawShape( shape, pos.getX() - x, pos.getY() - y, pos.getZ() - z, 0.0F, 0.0F, 0.0F, 0.4F );
+        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.enableTexture2D();
+        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.FirstPersonRenderer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.EnumHandSide;
+import net.minecraft.util.Hand;
+import net.minecraft.util.HandSide;
 import net.minecraft.util.math.MathHelper;
 
 public abstract class ItemMapLikeRenderer
@@ -25,19 +25,19 @@ public abstract class ItemMapLikeRenderer
      */
     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.getInstance().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,12 +51,12 @@ public abstract class ItemMapLikeRenderer
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
      * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPersonSide(float, 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.getInstance();
-        float offset = side == EnumHandSide.RIGHT ? 1f : -1f;
+        float offset = side == HandSide.RIGHT ? 1f : -1f;
         GlStateManager.translatef( offset * 0.125f, -0.125f, 0f );
 
         // If the player is not invisible then render a single arm

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

@@ -6,31 +6,30 @@
 
 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.ItemRenderer;
-import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType;
-import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.event.RenderSpecificHandEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import org.lwjgl.opengl.GL11;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
+import static dan200.computercraft.client.gui.GuiComputer.*;
 
 /**
  * Emulates map rendering for pocket computers
@@ -38,6 +37,10 @@ import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 @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,115 +60,195 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     @Override
     protected void renderItem( ItemStack stack )
     {
+        ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
+        Terminal terminal = computer == null ? null : computer.getTerminal();
+
+        int termWidth, termHeight;
+        if( terminal == null )
+        {
+            termWidth = ComputerCraft.terminalWidth_pocketComputer;
+            termHeight = ComputerCraft.terminalHeight_pocketComputer;
+        }
+        else
+        {
+            termWidth = terminal.getWidth();
+            termHeight = terminal.getHeight();
+        }
+
+        int width = termWidth * FONT_WIDTH + MARGIN * 2;
+        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 );
 
-        ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
+        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 )
         {
-            // First render the background item. We use the item's model rather than a direct texture as this ensures
-            // we display the pocket light and other such decorations.
-            GlStateManager.pushMatrix();
+            // If we've a computer and terminal then attempt to render it.
+            renderTerminal( terminal, !computer.isColour(), width, height );
+        }
+        else
+        {
+            // Otherwise render a plain background
+            Minecraft.getInstance().getTextureManager().bindTexture( BACKGROUND );
 
-            GlStateManager.scalef( 1.0f, -1.0f, 1.0f );
+            Tessellator tessellator = Tessellator.getInstance();
+            BufferBuilder buffer = tessellator.getBuffer();
 
-            Minecraft minecraft = Minecraft.getInstance();
-            TextureManager textureManager = minecraft.getTextureManager();
-            ItemRenderer renderItem = minecraft.getItemRenderer();
-
-            // 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.enableAlphaTest();
-            GlStateManager.alphaFunc( GL11.GL_GREATER, 0.1F );
-            GlStateManager.enableBlend();
-            GlStateManager.blendFunc( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA );
-            GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-
-            IBakedModel baked = renderItem.getItemModelWithOverrides( stack, null, null );
-            baked = ForgeHooksClient.handleCameraTransforms( baked, TransformType.GUI, false );
-            renderItem.renderItem( stack, baked );
-
-            GlStateManager.disableAlphaTest();
-            GlStateManager.disableRescaleNormal();
-
-            GlStateManager.popMatrix();
+            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();
         }
 
-        // If we've a computer and terminal then attempt to render it.
-        if( computer != null )
+        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 )
         {
-            Terminal terminal = computer.getTerminal();
-            if( terminal != null )
+            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 )
-                {
-                    GlStateManager.pushMatrix();
-                    GlStateManager.disableDepthTest();
+                TextBuffer text = terminal.getLine( line );
+                TextBuffer colour = terminal.getTextColourLine( line );
+                TextBuffer backgroundColour = terminal.getBackgroundColourLine( line );
+                fontRenderer.drawString(
+                    text, MARGIN, MARGIN + line * FONT_HEIGHT,
+                    colour, backgroundColour, MARGIN, MARGIN, greyscale, palette
+                );
+            }
 
-                    // Reset the position to be at the top left corner of the pocket computer
-                    // Note we translate towards the screen slightly too.
-                    GlStateManager.translated( -8 / 16.0, -8 / 16.0, 0.5 / 16.0 );
-                    // Translate to the top left of the screen.
-                    GlStateManager.translated( 4 / 16.0, 3 / 16.0, 0 );
-
-                    // Work out the scaling required to resize the terminal in order to fit on the computer
-                    final int margin = 2;
-                    int tw = terminal.getWidth();
-                    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.scaled( 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.enableDepthTest();
-                    GlStateManager.popMatrix();
-                }
+            // And render the cursor;
+            int tx = terminal.getCursorX(), ty = terminal.getCursorY();
+            if( terminal.getCursorBlink() && FrameInfo.getGlobalCursorBlink() &&
+                tx >= 0 && ty >= 0 && tx < termWidth && ty < termHeight )
+            {
+                TextBuffer cursorColour = new TextBuffer( "0123456789abcdef".charAt( terminal.getTextColour() ), 1 );
+                fontRenderer.drawString(
+                    new TextBuffer( '_', 1 ), MARGIN + FONT_WIDTH * tx, MARGIN + FONT_HEIGHT * ty,
+                    cursorColour, null, 0, 0, greyscale, palette
+                );
             }
         }
+    }
 
-        GlStateManager.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,9 +6,9 @@
 
 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;

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

@@ -9,7 +9,7 @@ package dan200.computercraft.client.render;
 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 ) );
         }
@@ -187,7 +187,7 @@ public final class ModelTransformer
         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;
@@ -212,7 +212,7 @@ public final class ModelTransformer
         }
 
         @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,14 +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.GlStateManager.DestFactor;
-import net.minecraft.client.renderer.GlStateManager.SourceFactor;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
@@ -76,7 +76,7 @@ public final class PrintoutRenderer
     {
         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();
@@ -91,7 +91,7 @@ public final class PrintoutRenderer
     {
         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.getInstance().getTextureManager().bindTexture( BG );

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

@@ -6,16 +6,17 @@
 
 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.CableModemVariant;
 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.Tessellator;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.model.IBakedModel;
@@ -23,12 +24,13 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 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.util.math.shapes.VoxelShape;
 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;
@@ -39,8 +41,17 @@ import java.util.Random;
  */
 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 )
     {
@@ -51,17 +62,17 @@ public class TileEntityCableRenderer extends TileEntityRenderer<TileCable>
         Minecraft mc = Minecraft.getInstance();
 
         RayTraceResult hit = mc.objectMouseOver;
-        if( hit == null || !hit.getBlockPos().equals( pos ) ) return;
-
-        if( MinecraftForgeClient.getRenderPass() != 0 ) return;
+        if( hit == null || hit.getType() != RayTraceResult.Type.BLOCK || !((BlockRayTraceResult) hit).getPos().equals( pos ) )
+        {
+            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;
 
-        VoxelShape shape = CableShapes.getModemShape( state );
-        state = te.hasModem() && shape.getBoundingBox().grow( 0.02, 0.02, 0.02 ).contains( hit.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) )
+        state = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getHitVec().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
             ? block.getDefaultState().with( BlockCable.MODEM, state.get( BlockCable.MODEM ) )
             : state.with( BlockCable.MODEM, CableModemVariant.None );
 
@@ -69,19 +80,20 @@ public class TileEntityCableRenderer extends TileEntityRenderer<TileCable>
 
         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() );
-
-        // See BlockRendererDispatcher#renderBlockDamage
-        TextureAtlasSprite breakingTexture = mc.getTextureMap().getSprite( DESTROY_STAGES[destroyStage] );
         mc.getBlockRendererDispatcher().getBlockModelRenderer().renderModel(
             world,
-            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos ),
-            state, pos, buffer, true, random, state.getPositionRandom( pos )
+            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos, 0 ),
+            state, pos, buffer, true, random, state.getPositionRandom( pos ), EmptyModelData.INSTANCE
         );
 
         ForgeHooksClient.setRenderLayer( BlockRenderLayer.SOLID );

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,12 +19,10 @@ import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import org.lwjgl.opengl.GL11;
 
@@ -64,8 +64,8 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
         posZ += originPos.getZ() - monitorPos.getZ();
 
         // Determine orientation
-        EnumFacing dir = origin.getDirection();
-        EnumFacing front = origin.getFront();
+        Direction dir = origin.getDirection();
+        Direction front = origin.getFront();
         float yaw = dir.getHorizontalAngle();
         float pitch = DirectionUtil.toPitchAngle( front );
 
@@ -94,7 +94,7 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
 
             // Draw the contents
             GlStateManager.depthMask( false );
-            OpenGlHelper.glMultiTexCoord2f( OpenGlHelper.GL_TEXTURE1, 0xFFFF, 0xFFFF );
+            GLX.glMultiTexCoord2f( GLX.GL_TEXTURE1, 0xFFFF, 0xFFFF );
             GlStateManager.disableLighting();
             mc.gameRenderer.disableLightmap();
             try
@@ -171,7 +171,7 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
                             }
                         }
                         GlStateManager.callList( originTerminal.renderDisplayLists[0] );
-                        GlStateManager.resetColor();
+                        GlStateManager.clearCurrentColor();
 
                         // Draw text
                         fontRenderer.bindFont();
@@ -199,7 +199,7 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
                             }
                         }
                         GlStateManager.callList( originTerminal.renderDisplayLists[1] );
-                        GlStateManager.resetColor();
+                        GlStateManager.clearCurrentColor();
 
                         // Draw cursor
                         fontRenderer.bindFont();
@@ -233,7 +233,7 @@ public class TileEntityMonitorRenderer extends TileEntityRenderer<TileMonitor>
                         if( FrameInfo.getGlobalCursorBlink() )
                         {
                             GlStateManager.callList( originTerminal.renderDisplayLists[2] );
-                            GlStateManager.resetColor();
+                            GlStateManager.clearCurrentColor();
                         }
                     }
                     finally

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

@@ -6,6 +6,7 @@
 
 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;
@@ -13,24 +14,26 @@ 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.GameRenderer;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelManager;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.texture.AtlasTexture;
 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;
@@ -84,13 +87,14 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
     {
         // 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 );
             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 );
         }
@@ -98,7 +102,7 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         GlStateManager.pushMatrix();
         try
         {
-            IBlockState state = turtle.getBlockState();
+            BlockState state = turtle.getBlockState();
             // Setup the transform
             Vec3d offset = turtle.getRenderOffset( partialTicks );
             float yaw = turtle.getRenderYaw( partialTicks );
@@ -152,7 +156,7 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         }
     }
 
-    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 )
@@ -185,22 +189,22 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
         }
     }
 
-    private void renderModel( IBlockState state, ModelResourceLocation modelLocation, int[] tints )
+    private void renderModel( BlockState state, ModelResourceLocation modelLocation, int[] tints )
     {
         Minecraft mc = Minecraft.getInstance();
         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 )
     {
         Random random = new Random( 0 );
         Tessellator tessellator = Tessellator.getInstance();
-        rendererDispatcher.textureManager.bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-        renderQuads( tessellator, model.getQuads( state, null, random ), tints );
-        for( EnumFacing facing : DirectionUtil.FACINGS )
+        rendererDispatcher.textureManager.bindTexture( AtlasTexture.LOCATION_BLOCKS_TEXTURE );
+        renderQuads( tessellator, model.getQuads( state, null, random, EmptyModelData.INSTANCE ), tints );
+        for( Direction facing : DirectionUtil.FACINGS )
         {
-            renderQuads( tessellator, model.getQuads( state, facing, random ), tints );
+            renderQuads( tessellator, model.getQuads( state, facing, random, EmptyModelData.INSTANCE ), tints );
         }
     }
 

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

@@ -9,15 +9,15 @@ package dan200.computercraft.client.render;
 import dan200.computercraft.ComputerCraft;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.IUnbakedModel;
+import net.minecraft.client.renderer.model.ModelBakery;
+import net.minecraft.client.renderer.texture.ISprite;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ICustomModelLoader;
-import net.minecraftforge.common.model.IModelState;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
@@ -70,7 +70,10 @@ public final class TurtleModelLoader implements ICustomModelLoader
     {
         private final ResourceLocation family;
 
-        private TurtleModel( ResourceLocation family ) {this.family = family;}
+        private TurtleModel( ResourceLocation family )
+        {
+            this.family = family;
+        }
 
         @Nonnull
         @Override
@@ -88,13 +91,13 @@ public final class TurtleModelLoader implements ICustomModelLoader
                 .collect( Collectors.toSet() );
         }
 
-        @Nullable
+        @Nonnull
         @Override
-        public IBakedModel bake( @Nonnull Function<ResourceLocation, IUnbakedModel> modelGetter, @Nonnull Function<ResourceLocation, TextureAtlasSprite> spriteGetter, @Nonnull IModelState state, boolean uvlock, @Nonnull VertexFormat format )
+        public IBakedModel bake( @Nonnull ModelBakery bakery, @Nonnull Function<ResourceLocation, TextureAtlasSprite> spriteGetter, @Nonnull ISprite sprite, @Nonnull VertexFormat format )
         {
             return new TurtleSmartItemModel(
-                modelGetter.apply( family ).bake( modelGetter, spriteGetter, state, uvlock, format ),
-                modelGetter.apply( COLOUR_TURTLE_MODEL ).bake( modelGetter, spriteGetter, state, uvlock, format )
+                bakery.getBakedModel( family, sprite, spriteGetter, format ),
+                bakery.getBakedModel( COLOUR_TURTLE_MODEL, sprite, spriteGetter, format )
             );
         }
     }

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

@@ -6,13 +6,14 @@
 
 package dan200.computercraft.client.render;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
-import net.minecraft.client.renderer.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.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;
@@ -28,7 +29,7 @@ public class TurtleMultiModel implements IBakedModel
     private final IBakedModel m_rightUpgradeModel;
     private final Matrix4f m_rightUpgradeTransform;
     private List<BakedQuad> m_generalQuads = null;
-    private Map<EnumFacing, List<BakedQuad>> m_faceQuads = new EnumMap<>( EnumFacing.class );
+    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 )
     {
@@ -44,7 +45,15 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, @Nonnull Random 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 )
         {
@@ -58,17 +67,13 @@ public class TurtleMultiModel implements IBakedModel
         }
     }
 
-    private List<BakedQuad> buildQuads( IBlockState state, EnumFacing side, Random 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 );
-        }
-        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_leftUpgradeModel != null )
         {
@@ -78,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 )
         {
@@ -88,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;
@@ -114,6 +119,7 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
+    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return m_baseModel.getParticleTexture();
@@ -122,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();
     }

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

@@ -12,15 +12,16 @@ import dan200.computercraft.api.turtle.TurtleSide;
 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.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;
@@ -110,7 +111,7 @@ public class TurtleSmartItemModel implements IBakedModel
         {
             @Nonnull
             @Override
-            public IBakedModel getModelWithOverrides( @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 )
             {
                 ItemTurtle turtle = (ItemTurtle) stack.getItem();
                 int colour = turtle.getColour( stack );
@@ -167,11 +168,20 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing facing, @Nonnull Random 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/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
 {
@@ -25,7 +25,7 @@ public final class ApiFactories
 
     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,7 +6,6 @@
 
 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;
@@ -121,7 +120,7 @@ public abstract class ComputerAccess implements IComputerAccess
     @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 );
     }
 

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

@@ -43,9 +43,7 @@ public class FSAPI implements ILuaAPI
     @Override
     public String[] getNames()
     {
-        return new String[] {
-            "fs"
-        };
+        return new String[] { "fs" };
     }
 
     @Override

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[] {
-            "http"
-        };
+        return new String[] { "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 );

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

@@ -8,6 +8,7 @@ package dan200.computercraft.core.apis;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IWorkMonitor;
+import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.core.computer.IComputerEnvironment;
 import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.terminal.Terminal;
@@ -18,16 +19,10 @@ import javax.annotation.Nullable;
 
 public interface IAPIEnvironment
 {
-    String[] SIDE_NAMES = new String[] {
-        "bottom", "top", "back", "front", "right", "left",
-    };
-
-    int SIDE_COUNT = 6;
-
     @FunctionalInterface
     interface IPeripheralChangeListener
     {
-        void onPeripheralChanged( int side, @Nullable IPeripheral newPeripheral );
+        void onPeripheralChanged( ComputerSide side, @Nullable IPeripheral newPeripheral );
     }
 
     int getComputerID();
@@ -49,22 +44,22 @@ public interface IAPIEnvironment
 
     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,9 +36,9 @@ 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;
         }
@@ -41,10 +46,10 @@ public class OSAPI implements ILuaAPI
 
     private static class Alarm implements Comparable<Alarm>
     {
-        public final double m_time;
-        public final int m_day;
+        final double m_time;
+        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[] {
-            "os"
-        };
+        return new String[] { "os" };
     }
 
     @Override
@@ -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,7 +200,7 @@ 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();
         int year = c.get( Calendar.YEAR );
@@ -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();
     }
@@ -282,6 +286,9 @@ public class OSAPI implements ILuaAPI
             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.toLowerCase( Locale.ROOT ) )
                 {
@@ -355,9 +362,8 @@ public class OSAPI implements ILuaAPI
                 }
                 return null;
             }
-            case 15:
+            case 15: // epoch
             {
-                // epoch
                 String param = optString( args, 0, "ingame" );
                 switch( param.toLowerCase( Locale.ROOT ) )
                 {
@@ -377,14 +383,39 @@ public class OSAPI implements ILuaAPI
                         // Get in-game epoch
                         synchronized( m_alarms )
                         {
-                            return new Object[] {
-                                m_day * 86400000 + (int) (m_time * 3600000.0f)
-                            };
+                            return new Object[] { m_day * 86400000 + (int) (m_time * 3600000.0f) };
                         }
                     default:
                         throw new LuaException( "Unsupported operation" );
                 }
             }
+            case 16: // date
+            {
+                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;
         }

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

@@ -12,6 +12,7 @@ import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.core.tracking.TrackingField;
 
 import javax.annotation.Nonnull;
@@ -35,7 +36,7 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
         private Map<String, Integer> m_methodMap;
         private boolean m_attached;
 
-        public PeripheralWrapper( IPeripheral peripheral, String side )
+        PeripheralWrapper( IPeripheral peripheral, String side )
         {
             super( m_environment );
             m_side = side;
@@ -245,32 +246,33 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
     // IPeripheralChangeListener
 
     @Override
-    public void onPeripheralChanged( int side, IPeripheral newPeripheral )
+    public void onPeripheralChanged( ComputerSide side, IPeripheral newPeripheral )
     {
         synchronized( m_peripherals )
         {
-            if( m_peripherals[side] != null )
+            int index = side.ordinal();
+            if( m_peripherals[index] != null )
             {
                 // Queue a detachment
-                final PeripheralWrapper wrapper = m_peripherals[side];
+                final PeripheralWrapper wrapper = m_peripherals[index];
                 if( wrapper.isAttached() ) wrapper.detach();
 
                 // Queue a detachment event
-                m_environment.queueEvent( "peripheral_detach", new Object[] { IAPIEnvironment.SIDE_NAMES[side] } );
+                m_environment.queueEvent( "peripheral_detach", new Object[] { side.getName() } );
             }
 
             // Assign the new peripheral
-            m_peripherals[side] = newPeripheral == null ? null
-                : new PeripheralWrapper( newPeripheral, IAPIEnvironment.SIDE_NAMES[side] );
+            m_peripherals[index] = newPeripheral == null ? null
+                : new PeripheralWrapper( newPeripheral, side.getName() );
 
-            if( m_peripherals[side] != null )
+            if( m_peripherals[index] != null )
             {
                 // Queue an attachment
-                final PeripheralWrapper wrapper = m_peripherals[side];
+                final PeripheralWrapper wrapper = m_peripherals[index];
                 if( m_running && !wrapper.isAttached() ) wrapper.attach();
 
                 // Queue an attachment event
-                m_environment.queueEvent( "peripheral", new Object[] { IAPIEnvironment.SIDE_NAMES[side] } );
+                m_environment.queueEvent( "peripheral", new Object[] { side.getName() } );
             }
         }
     }
@@ -280,9 +282,7 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
     @Override
     public String[] getNames()
     {
-        return new String[] {
-            "peripheral"
-        };
+        return new String[] { "peripheral" };
     }
 
     @Override
@@ -324,7 +324,7 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             "isPresent",
             "getType",
             "getMethods",
-            "call"
+            "call",
         };
     }
 
@@ -337,16 +337,13 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             {
                 // isPresent
                 boolean present = false;
-                int side = parseSide( args );
-                if( side >= 0 )
+                ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
+                if( side != null )
                 {
                     synchronized( m_peripherals )
                     {
-                        PeripheralWrapper p = m_peripherals[side];
-                        if( p != null )
-                        {
-                            present = true;
-                        }
+                        PeripheralWrapper p = m_peripherals[side.ordinal()];
+                        if( p != null ) present = true;
                     }
                 }
                 return new Object[] { present };
@@ -354,21 +351,13 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             case 1:
             {
                 // getType
-                String type = null;
-                int side = parseSide( args );
-                if( side >= 0 )
+                ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
+                if( side != null )
                 {
                     synchronized( m_peripherals )
                     {
-                        PeripheralWrapper p = m_peripherals[side];
-                        if( p != null )
-                        {
-                            type = p.getType();
-                        }
-                    }
-                    if( type != null )
-                    {
-                        return new Object[] { type };
+                        PeripheralWrapper p = m_peripherals[side.ordinal()];
+                        if( p != null ) return new Object[] { p.getType() };
                     }
                 }
                 return null;
@@ -377,12 +366,12 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             {
                 // getMethods
                 String[] methods = null;
-                int side = parseSide( args );
-                if( side >= 0 )
+                ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
+                if( side != null )
                 {
                     synchronized( m_peripherals )
                     {
-                        PeripheralWrapper p = m_peripherals[side];
+                        PeripheralWrapper p = m_peripherals[side.ordinal()];
                         if( p != null )
                         {
                             methods = p.getMethods();
@@ -403,16 +392,16 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             case 3:
             {
                 // call
-                int side = parseSide( args );
+                ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
                 String methodName = getString( args, 1 );
                 Object[] methodArgs = Arrays.copyOfRange( args, 2, args.length );
 
-                if( side >= 0 )
+                if( side != null )
                 {
                     PeripheralWrapper p;
                     synchronized( m_peripherals )
                     {
-                        p = m_peripherals[side];
+                        p = m_peripherals[side.ordinal()];
                     }
                     if( p != null )
                     {
@@ -425,19 +414,4 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
                 return null;
         }
     }
-
-    // Privates
-
-    private int parseSide( Object[] args ) throws LuaException
-    {
-        String side = getString( args, 0 );
-        for( int n = 0; n < IAPIEnvironment.SIDE_NAMES.length; n++ )
-        {
-            if( side.equals( IAPIEnvironment.SIDE_NAMES[n] ) )
-            {
-                return n;
-            }
-        }
-        return -1;
-    }
 }

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

@@ -9,6 +9,7 @@ package dan200.computercraft.core.apis;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
+import dan200.computercraft.core.computer.ComputerSide;
 
 import javax.annotation.Nonnull;
 import java.util.HashMap;
@@ -28,9 +29,7 @@ public class RedstoneAPI implements ILuaAPI
     @Override
     public String[] getNames()
     {
-        return new String[] {
-            "rs", "redstone"
-        };
+        return new String[] { "rs", "redstone" };
     }
 
     @Nonnull
@@ -64,56 +63,40 @@ public class RedstoneAPI implements ILuaAPI
             {
                 // getSides
                 Map<Object, Object> table = new HashMap<>();
-                for( int i = 0; i < IAPIEnvironment.SIDE_NAMES.length; i++ )
+                for( int i = 0; i < ComputerSide.NAMES.length; i++ )
                 {
-                    table.put( i + 1, IAPIEnvironment.SIDE_NAMES[i] );
+                    table.put( i + 1, ComputerSide.NAMES[i] );
                 }
                 return new Object[] { table };
             }
             case 1:
             {
                 // setOutput
-                int side = parseSide( args );
+                ComputerSide side = parseSide( args );
                 boolean output = getBoolean( args, 1 );
                 m_environment.setOutput( side, output ? 15 : 0 );
                 return null;
             }
-            case 2:
-            {
-                // getOutput
-                int side = parseSide( args );
-                return new Object[] { m_environment.getOutput( side ) > 0 };
-            }
-            case 3:
-            {
-                // getInput
-                int side = parseSide( args );
-                return new Object[] { m_environment.getInput( side ) > 0 };
-            }
+            case 2: // getOutput
+                return new Object[] { m_environment.getOutput( parseSide( args ) ) > 0 };
+            case 3: // getInput
+                return new Object[] { m_environment.getInput( parseSide( args ) ) > 0 };
             case 4:
             {
                 // setBundledOutput
-                int side = parseSide( args );
+                ComputerSide side = parseSide( args );
                 int output = getInt( args, 1 );
                 m_environment.setBundledOutput( side, output );
                 return null;
             }
-            case 5:
-            {
-                // getBundledOutput
-                int side = parseSide( args );
-                return new Object[] { m_environment.getBundledOutput( side ) };
-            }
-            case 6:
-            {
-                // getBundledInput
-                int side = parseSide( args );
-                return new Object[] { m_environment.getBundledInput( side ) };
-            }
+            case 5: // getBundledOutput
+                return new Object[] { m_environment.getBundledOutput( parseSide( args ) ) };
+            case 6: // getBundledInput
+                return new Object[] { m_environment.getBundledInput( parseSide( args ) ) };
             case 7:
             {
                 // testBundledInput
-                int side = parseSide( args );
+                ComputerSide side = parseSide( args );
                 int mask = getInt( args, 1 );
                 int input = m_environment.getBundledInput( side );
                 return new Object[] { (input & mask) == mask };
@@ -122,7 +105,7 @@ public class RedstoneAPI implements ILuaAPI
             case 9:
             {
                 // setAnalogOutput/setAnalogueOutput
-                int side = parseSide( args );
+                ComputerSide side = parseSide( args );
                 int output = getInt( args, 1 );
                 if( output < 0 || output > 15 )
                 {
@@ -132,34 +115,20 @@ public class RedstoneAPI implements ILuaAPI
                 return null;
             }
             case 10:
-            case 11:
-            {
-                // getAnalogOutput/getAnalogueOutput
-                int side = parseSide( args );
-                return new Object[] { m_environment.getOutput( side ) };
-            }
+            case 11: // getAnalogOutput/getAnalogueOutput
+                return new Object[] { m_environment.getOutput( parseSide( args ) ) };
             case 12:
-            case 13:
-            {
-                // getAnalogInput/getAnalogueInput
-                int side = parseSide( args );
-                return new Object[] { m_environment.getInput( side ) };
-            }
+            case 13: // getAnalogInput/getAnalogueInput
+                return new Object[] { m_environment.getInput( parseSide( args ) ) };
             default:
                 return null;
         }
     }
 
-    private static int parseSide( Object[] args ) throws LuaException
+    private static ComputerSide parseSide( Object[] args ) throws LuaException
     {
-        String side = getString( args, 0 );
-        for( int n = 0; n < IAPIEnvironment.SIDE_NAMES.length; n++ )
-        {
-            if( side.equals( IAPIEnvironment.SIDE_NAMES[n] ) )
-            {
-                return n;
-            }
-        }
-        throw new LuaException( "Invalid side." );
+        ComputerSide side = ComputerSide.valueOfInsensitive( getString( args, 0 ) );
+        if( side == null ) throw new LuaException( "Invalid side." );
+        return side;
     }
 }

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

@@ -33,9 +33,7 @@ public class TermAPI implements ILuaAPI
     @Override
     public String[] getNames()
     {
-        return new String[] {
-            "term"
-        };
+        return new String[] { "term" };
     }
 
     @Nonnull
@@ -89,9 +87,7 @@ public class TermAPI implements ILuaAPI
 
     public static Object[] encodeColour( int colour ) throws LuaException
     {
-        return new Object[] {
-            1 << colour
-        };
+        return new Object[] { 1 << colour };
     }
 
     public static void setColour( Terminal terminal, int colour, double r, double g, double b )

src/main/java/dan200/computercraft/core/apis/handles/BinaryReadableHandle.java

@@ -212,6 +212,7 @@ public class BinaryReadableHandle extends HandleGeneric
                 }
             }
             case 3: // close
+                checkOpen();
                 close();
                 return null;
             case 4: // seek

src/main/java/dan200/computercraft/core/apis/handles/BinaryWritableHandle.java

@@ -95,6 +95,7 @@ public class BinaryWritableHandle extends HandleGeneric
                     return null;
                 }
             case 2: // close
+                checkOpen();
                 close();
                 return null;
             case 3: // seek

src/main/java/dan200/computercraft/core/apis/handles/EncodedReadableHandle.java

@@ -152,6 +152,7 @@ public class EncodedReadableHandle extends HandleGeneric
                     return null;
                 }
             case 3: // close
+                checkOpen();
                 close();
                 return null;
             default:

src/main/java/dan200/computercraft/core/apis/handles/EncodedWritableHandle.java

@@ -93,6 +93,7 @@ public class EncodedWritableHandle extends HandleGeneric
                     return null;
                 }
             case 3: // close
+                checkOpen();
                 close();
                 return null;
             default:

src/main/java/dan200/computercraft/core/apis/handles/HandleGeneric.java

@@ -37,8 +37,13 @@ public abstract class HandleGeneric implements ILuaObject
     protected final void close()
     {
         m_open = false;
-        IoUtil.closeQuietly( m_closable );
-        m_closable = null;
+
+        Closeable closeable = m_closable;
+        if( closeable != null )
+        {
+            IoUtil.closeQuietly( closeable );
+            m_closable = null;
+        }
     }
 
     /**

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

@@ -72,7 +72,8 @@ public abstract class Resource<T extends Resource<T>> implements Closeable
      */
     protected void dispose()
     {
-        @SuppressWarnings( "unchecked" ) T thisT = (T) this;
+        @SuppressWarnings( "unchecked" )
+        T thisT = (T) this;
         limiter.release( thisT );
     }
 
@@ -95,7 +96,8 @@ public abstract class Resource<T extends Resource<T>> implements Closeable
 
     public boolean queue( Consumer<T> task )
     {
-        @SuppressWarnings( "unchecked" ) T thisT = (T) this;
+        @SuppressWarnings( "unchecked" )
+        T thisT = (T) this;
         return limiter.queue( thisT, () -> task.accept( thisT ) );
     }
 

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

@@ -24,6 +24,7 @@ import java.io.Closeable;
 import java.util.Arrays;
 
 import static dan200.computercraft.core.apis.ArgumentHelper.optBoolean;
+import static dan200.computercraft.core.apis.http.websocket.Websocket.CLOSE_EVENT;
 import static dan200.computercraft.core.apis.http.websocket.Websocket.MESSAGE_EVENT;
 
 public class WebsocketHandle implements ILuaObject, Closeable
@@ -53,15 +54,18 @@ public class WebsocketHandle implements ILuaObject, Closeable
         switch( method )
         {
             case 0: // receive
+                checkOpen();
                 while( true )
                 {
-                    checkOpen();
-
-                    Object[] event = context.pullEvent( MESSAGE_EVENT );
-                    if( event.length >= 3 && Objects.equal( event[1], websocket.address() ) )
+                    Object[] event = context.pullEvent( null );
+                    if( event.length >= 3 && Objects.equal( event[0], MESSAGE_EVENT ) && Objects.equal( event[1], websocket.address() ) )
                     {
                         return Arrays.copyOfRange( event, 2, event.length );
                     }
+                    else if( event.length >= 2 && Objects.equal( event[0], CLOSE_EVENT ) && Objects.equal( event[1], websocket.address() ) && closed )
+                    {
+                        return null;
+                    }
                 }
 
             case 1: // send

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

@@ -338,7 +338,7 @@ final class ComputerExecutor
         }
     }
 
-    private FileSystem createFileSystem()
+    IWritableMount getRootMount()
     {
         if( rootMount == null )
         {
@@ -347,11 +347,15 @@ final class ComputerExecutor
                 computer.getComputerEnvironment().getComputerSpaceLimit()
             );
         }
+        return rootMount;
+    }
 
+    private FileSystem createFileSystem()
+    {
         FileSystem filesystem = null;
         try
         {
-            filesystem = new FileSystem( "hdd", rootMount );
+            filesystem = new FileSystem( "hdd", getRootMount() );
 
             IMount romMount = getRomMount();
             if( romMount == null )

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

@@ -0,0 +1,61 @@
+/*
+ * 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.computer;
+
+import net.minecraft.util.Direction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * A side on a computer. Unlike {@link Direction}, this is relative to the direction the computer is
+ * facing..
+ */
+public enum ComputerSide
+{
+    BOTTOM( "bottom" ),
+    TOP( "top" ),
+    BACK( "back" ),
+    FRONT( "front" ),
+    RIGHT( "right" ),
+    LEFT( "left" );
+
+    public static final String[] NAMES = new String[] { "bottom", "top", "back", "front", "right", "left" };
+
+    public static final int COUNT = 6;
+
+    private static final ComputerSide[] VALUES = values();
+
+    private final String name;
+
+    ComputerSide( String name )
+    {
+        this.name = name;
+    }
+
+    @Nonnull
+    public static ComputerSide valueOf( int side )
+    {
+        return VALUES[side];
+    }
+
+    @Nullable
+    public static ComputerSide valueOfInsensitive( @Nonnull String name )
+    {
+        for( ComputerSide side : VALUES )
+        {
+            if( side.name.equalsIgnoreCase( name ) ) return side;
+        }
+
+        return null;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+}

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

@@ -26,12 +26,12 @@ import javax.annotation.Nullable;
  */
 public class ComputerSystem extends ComputerAccess implements IComputerSystem
 {
-    private final IAPIEnvironment m_environment;
+    private final IAPIEnvironment environment;
 
     ComputerSystem( IAPIEnvironment environment )
     {
         super( environment );
-        this.m_environment = environment;
+        this.environment = environment;
     }
 
     @Nonnull
@@ -45,7 +45,7 @@ public class ComputerSystem extends ComputerAccess implements IComputerSystem
     @Override
     public IFileSystem getFileSystem()
     {
-        FileSystem fs = m_environment.getFileSystem();
+        FileSystem fs = environment.getFileSystem();
         return fs == null ? null : fs.getMountWrapper();
     }
 
@@ -53,6 +53,6 @@ public class ComputerSystem extends ComputerAccess implements IComputerSystem
     @Override
     public String getLabel()
     {
-        return m_environment.getLabel();
+        return environment.getLabel();
     }
 }

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

@@ -133,7 +133,6 @@ public final class ComputerThread
         synchronized( threadLock )
         {
             running = true;
-            if( monitor == null || !monitor.isAlive() ) (monitor = monitorFactory.newThread( new Monitor() )).start();
 
             if( runners == null )
             {
@@ -158,6 +157,8 @@ public final class ComputerThread
                     runnerFactory.newThread( runners[i] = new TaskRunner() ).start();
                 }
             }
+
+            if( monitor == null || !monitor.isAlive() ) (monitor = monitorFactory.newThread( new Monitor() )).start();
         }
     }
 
@@ -368,7 +369,16 @@ public final class ComputerThread
                         {
                             TaskRunner runner = currentRunners[i];
                             // If we've no runner, skip.
-                            if( runner == null ) continue;
+                            if( runner == null || runner.owner == null || !runner.owner.isAlive() )
+                            {
+                                if( !running ) continue;
+
+                                // Mark the old runner as dead and start a new one.
+                                ComputerCraft.log.warn( "Previous runner ({}) has crashed, restarting!",
+                                    runner != null && runner.owner != null ? runner.owner.getName() : runner );
+                                if( runner != null ) runner.running = false;
+                                runnerFactory.newThread( runners[i] = new TaskRunner() ).start();
+                            }
 
                             // If the runner has no work, skip
                             ComputerExecutor executor = runner.currentExecutor.get();
@@ -492,7 +502,7 @@ public final class ComputerThread
                 {
                     executor.work();
                 }
-                catch( Exception e )
+                catch( Exception | LinkageError | VirtualMachineError e )
                 {
                     ComputerCraft.log.error( "Error running task on computer #" + executor.getComputer().getID(), e );
                 }

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

@@ -41,17 +41,17 @@ public final class Environment implements IAPIEnvironment
     private final Computer computer;
 
     private boolean internalOutputChanged = false;
-    private final int[] internalOutput = new int[SIDE_COUNT];
-    private final int[] internalBundledOutput = new int[SIDE_COUNT];
+    private final int[] internalOutput = new int[ComputerSide.COUNT];
+    private final int[] internalBundledOutput = new int[ComputerSide.COUNT];
 
-    private final int[] externalOutput = new int[SIDE_COUNT];
-    private final int[] externalBundledOutput = new int[SIDE_COUNT];
+    private final int[] externalOutput = new int[ComputerSide.COUNT];
+    private final int[] externalBundledOutput = new int[ComputerSide.COUNT];
 
     private boolean inputChanged = false;
-    private final int[] input = new int[SIDE_COUNT];
-    private final int[] bundledInput = new int[SIDE_COUNT];
+    private final int[] input = new int[ComputerSide.COUNT];
+    private final int[] bundledInput = new int[ComputerSide.COUNT];
 
-    private final IPeripheral[] peripherals = new IPeripheral[SIDE_COUNT];
+    private final IPeripheral[] peripherals = new IPeripheral[ComputerSide.COUNT];
     private IPeripheralChangeListener peripheralListener = null;
 
     Environment( Computer computer )
@@ -111,85 +111,89 @@ public final class Environment implements IAPIEnvironment
     }
 
     @Override
-    public int getInput( int side )
+    public int getInput( ComputerSide side )
     {
-        return input[side];
+        return input[side.ordinal()];
     }
 
     @Override
-    public int getBundledInput( int side )
+    public int getBundledInput( ComputerSide side )
     {
-        return bundledInput[side];
+        return bundledInput[side.ordinal()];
     }
 
     @Override
-    public void setOutput( int side, int output )
+    public void setOutput( ComputerSide side, int output )
     {
+        int index = side.ordinal();
         synchronized( internalOutput )
         {
-            if( internalOutput[side] != output )
+            if( internalOutput[index] != output )
             {
-                internalOutput[side] = output;
+                internalOutput[index] = output;
                 internalOutputChanged = true;
             }
         }
     }
 
     @Override
-    public int getOutput( int side )
+    public int getOutput( ComputerSide side )
     {
         synchronized( internalOutput )
         {
-            return computer.isOn() ? internalOutput[side] : 0;
+            return computer.isOn() ? internalOutput[side.ordinal()] : 0;
         }
     }
 
     @Override
-    public void setBundledOutput( int side, int output )
+    public void setBundledOutput( ComputerSide side, int output )
     {
+        int index = side.ordinal();
         synchronized( internalOutput )
         {
-            if( internalBundledOutput[side] != output )
+            if( internalBundledOutput[index] != output )
             {
-                internalBundledOutput[side] = output;
+                internalBundledOutput[index] = output;
                 internalOutputChanged = true;
             }
         }
     }
 
     @Override
-    public int getBundledOutput( int side )
+    public int getBundledOutput( ComputerSide side )
     {
         synchronized( internalOutput )
         {
-            return computer.isOn() ? internalBundledOutput[side] : 0;
+            return computer.isOn() ? internalBundledOutput[side.ordinal()] : 0;
         }
     }
 
-    public int getExternalRedstoneOutput( int side )
+    public int getExternalRedstoneOutput( ComputerSide side )
     {
-        return computer.isOn() ? externalOutput[side] : 0;
+        return computer.isOn() ? externalOutput[side.ordinal()] : 0;
     }
 
-    public int getExternalBundledRedstoneOutput( int side )
+    public int getExternalBundledRedstoneOutput( ComputerSide side )
     {
-        return computer.isOn() ? externalBundledOutput[side] : 0;
+        return computer.isOn() ? externalBundledOutput[side.ordinal()] : 0;
     }
 
-    public void setRedstoneInput( int side, int level )
+    public void setRedstoneInput( ComputerSide side, int level )
     {
-        if( input[side] != level )
+        int index = side.ordinal();
+        if( input[index] != level )
         {
-            input[side] = level;
+            input[index] = level;
             inputChanged = true;
         }
     }
 
-    public void setBundledRedstoneInput( int side, int combination )
+    public void setBundledRedstoneInput( ComputerSide side, int combination )
     {
-        if( bundledInput[side] != combination )
+        int index = side.ordinal();
+        if( bundledInput[index] != combination )
         {
-            bundledInput[side] = combination;
+            bundledInput[index] = combination;
             inputChanged = true;
         }
     }
@@ -222,7 +226,7 @@ public final class Environment implements IAPIEnvironment
 
             boolean changed = false;
 
-            for( int i = 0; i < SIDE_COUNT; i++ )
+            for( int i = 0; i < ComputerSide.COUNT; i++ )
             {
                 if( externalOutput[i] != internalOutput[i] )
                 {
@@ -255,24 +259,25 @@ public final class Environment implements IAPIEnvironment
     }
 
     @Override
-    public IPeripheral getPeripheral( int side )
+    public IPeripheral getPeripheral( ComputerSide side )
     {
         synchronized( peripherals )
         {
-            return peripherals[side];
+            return peripherals[side.ordinal()];
         }
     }
 
-    public void setPeripheral( int side, IPeripheral peripheral )
+    public void setPeripheral( ComputerSide side, IPeripheral peripheral )
     {
         synchronized( peripherals )
         {
-            IPeripheral existing = peripherals[side];
+            int index = side.ordinal();
+            IPeripheral existing = peripherals[index];
             if( (existing == null && peripheral != null) ||
                 (existing != null && peripheral == null) ||
                 (existing != null && !existing.equals( peripheral )) )
             {
-                peripherals[side] = peripheral;
+                peripherals[index] = peripheral;
                 if( peripheralListener != null ) peripheralListener.onPeripheralChanged( side, peripheral );
             }
         }

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

@@ -134,7 +134,7 @@ public final class MainThread
         // Of course, we'll go over the MAX_TICK_TIME most of the time, but eventually that overrun will accumulate
         // and we'll skip a whole tick - bringing the average back down again.
         currentTick++;
-        budget += Math.min( budget + ComputerCraft.maxMainGlobalTime, ComputerCraft.maxMainGlobalTime );
+        budget = Math.min( budget + ComputerCraft.maxMainGlobalTime, ComputerCraft.maxMainGlobalTime );
         canExecute = budget > 0;
 
         // Cool down any warm computers.

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

@@ -224,7 +224,7 @@ final class MainThreadExecutor implements IWorkMonitor
     {
         state = State.COOLING;
         currentTick = MainThread.currentTick();
-        budget += Math.min( budget + ComputerCraft.maxMainComputerTime, ComputerCraft.maxMainComputerTime );
+        budget = Math.min( budget + ComputerCraft.maxMainComputerTime, ComputerCraft.maxMainComputerTime );
         if( budget < ComputerCraft.maxMainComputerTime ) return false;
 
         state = State.COOL;

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

@@ -6,6 +6,7 @@
 
 package dan200.computercraft.core.filesystem;
 
+import dan200.computercraft.api.filesystem.FileOperationException;
 import dan200.computercraft.api.filesystem.IMount;
 
 import javax.annotation.Nonnull;
@@ -95,7 +96,7 @@ public class ComboMount implements IMount
         }
         else
         {
-            throw new IOException( "/" + path + ": Not a directory" );
+            throw new FileOperationException( path, "Not a directory" );
         }
     }
 
@@ -110,7 +111,7 @@ public class ComboMount implements IMount
                 return part.getSize( path );
             }
         }
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     @Nonnull
@@ -126,7 +127,7 @@ public class ComboMount implements IMount
                 return part.openForRead( path );
             }
         }
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     @Nonnull
@@ -141,6 +142,6 @@ public class ComboMount implements IMount
                 return part.openChannelForRead( path );
             }
         }
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 }

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

@@ -6,6 +6,7 @@
 
 package dan200.computercraft.core.filesystem;
 
+import dan200.computercraft.api.filesystem.FileOperationException;
 import dan200.computercraft.api.filesystem.IMount;
 
 import javax.annotation.Nonnull;
@@ -44,7 +45,7 @@ public class EmptyMount implements IMount
     @Deprecated
     public InputStream openForRead( @Nonnull String path ) throws IOException
     {
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     @Nonnull
@@ -52,6 +53,6 @@ public class EmptyMount implements IMount
     @Deprecated
     public ReadableByteChannel openChannelForRead( @Nonnull String path ) throws IOException
     {
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 }

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

@@ -7,6 +7,7 @@
 package dan200.computercraft.core.filesystem;
 
 import com.google.common.collect.Sets;
+import dan200.computercraft.api.filesystem.FileOperationException;
 import dan200.computercraft.api.filesystem.IWritableMount;
 
 import javax.annotation.Nonnull;
@@ -167,12 +168,12 @@ public class FileMount implements IWritableMount
     {
         if( !created() )
         {
-            if( !path.isEmpty() ) throw new IOException( "/" + path + ": Not a directory" );
+            if( !path.isEmpty() ) throw new FileOperationException( path, "Not a directory" );
             return;
         }
 
         File file = getRealPath( path );
-        if( !file.exists() || !file.isDirectory() ) throw new IOException( "/" + path + ": Not a directory" );
+        if( !file.exists() || !file.isDirectory() ) throw new FileOperationException( path, "Not a directory" );
 
         String[] paths = file.list();
         for( String subPath : paths )
@@ -194,7 +195,7 @@ public class FileMount implements IWritableMount
             if( file.exists() ) return file.isDirectory() ? 0 : file.length();
         }
 
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     @Nonnull
@@ -208,7 +209,7 @@ public class FileMount implements IWritableMount
             if( file.exists() && !file.isDirectory() ) return new FileInputStream( file );
         }
 
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     @Nonnull
@@ -221,7 +222,7 @@ public class FileMount implements IWritableMount
             if( file.exists() && !file.isDirectory() ) return FileChannel.open( file.toPath(), READ_OPTIONS );
         }
 
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     // IWritableMount implementation
@@ -233,7 +234,7 @@ public class FileMount implements IWritableMount
         File file = getRealPath( path );
         if( file.exists() )
         {
-            if( !file.isDirectory() ) throw new IOException( "/" + path + ": File exists" );
+            if( !file.isDirectory() ) throw new FileOperationException( path, "File exists" );
             return;
         }
 
@@ -247,7 +248,7 @@ public class FileMount implements IWritableMount
 
         if( getRemainingSpace() < dirsToCreate * MINIMUM_FILE_SIZE )
         {
-            throw new IOException( "/" + path + ": Out of space" );
+            throw new FileOperationException( path, "Out of space" );
         }
 
         if( file.mkdirs() )
@@ -256,14 +257,14 @@ public class FileMount implements IWritableMount
         }
         else
         {
-            throw new IOException( "/" + path + ": Access denied" );
+            throw new FileOperationException( path, "Access denied" );
         }
     }
 
     @Override
     public void delete( @Nonnull String path ) throws IOException
     {
-        if( path.isEmpty() ) throw new IOException( "/" + path + ": Access denied" );
+        if( path.isEmpty() ) throw new FileOperationException( path, "Access denied" );
 
         if( created() )
         {
@@ -319,7 +320,7 @@ public class FileMount implements IWritableMount
     {
         create();
         File file = getRealPath( path );
-        if( file.exists() && file.isDirectory() ) throw new IOException( "/" + path + ": Cannot write to directory" );
+        if( file.exists() && file.isDirectory() ) throw new FileOperationException( path, "Cannot write to directory" );
 
         if( file.exists() )
         {
@@ -327,7 +328,7 @@ public class FileMount implements IWritableMount
         }
         else if( getRemainingSpace() < MINIMUM_FILE_SIZE )
         {
-            throw new IOException( "/" + path + ": Out of space" );
+            throw new FileOperationException( path, "Out of space" );
         }
         m_usedSpace += MINIMUM_FILE_SIZE;
 
@@ -340,12 +341,12 @@ public class FileMount implements IWritableMount
     {
         if( !created() )
         {
-            throw new IOException( "/" + path + ": No such file" );
+            throw new FileOperationException( path, "No such file" );
         }
 
         File file = getRealPath( path );
-        if( !file.exists() ) throw new IOException( "/" + path + ": No such file" );
-        if( file.isDirectory() ) throw new IOException( "/" + path + ": Cannot write to directory" );
+        if( !file.exists() ) throw new FileOperationException( path, "No such file" );
+        if( file.isDirectory() ) throw new FileOperationException( path, "Cannot write to directory" );
 
         // Allowing seeking when appending is not recommended, so we use a separate channel.
         return new WritableCountingChannel(

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

@@ -8,6 +8,7 @@ package dan200.computercraft.core.filesystem;
 
 import com.google.common.io.ByteStreams;
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.api.filesystem.FileOperationException;
 import dan200.computercraft.api.filesystem.IFileSystem;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
@@ -45,7 +46,7 @@ public class FileSystem
             m_writableMount = null;
         }
 
-        public MountWrapper( String label, String location, IWritableMount mount )
+        MountWrapper( String label, String location, IWritableMount mount )
         {
             this( label, location, (IMount) mount );
             m_writableMount = mount;
@@ -107,7 +108,7 @@ public class FileSystem
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
@@ -122,12 +123,12 @@ public class FileSystem
                 }
                 else
                 {
-                    throw new FileSystemException( "/" + path + ": Not a directory" );
+                    throw localExceptionOf( path, "Not a directory" );
                 }
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
@@ -149,12 +150,12 @@ public class FileSystem
                 }
                 else
                 {
-                    throw new FileSystemException( "/" + path + ": No such file" );
+                    throw localExceptionOf( path, "No such file" );
                 }
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
@@ -169,12 +170,12 @@ public class FileSystem
                 }
                 else
                 {
-                    throw new FileSystemException( "/" + path + ": No such file" );
+                    throw localExceptionOf( path, "No such file" );
                 }
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
@@ -182,19 +183,14 @@ public class FileSystem
 
         public void makeDirectory( String path ) throws FileSystemException
         {
-            if( m_writableMount == null )
-            {
-                throw new FileSystemException( "/" + path + ": Access denied" );
-            }
+            if( m_writableMount == null ) throw exceptionOf( path, "Access denied" );
+
+            path = toLocal( path );
             try
             {
-                path = toLocal( path );
                 if( m_mount.exists( path ) )
                 {
-                    if( !m_mount.isDirectory( path ) )
-                    {
-                        throw new FileSystemException( "/" + path + ": File exists" );
-                    }
+                    if( !m_mount.isDirectory( path ) ) throw localExceptionOf( path, "File exists" );
                 }
                 else
                 {
@@ -203,16 +199,14 @@ public class FileSystem
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
         public void delete( String path ) throws FileSystemException
         {
-            if( m_writableMount == null )
-            {
-                throw new FileSystemException( "/" + path + ": Access denied" );
-            }
+            if( m_writableMount == null ) throw exceptionOf( path, "Access denied" );
+
             try
             {
                 path = toLocal( path );
@@ -227,22 +221,20 @@ public class FileSystem
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
         public WritableByteChannel openForWrite( String path ) throws FileSystemException
         {
-            if( m_writableMount == null )
-            {
-                throw new FileSystemException( "/" + path + ": Access denied" );
-            }
+            if( m_writableMount == null ) throw exceptionOf( path, "Access denied" );
+
+            path = toLocal( path );
             try
             {
-                path = toLocal( path );
                 if( m_mount.exists( path ) && m_mount.isDirectory( path ) )
                 {
-                    throw new FileSystemException( "/" + path + ": Cannot write to directory" );
+                    throw localExceptionOf( path, "Cannot write to directory" );
                 }
                 else
                 {
@@ -263,19 +255,17 @@ public class FileSystem
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
         public WritableByteChannel openForAppend( String path ) throws FileSystemException
         {
-            if( m_writableMount == null )
-            {
-                throw new FileSystemException( "/" + path + ": Access denied" );
-            }
+            if( m_writableMount == null ) throw exceptionOf( path, "Access denied" );
+
+            path = toLocal( path );
             try
             {
-                path = toLocal( path );
                 if( !m_mount.exists( path ) )
                 {
                     if( !path.isEmpty() )
@@ -290,7 +280,7 @@ public class FileSystem
                 }
                 else if( m_mount.isDirectory( path ) )
                 {
-                    throw new FileSystemException( "/" + path + ": Cannot write to directory" );
+                    throw localExceptionOf( path, "Cannot write to directory" );
                 }
                 else
                 {
@@ -303,16 +293,36 @@ public class FileSystem
             }
             catch( IOException e )
             {
-                throw new FileSystemException( e.getMessage() );
+                throw localExceptionOf( e );
             }
         }
 
-        // private members
-
         private String toLocal( String path )
         {
             return FileSystem.toLocal( path, m_location );
         }
+
+        private FileSystemException localExceptionOf( IOException e )
+        {
+            if( !m_location.isEmpty() && e instanceof FileOperationException )
+            {
+                FileOperationException ex = (FileOperationException) e;
+                if( ex.getFilename() != null ) return localExceptionOf( ex.getFilename(), ex.getMessage() );
+            }
+
+            return new FileSystemException( e.getMessage() );
+        }
+
+        private FileSystemException localExceptionOf( String path, String message )
+        {
+            if( !m_location.isEmpty() ) path = path.isEmpty() ? m_location : m_location + "/" + path;
+            return exceptionOf( path, message );
+        }
+
+        private static FileSystemException exceptionOf( String path, String message )
+        {
+            return new FileSystemException( "/" + path + ": " + message );
+        }
     }
 
     private final FileSystemWrapperMount m_wrapper = new FileSystemWrapperMount( this );
@@ -769,7 +779,7 @@ public class FileSystem
 
         // Clean the path or illegal characters.
         final char[] specialChars = new char[] {
-            '"', ':', '<', '>', '?', '|' // Sorted by ascii value (important)
+            '"', ':', '<', '>', '?', '|', // Sorted by ascii value (important)
         };
 
         StringBuilder cleanName = new StringBuilder();

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

@@ -9,6 +9,7 @@ package dan200.computercraft.core.filesystem;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.io.ByteStreams;
+import dan200.computercraft.api.filesystem.FileOperationException;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.core.apis.handles.ArrayByteChannel;
 import dan200.computercraft.shared.util.IoUtil;
@@ -69,7 +70,7 @@ public class JarMount implements IMount
         // Cleanup any old mounts. It's unlikely that there will be any, but it's best to be safe.
         cleanup();
 
-        if( !jarFile.exists() || jarFile.isDirectory() ) throw new FileNotFoundException();
+        if( !jarFile.exists() || jarFile.isDirectory() ) throw new FileNotFoundException( "Cannot find " + jarFile );
 
         // Open the zip file
         try
@@ -85,14 +86,14 @@ public class JarMount implements IMount
         if( zip.getEntry( subPath ) == null )
         {
             zip.close();
-            throw new IOException( "Zip does not contain path" );
+            throw new FileNotFoundException( "Zip does not contain path" );
         }
 
         // We now create a weak reference to this mount. This is automatically added to the appropriate queue.
         new MountReference( this );
 
         // Read in all the entries
-        root = new FileEntry( "" );
+        root = new FileEntry();
         Enumeration<? extends ZipEntry> zipEntries = zip.entries();
         while( zipEntries.hasMoreElements() )
         {
@@ -139,7 +140,7 @@ public class JarMount implements IMount
             FileEntry nextEntry = lastEntry.children.get( part );
             if( nextEntry == null || !nextEntry.isDirectory() )
             {
-                lastEntry.children.put( part, nextEntry = new FileEntry( part ) );
+                lastEntry.children.put( part, nextEntry = new FileEntry() );
             }
 
             lastEntry = nextEntry;
@@ -166,7 +167,7 @@ public class JarMount implements IMount
     public void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException
     {
         FileEntry file = get( path );
-        if( file == null || !file.isDirectory() ) throw new IOException( "/" + path + ": Not a directory" );
+        if( file == null || !file.isDirectory() ) throw new FileOperationException( path, "Not a directory" );
 
         file.list( contents );
     }
@@ -176,7 +177,7 @@ public class JarMount implements IMount
     {
         FileEntry file = get( path );
         if( file != null ) return file.size;
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     @Nonnull
@@ -218,22 +219,15 @@ public class JarMount implements IMount
             }
         }
 
-        throw new IOException( "/" + path + ": No such file" );
+        throw new FileOperationException( path, "No such file" );
     }
 
     private static class FileEntry
     {
-        final String name;
-
         String path;
         long size;
         Map<String, FileEntry> children;
 
-        FileEntry( String name )
-        {
-            this.name = name;
-        }
-
         void setup( ZipEntry entry )
         {
             path = entry.getName();

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

@@ -14,7 +14,6 @@ import dan200.computercraft.core.apis.handles.ArrayByteChannel;
 import net.minecraft.resources.IReloadableResourceManager;
 import net.minecraft.resources.IResource;
 import net.minecraft.resources.IResourceManager;
-import net.minecraft.resources.IResourceManagerReloadListener;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.resource.IResourceType;
 import net.minecraftforge.resource.ISelectiveResourceReloadListener;
@@ -241,7 +240,7 @@ public class ResourceMount implements IMount
     }
 
     /**
-     * A {@link IResourceManagerReloadListener} which reloads any associated mounts.
+     * A {@link ISelectiveResourceReloadListener} which reloads any associated mounts.
      *
      * While people should really be keeping a permanent reference to this, some people construct it every
      * method call, so let's make this as small as possible.

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

@@ -242,7 +242,7 @@ public class CobaltLuaMachine implements ILuaMachine
                         }
                         catch( InterruptedException e )
                         {
-                            throw new OrphanedThread();
+                            throw new InterruptedError( e );
                         }
                         catch( LuaException e )
                         {
@@ -550,7 +550,7 @@ public class CobaltLuaMachine implements ILuaMachine
                 {
                     if( ComputerCraft.logPeripheralErrors ) ComputerCraft.log.error( "Error running task", t );
                     m_computer.queueEvent( "task_complete", new Object[] {
-                        taskID, false, "Java Exception Thrown: " + t
+                        taskID, false, "Java Exception Thrown: " + t,
                     } );
                 }
             };

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

@@ -7,7 +7,7 @@
 package dan200.computercraft.core.terminal;
 
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 
 public class Terminal
 {
@@ -334,7 +334,7 @@ public class Terminal
         m_changed = false;
     }
 
-    public synchronized NBTTagCompound writeToNBT( NBTTagCompound nbt )
+    public synchronized CompoundNBT writeToNBT( CompoundNBT nbt )
     {
         nbt.putInt( "term_cursorX", m_cursorX );
         nbt.putInt( "term_cursorY", m_cursorY );
@@ -354,7 +354,7 @@ public class Terminal
         return nbt;
     }
 
-    public synchronized void readFromNBT( NBTTagCompound nbt )
+    public synchronized void readFromNBT( CompoundNBT nbt )
     {
         m_cursorX = nbt.getInt( "term_cursorX" );
         m_cursorY = nbt.getInt( "term_cursorY" );

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

@@ -8,7 +8,7 @@ package dan200.computercraft.core.terminal;
 
 public class TextBuffer
 {
-    public char[] m_text;
+    private final char[] m_text;
 
     public TextBuffer( char c, int length )
     {

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

@@ -6,16 +6,16 @@
 
 package dan200.computercraft.shared;
 
-import com.google.common.base.Preconditions;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.shared.common.DefaultBundledRedstoneProvider;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 
 public final class BundledRedstone
@@ -26,16 +26,16 @@ public final class BundledRedstone
 
     public static synchronized void register( @Nonnull IBundledRedstoneProvider provider )
     {
-        Preconditions.checkNotNull( provider, "provider cannot be null" );
+        Objects.requireNonNull( provider, "provider cannot be null" );
         providers.add( provider );
     }
 
-    public static int getDefaultOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public static int getDefaultOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return World.isValid( pos ) ? DefaultBundledRedstoneProvider.getDefaultBundledRedstoneOutput( world, pos, side ) : -1;
     }
 
-    private static int getUnmaskedOutput( World world, BlockPos pos, EnumFacing side )
+    private static int getUnmaskedOutput( World world, BlockPos pos, Direction side )
     {
         if( !World.isValid( pos ) ) return -1;
 
@@ -60,7 +60,7 @@ public final class BundledRedstone
         return combinedSignal;
     }
 
-    public static int getOutput( World world, BlockPos pos, EnumFacing side )
+    public static int getOutput( World world, BlockPos pos, Direction side )
     {
         int signal = getUnmaskedOutput( world, pos, side );
         return signal >= 0 ? signal : 0;

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

@@ -6,6 +6,8 @@
 
 package dan200.computercraft.shared;
 
+import com.electronwill.nightconfig.core.CommentedConfig;
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Converter;
 import dan200.computercraft.ComputerCraft;
@@ -44,8 +46,8 @@ public final class Config
     private static ConfigValue<Boolean> logComputerErrors;
 
     private static ConfigValue<Integer> computerThreads;
-    private static ConfigValue<Long> maxMainGlobalTime;
-    private static ConfigValue<Long> maxMainComputerTime;
+    private static ConfigValue<Integer> maxMainGlobalTime;
+    private static ConfigValue<Integer> maxMainComputerTime;
 
     private static ConfigValue<Boolean> httpEnabled;
     private static ConfigValue<Boolean> httpWebsocketEnabled;
@@ -54,8 +56,8 @@ public final class Config
 
     private static ConfigValue<Integer> httpTimeout;
     private static ConfigValue<Integer> httpMaxRequests;
-    private static ConfigValue<Long> httpMaxDownload;
-    private static ConfigValue<Long> httpMaxUpload;
+    private static ConfigValue<Integer> httpMaxDownload;
+    private static ConfigValue<Integer> httpMaxUpload;
     private static ConfigValue<Integer> httpMaxWebsockets;
     private static ConfigValue<Integer> httpMaxWebsocketMessage;
 
@@ -134,13 +136,13 @@ public final class Config
                 .comment( "The maximum time that can be spent executing tasks in a single tick, in milliseconds.\n" +
                     "Note, we will quite possibly go over this limit, as there's no way to tell how long a will take " +
                     "- this aims to be the upper bound of the average time." )
-                .defineInRange( "max_main_global_time", TimeUnit.NANOSECONDS.toMillis( ComputerCraft.maxMainGlobalTime ), 1, Long.MAX_VALUE );
+                .defineInRange( "max_main_global_time", (int) TimeUnit.NANOSECONDS.toMillis( ComputerCraft.maxMainGlobalTime ), 1, Integer.MAX_VALUE );
 
             maxMainComputerTime = builder
                 .comment( "The ideal maximum time a computer can execute for in a tick, in milliseconds.\n" +
                     "Note, we will quite possibly go over this limit, as there's no way to tell how long a will take " +
                     "- this aims to be the upper bound of the average time." )
-                .defineInRange( "max_main_computer_time", TimeUnit.NANOSECONDS.toMillis( ComputerCraft.maxMainComputerTime ), 1, Long.MAX_VALUE );
+                .defineInRange( "max_main_computer_time", (int) TimeUnit.NANOSECONDS.toMillis( ComputerCraft.maxMainComputerTime ), 1, Integer.MAX_VALUE );
 
             builder.pop();
         }
@@ -180,11 +182,11 @@ public final class Config
 
             httpMaxDownload = builder
                 .comment( "The maximum size (in bytes) that a computer can download in a single request. Note that responses may receive more data than allowed, but this data will not be returned to the client." )
-                .defineInRange( "max_download", ComputerCraft.httpMaxDownload, 0, Long.MAX_VALUE );
+                .defineInRange( "max_download", (int) ComputerCraft.httpMaxDownload, 0, Integer.MAX_VALUE );
 
             httpMaxUpload = builder
                 .comment( "The maximum size (in bytes) that a computer can upload in a single request. This includes headers and POST text." )
-                .defineInRange( "max_upload", ComputerCraft.httpMaxUpload, 0, Long.MAX_VALUE );
+                .defineInRange( "max_upload", (int) ComputerCraft.httpMaxUpload, 0, Integer.MAX_VALUE );
 
             httpMaxWebsockets = builder
                 .comment( "The number of websockets a computer can have open at one time. Set to 0 for unlimited." )
@@ -325,6 +327,10 @@ public final class Config
     @SubscribeEvent
     public static void sync( ModConfig.ConfigReloading event )
     {
+        // Ensure file configs are reloaded. Forge should probably do this, so worth checking in the future.
+        CommentedConfig config = event.getConfig().getConfigData();
+        if( config instanceof CommentedFileConfig ) ((CommentedFileConfig) config).load();
+
         sync();
     }
 

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

@@ -9,7 +9,7 @@ package dan200.computercraft.shared;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralProvider;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -30,12 +30,12 @@ public final class Peripherals
         providers.add( provider );
     }
 
-    public static IPeripheral getPeripheral( World world, BlockPos pos, EnumFacing side )
+    public static IPeripheral getPeripheral( World world, BlockPos pos, Direction side )
     {
         return World.isValid( pos ) && !world.isRemote ? getPeripheralAt( world, pos, side ) : null;
     }
 
-    private static IPeripheral getPeripheralAt( World world, BlockPos pos, EnumFacing side )
+    private static IPeripheral getPeripheralAt( World world, BlockPos pos, Direction side )
     {
         // Try the handlers in order:
         for( IPeripheralProvider peripheralProvider : providers )

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

@@ -8,15 +8,23 @@ package dan200.computercraft.shared;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.shared.common.ColourableRecipe;
+import dan200.computercraft.shared.common.ContainerHeldItem;
 import dan200.computercraft.shared.computer.blocks.BlockComputer;
 import dan200.computercraft.shared.computer.blocks.TileCommandComputer;
 import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.computer.inventory.ContainerComputer;
+import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.computer.items.ItemComputer;
+import dan200.computercraft.shared.computer.recipe.ComputerUpgradeRecipe;
 import dan200.computercraft.shared.media.items.ItemDisk;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
+import dan200.computercraft.shared.media.recipes.DiskRecipe;
+import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
 import dan200.computercraft.shared.peripheral.diskdrive.BlockDiskDrive;
+import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
 import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive;
 import dan200.computercraft.shared.peripheral.modem.wired.*;
 import dan200.computercraft.shared.peripheral.modem.wireless.BlockWirelessModem;
@@ -24,25 +32,35 @@ import dan200.computercraft.shared.peripheral.modem.wireless.TileWirelessModem;
 import dan200.computercraft.shared.peripheral.monitor.BlockMonitor;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import dan200.computercraft.shared.peripheral.printer.BlockPrinter;
+import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
 import dan200.computercraft.shared.peripheral.printer.TilePrinter;
 import dan200.computercraft.shared.peripheral.speaker.BlockSpeaker;
 import dan200.computercraft.shared.peripheral.speaker.TileSpeaker;
+import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
 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.pocket.recipes.PocketComputerUpgradeRecipe;
 import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.core.TurtlePlayer;
+import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
 import dan200.computercraft.shared.turtle.items.ItemTurtle;
+import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
+import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
 import dan200.computercraft.shared.turtle.upgrades.*;
 import dan200.computercraft.shared.util.CreativeTabMain;
+import dan200.computercraft.shared.util.ImpostorRecipe;
+import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityType;
-import net.minecraft.init.Items;
+import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.Items;
+import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.event.RegistryEvent;
@@ -181,7 +199,7 @@ public final class Registry
         );
     }
 
-    private static <T extends ItemBlock> T setupItemBlock( T item )
+    private static <T extends BlockItem> T setupItemBlock( T item )
     {
         item.setRegistryName( item.getBlock().getRegistryName() );
         return item;
@@ -247,14 +265,14 @@ public final class Registry
 
         // Peripherals
         registry.registerAll(
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.speaker, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.diskDrive, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.printer, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.monitorNormal, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.monitorAdvanced, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.wirelessModemNormal, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.wirelessModemAdvanced, defaultItem() ) ),
-            setupItemBlock( new ItemBlock( ComputerCraft.Blocks.wiredModemFull, defaultItem() ) )
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.speaker, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.diskDrive, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.printer, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.monitorNormal, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.monitorAdvanced, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.wirelessModemNormal, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.wirelessModemAdvanced, defaultItem() ) ),
+            setupItemBlock( new BlockItem( ComputerCraft.Blocks.wiredModemFull, defaultItem() ) )
         );
 
         ComputerCraft.Items.cable = new ItemBlockCable.Cable( ComputerCraft.Blocks.cable, defaultItem() );
@@ -286,7 +304,7 @@ public final class Registry
         ComputerCraft.TurtleUpgrades.diamondSword = new TurtleSword( new ResourceLocation( "minecraft", "diamond_sword" ), Items.DIAMOND_SWORD );
         ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondSword );
 
-        ComputerCraft.TurtleUpgrades.diamondShovel = new TurtleShovel( new ResourceLocation( "minecraft", "diamond_shovel" ), Items.DIAMOND_SHOVEL );
+        ComputerCraft.TurtleUpgrades.diamondShovel = new TurtleShovel( new ResourceLocation( "minecraft", "diamond_shovel" ), net.minecraft.item.Items.DIAMOND_SHOVEL );
         ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondShovel );
 
         ComputerCraft.TurtleUpgrades.diamondPickaxe = new TurtleTool( new ResourceLocation( "minecraft", "diamond_pickaxe" ), Items.DIAMOND_PICKAXE );
@@ -311,4 +329,37 @@ public final class Registry
     {
         registry.getRegistry().register( TurtlePlayer.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_player" ) ) );
     }
+
+    @SubscribeEvent
+    public static void registerContainers( RegistryEvent.Register<ContainerType<?>> event )
+    {
+        event.getRegistry().registerAll(
+            ContainerComputer.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ),
+            ContainerPocketComputer.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "pocket_computer" ) ),
+            ContainerTurtle.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ) ),
+
+            ContainerDiskDrive.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk_drive" ) ),
+            ContainerPrinter.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "printer" ) ),
+            ContainerHeldItem.PRINTOUT_TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "printout" ) ),
+
+            ContainerViewComputer.TYPE.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "view_computer" ) )
+        );
+    }
+
+    @SubscribeEvent
+    public static void regsterRecipeSerializers( RegistryEvent.Register<IRecipeSerializer<?>> event )
+    {
+
+        event.getRegistry().registerAll(
+            ColourableRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "colour" ) ),
+            ComputerUpgradeRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "computer_upgrade" ) ),
+            PocketComputerUpgradeRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "pocket_computer_upgrade" ) ),
+            DiskRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk" ) ),
+            PrintoutRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "printout" ) ),
+            TurtleRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ) ),
+            TurtleUpgradeRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_upgrade" ) ),
+            ImpostorShapelessRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "impostor_shapeless" ) ),
+            ImpostorRecipe.SERIALIZER.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "impostor_shaped" ) )
+        );
+    }
 }

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

@@ -8,7 +8,7 @@ package dan200.computercraft.shared;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.turtle.event.TurtleActionEvent;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -18,13 +18,13 @@ import net.minecraftforge.fml.common.Mod;
 @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID )
 public final class TurtlePermissions
 {
-    public static boolean isBlockEnterable( World world, BlockPos pos, EntityPlayer player )
+    public static boolean isBlockEnterable( World world, BlockPos pos, PlayerEntity player )
     {
         MinecraftServer server = world.getServer();
         return server == null || world.isRemote || !server.isBlockProtected( world, pos, player );
     }
 
-    public static boolean isBlockEditable( World world, BlockPos pos, EntityPlayer player )
+    public static boolean isBlockEditable( World world, BlockPos pos, PlayerEntity player )
     {
         MinecraftServer server = world.getServer();
         return server == null || world.isRemote || !server.isBlockProtected( world, pos, player );

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

@@ -11,8 +11,8 @@ import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.core.apis.IAPIEnvironment;
 import dan200.computercraft.core.computer.Computer;
+import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.core.tracking.ComputerTracker;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.core.tracking.TrackingContext;
@@ -20,17 +20,22 @@ import dan200.computercraft.core.tracking.TrackingField;
 import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
-import dan200.computercraft.shared.network.Containers;
+import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
+import dan200.computercraft.shared.network.container.ViewComputerContainerData;
 import net.minecraft.command.CommandSource;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.play.server.SPacketPlayerPosLook;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.INamedContainerProvider;
+import net.minecraft.network.play.server.SPlayerPositionLookPacket;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
+import net.minecraft.world.server.ServerWorld;
 
 import javax.annotation.Nonnull;
 import java.util.*;
@@ -118,12 +123,12 @@ public final class CommandComputerCraft
                         table.row( header( "Position" ), linkPosition( context.getSource(), computer ) );
                         table.row( header( "Family" ), text( computer.getFamily().toString() ) );
 
-                        for( int i = 0; i < 6; i++ )
+                        for( ComputerSide side : ComputerSide.values() )
                         {
-                            IPeripheral peripheral = computer.getPeripheral( i );
+                            IPeripheral peripheral = computer.getPeripheral( side );
                             if( peripheral != null )
                             {
-                                table.row( header( "Peripheral " + IAPIEnvironment.SIDE_NAMES[i] ), text( peripheral.getType() ) );
+                                table.row( header( "Peripheral " + side.getName() ), text( peripheral.getType() ) );
                             }
                         }
 
@@ -170,16 +175,21 @@ public final class CommandComputerCraft
                     if( world == null || pos == null ) throw TP_NOT_THERE.create();
 
                     Entity entity = context.getSource().assertIsEntity();
-                    if( !(entity instanceof EntityPlayerMP) ) throw TP_NOT_PLAYER.create();
+                    if( !(entity instanceof ServerPlayerEntity) ) throw TP_NOT_PLAYER.create();
 
-                    EntityPlayerMP player = (EntityPlayerMP) entity;
+                    ServerPlayerEntity player = (ServerPlayerEntity) entity;
                     if( player.getEntityWorld() == world )
                     {
-                        player.connection.setPlayerLocation( pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0, EnumSet.noneOf( SPacketPlayerPosLook.EnumFlags.class ) );
+                        player.connection.setPlayerLocation(
+                            pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0,
+                            EnumSet.noneOf( SPlayerPositionLookPacket.Flags.class )
+                        );
                     }
                     else
                     {
-                        player.teleport( (WorldServer) world, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0 );
+                        player.teleport( (ServerWorld) world,
+                            pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0
+                        );
                     }
 
                     return 1;
@@ -210,9 +220,24 @@ public final class CommandComputerCraft
                 .requires( UserLevel.OP )
                 .arg( "computer", oneComputer() )
                 .executes( context -> {
-                    EntityPlayerMP player = context.getSource().asPlayer();
+                    ServerPlayerEntity player = context.getSource().asPlayer();
                     ServerComputer computer = getComputerArgument( context, "computer" );
-                    Containers.openComputerGUI( player, computer );
+                    new ViewComputerContainerData( computer ).open( player, new INamedContainerProvider()
+                    {
+                        @Nonnull
+                        @Override
+                        public ITextComponent getDisplayName()
+                        {
+                            return new TranslationTextComponent( "gui.computercraft.view_computer" );
+                        }
+
+                        @Nonnull
+                        @Override
+                        public Container createMenu( int id, @Nonnull PlayerInventory player, @Nonnull PlayerEntity entity )
+                        {
+                            return new ContainerViewComputer( id, computer );
+                        }
+                    } );
                     return 1;
                 } ) )
 
@@ -259,7 +284,7 @@ public final class CommandComputerCraft
 
     private static ITextComponent linkComputer( CommandSource source, ServerComputer serverComputer, int computerId )
     {
-        ITextComponent out = new TextComponentString( "" );
+        ITextComponent out = new StringTextComponent( "" );
 
         // Append the computer instance
         if( serverComputer == null )
@@ -319,7 +344,7 @@ public final class CommandComputerCraft
     private static TrackingContext getTimingContext( CommandSource source )
     {
         Entity entity = source.getEntity();
-        return entity instanceof EntityPlayer ? Tracking.getContext( entity.getUniqueID() ) : Tracking.getContext( SYSTEM_UUID );
+        return entity instanceof PlayerEntity ? Tracking.getContext( entity.getUniqueID() ) : Tracking.getContext( SYSTEM_UUID );
     }
 
     private static final List<TrackingField> DEFAULT_FIELDS = Arrays.asList( TrackingField.TASKS, TrackingField.TOTAL_TIME, TrackingField.AVERAGE_TIME, TrackingField.MAX_TIME );