Fix changelog being out-of-sync

This isn't going to get annoying or anything

.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)
-[![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](https://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
+[![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.
@@ -41,7 +41,7 @@ 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`.

build.gradle

@@ -4,12 +4,12 @@ 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.117'
+        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'
     }
@@ -67,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"
@@ -79,7 +79,7 @@ repositories {
     }
     maven {
         name "Amadornes"
-        url "http://maven.amadornes.com/"
+        url "https://maven.amadornes.com/"
     }
 }
 
@@ -94,16 +94,16 @@ dependencies {
 
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
-    compileOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20: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"
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.13.2:5.0.0.20")
+    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"
 }
@@ -117,6 +117,8 @@ sourceSets {
     }
 }
 
+// Compile tasks
+
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
@@ -127,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",
@@ -141,6 +143,14 @@ 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.*
@@ -276,7 +286,14 @@ task compressJson(dependsOn: jar) {
 
 assemble.dependsOn compressJson
 
-/* Check tasks */
+// Check tasks
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "skipped", "failed"
+    }
+}
 
 license {
     mapping("java", "SLASHSTAR_STYLE")
@@ -300,6 +317,13 @@ license {
     }
 }
 
+gradle.projectsEvaluated {
+    tasks.withType(LicenseFormat) {
+        outputs.upToDateWhen { false }
+    }
+}
+
+
 task licenseAPI(type: LicenseCheck);
 task licenseFormatAPI(type: LicenseFormat);
 [licenseAPI, licenseFormatAPI].forEach {
@@ -310,7 +334,7 @@ task licenseFormatAPI(type: LicenseFormat);
     }
 }
 
-/* Upload tasks */
+// Upload tasks
 
 task checkRelease {
     group "upload"
@@ -355,7 +379,7 @@ curseforge {
     apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
     project {
         id = '282001'
-        releaseType = 'release'
+        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 {
@@ -431,7 +455,7 @@ githubRelease {
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()
     }
-    prerelease false
+    prerelease true
 }
 
 def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
@@ -441,23 +465,3 @@ task uploadAll(dependsOn: uploadTasks) {
     group "upload"
     description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "passed", "skipped", "failed"
-    }
-}
-
-gradle.projectsEvaluated {
-    reobfJar.dependsOn proguardMove
-
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing" // Causes Forge build to fail << "-Werror"
-    }
-
-    tasks.withType(LicenseFormat) {
-        outputs.upToDateWhen { false }
-    }
-}
-

config/checkstyle/checkstyle.xml

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

config/checkstyle/suppressions.xml

@@ -3,10 +3,6 @@
     "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
     "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-    <!-- Has a public m_label field. We need to check if this is used in other projects before renaming it. -->
-    <suppress checks="MemberName" files=".*[\\/]TileComputerBase.java"
-        message="Name 'm_label' must match pattern .*" />
-
     <!-- All the config options and method fields. -->
     <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
     <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />

gradle.properties

@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.83.1
+mod_version=1.84.0
 
 # Minecraft properties
-mc_version=1.13.2
-forge_version=25.0.219
-mappings_version=20190530-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;
@@ -94,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 );
     }
@@ -133,7 +133,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
 
     @Nonnull
     @Override
-    public LazyOptional<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 );
         return tile == null ? LazyOptional.empty() : tile.getCapability( CapabilityWiredElement.CAPABILITY, side );

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

@@ -20,7 +20,7 @@ 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;
@@ -183,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 );
     }
@@ -242,7 +242,7 @@ public final class ComputerCraftAPI
      * @see IWiredElement#getNode()
      */
     @Nonnull
-    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
+    public static LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
         return getInstance().getWiredElementAt( world, pos, side );
     }
@@ -284,7 +284,7 @@ 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 );
 
@@ -299,6 +299,6 @@ public final class ComputerCraftAPI
         IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
 
         @Nonnull
-        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull EnumFacing side );
+        LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side );
     }
 }

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/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/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 )
         {
@@ -160,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,19 +6,23 @@
 
 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>
 {
     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" );
@@ -33,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;
@@ -65,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 );
@@ -75,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
@@ -90,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 )
     {
@@ -108,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, 12 );
-        drawTexturedModalRect( endX, startY - 12, 24, 28, 12, 12 );
-        drawTexturedModalRect( endX, endY, 24, 40, 12, 12 );
+        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, 12 );
+        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.turtleInvStartX - 2 + slotX * 18, guiTop + m_container.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,35 +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() );
-            @SuppressWarnings( "unchecked" )
-            BiFunction<ContainerType<?>, EntityPlayer, GuiContainer> factory = (BiFunction<ContainerType<?>, EntityPlayer, GuiContainer>) ContainerType.guiFactories.get( packet.getId() );
-            return factory.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;
@@ -36,17 +38,19 @@ public final class CableHighlightRenderer
      * 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,33 +60,31 @@ public final class CableHighlightRenderer
 
         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 ), event.getTarget().hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) )
+        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getHitVec().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,6 +6,7 @@
 
 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;
@@ -18,7 +19,6 @@ import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
@@ -173,7 +173,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     private static void renderLight( int colour, int width, int height )
     {
         GlStateManager.enableBlend();
-        GlStateManager.disableTexture2D();
+        GlStateManager.disableTexture();
 
         float r = ((colour >>> 16) & 0xFF) / 255.0f;
         float g = ((colour >>> 8) & 0xFF) / 255.0f;
@@ -188,7 +188,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         buffer.pos( width - LIGHT_HEIGHT * 2, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
 
         tessellator.draw();
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
     }
 
     private static void renderTerminal( Terminal terminal, boolean greyscale, int width, int height )

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;
@@ -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

@@ -6,18 +6,19 @@
 
 package dan200.computercraft.client.render;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
+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;
@@ -27,7 +28,7 @@ import org.lwjgl.opengl.GL11;
 
 import java.util.EnumSet;
 
-import static net.minecraft.util.EnumFacing.*;
+import static net.minecraft.util.Direction.*;
 
 @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class MonitorHighlightRenderer
@@ -41,10 +42,13 @@ public final class MonitorHighlightRenderer
     @SubscribeEvent
     public static void drawHighlight( DrawBlockHighlightEvent event )
     {
-        if( event.getTarget().type != RayTraceResult.Type.BLOCK || event.getPlayer().isSneaking() ) return;
+        if( event.getTarget().getType() != RayTraceResult.Type.BLOCK || event.getInfo().getRenderViewEntity().isSneaking() )
+        {
+            return;
+        }
 
-        World world = event.getPlayer().getEntityWorld();
-        BlockPos pos = event.getTarget().getBlockPos();
+        World world = event.getInfo().getRenderViewEntity().getEntityWorld();
+        BlockPos pos = ((BlockRayTraceResult) event.getTarget()).getPos();
 
         TileEntity tile = world.getTileEntity( pos );
         if( !(tile instanceof TileMonitor) ) return;
@@ -53,8 +57,8 @@ public final class MonitorHighlightRenderer
         event.setCanceled( true );
 
         // Determine which sides are part of the external faces of the monitor, and so which need to be rendered.
-        EnumSet<EnumFacing> faces = EnumSet.allOf( EnumFacing.class );
-        EnumFacing front = monitor.getFront();
+        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() );
@@ -64,16 +68,12 @@ public final class MonitorHighlightRenderer
         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.disableTexture2D();
+        GlStateManager.disableTexture();
         GlStateManager.depthMask( false );
         GlStateManager.pushMatrix();
 
-        EntityPlayer player = event.getPlayer();
-        double x = player.lastTickPosX + (player.posX - player.lastTickPosX) * event.getPartialTicks();
-        double y = player.lastTickPosY + (player.posY - player.lastTickPosY) * event.getPartialTicks();
-        double z = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * event.getPartialTicks();
-
-        GlStateManager.translated( -x + pos.getX(), -y + pos.getY(), -z + pos.getZ() );
+        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();
@@ -97,11 +97,11 @@ public final class MonitorHighlightRenderer
 
         GlStateManager.popMatrix();
         GlStateManager.depthMask( true );
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
         GlStateManager.disableBlend();
     }
 
-    private static void line( BufferBuilder buffer, int x, int y, int z, EnumFacing direction )
+    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;

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,6 +6,7 @@
 
 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;
@@ -13,10 +14,9 @@ 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;
@@ -24,11 +24,12 @@ 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.world.World;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import org.lwjgl.opengl.GL11;
 
@@ -40,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 )
     {
@@ -52,16 +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;
 
-        state = WorldUtil.isVecInside( CableShapes.getModemShape( state ), 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,18 +80,19 @@ 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 ),
+            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos, 0 ),
             state, pos, buffer, true, random, state.getPositionRandom( pos ), EmptyModelData.INSTANCE
         );
 

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,22 +14,23 @@ 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;
@@ -85,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 );
         }
@@ -99,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 );
@@ -153,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 )
@@ -186,20 +189,20 @@ 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 );
+        rendererDispatcher.textureManager.bindTexture( AtlasTexture.LOCATION_BLOCKS_TEXTURE );
         renderQuads( tessellator, model.getQuads( state, null, random, EmptyModelData.INSTANCE ), tints );
-        for( EnumFacing facing : DirectionUtil.FACINGS )
+        for( Direction facing : DirectionUtil.FACINGS )
         {
             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;
@@ -91,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,12 +6,12 @@
 
 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.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;
 
@@ -29,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 )
     {
@@ -46,14 +46,14 @@ public class TurtleMultiModel implements IBakedModel
     @Nonnull
     @Override
     @Deprecated
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
     {
         return getQuads( state, side, rand, EmptyModelData.INSTANCE );
     }
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, @Nonnull Random rand, @Nonnull IModelData data )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand, @Nonnull IModelData data )
     {
         if( side != null )
         {
@@ -67,7 +67,7 @@ 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, EmptyModelData.INSTANCE ), m_generalTransform );
@@ -119,6 +119,7 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
+    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return m_baseModel.getParticleTexture();

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

@@ -12,13 +12,13 @@ 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;
@@ -111,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 );
@@ -169,7 +169,7 @@ public class TurtleSmartItemModel implements IBakedModel
     @Nonnull
     @Override
     @Deprecated
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing facing, @Nonnull Random rand )
+    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand )
     {
         return familyModel.getQuads( state, facing, rand );
     }
@@ -177,7 +177,7 @@ public class TurtleSmartItemModel implements IBakedModel
     @Nonnull
     @Override
     @Deprecated
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing facing, @Nonnull Random rand, @Nonnull IModelData data )
+    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand, @Nonnull IModelData data )
     {
         return familyModel.getQuads( state, facing, rand, data );
     }
@@ -202,6 +202,7 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
+    @Deprecated
     public TextureAtlasSprite getParticleTexture()
     {
         return familyModel.getParticleTexture();

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

@@ -6,11 +6,13 @@
 
 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 net.minecraft.util.EnumFacing}, this is relative to the direction the computer is
+ * A side on a computer. Unlike {@link Direction}, this is relative to the direction the computer is
  * facing..
  */
 public enum ComputerSide

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

@@ -170,7 +170,7 @@ public class ResourceMount implements IMount
                 {
                     total += read;
                     read = s.read( TEMP_BUFFER );
-                } while ( read > 0 );
+                } while( read > 0 );
 
                 return file.size = total;
             }

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/shared/BundledRedstone.java

@@ -9,7 +9,7 @@ package dan200.computercraft.shared;
 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;
 
@@ -30,12 +30,12 @@ public final class BundledRedstone
         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;
@@ -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

@@ -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.*;
@@ -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 );

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

@@ -12,8 +12,8 @@ import dan200.computercraft.ComputerCraft;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandSource;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
 import net.minecraftforge.api.distmarker.Dist;
@@ -58,10 +58,10 @@ public final class CommandCopy
 
     public static ITextComponent createCopyText( String text )
     {
-        TextComponentString name = new TextComponentString( text );
+        StringTextComponent name = new StringTextComponent( text );
         name.getStyle()
             .setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, PREFIX + text ) )
-            .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TextComponentTranslation( "gui.computercraft.tooltip.copy" ) ) );
+            .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TranslationTextComponent( "gui.computercraft.tooltip.copy" ) ) );
         return name;
     }
 }

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

@@ -12,7 +12,7 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.ISuggestionProvider;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraftforge.common.util.FakePlayer;
 
 import java.util.Arrays;
@@ -27,9 +27,9 @@ public final class CommandUtils
     public static boolean isPlayer( CommandSource output )
     {
         Entity sender = output.getEntity();
-        return sender instanceof EntityPlayerMP
+        return sender instanceof ServerPlayerEntity
             && !(sender instanceof FakePlayer)
-            && ((EntityPlayerMP) sender).connection != null;
+            && ((ServerPlayerEntity) sender).connection != null;
     }
 
     @SuppressWarnings( "unchecked" )

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

@@ -9,7 +9,7 @@ package dan200.computercraft.shared.command;
 import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
-import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.util.text.TranslationTextComponent;
 
 public final class Exceptions
 {
@@ -28,16 +28,16 @@ public final class Exceptions
 
     private static SimpleCommandExceptionType translated( String key )
     {
-        return new SimpleCommandExceptionType( new TextComponentTranslation( key ) );
+        return new SimpleCommandExceptionType( new TranslationTextComponent( key ) );
     }
 
     private static DynamicCommandExceptionType translated1( String key )
     {
-        return new DynamicCommandExceptionType( x -> new TextComponentTranslation( key, x ) );
+        return new DynamicCommandExceptionType( x -> new TranslationTextComponent( key, x ) );
     }
 
     private static Dynamic2CommandExceptionType translated2( String key )
     {
-        return new Dynamic2CommandExceptionType( ( x, y ) -> new TextComponentTranslation( key, x, y ) );
+        return new Dynamic2CommandExceptionType( ( x, y ) -> new TranslationTextComponent( key, x, y ) );
     }
 }

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

@@ -8,7 +8,7 @@ package dan200.computercraft.shared.command;
 
 import net.minecraft.command.CommandSource;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 
 import java.util.function.Predicate;
@@ -62,8 +62,8 @@ public enum UserLevel implements Predicate<CommandSource>
         MinecraftServer server = source.getServer();
         Entity sender = source.getEntity();
 
-        if( server.isSinglePlayer() && sender instanceof EntityPlayer &&
-            ((EntityPlayer) sender).getGameProfile().getName().equalsIgnoreCase( server.getServerModName() ) )
+        if( server.isSinglePlayer() && sender instanceof PlayerEntity &&
+            ((PlayerEntity) sender).getGameProfile().getName().equalsIgnoreCase( server.getServerModName() ) )
         {
             if( this == OWNER || this == OWNER_OP ) return true;
         }

src/main/java/dan200/computercraft/shared/command/arguments/ArgumentSerializers.java

@@ -18,12 +18,12 @@ public final class ArgumentSerializers
     @SuppressWarnings( "unchecked" )
     private static <T extends ArgumentType<?>> void registerUnsafe( ResourceLocation id, Class<T> type, IArgumentSerializer<?> serializer )
     {
-        ArgumentTypes.register( id, type, (IArgumentSerializer<T>) serializer );
+        ArgumentTypes.register( id.toString(), type, (IArgumentSerializer<T>) serializer );
     }
 
     private static <T extends ArgumentType<?>> void register( ResourceLocation id, Class<T> type, IArgumentSerializer<T> serializer )
     {
-        ArgumentTypes.register( id, type, serializer );
+        ArgumentTypes.register( id.toString(), type, serializer );
     }
 
     private static <T extends ArgumentType<?>> void register( ResourceLocation id, T instance )

src/main/java/dan200/computercraft/shared/command/arguments/RepeatArgumentType.java

@@ -19,7 +19,7 @@ import net.minecraft.command.arguments.ArgumentTypes;
 import net.minecraft.command.arguments.IArgumentSerializer;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
@@ -160,7 +160,7 @@ public final class RepeatArgumentType<T, U> implements ArgumentType<List<T>>
         {
             Message message = arg.some.create().getRawMessage();
             if( message instanceof ITextComponent ) return (ITextComponent) message;
-            return new TextComponentString( message.getString() );
+            return new StringTextComponent( message.getString() );
         }
     }
 }

src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java

@@ -15,7 +15,7 @@ import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import net.minecraft.command.CommandSource;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.text.event.ClickEvent;
 
@@ -174,7 +174,7 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<Command
         temp.addChild( node );
         String usage = dispatcher.getSmartUsage( temp, context.getSource() ).get( node ).substring( node.getName().length() );
 
-        ITextComponent output = new TextComponentString( "" )
+        ITextComponent output = new StringTextComponent( "" )
             .appendSibling( coloured( "/" + command + usage, HEADER ) )
             .appendText( " " )
             .appendSibling( coloured( translate( "commands." + id + ".synopsis" ), SYNOPSIS ) )

src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java

@@ -22,7 +22,7 @@ public final class ChatHelpers
 
     public static ITextComponent coloured( String text, TextFormatting colour )
     {
-        ITextComponent component = new TextComponentString( text == null ? "" : text );
+        ITextComponent component = new StringTextComponent( text == null ? "" : text );
         component.getStyle().setColor( colour );
         return component;
     }
@@ -35,22 +35,22 @@ public final class ChatHelpers
 
     public static ITextComponent text( String text )
     {
-        return new TextComponentString( text == null ? "" : text );
+        return new StringTextComponent( text == null ? "" : text );
     }
 
     public static ITextComponent translate( String text )
     {
-        return new TextComponentTranslation( text == null ? "" : text );
+        return new TranslationTextComponent( text == null ? "" : text );
     }
 
     public static ITextComponent translate( String text, Object... args )
     {
-        return new TextComponentTranslation( text == null ? "" : text, args );
+        return new TranslationTextComponent( text == null ? "" : text, args );
     }
 
     public static ITextComponent list( ITextComponent... children )
     {
-        ITextComponent component = new TextComponentString( "" );
+        ITextComponent component = new StringTextComponent( "" );
         for( ITextComponent child : children )
         {
             component.appendSibling( child );

src/main/java/dan200/computercraft/shared/command/text/ServerTableFormatter.java

@@ -8,7 +8,7 @@ package dan200.computercraft.shared.command.text;
 
 import net.minecraft.command.CommandSource;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
@@ -28,7 +28,7 @@ public class ServerTableFormatter implements TableFormatter
     {
         int extraWidth = width - getWidth( component );
         if( extraWidth <= 0 ) return null;
-        return new TextComponentString( StringUtils.repeat( ' ', extraWidth ) );
+        return new StringTextComponent( StringUtils.repeat( ' ', extraWidth ) );
     }
 
     @Override

src/main/java/dan200/computercraft/shared/command/text/TableBuilder.java

@@ -10,7 +10,7 @@ import dan200.computercraft.shared.command.CommandUtils;
 import dan200.computercraft.shared.network.NetworkHandler;
 import dan200.computercraft.shared.network.client.ChatTableClientMessage;
 import net.minecraft.command.CommandSource;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.util.text.ITextComponent;
 
 import javax.annotation.Nonnull;
@@ -125,7 +125,7 @@ public class TableBuilder
         if( CommandUtils.isPlayer( source ) )
         {
             trim( 18 );
-            NetworkHandler.sendToPlayer( (EntityPlayerMP) source.getEntity(), new ChatTableClientMessage( this ) );
+            NetworkHandler.sendToPlayer( (ServerPlayerEntity) source.getEntity(), new ChatTableClientMessage( this ) );
         }
         else
         {

src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java

@@ -7,7 +7,7 @@
 package dan200.computercraft.shared.command.text;
 
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import org.apache.commons.lang3.StringUtils;
 
@@ -77,7 +77,7 @@ public interface TableFormatter
 
         if( headers != null )
         {
-            TextComponentString line = new TextComponentString( "" );
+            StringTextComponent line = new StringTextComponent( "" );
             for( int i = 0; i < columns - 1; i++ )
             {
                 line.appendSibling( headers[i] );
@@ -98,7 +98,7 @@ public interface TableFormatter
 
         for( ITextComponent[] row : table.getRows() )
         {
-            TextComponentString line = new TextComponentString( "" );
+            StringTextComponent line = new StringTextComponent( "" );
             for( int i = 0; i < columns - 1; i++ )
             {
                 line.appendSibling( row[i] );

src/main/java/dan200/computercraft/shared/common/BlockGeneric.java

@@ -6,14 +6,15 @@
 
 package dan200.computercraft.shared.common;
 
+import dan200.computercraft.shared.util.NamedTileEntityType;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
@@ -26,15 +27,16 @@ public abstract class BlockGeneric extends Block
 {
     private final TileEntityType<? extends TileGeneric> type;
 
-    public BlockGeneric( Properties settings, TileEntityType<? extends TileGeneric> type )
+    public BlockGeneric( Properties settings, NamedTileEntityType<? extends TileGeneric> type )
     {
         super( settings );
         this.type = type;
+        type.setBlock( this );
     }
 
     @Override
     @Deprecated
-    public final void onReplaced( @Nonnull IBlockState block, @Nonnull World world, @Nonnull BlockPos pos, IBlockState replace, boolean bool )
+    public final void onReplaced( @Nonnull BlockState block, @Nonnull World world, @Nonnull BlockPos pos, BlockState replace, boolean bool )
     {
         if( block.getBlock() == replace.getBlock() ) return;
 
@@ -46,22 +48,22 @@ public abstract class BlockGeneric extends Block
 
     @Override
     @Deprecated
-    public final boolean onBlockActivated( IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ )
+    public final boolean onBlockActivated( BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit )
     {
         TileEntity tile = world.getTileEntity( pos );
-        return tile instanceof TileGeneric && ((TileGeneric) tile).onActivate( player, hand, side, hitX, hitY, hitZ );
+        return tile instanceof TileGeneric && ((TileGeneric) tile).onActivate( player, hand, hit );
     }
 
     @Override
     @Deprecated
-    public final void neighborChanged( IBlockState state, World world, BlockPos pos, Block neighbourBlock, BlockPos neighbourPos )
+    public final void neighborChanged( BlockState state, World world, BlockPos pos, Block neighbourBlock, BlockPos neighbourPos, boolean isMoving )
     {
         TileEntity tile = world.getTileEntity( pos );
         if( tile instanceof TileGeneric ) ((TileGeneric) tile).onNeighbourChange( neighbourPos );
     }
 
     @Override
-    public final void onNeighborChange( IBlockState state, IWorldReader world, BlockPos pos, BlockPos neighbour )
+    public final void onNeighborChange( BlockState state, IWorldReader world, BlockPos pos, BlockPos neighbour )
     {
         TileEntity tile = world.getTileEntity( pos );
         if( tile instanceof TileGeneric ) ((TileGeneric) tile).onNeighbourTileEntityChange( neighbour );
@@ -69,22 +71,28 @@ public abstract class BlockGeneric extends Block
 
     @Override
     @Deprecated
-    public void tick( IBlockState state, World world, BlockPos pos, Random rand )
+    public void tick( BlockState state, World world, BlockPos pos, Random rand )
     {
         TileEntity te = world.getTileEntity( pos );
         if( te instanceof TileGeneric ) ((TileGeneric) te).blockTick();
     }
 
     @Override
-    public boolean hasTileEntity( IBlockState state )
+    public boolean hasTileEntity( BlockState state )
     {
         return true;
     }
 
     @Nullable
     @Override
-    public TileEntity createTileEntity( @Nonnull IBlockState state, @Nonnull IBlockReader world )
+    public TileEntity createTileEntity( @Nonnull BlockState state, @Nonnull IBlockReader world )
     {
         return type.create();
     }
+
+    @Override
+    public boolean canBeReplacedByLeaves( BlockState state, IWorldReader world, BlockPos pos )
+    {
+        return false;
+    }
 }

src/main/java/dan200/computercraft/shared/common/ClientTerminal.java

@@ -7,7 +7,7 @@
 package dan200.computercraft.shared.common;
 
 import dan200.computercraft.core.terminal.Terminal;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 
 public class ClientTerminal implements ITerminal
 {
@@ -47,12 +47,12 @@ public class ClientTerminal implements ITerminal
         return m_colour;
     }
 
-    public void readDescription( NBTTagCompound nbt )
+    public void readDescription( CompoundNBT nbt )
     {
         m_colour = nbt.getBoolean( "colour" );
         if( nbt.contains( "terminal" ) )
         {
-            NBTTagCompound terminal = nbt.getCompound( "terminal" );
+            CompoundNBT terminal = nbt.getCompound( "terminal" );
             resizeTerminal( terminal.getInt( "term_width" ), terminal.getInt( "term_height" ) );
             m_terminal.readFromNBT( terminal );
         }

src/main/java/dan200/computercraft/shared/common/ColourableRecipe.java

@@ -6,30 +6,29 @@
 
 package dan200.computercraft.shared.common;
 
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.util.AbstractRecipe;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.ColourTracker;
 import dan200.computercraft.shared.util.ColourUtils;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.EnumDyeColor;
+import net.minecraft.inventory.CraftingInventory;
+import net.minecraft.item.DyeColor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipeSerializer;
-import net.minecraft.item.crafting.RecipeSerializers;
+import net.minecraft.item.crafting.SpecialRecipe;
+import net.minecraft.item.crafting.SpecialRecipeSerializer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 
-public class ColourableRecipe extends AbstractRecipe
+public final class ColourableRecipe extends SpecialRecipe
 {
-    public ColourableRecipe( ResourceLocation id )
+    private ColourableRecipe( ResourceLocation id )
     {
         super( id );
     }
 
     @Override
-    public boolean matches( @Nonnull IInventory inv, @Nonnull World world )
+    public boolean matches( @Nonnull CraftingInventory inv, @Nonnull World world )
     {
         boolean hasColourable = false;
         boolean hasDye = false;
@@ -58,7 +57,7 @@ public class ColourableRecipe extends AbstractRecipe
 
     @Nonnull
     @Override
-    public ItemStack getCraftingResult( @Nonnull IInventory inv )
+    public ItemStack getCraftingResult( @Nonnull CraftingInventory inv )
     {
         ItemStack colourable = ItemStack.EMPTY;
 
@@ -76,7 +75,7 @@ public class ColourableRecipe extends AbstractRecipe
             }
             else
             {
-                EnumDyeColor dye = ColourUtils.getStackColour( stack );
+                DyeColor dye = ColourUtils.getStackColour( stack );
                 if( dye == null ) continue;
 
                 Colour colour = Colour.fromInt( 15 - dye.getId() );
@@ -101,7 +100,5 @@ public class ColourableRecipe extends AbstractRecipe
         return SERIALIZER;
     }
 
-    public static final IRecipeSerializer<?> SERIALIZER = new RecipeSerializers.SimpleSerializer<>(
-        ComputerCraft.MOD_ID + ":colour", ColourableRecipe::new
-    );
+    public static final IRecipeSerializer<?> SERIALIZER = new SpecialRecipeSerializer<>( ColourableRecipe::new );
 }

src/main/java/dan200/computercraft/shared/common/ContainerHeldItem.java

@@ -6,37 +6,81 @@
 
 package dan200.computercraft.shared.common;
 
+import dan200.computercraft.shared.network.container.ContainerData;
+import dan200.computercraft.shared.network.container.HeldItemContainerData;
 import dan200.computercraft.shared.util.InventoryUtil;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.inventory.container.INamedContainerProvider;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Hand;
+import net.minecraft.util.text.ITextComponent;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public class ContainerHeldItem extends Container
 {
-    private final ItemStack m_stack;
-    private final EnumHand m_hand;
+    public static final ContainerType<ContainerHeldItem> PRINTOUT_TYPE = ContainerData.toType( HeldItemContainerData::new, ContainerHeldItem::createPrintout );
 
-    public ContainerHeldItem( EntityPlayer player, EnumHand hand )
+    private final ItemStack stack;
+    private final Hand hand;
+
+    public ContainerHeldItem( ContainerType<? extends ContainerHeldItem> type, int id, PlayerEntity player, Hand hand )
     {
-        m_hand = hand;
-        m_stack = InventoryUtil.copyItem( player.getHeldItem( hand ) );
+        super( type, id );
+
+        this.hand = hand;
+        stack = InventoryUtil.copyItem( player.getHeldItem( hand ) );
+    }
+
+    private static ContainerHeldItem createPrintout( int id, PlayerInventory inventory, HeldItemContainerData data )
+    {
+        return new ContainerHeldItem( PRINTOUT_TYPE, id, inventory.player, data.getHand() );
     }
 
     @Nonnull
     public ItemStack getStack()
     {
-        return m_stack;
+        return stack;
     }
 
     @Override
-    public boolean canInteractWith( @Nonnull EntityPlayer player )
+    public boolean canInteractWith( @Nonnull PlayerEntity player )
     {
         if( !player.isAlive() ) return false;
 
-        ItemStack stack = player.getHeldItem( m_hand );
-        return stack == m_stack || !stack.isEmpty() && !m_stack.isEmpty() && stack.getItem() == m_stack.getItem();
+        ItemStack stack = player.getHeldItem( hand );
+        return stack == this.stack || !stack.isEmpty() && !this.stack.isEmpty() && stack.getItem() == this.stack.getItem();
+    }
+
+    public static class Factory implements INamedContainerProvider
+    {
+        private final ContainerType<ContainerHeldItem> type;
+        private final ITextComponent name;
+        private final Hand hand;
+
+        public Factory( ContainerType<ContainerHeldItem> type, ItemStack stack, Hand hand )
+        {
+            this.type = type;
+            this.name = stack.getDisplayName();
+            this.hand = hand;
+        }
+
+        @Nonnull
+        @Override
+        public ITextComponent getDisplayName()
+        {
+            return name;
+        }
+
+        @Nullable
+        @Override
+        public Container createMenu( int id, @Nonnull PlayerInventory inventory, @Nonnull PlayerEntity player )
+        {
+            return new ContainerHeldItem( type, id, player, hand );
+        }
     }
 }

src/main/java/dan200/computercraft/shared/common/DefaultBundledRedstoneProvider.java

@@ -8,7 +8,7 @@ package dan200.computercraft.shared.common;
 
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import net.minecraft.block.Block;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -17,12 +17,12 @@ import javax.annotation.Nonnull;
 public class DefaultBundledRedstoneProvider implements IBundledRedstoneProvider
 {
     @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 getDefaultBundledRedstoneOutput( world, pos, side );
     }
 
-    public static int getDefaultBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
+    public static int getDefaultBundledRedstoneOutput( World world, BlockPos pos, Direction side )
     {
         Block block = world.getBlockState( pos ).getBlock();
         if( block instanceof IBundledRedstoneBlock )

src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java

@@ -6,13 +6,13 @@
 
 package dan200.computercraft.shared.common;
 
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IBundledRedstoneBlock
 {
-    boolean getBundledRedstoneConnectivity( World world, BlockPos pos, EnumFacing side );
+    boolean getBundledRedstoneConnectivity( World world, BlockPos pos, Direction side );
 
-    int getBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side );
+    int getBundledRedstoneOutput( World world, BlockPos pos, Direction side );
 }

src/main/java/dan200/computercraft/shared/common/IColouredItem.java

@@ -7,7 +7,7 @@
 package dan200.computercraft.shared.common;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 
 public interface IColouredItem
 {
@@ -27,7 +27,7 @@ public interface IColouredItem
 
     static int getColourBasic( ItemStack stack )
     {
-        NBTTagCompound tag = stack.getTag();
+        CompoundNBT tag = stack.getTag();
         return tag != null && tag.contains( NBT_COLOUR ) ? tag.getInt( NBT_COLOUR ) : -1;
     }
 
@@ -35,7 +35,7 @@ public interface IColouredItem
     {
         if( colour == -1 )
         {
-            NBTTagCompound tag = stack.getTag();
+            CompoundNBT tag = stack.getTag();
             if( tag != null ) tag.remove( NBT_COLOUR );
         }
         else

src/main/java/dan200/computercraft/shared/common/ServerTerminal.java

@@ -7,7 +7,7 @@
 package dan200.computercraft.shared.common;
 
 import dan200.computercraft.core.terminal.Terminal;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -86,12 +86,12 @@ public class ServerTerminal implements ITerminal
 
     // Networking stuff
 
-    public void writeDescription( NBTTagCompound nbt )
+    public void writeDescription( CompoundNBT nbt )
     {
         nbt.putBoolean( "colour", m_colour );
         if( m_terminal != null )
         {
-            NBTTagCompound terminal = new NBTTagCompound();
+            CompoundNBT terminal = new CompoundNBT();
             terminal.putInt( "term_width", m_terminal.getWidth() );
             terminal.putInt( "term_height", m_terminal.getHeight() );
             m_terminal.writeToNBT( terminal );

src/main/java/dan200/computercraft/shared/common/TileGeneric.java

@@ -6,16 +6,16 @@
 
 package dan200.computercraft.shared.common;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.network.play.server.SPacketUpdateTileEntity;
+import net.minecraft.network.play.server.SUpdateTileEntityPacket;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 
 import javax.annotation.Nonnull;
 
@@ -34,12 +34,11 @@ public abstract class TileGeneric extends TileEntity
     {
         markDirty();
         BlockPos pos = getPos();
-        IBlockState state = getBlockState();
-        getWorld().markBlockRangeForRenderUpdate( pos, pos );
+        BlockState state = getBlockState();
         getWorld().notifyBlockUpdate( pos, state, state, 3 );
     }
 
-    public boolean onActivate( EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ )
+    public boolean onActivate( PlayerEntity player, Hand hand, BlockRayTraceResult hit )
     {
         return false;
     }
@@ -56,12 +55,12 @@ public abstract class TileGeneric extends TileEntity
     {
     }
 
-    protected double getInteractRange( EntityPlayer player )
+    protected double getInteractRange( PlayerEntity player )
     {
         return 8.0;
     }
 
-    public boolean isUsable( EntityPlayer player, boolean ignoreRange )
+    public boolean isUsable( PlayerEntity player, boolean ignoreRange )
     {
         if( player == null || !player.isAlive() || getWorld().getTileEntity( getPos() ) != this ) return false;
         if( ignoreRange ) return true;
@@ -72,40 +71,40 @@ public abstract class TileGeneric extends TileEntity
             player.getDistanceSq( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ) <= range * range;
     }
 
-    protected void writeDescription( @Nonnull NBTTagCompound nbt )
+    protected void writeDescription( @Nonnull CompoundNBT nbt )
     {
     }
 
-    protected void readDescription( @Nonnull NBTTagCompound nbt )
+    protected void readDescription( @Nonnull CompoundNBT nbt )
     {
     }
 
     @Nonnull
     @Override
-    public final SPacketUpdateTileEntity getUpdatePacket()
+    public final SUpdateTileEntityPacket getUpdatePacket()
     {
-        NBTTagCompound nbt = new NBTTagCompound();
+        CompoundNBT nbt = new CompoundNBT();
         writeDescription( nbt );
-        return new SPacketUpdateTileEntity( pos, 0, nbt );
+        return new SUpdateTileEntityPacket( pos, 0, nbt );
     }
 
     @Override
-    public final void onDataPacket( NetworkManager net, SPacketUpdateTileEntity packet )
+    public final void onDataPacket( NetworkManager net, SUpdateTileEntityPacket packet )
     {
         if( packet.getTileEntityType() == 0 ) readDescription( packet.getNbtCompound() );
     }
 
     @Nonnull
     @Override
-    public NBTTagCompound getUpdateTag()
+    public CompoundNBT getUpdateTag()
     {
-        NBTTagCompound tag = super.getUpdateTag();
+        CompoundNBT tag = super.getUpdateTag();
         writeDescription( tag );
         return tag;
     }
 
     @Override
-    public void handleUpdateTag( @Nonnull NBTTagCompound tag )
+    public void handleUpdateTag( @Nonnull CompoundNBT tag )
     {
         super.handleUpdateTag( tag );
         readDescription( tag );

src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java

@@ -16,10 +16,10 @@ import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.shared.computer.blocks.TileCommandComputer;
 import dan200.computercraft.shared.util.NBTUtil;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.Commands;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.state.IProperty;
 import net.minecraft.tileentity.TileEntity;
@@ -97,7 +97,7 @@ public class CommandAPI implements ILuaAPI
     private static Object getBlockInfo( World world, BlockPos pos )
     {
         // Get the details of the block
-        IBlockState state = world.getBlockState( pos );
+        BlockState state = world.getBlockState( pos );
         Block block = state.getBlock();
 
         Map<Object, Object> table = new HashMap<>();
@@ -112,7 +112,7 @@ public class CommandAPI implements ILuaAPI
         table.put( "state", stateTable );
 
         TileEntity tile = world.getTileEntity( pos );
-        if( tile != null ) table.put( "nbt", NBTUtil.toLua( tile.write( new NBTTagCompound() ) ) );
+        if( tile != null ) table.put( "nbt", NBTUtil.toLua( tile.write( new CompoundNBT() ) ) );
 
         return table;
     }

src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputer.java

@@ -9,16 +9,16 @@ package dan200.computercraft.shared.computer.blocks;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.items.ComputerItemFactory;
+import dan200.computercraft.shared.util.NamedTileEntityType;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.state.DirectionProperty;
 import net.minecraft.state.EnumProperty;
 import net.minecraft.state.StateContainer;
 import net.minecraft.state.properties.BlockStateProperties;
-import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -28,24 +28,24 @@ public class BlockComputer extends BlockComputerBase<TileComputer>
     public static final EnumProperty<ComputerState> STATE = EnumProperty.create( "state", ComputerState.class );
     public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING;
 
-    public BlockComputer( Properties settings, ComputerFamily family, TileEntityType<? extends TileComputer> type )
+    public BlockComputer( Properties settings, ComputerFamily family, NamedTileEntityType<? extends TileComputer> type )
     {
         super( settings, family, type );
         setDefaultState( getDefaultState()
-            .with( FACING, EnumFacing.NORTH )
+            .with( FACING, Direction.NORTH )
             .with( STATE, ComputerState.OFF )
         );
     }
 
     @Override
-    protected void fillStateContainer( StateContainer.Builder<Block, IBlockState> builder )
+    protected void fillStateContainer( StateContainer.Builder<Block, BlockState> builder )
     {
         builder.add( FACING, STATE );
     }
 
     @Nullable
     @Override
-    public IBlockState getStateForPlacement( BlockItemUseContext placement )
+    public BlockState getStateForPlacement( BlockItemUseContext placement )
     {
         return getDefaultState().with( FACING, placement.getPlacementHorizontalFacing().getOpposite() );
     }

src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java

@@ -6,33 +6,40 @@
 
 package dan200.computercraft.shared.computer.blocks;
 
+import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.shared.common.BlockGeneric;
 import dan200.computercraft.shared.common.IBundledRedstoneBlock;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.items.IComputerItem;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.fluid.IFluidState;
+import dan200.computercraft.shared.util.NamedTileEntityType;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.stats.Stats;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.NonNullList;
+import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
+import net.minecraft.world.server.ServerWorld;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameters;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 public abstract class BlockComputerBase<T extends TileComputerBase> extends BlockGeneric implements IBundledRedstoneBlock
 {
+    private static final ResourceLocation DROP = new ResourceLocation( ComputerCraft.MOD_ID, "computer" );
+
     private final ComputerFamily family;
 
-    protected BlockComputerBase( Properties settings, ComputerFamily family, TileEntityType<? extends T> type )
+    protected BlockComputerBase( Properties settings, ComputerFamily family, NamedTileEntityType<? extends T> type )
     {
         super( settings, type );
         this.family = family;
@@ -40,9 +47,9 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
 
     @Override
     @Deprecated
-    public void onBlockAdded( IBlockState state, World world, BlockPos pos, IBlockState oldState )
+    public void onBlockAdded( BlockState state, World world, BlockPos pos, BlockState oldState, boolean isMoving )
     {
-        super.onBlockAdded( state, world, pos, oldState );
+        super.onBlockAdded( state, world, pos, oldState, isMoving );
 
         TileEntity tile = world.getTileEntity( pos );
         if( tile instanceof TileComputerBase ) ((TileComputerBase) tile).updateInput();
@@ -50,14 +57,14 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
 
     @Override
     @Deprecated
-    public boolean canProvidePower( IBlockState state )
+    public boolean canProvidePower( BlockState state )
     {
         return true;
     }
 
     @Override
     @Deprecated
-    public int getStrongPower( IBlockState state, IBlockReader world, BlockPos pos, EnumFacing incomingSide )
+    public int getStrongPower( BlockState state, IBlockReader world, BlockPos pos, Direction incomingSide )
     {
         TileEntity entity = world.getTileEntity( pos );
         if( !(entity instanceof TileComputerBase) ) return 0;
@@ -80,19 +87,19 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
 
     @Override
     @Deprecated
-    public int getWeakPower( IBlockState state, IBlockReader world, BlockPos pos, EnumFacing incomingSide )
+    public int getWeakPower( BlockState state, IBlockReader world, BlockPos pos, Direction incomingSide )
     {
         return getStrongPower( state, world, pos, incomingSide );
     }
 
     @Override
-    public boolean getBundledRedstoneConnectivity( World world, BlockPos pos, EnumFacing side )
+    public boolean getBundledRedstoneConnectivity( World world, BlockPos pos, Direction side )
     {
         return true;
     }
 
     @Override
-    public int getBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
+    public int getBundledRedstoneOutput( World world, BlockPos pos, Direction side )
     {
         TileEntity entity = world.getTileEntity( pos );
         if( !(entity instanceof TileComputerBase) ) return 0;
@@ -107,7 +114,7 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
 
     @Nonnull
     @Override
-    public ItemStack getPickBlock( IBlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, EntityPlayer player )
+    public ItemStack getPickBlock( BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, PlayerEntity player )
     {
         TileEntity tile = world.getTileEntity( pos );
         if( tile instanceof TileComputerBase )
@@ -120,45 +127,43 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
     }
 
     @Override
-    @Deprecated
-    public final void dropBlockAsItemWithChance( @Nonnull IBlockState state, World world, @Nonnull BlockPos pos, float change, int fortune )
+    public void harvestBlock( @Nonnull World world, PlayerEntity player, @Nonnull BlockPos pos, BlockState state, @Nullable TileEntity tile, @Nonnull ItemStack tool )
     {
+        // Don't drop blocks here - see onBlockHarvested.
+        player.addStat( Stats.BLOCK_MINED.get( this ) );
+        player.addExhaustion( 0.005F );
     }
 
     @Override
-    public final void getDrops( IBlockState state, NonNullList<ItemStack> drops, World world, BlockPos pos, int fortune )
+    public void onBlockHarvested( World world, @Nonnull BlockPos pos, BlockState state, @Nonnull PlayerEntity player )
     {
+        if( !(world instanceof ServerWorld) ) return;
+
+        // We drop the item here instead of doing it in the harvest method, as we should
+        // drop computers for creative players too.
+
         TileEntity tile = world.getTileEntity( pos );
         if( tile instanceof TileComputerBase )
         {
-            ItemStack stack = getItem( (TileComputerBase) tile );
-            if( !stack.isEmpty() ) drops.add( stack );
-        }
-    }
-
-    @Override
-    public boolean removedByPlayer( IBlockState state, World world, BlockPos pos, EntityPlayer player, boolean willHarvest, IFluidState fluid )
-    {
-        if( !world.isRemote )
-        {
-            // We drop the item here instead of doing it in the harvest method, as we
-            // need to drop it for creative players too.
-            TileEntity tile = world.getTileEntity( pos );
-            if( tile instanceof TileComputerBase )
+            TileComputerBase computer = (TileComputerBase) tile;
+            LootContext.Builder context = new LootContext.Builder( (ServerWorld) world )
+                .withRandom( world.rand )
+                .withParameter( LootParameters.POSITION, pos )
+                .withParameter( LootParameters.TOOL, player.getHeldItemMainhand() )
+                .withParameter( LootParameters.THIS_ENTITY, player )
+                .withNullableParameter( LootParameters.BLOCK_ENTITY, tile )
+                .withDynamicDrop( DROP, ( ctx, out ) -> out.accept( getItem( computer ) ) );
+            for( ItemStack item : state.getDrops( context ) )
             {
-                TileComputerBase computer = (TileComputerBase) tile;
-                if( !player.abilities.isCreativeMode || computer.getLabel() != null )
-                {
-                    spawnAsEntity( world, pos, getItem( computer ) );
-                }
+                spawnAsEntity( world, pos, item );
             }
-        }
 
-        return super.removedByPlayer( state, world, pos, player, willHarvest, fluid );
+            state.spawnAdditionalDrops( world, pos, player.getHeldItemMainhand() );
+        }
     }
 
     @Override
-    public void onBlockPlacedBy( World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack )
+    public void onBlockPlacedBy( World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack )
     {
         super.onBlockPlacedBy( world, pos, state, placer, stack );
 

src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java

@@ -10,19 +10,20 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.apis.CommandAPI;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
-import dan200.computercraft.shared.util.NamedBlockEntityType;
+import dan200.computercraft.shared.util.NamedTileEntityType;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.ICommandSource;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextComponentTranslation;
-import net.minecraft.world.WorldServer;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.server.ServerWorld;
 
 import javax.annotation.Nonnull;
 import java.util.HashMap;
@@ -30,7 +31,7 @@ import java.util.Map;
 
 public class TileCommandComputer extends TileComputer
 {
-    public static final NamedBlockEntityType<TileCommandComputer> FACTORY = NamedBlockEntityType.create(
+    public static final NamedTileEntityType<TileCommandComputer> FACTORY = NamedTileEntityType.create(
         new ResourceLocation( ComputerCraft.MOD_ID, "command_computer" ),
         f -> new TileCommandComputer( ComputerFamily.Command, f )
     );
@@ -63,7 +64,7 @@ public class TileCommandComputer extends TileComputer
         @Override
         public boolean shouldReceiveFeedback()
         {
-            return getWorld().getGameRules().getBoolean( "sendCommandFeedback" );
+            return getWorld().getGameRules().getBoolean( GameRules.SEND_COMMAND_FEEDBACK );
         }
 
         @Override
@@ -75,7 +76,7 @@ public class TileCommandComputer extends TileComputer
         @Override
         public boolean allowLogging()
         {
-            return getWorld().getGameRules().getBoolean( "commandBlockOutput" );
+            return getWorld().getGameRules().getBoolean( GameRules.COMMAND_BLOCK_OUTPUT );
         }
     }
 
@@ -104,8 +105,8 @@ public class TileCommandComputer extends TileComputer
 
         return new CommandSource( receiver,
             new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ), Vec2f.ZERO,
-            (WorldServer) getWorld(), 2,
-            name, new TextComponentString( name ),
+            (ServerWorld) getWorld(), 2,
+            name, new StringTextComponent( name ),
             getWorld().getServer(), null
         );
     }
@@ -119,17 +120,17 @@ public class TileCommandComputer extends TileComputer
     }
 
     @Override
-    public boolean isUsable( EntityPlayer player, boolean ignoreRange )
+    public boolean isUsable( PlayerEntity player, boolean ignoreRange )
     {
         MinecraftServer server = player.getServer();
         if( server == null || !server.isCommandBlockEnabled() )
         {
-            player.sendStatusMessage( new TextComponentTranslation( "advMode.notEnabled" ), true );
+            player.sendStatusMessage( new TranslationTextComponent( "advMode.notEnabled" ), true );
             return false;
         }
         else if( !player.canUseCommandBlock() )
         {
-            player.sendStatusMessage( new TextComponentTranslation( "advMode.notAllowed" ), true );
+            player.sendStatusMessage( new TranslationTextComponent( "advMode.notAllowed" ), true );
             return false;
         }
         else

src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java

@@ -11,22 +11,27 @@ import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
-import dan200.computercraft.shared.network.Containers;
-import dan200.computercraft.shared.util.NamedBlockEntityType;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import dan200.computercraft.shared.computer.inventory.ContainerComputer;
+import dan200.computercraft.shared.util.NamedTileEntityType;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.Container;
 import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public class TileComputer extends TileComputerBase
 {
-    public static final NamedBlockEntityType<TileComputer> FACTORY_NORMAL = NamedBlockEntityType.create(
+    public static final NamedTileEntityType<TileComputer> FACTORY_NORMAL = NamedTileEntityType.create(
         new ResourceLocation( ComputerCraft.MOD_ID, "computer_normal" ),
         f -> new TileComputer( ComputerFamily.Normal, f )
     );
 
-    public static final NamedBlockEntityType<TileComputer> FACTORY_ADVANCED = NamedBlockEntityType.create(
+    public static final NamedTileEntityType<TileComputer> FACTORY_ADVANCED = NamedTileEntityType.create(
         new ResourceLocation( ComputerCraft.MOD_ID, "computer_advanced" ),
         f -> new TileComputer( ComputerFamily.Advanced, f )
     );
@@ -43,7 +48,7 @@ public class TileComputer extends TileComputerBase
     {
         ComputerFamily family = getFamily();
         ServerComputer computer = new ServerComputer(
-            getWorld(), id, m_label, instanceID, family,
+            getWorld(), id, label, instanceID, family,
             ComputerCraft.terminalWidth_computer,
             ComputerCraft.terminalHeight_computer
         );
@@ -68,19 +73,13 @@ public class TileComputer extends TileComputerBase
         return m_proxy;
     }
 
-    @Override
-    public void openGUI( EntityPlayer player )
-    {
-        Containers.openComputerGUI( player, this );
-    }
-
-    public boolean isUsableByPlayer( EntityPlayer player )
+    public boolean isUsableByPlayer( PlayerEntity player )
     {
         return isUsable( player, false );
     }
 
     @Override
-    public EnumFacing getDirection()
+    public Direction getDirection()
     {
         return getBlockState().get( BlockComputer.FACING );
     }
@@ -88,7 +87,7 @@ public class TileComputer extends TileComputerBase
     @Override
     protected void updateBlockState( ComputerState newState )
     {
-        IBlockState existing = getBlockState();
+        BlockState existing = getBlockState();
         if( existing.get( BlockComputer.STATE ) != newState )
         {
             getWorld().setBlockState( getPos(), existing.with( BlockComputer.STATE, newState ), 3 );
@@ -104,4 +103,11 @@ public class TileComputer extends TileComputerBase
         if( localSide == ComputerSide.LEFT ) return ComputerSide.RIGHT;
         return localSide;
     }
+
+    @Nullable
+    @Override
+    public Container createMenu( int id, @Nonnull PlayerInventory inventory, @Nonnull PlayerEntity player )
+    {
+        return new ContainerComputer( id, this );
+    }
 }

src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java

@@ -13,44 +13,47 @@ import dan200.computercraft.core.computer.ComputerSide;
 import dan200.computercraft.shared.BundledRedstone;
 import dan200.computercraft.shared.Peripherals;
 import dan200.computercraft.shared.common.TileGeneric;
-import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
+import dan200.computercraft.shared.network.container.ComputerContainerData;
 import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.RedstoneUtil;
 import joptsimple.internal.Strings;
-import net.minecraft.block.BlockRedstoneWire;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.RedstoneDiodeBlock;
+import net.minecraft.block.RedstoneWireBlock;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.INamedContainerProvider;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.INameable;
-import net.minecraft.util.ITickable;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 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 javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.Objects;
 
-public abstract class TileComputerBase extends TileGeneric implements IComputerTile, ITickable, IPeripheralTile, INameable
+public abstract class TileComputerBase extends TileGeneric implements IComputerTile, ITickableTileEntity, IPeripheralTile, INameable, INamedContainerProvider
 {
     private static final String NBT_ID = "ComputerId";
     private static final String NBT_LABEL = "Label";
-    private static final String NBT_INSTANCE = "InstanceId";
     private static final String NBT_ON = "On";
 
     private int m_instanceID = -1;
     private int m_computerID = -1;
-    protected String m_label = null;
+    protected String label = null;
     private boolean m_on = false;
     boolean m_startOn = false;
     private boolean m_fresh = false;
@@ -76,7 +79,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     public void destroy()
     {
         unload();
-        for( EnumFacing dir : DirectionUtil.FACINGS )
+        for( Direction dir : DirectionUtil.FACINGS )
         {
             RedstoneUtil.propagateRedstoneOutput( getWorld(), getPos(), dir );
         }
@@ -95,15 +98,13 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
         super.remove();
     }
 
-    public abstract void openGUI( EntityPlayer player );
-
-    protected boolean canNameWithTag( EntityPlayer player )
+    protected boolean canNameWithTag( PlayerEntity player )
     {
         return false;
     }
 
     @Override
-    public boolean onActivate( EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ )
+    public boolean onActivate( PlayerEntity player, Hand hand, BlockRayTraceResult hit )
     {
         ItemStack currentItem = player.getHeldItem( hand );
         if( !currentItem.isEmpty() && currentItem.getItem() == Items.NAME_TAG && canNameWithTag( player ) && currentItem.hasDisplayName() )
@@ -122,7 +123,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
             if( !getWorld().isRemote && isUsable( player, false ) )
             {
                 createServerComputer().turnOn();
-                openGUI( player );
+                new ComputerContainerData( createServerComputer() ).open( player, this );
             }
             return true;
         }
@@ -160,7 +161,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
 
             m_fresh = false;
             m_computerID = computer.getID();
-            m_label = computer.getLabel();
+            label = computer.getLabel();
             m_on = computer.isOn();
 
             if( computer.hasOutputChanged() ) updateOutput();
@@ -171,35 +172,30 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
 
             if( computer.hasOutputChanged() ) updateOutput();
         }
-        else
-        {
-            ClientComputer computer = createClientComputer();
-            if( computer != null && computer.hasOutputChanged() ) updateBlock();
-        }
     }
 
     protected abstract void updateBlockState( ComputerState newState );
 
     @Nonnull
     @Override
-    public NBTTagCompound write( NBTTagCompound nbt )
+    public CompoundNBT write( CompoundNBT nbt )
     {
         // Save ID, label and power state
         if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID );
-        if( m_label != null ) nbt.putString( NBT_LABEL, m_label );
+        if( label != null ) nbt.putString( NBT_LABEL, label );
         nbt.putBoolean( NBT_ON, m_on );
 
         return super.write( nbt );
     }
 
     @Override
-    public void read( NBTTagCompound nbt )
+    public void read( CompoundNBT nbt )
     {
         super.read( nbt );
 
         // Load ID, label and power state
         m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
-        m_label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
+        label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
         m_on = m_startOn = nbt.getBoolean( NBT_ON );
     }
 
@@ -208,9 +204,9 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
         return false;
     }
 
-    protected abstract EnumFacing getDirection();
+    protected abstract Direction getDirection();
 
-    protected ComputerSide remapToLocalSide( EnumFacing globalSide )
+    protected ComputerSide remapToLocalSide( Direction globalSide )
     {
         return remapLocalSide( DirectionUtil.toLocal( getDirection(), globalSide ) );
     }
@@ -220,9 +216,9 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
         return localSide;
     }
 
-    private void updateSideInput( ServerComputer computer, EnumFacing dir, BlockPos offset )
+    private void updateSideInput( ServerComputer computer, Direction dir, BlockPos offset )
     {
-        EnumFacing offsetSide = dir.getOpposite();
+        Direction offsetSide = dir.getOpposite();
         ComputerSide localDir = remapToLocalSide( dir );
 
         computer.setRedstoneInput( localDir, getRedstoneInput( world, offset, dir ) );
@@ -240,16 +236,16 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
      * @param pos   The position of the neighbour
      * @param side  The side we are reading from
      * @return The effective redstone power
-     * @see net.minecraft.block.BlockRedstoneDiode#calculateInputStrength(World, BlockPos, IBlockState)
+     * @see RedstoneDiodeBlock#calculateInputStrength(World, BlockPos, BlockState)
      */
-    protected static int getRedstoneInput( World world, BlockPos pos, EnumFacing side )
+    protected static int getRedstoneInput( World world, BlockPos pos, Direction side )
     {
         int power = world.getRedstonePower( pos, side );
         if( power >= 15 ) return power;
 
-        IBlockState neighbour = world.getBlockState( pos );
+        BlockState neighbour = world.getBlockState( pos );
         return neighbour.getBlock() == Blocks.REDSTONE_WIRE
-            ? Math.max( power, neighbour.get( BlockRedstoneWire.POWER ) )
+            ? Math.max( power, neighbour.get( RedstoneWireBlock.POWER ) )
             : power;
     }
 
@@ -262,7 +258,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
         if( computer == null ) return;
 
         BlockPos pos = computer.getPosition();
-        for( EnumFacing dir : DirectionUtil.FACINGS )
+        for( Direction dir : DirectionUtil.FACINGS )
         {
             updateSideInput( computer, dir, pos.offset( dir ) );
         }
@@ -276,7 +272,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
         if( computer == null ) return;
 
         BlockPos pos = computer.getPosition();
-        for( EnumFacing dir : DirectionUtil.FACINGS )
+        for( Direction dir : DirectionUtil.FACINGS )
         {
             BlockPos offset = pos.offset( dir );
             if( offset.equals( neighbour ) )
@@ -294,7 +290,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     {
         // Update redstone
         updateBlock();
-        for( EnumFacing dir : DirectionUtil.FACINGS )
+        for( Direction dir : DirectionUtil.FACINGS )
         {
             RedstoneUtil.propagateRedstoneOutput( getWorld(), getPos(), dir );
         }
@@ -313,7 +309,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     @Override
     public final String getLabel()
     {
-        return m_label;
+        return label;
     }
 
     @Override
@@ -330,9 +326,9 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     @Override
     public final void setLabel( String label )
     {
-        if( getWorld().isRemote || Objects.equals( m_label, label ) ) return;
+        if( getWorld().isRemote || Objects.equals( this.label, label ) ) return;
 
-        m_label = label;
+        this.label = label;
         ServerComputer computer = getServerComputer();
         if( computer != null ) computer.setLabel( label );
         markDirty();
@@ -374,41 +370,21 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
         return getWorld().isRemote ? null : ComputerCraft.serverComputerRegistry.get( m_instanceID );
     }
 
-    public ClientComputer createClientComputer()
-    {
-        if( !getWorld().isRemote || m_instanceID < 0 ) return null;
-
-        ClientComputer computer = ComputerCraft.clientComputerRegistry.get( m_instanceID );
-        if( computer == null )
-        {
-            ComputerCraft.clientComputerRegistry.add( m_instanceID, computer = new ClientComputer( m_instanceID ) );
-        }
-        return computer;
-    }
-
-    public ClientComputer getClientComputer()
-    {
-        return getWorld().isRemote ? ComputerCraft.clientComputerRegistry.get( m_instanceID ) : null;
-    }
-
     // Networking stuff
 
     @Override
-    protected void writeDescription( @Nonnull NBTTagCompound nbt )
+    protected void writeDescription( @Nonnull CompoundNBT nbt )
     {
         super.writeDescription( nbt );
-
+        if( label != null ) nbt.putString( NBT_LABEL, label );
         if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID );
-        if( m_label != null ) nbt.putString( NBT_LABEL, m_label );
-        nbt.putInt( NBT_INSTANCE, createServerComputer().getInstanceID() );
     }
 
     @Override
-    protected void readDescription( @Nonnull NBTTagCompound nbt )
+    protected void readDescription( @Nonnull CompoundNBT nbt )
     {
         super.readDescription( nbt );
-        m_instanceID = nbt.contains( NBT_INSTANCE ) ? nbt.getInt( NBT_INSTANCE ) : -1;
-        m_label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
+        label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null;
         m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
     }
 
@@ -419,7 +395,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
             unload();
             m_instanceID = copy.m_instanceID;
             m_computerID = copy.m_computerID;
-            m_label = copy.m_label;
+            label = copy.label;
             m_on = copy.m_on;
             m_startOn = copy.m_startOn;
             updateBlock();
@@ -429,7 +405,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
 
     @Nullable
     @Override
-    public IPeripheral getPeripheral( @Nonnull EnumFacing side )
+    public IPeripheral getPeripheral( @Nonnull Direction side )
     {
         return new ComputerPeripheral( "computer", createProxy() );
     }
@@ -438,19 +414,28 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
     @Override
     public ITextComponent getName()
     {
-        return hasCustomName() ? new TextComponentString( m_label ) : getBlockState().getBlock().getNameTextComponent();
+        return hasCustomName()
+            ? new StringTextComponent( label )
+            : new TranslationTextComponent( getBlockState().getBlock().getTranslationKey() );
     }
 
     @Override
     public boolean hasCustomName()
     {
-        return !Strings.isNullOrEmpty( m_label );
+        return !Strings.isNullOrEmpty( label );
     }
 
     @Nullable
     @Override
     public ITextComponent getCustomName()
     {
-        return hasCustomName() ? new TextComponentString( m_label ) : null;
+        return hasCustomName() ? new StringTextComponent( label ) : null;
+    }
+
+    @Nonnull
+    @Override
+    public ITextComponent getDisplayName()
+    {
+        return INameable.super.getDisplayName();
     }
 }

src/main/java/dan200/computercraft/shared/computer/core/ClientComputer.java

@@ -6,11 +6,10 @@
 
 package dan200.computercraft.shared.computer.core;
 
-import com.google.common.base.Objects;
 import dan200.computercraft.shared.common.ClientTerminal;
 import dan200.computercraft.shared.network.NetworkHandler;
 import dan200.computercraft.shared.network.server.*;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 
 public class ClientComputer extends ClientTerminal implements IComputer
 {
@@ -18,10 +17,8 @@ public class ClientComputer extends ClientTerminal implements IComputer
 
     private boolean m_on = false;
     private boolean m_blinking = false;
-    private boolean m_changed = true;
-    private NBTTagCompound m_userData = null;
+    private CompoundNBT m_userData = null;
 
-    private boolean m_changedLastFrame = false;
 
     public ClientComputer( int instanceID )
     {
@@ -29,18 +26,7 @@ public class ClientComputer extends ClientTerminal implements IComputer
         m_instanceID = instanceID;
     }
 
-    public void update()
-    {
-        m_changedLastFrame = m_changed;
-        m_changed = false;
-    }
-
-    public boolean hasOutputChanged()
-    {
-        return m_changedLastFrame;
-    }
-
-    public NBTTagCompound getUserData()
+    public CompoundNBT getUserData()
     {
         return m_userData;
     }
@@ -135,16 +121,10 @@ public class ClientComputer extends ClientTerminal implements IComputer
         NetworkHandler.sendToServer( new MouseEventServerMessage( m_instanceID, MouseEventServerMessage.TYPE_SCROLL, direction, x, y ) );
     }
 
-    public void setState( ComputerState state, NBTTagCompound userData )
+    public void setState( ComputerState state, CompoundNBT userData )
     {
-        boolean oldOn = m_on;
-        boolean oldBlinking = m_blinking;
-        NBTTagCompound oldUserData = m_userData;
-
         m_on = state != ComputerState.OFF;
         m_blinking = state == ComputerState.BLINKING;
         m_userData = userData;
-
-        m_changed |= m_on != oldOn || m_blinking != oldBlinking || !Objects.equal( m_userData, oldUserData );
     }
 }

src/main/java/dan200/computercraft/shared/computer/core/ClientComputerRegistry.java

@@ -8,14 +8,6 @@ package dan200.computercraft.shared.computer.core;
 
 public class ClientComputerRegistry extends ComputerRegistry<ClientComputer>
 {
-    public void update()
-    {
-        for( ClientComputer computer : getComputers() )
-        {
-            computer.update();
-        }
-    }
-
     @Override
     public void add( int instanceID, ClientComputer computer )
     {

src/main/java/dan200/computercraft/shared/computer/core/IContainerComputer.java

@@ -6,11 +6,13 @@
 
 package dan200.computercraft.shared.computer.core;
 
+import net.minecraft.inventory.container.Container;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
- * An instance of {@link net.minecraft.inventory.Container} which provides a computer. You should implement this
+ * An instance of {@link Container} which provides a computer. You should implement this
  * if you provide custom computers/GUIs to interact with them.
  */
 @FunctionalInterface

src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java

@@ -22,9 +22,9 @@ import dan200.computercraft.shared.network.NetworkMessage;
 import dan200.computercraft.shared.network.client.ComputerDataClientMessage;
 import dan200.computercraft.shared.network.client.ComputerDeletedClientMessage;
 import dan200.computercraft.shared.network.client.ComputerTerminalClientMessage;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -43,7 +43,7 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
 
     private final ComputerFamily m_family;
     private final Computer m_computer;
-    private NBTTagCompound m_userData;
+    private CompoundNBT m_userData;
     private boolean m_changed;
 
     private boolean m_changedLastFrame;
@@ -134,11 +134,11 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
         m_computer.unload();
     }
 
-    public NBTTagCompound getUserData()
+    public CompoundNBT getUserData()
     {
         if( m_userData == null )
         {
-            m_userData = new NBTTagCompound();
+            m_userData = new CompoundNBT();
         }
         return m_userData;
     }
@@ -155,7 +155,7 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
 
     protected NetworkMessage createTerminalPacket()
     {
-        NBTTagCompound tagCompound = new NBTTagCompound();
+        CompoundNBT tagCompound = new CompoundNBT();
         writeDescription( tagCompound );
         return new ComputerTerminalClientMessage( getInstanceID(), tagCompound );
     }
@@ -174,7 +174,7 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
             MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
 
             NetworkMessage packet = null;
-            for( EntityPlayer player : server.getPlayerList().getPlayers() )
+            for( PlayerEntity player : server.getPlayerList().getPlayers() )
             {
                 if( isInteracting( player ) )
                 {
@@ -185,13 +185,13 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
         }
     }
 
-    public void sendComputerState( EntityPlayer player )
+    public void sendComputerState( PlayerEntity player )
     {
         // Send state to client
         NetworkHandler.sendToPlayer( player, createComputerPacket() );
     }
 
-    public void sendTerminalState( EntityPlayer player )
+    public void sendTerminalState( PlayerEntity player )
     {
         // Send terminal state to client
         NetworkHandler.sendToPlayer( player, createTerminalPacket() );
@@ -357,7 +357,7 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
     }
 
     @Nullable
-    public IContainerComputer getContainer( EntityPlayer player )
+    public IContainerComputer getContainer( PlayerEntity player )
     {
         if( player == null ) return null;
 
@@ -368,7 +368,7 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComput
         return computerContainer.getComputer() != this ? null : computerContainer;
     }
 
-    protected boolean isInteracting( EntityPlayer player )
+    protected boolean isInteracting( PlayerEntity player )
     {
         return getContainer( player ) != null;
     }

src/main/java/dan200/computercraft/shared/computer/inventory/ContainerComputer.java

@@ -7,49 +7,22 @@
 package dan200.computercraft.shared.computer.inventory;
 
 import dan200.computercraft.shared.computer.blocks.TileComputer;
-import dan200.computercraft.shared.computer.core.IComputer;
-import dan200.computercraft.shared.computer.core.IContainerComputer;
-import dan200.computercraft.shared.computer.core.InputState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
+import dan200.computercraft.shared.network.container.ComputerContainerData;
+import dan200.computercraft.shared.network.container.ContainerData;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public class ContainerComputer extends Container implements IContainerComputer
+public class ContainerComputer extends ContainerComputerBase
 {
-    private final TileComputer computer;
-    private final InputState input = new InputState( this );
+    public static final ContainerType<ContainerComputer> TYPE = ContainerData.toType( ComputerContainerData::new, ContainerComputer::new );
 
-    public ContainerComputer( TileComputer computer )
+    public ContainerComputer( int id, TileComputer tile )
     {
-        this.computer = computer;
+        super( TYPE, id, tile::isUsableByPlayer, tile.createServerComputer(), tile.getFamily() );
     }
 
-    @Override
-    public boolean canInteractWith( @Nonnull EntityPlayer player )
+    private ContainerComputer( int id, PlayerInventory player, ComputerContainerData data )
     {
-        return computer.isUsableByPlayer( player );
-    }
-
-    @Nullable
-    @Override
-    public IComputer getComputer()
-    {
-        return computer.getServerComputer();
-    }
-
-    @Nonnull
-    @Override
-    public InputState getInput()
-    {
-        return input;
-    }
-
-    @Override
-    public void onContainerClosed( EntityPlayer player )
-    {
-        super.onContainerClosed( player );
-        input.close();
+        super( TYPE, id, player, data );
     }
 }

src/main/java/dan200/computercraft/shared/computer/inventory/ContainerComputerBase.java

@@ -0,0 +1,83 @@
+/*
+ * 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.shared.computer.inventory;
+
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.computer.core.*;
+import dan200.computercraft.shared.network.container.ComputerContainerData;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.ContainerType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.function.Predicate;
+
+public class ContainerComputerBase extends Container implements IContainerComputer
+{
+    private final Predicate<PlayerEntity> canUse;
+    private final IComputer computer;
+    private final ComputerFamily family;
+    private final InputState input = new InputState( this );
+
+    protected ContainerComputerBase( ContainerType<? extends ContainerComputerBase> type, int id, Predicate<PlayerEntity> canUse, IComputer computer, ComputerFamily family )
+    {
+        super( type, id );
+        this.canUse = canUse;
+        this.computer = computer;
+        this.family = family;
+    }
+
+    protected ContainerComputerBase( ContainerType<? extends ContainerComputerBase> type, int id, PlayerInventory player, ComputerContainerData data )
+    {
+        this( type, id, x -> true, getComputer( player, data ), data.getFamily() );
+    }
+
+    protected static IComputer getComputer( PlayerInventory player, ComputerContainerData data )
+    {
+        int id = data.getInstanceId();
+        if( !player.player.world.isRemote ) return ComputerCraft.serverComputerRegistry.get( id );
+
+        ClientComputer computer = ComputerCraft.clientComputerRegistry.get( id );
+        if( computer == null ) ComputerCraft.clientComputerRegistry.add( id, computer = new ClientComputer( id ) );
+        return computer;
+    }
+
+    @Override
+    public boolean canInteractWith( @Nonnull PlayerEntity player )
+    {
+        return canUse.test( player );
+    }
+
+    @Nonnull
+    public ComputerFamily getFamily()
+    {
+        return family;
+    }
+
+    @Nullable
+    @Override
+    public IComputer getComputer()
+    {
+        return computer;
+    }
+
+    @Nonnull
+    @Override
+    public InputState getInput()
+    {
+        return input;
+    }
+
+    @Override
+    public void onContainerClosed( PlayerEntity player )
+    {
+        super.onContainerClosed( player );
+        input.close();
+    }
+}

src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java

@@ -7,76 +7,72 @@
 package dan200.computercraft.shared.computer.inventory;
 
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.computer.core.*;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.computer.core.IContainerComputer;
+import dan200.computercraft.shared.computer.core.ServerComputer;
+import dan200.computercraft.shared.network.container.ContainerData;
+import dan200.computercraft.shared.network.container.ViewComputerContainerData;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.util.text.TranslationTextComponent;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
-public class ContainerViewComputer extends Container implements IContainerComputer
+public class ContainerViewComputer extends ContainerComputerBase implements IContainerComputer
 {
-    private final IComputer computer;
-    private final InputState input = new InputState( this );
+    public static final ContainerType<ContainerViewComputer> TYPE = ContainerData.toType( ViewComputerContainerData::new, ContainerViewComputer::new );
 
-    public ContainerViewComputer( IComputer computer )
+    private final int width;
+    private final int height;
+
+    public ContainerViewComputer( int id, ServerComputer computer )
     {
-        this.computer = computer;
+        super( TYPE, id, player -> canInteractWith( computer, player ), computer, computer.getFamily() );
+        this.width = this.height = 0;
     }
 
-    @Nullable
-    @Override
-    public IComputer getComputer()
+    public ContainerViewComputer( int id, PlayerInventory player, ViewComputerContainerData data )
     {
-        return computer;
+        super( TYPE, id, player, data );
+        this.width = data.getWidth();
+        this.height = data.getHeight();
     }
 
-    @Override
-    public boolean canInteractWith( @Nonnull EntityPlayer player )
+    private static boolean canInteractWith( @Nonnull ServerComputer computer, @Nonnull PlayerEntity player )
     {
-        if( computer instanceof ServerComputer )
+        // If this computer no longer exists then discard it.
+        if( ComputerCraft.serverComputerRegistry.get( computer.getInstanceID() ) != computer )
         {
-            ServerComputer serverComputer = (ServerComputer) computer;
+            return false;
+        }
 
-            // If this computer no longer exists then discard it.
-            if( ComputerCraft.serverComputerRegistry.get( serverComputer.getInstanceID() ) != serverComputer )
+        // If we're a command computer then ensure we're in creative
+        if( computer.getFamily() == ComputerFamily.Command )
+        {
+            MinecraftServer server = player.getServer();
+            if( server == null || !server.isCommandBlockEnabled() )
             {
                 return false;
             }
-
-            // If we're a command computer then ensure we're in creative
-            if( serverComputer.getFamily() == ComputerFamily.Command )
+            else if( !player.canUseCommandBlock() )
             {
-                MinecraftServer server = player.getServer();
-                if( server == null || !server.isCommandBlockEnabled() )
-                {
-                    player.sendStatusMessage( new TextComponentTranslation( "advMode.notEnabled" ), false );
-                    return false;
-                }
-                else if( !player.canUseCommandBlock() )
-                {
-                    player.sendStatusMessage( new TextComponentTranslation( "advMode.notAllowed" ), false );
-                    return false;
-                }
+                player.sendStatusMessage( new TranslationTextComponent( "advMode.notAllowed" ), false );
+                return false;
             }
         }
 
         return true;
     }
 
-    @Nonnull
-    @Override
-    public InputState getInput()
+    public int getWidth()
     {
-        return input;
+        return width;
     }
 
-    @Override
-    public void onContainerClosed( EntityPlayer player )
+    public int getHeight()
     {
-        super.onContainerClosed( player );
-        input.close();
+        return height;
     }
 }

src/main/java/dan200/computercraft/shared/computer/items/IComputerItem.java

@@ -8,7 +8,7 @@ package dan200.computercraft.shared.computer.items;
 
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundNBT;
 
 import javax.annotation.Nonnull;
 
@@ -18,7 +18,7 @@ public interface IComputerItem
 
     default int getComputerID( @Nonnull ItemStack stack )
     {
-        NBTTagCompound nbt = stack.getTag();
+        CompoundNBT nbt = stack.getTag();
         return nbt != null && nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
     }
 

src/main/java/dan200/computercraft/shared/computer/items/ItemComputer.java

@@ -9,7 +9,7 @@ package dan200.computercraft.shared.computer.items;
 import dan200.computercraft.shared.computer.blocks.BlockComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.StringTextComponent;
 
 import javax.annotation.Nonnull;
 
@@ -24,7 +24,7 @@ public class ItemComputer extends ItemComputerBase
     {
         ItemStack result = new ItemStack( this );
         if( id >= 0 ) result.getOrCreateTag().putInt( NBT_ID, id );
-        if( label != null ) result.setDisplayName( new TextComponentString( label ) );
+        if( label != null ) result.setDisplayName( new StringTextComponent( label ) );
         return result;
     }
 

src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java

@@ -13,19 +13,19 @@ import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.shared.computer.blocks.BlockComputerBase;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.List;
 
-public abstract class ItemComputerBase extends ItemBlock implements IComputerItem, IMedia
+public abstract class ItemComputerBase extends BlockItem implements IComputerItem, IMedia
 {
     private final ComputerFamily family;
 
@@ -43,7 +43,7 @@ public abstract class ItemComputerBase extends ItemBlock implements IComputerIte
             int id = getComputerID( stack );
             if( id >= 0 )
             {
-                list.add( new TextComponentTranslation( "gui.computercraft.tooltip.computer_id", id )
+                list.add( new TranslationTextComponent( "gui.computercraft.tooltip.computer_id", id )
                     .applyTextStyle( TextFormatting.GRAY ) );
             }
         }
@@ -68,7 +68,7 @@ public abstract class ItemComputerBase extends ItemBlock implements IComputerIte
     {
         if( label != null )
         {
-            stack.setDisplayName( new TextComponentString( label ) );
+            stack.setDisplayName( new StringTextComponent( label ) );
         }
         else
         {

src/main/java/dan200/computercraft/shared/computer/recipe/ComputerConvertRecipe.java

@@ -7,7 +7,7 @@
 package dan200.computercraft.shared.computer.recipe;
 
 import dan200.computercraft.shared.computer.items.IComputerItem;
-import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.item.crafting.ShapedRecipe;
@@ -34,7 +34,7 @@ public abstract class ComputerConvertRecipe extends ShapedRecipe
     protected abstract ItemStack convert( @Nonnull IComputerItem item, @Nonnull ItemStack stack );
 
     @Override
-    public boolean matches( @Nonnull IInventory inventory, @Nonnull World world )
+    public boolean matches( @Nonnull CraftingInventory inventory, @Nonnull World world )
     {
         if( !super.matches( inventory, world ) ) return false;
 
@@ -48,7 +48,7 @@ public abstract class ComputerConvertRecipe extends ShapedRecipe
 
     @Nonnull
     @Override
-    public ItemStack getCraftingResult( @Nonnull IInventory inventory )
+    public ItemStack getCraftingResult( @Nonnull CraftingInventory inventory )
     {
         // Find our computer item and convert it.
         for( int i = 0; i < inventory.getSizeInventory(); i++ )

src/main/java/dan200/computercraft/shared/computer/recipe/ComputerFamilyRecipe.java

@@ -8,12 +8,12 @@ package dan200.computercraft.shared.computer.recipe;
 
 import com.google.gson.JsonObject;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.util.BasicRecipeSerializer;
 import dan200.computercraft.shared.util.RecipeUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.JsonUtils;
+import net.minecraft.util.JSONUtils;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 
@@ -34,7 +34,7 @@ public abstract class ComputerFamilyRecipe extends ComputerConvertRecipe
         return family;
     }
 
-    public abstract static class Serializer<T extends ComputerFamilyRecipe> implements IRecipeSerializer<T>
+    public abstract static class Serializer<T extends ComputerFamilyRecipe> extends BasicRecipeSerializer<T>
     {
         protected abstract T create( ResourceLocation identifier, String group, int width, int height, NonNullList<Ingredient> ingredients, ItemStack result, ComputerFamily family );
 
@@ -42,11 +42,11 @@ public abstract class ComputerFamilyRecipe extends ComputerConvertRecipe
         @Override
         public T read( @Nonnull ResourceLocation identifier, @Nonnull JsonObject json )
         {
-            String group = JsonUtils.getString( json, "group", "" );
+            String group = JSONUtils.getString( json, "group", "" );
             ComputerFamily family = RecipeUtil.getFamily( json, "family" );
 
             RecipeUtil.ShapedTemplate template = RecipeUtil.getTemplate( json );
-            ItemStack result = deserializeItem( JsonUtils.getJsonObject( json, "result" ) );
+            ItemStack result = deserializeItem( JSONUtils.getJsonObject( json, "result" ) );
 
             return create( identifier, group, template.width, template.height, template.ingredients, result, family );
         }

src/main/java/dan200/computercraft/shared/computer/recipe/ComputerUpgradeRecipe.java

@@ -6,7 +6,6 @@
 
 package dan200.computercraft.shared.computer.recipe;
 
-import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.items.IComputerItem;
 import net.minecraft.item.ItemStack;
@@ -38,7 +37,6 @@ public class ComputerUpgradeRecipe extends ComputerFamilyRecipe
         return SERIALIZER;
     }
 
-    private static final ResourceLocation ID = new ResourceLocation( ComputerCraft.MOD_ID, "computer_upgrade" );
     public static final IRecipeSerializer<ComputerUpgradeRecipe> SERIALIZER = new Serializer<ComputerUpgradeRecipe>()
     {
         @Override
@@ -46,12 +44,5 @@ public class ComputerUpgradeRecipe extends ComputerFamilyRecipe
         {
             return new ComputerUpgradeRecipe( identifier, group, width, height, ingredients, result, family );
         }
-
-        @Nonnull
-        @Override
-        public ResourceLocation getName()
-        {
-            return ID;
-        }
     };
 }

src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java

@@ -0,0 +1,44 @@
+/*
+ * 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.shared.data;
+
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.INameable;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameter;
+import net.minecraft.world.storage.loot.LootParameters;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * A loot condition which checks if the tile entity has a name.
+ */
+public final class BlockNamedEntityLootCondition implements ILootCondition
+{
+    public static final BlockNamedEntityLootCondition INSTANCE = new BlockNamedEntityLootCondition();
+
+    private BlockNamedEntityLootCondition()
+    {
+    }
+
+    @Override
+    public boolean test( LootContext lootContext )
+    {
+        TileEntity tile = lootContext.get( LootParameters.BLOCK_ENTITY );
+        return tile instanceof INameable && ((INameable) tile).hasCustomName();
+    }
+
+    @Nonnull
+    @Override
+    public Set<LootParameter<?>> getRequiredParameters()
+    {
+        return Collections.singleton( LootParameters.BLOCK_ENTITY );
+    }
+}

src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java

@@ -0,0 +1,43 @@
+/*
+ * 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.shared.data;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;
+
+import javax.annotation.Nonnull;
+
+public final class ConstantLootConditionSerializer<T extends ILootCondition> extends ILootCondition.AbstractSerializer<T>
+{
+    private final T instance;
+
+    private ConstantLootConditionSerializer( ResourceLocation id, Class<T> klass, T instance )
+    {
+        super( id, klass );
+        this.instance = instance;
+    }
+
+    public static <T extends ILootCondition> ILootCondition.AbstractSerializer<T> of( ResourceLocation id, Class<T> klass, T instance )
+    {
+        return new ConstantLootConditionSerializer<>( id, klass, instance );
+    }
+
+    @Override
+    public void serialize( @Nonnull JsonObject json, @Nonnull T object, @Nonnull JsonSerializationContext context )
+    {
+    }
+
+    @Nonnull
+    @Override
+    public T deserialize( @Nonnull JsonObject json, @Nonnull JsonDeserializationContext context )
+    {
+        return instance;
+    }
+}

src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java

@@ -0,0 +1,44 @@
+/*
+ * 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.shared.data;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameter;
+import net.minecraft.world.storage.loot.LootParameters;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * A loot condition which checks if the entity is in creative mode.
+ */
+public final class PlayerCreativeLootCondition implements ILootCondition
+{
+    public static final PlayerCreativeLootCondition INSTANCE = new PlayerCreativeLootCondition();
+
+    private PlayerCreativeLootCondition()
+    {
+    }
+
+    @Override
+    public boolean test( LootContext lootContext )
+    {
+        Entity entity = lootContext.get( LootParameters.THIS_ENTITY );
+        return entity instanceof PlayerEntity && ((PlayerEntity) entity).abilities.isCreativeMode;
+    }
+
+    @Nonnull
+    @Override
+    public Set<LootParameter<?>> getRequiredParameters()
+    {
+        return Collections.singleton( LootParameters.THIS_ENTITY );
+    }
+}

src/main/java/dan200/computercraft/shared/integration/charset/BundledCapabilityProvider.java

@@ -6,7 +6,7 @@
 package dan200.computercraft.shared.integration.charset;
 
 import dan200.computercraft.shared.common.TileGeneric;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import pl.asie.charset.api.wires.IBundledEmitter;
@@ -30,14 +30,14 @@ final class BundledCapabilityProvider implements ICapabilityProvider
     }
 
     @Override
-    public boolean hasCapability( @Nonnull Capability<?> capability, @Nullable EnumFacing side )
+    public boolean hasCapability( @Nonnull Capability<?> capability, @Nullable Direction side )
     {
         return capability == CAPABILITY_EMITTER || capability == CAPABILITY_RECEIVER;
     }
 
     @Nullable
     @Override
-    public <T> T getCapability( @Nonnull Capability<T> capability, @Nullable EnumFacing side )
+    public <T> T getCapability( @Nonnull Capability<T> capability, @Nullable Direction side )
     {
         if( capability == CAPABILITY_RECEIVER )
         {
@@ -62,7 +62,7 @@ final class BundledCapabilityProvider implements ICapabilityProvider
                 {
                     emitter = emitters[index] = () -> {
                         int flags = 0;
-                        for( EnumFacing facing : EnumFacing.VALUES ) flags |= tile.getBundledRedstoneOutput( facing );
+                        for( Direction facing : Direction.VALUES ) flags |= tile.getBundledRedstoneOutput( facing );
                         return toBytes( flags );
                     };
                 }

src/main/java/dan200/computercraft/shared/integration/charset/BundledRedstoneProvider.java

@@ -7,7 +7,7 @@ package dan200.computercraft.shared.integration.charset;
 
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 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;
 
@@ -18,7 +18,7 @@ import static dan200.computercraft.shared.integration.charset.IntegrationCharset
 public class BundledRedstoneProvider implements IBundledRedstoneProvider
 {
     @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 )
     {
         TileEntity tile = world.getTileEntity( pos );
         if( tile == null || !tile.hasCapability( CAPABILITY_EMITTER, side ) ) return -1;

src/main/java/dan200/computercraft/shared/integration/mcmp/MCMPHooks.java

@@ -8,13 +8,11 @@ package dan200.computercraft.shared.integration.mcmp;
 
 import mcmultipart.MCMultiPart;
 import mcmultipart.api.item.ItemBlockMultipart;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.ActionResultType;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.Loader;
@@ -27,9 +25,9 @@ public final class MCMPHooks
     {
     }
 
-    public static EnumActionResult onItemUse( ItemBlock itemBlock, EntityPlayer player, World world, @Nonnull BlockPos pos, @Nonnull EnumHand hand, @Nonnull EnumFacing facing, float hitX, float hitY, float hitZ )
+    public static ActionResultType onItemUse( BlockItem itemBlock, PlayerEntity player, World world, @Nonnull BlockPos pos, @Nonnull Hand hand, @Nonnull Direction facing, float hitX, float hitY, float hitZ )
     {
-        if( !Loader.isModLoaded( MCMultiPart.MODID ) ) return EnumActionResult.PASS;
+        if( !Loader.isModLoaded( MCMultiPart.MODID ) ) return ActionResultType.PASS;
 
         return ItemBlockMultipart.place(
             player, world, pos, hand, facing, hitX, hitY, hitZ, itemBlock,
@@ -37,8 +35,8 @@ public final class MCMPHooks
             MCMPIntegration.multipartMap.get( itemBlock.getBlock() ),
 
             (
-                ItemStack stack, EntityPlayer thisPlayer, World thisWorld, BlockPos thisPos, EnumFacing thisFacing,
-                float thisX, float thisY, float thisZ, IBlockState thisState
+                ItemStack stack, PlayerEntity thisPlayer, World thisWorld, BlockPos thisPos, Direction thisFacing,
+                float thisX, float thisY, float thisZ, BlockState thisState
             ) ->
                 thisPlayer.canPlayerEdit( thisPos, thisFacing, stack ) &&
                     thisWorld.getBlockState( thisPos ).getBlock().isReplaceable( thisWorld, thisPos ) &&

src/main/java/dan200/computercraft/shared/integration/mcmp/MCMPIntegration.java

@@ -24,7 +24,7 @@ import mcmultipart.api.ref.MCMPCapabilities;
 import mcmultipart.api.slot.EnumFaceSlot;
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.Capability;
@@ -105,14 +105,14 @@ public class MCMPIntegration implements IMCMPAddon
         }
 
         @Override
-        public boolean hasCapability( @Nonnull Capability<?> capability, @Nullable EnumFacing facing )
+        public boolean hasCapability( @Nonnull Capability<?> capability, @Nullable Direction facing )
         {
             return capability == MCMPCapabilities.MULTIPART_TILE;
         }
 
         @Nullable
         @Override
-        public <T> T getCapability( @Nonnull Capability<T> capability, @Nullable EnumFacing facing )
+        public <T> T getCapability( @Nonnull Capability<T> capability, @Nullable Direction facing )
         {
             if( capability == MCMPCapabilities.MULTIPART_TILE )
             {

src/main/java/dan200/computercraft/shared/integration/mcmp/PartAdvancedModem.java

@@ -12,9 +12,9 @@ import mcmultipart.api.multipart.IMultipart;
 import mcmultipart.api.slot.EnumFaceSlot;
 import mcmultipart.api.slot.IPartSlot;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -22,13 +22,13 @@ import net.minecraft.world.World;
 public class PartAdvancedModem implements IMultipart
 {
     @Override
-    public IPartSlot getSlotForPlacement( World world, BlockPos pos, IBlockState state, EnumFacing facing, float hitX, float hitY, float hitZ, EntityLivingBase placer )
+    public IPartSlot getSlotForPlacement( World world, BlockPos pos, BlockState state, Direction facing, float hitX, float hitY, float hitZ, LivingEntity placer )
     {
         return EnumFaceSlot.fromFace( state.getValue( BlockAdvancedModem.FACING ) );
     }
 
     @Override
-    public IPartSlot getSlotFromWorld( IBlockAccess world, BlockPos pos, IBlockState state )
+    public IPartSlot getSlotFromWorld( IBlockAccess world, BlockPos pos, BlockState state )
     {
         return EnumFaceSlot.fromFace( state.getValue( BlockAdvancedModem.FACING ) );
     }