Merge branch 'mc-1.13.x' into mc-1.14-fabric

Fixes #223

build.gradle

@@ -1,27 +1,17 @@
-
-// For those who want the bleeding edge
 buildscript {
-    repositories {
-        jcenter()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-    }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
         classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
 }
 
 plugins {
+    id 'fabric-loom' version '0.2.3-SNAPSHOT'
     id 'com.matthewprenger.cursegradle' version '1.2.0'
     id "com.github.breadmoirai.github-release" version "2.2.4"
 }
 
-apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
@@ -32,18 +22,13 @@ group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
 minecraft {
-    version = "${mc_version}-${forge_version}"
-    runDir = "run"
-    replace '${version}', mod_version
-
-    mappings = mappings_version
-    makeObfSourceJar = false
 }
 
 repositories {
+    mavenCentral()
     maven {
         name "JEI"
-        url "http://dvs1.progwml6.com/files/maven"
+        url  "http://dvs1.progwml6.com/files/maven"
     }
     maven {
         name "SquidDev"
@@ -66,13 +51,15 @@ configurations {
 }
 
 dependencies {
-    deobfProvided "mezz.jei:jei_1.12.2:4.15.0.269:api"
-    deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
-    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
+    minecraft "com.mojang:minecraft:${mc_version}"
+    mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}"
+    modCompile "net.fabricmc:fabric-loader:0.4.8+build.153"
+    modCompile "net.fabricmc.fabric-api:fabric-api:0.3.0+build.175"
 
-    runtime "mezz.jei:jei_1.12.2:4.15.0.269"
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
     shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'
+    shade 'javax.vecmath:vecmath:1.5.2'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
@@ -80,6 +67,14 @@ dependencies {
     deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
 }
 
+sourceSets {
+    main {
+        java {
+            exclude 'dan200/computercraft/shared/integration'
+        }
+    }
+}
+
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
@@ -88,7 +83,13 @@ jar {
     dependsOn javadoc
 
     manifest {
-        attributes('FMLAT': 'computercraft_at.cfg')
+        attributes(["Specification-Title": "computercraft",
+                    "Specification-Vendor": "SquidDev",
+                    "Specification-Version": "25.0",
+                    "Implementation-Title": "CC: Tweaked",
+                    "Implementation-Version": "${mod_version}",
+                    "Implementation-Vendor" :"SquidDev",
+                    "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
     }
 
     from (sourceSets.main.allSource) {
@@ -111,8 +112,11 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
     description "Removes unused shadowed classes from the jar"
     group "compact"
 
-    injars jar.archivePath
-    outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
+    afterEvaluate {
+        // Fabric changes the jar's classifier so we to do this after evaluating!
+        injars jar.archivePath
+        outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
+    }
 
     // Add the main runtime jar and all non-shadowed dependencies
     libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
@@ -126,13 +130,17 @@ task proguard(type: ProGuardTask, dependsOn: jar) {
     dontobfuscate; dontoptimize; keepattributes; keepparameternames
 
     // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'assets/computercraft/lua**'
+    keepdirectories 'data/computercraft/lua**'
 
     // Preserve ComputerCraft classes - we only want to strip shadowed files.
     keep 'class dan200.computercraft.** { *; }'
 
     // Preserve the constructors in Cobalt library class, as we init them via reflection
     keepclassmembers 'class org.squiddev.cobalt.lib.** { <init>(...); }'
+
+    // LWJGL and Apache bundle Java 9 versions, which is great, but rather breaks Proguard
+    dontwarn 'module-info'
+    dontwarn 'org.apache.**,org.lwjgl.**,javax.crypto.SecretKey'
 }
 
 task proguardMove(dependsOn: proguard) {
@@ -148,7 +156,7 @@ task proguardMove(dependsOn: proguard) {
     }
 }
 
-reobfJar.dependsOn proguardMove
+remapJar.dependsOn proguardMove
 
 processResources {
     inputs.property "version", mod_version
@@ -170,8 +178,8 @@ processResources {
     inputs.property "commithash", hash
 
     from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        include 'assets/computercraft/lua/rom/help/credits.txt'
+        include 'fabric.mod.json'
+        include 'data/computercraft/lua/rom/help/credits.txt'
 
         expand 'version': mod_version,
                'mcversion': mc_version,
@@ -179,12 +187,12 @@ processResources {
     }
 
     from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-        exclude 'assets/computercraft/lua/rom/help/credits.txt'
+        exclude 'fabric.mod.json'
+        exclude 'data/computercraft/lua/rom/help/credits.txt'
     }
 }
 
-task compressJson(dependsOn: extractAnnotationsJar) {
+task compressJson(dependsOn: remapJar) {
     group "compact"
     description "Minifies all JSON files, stripping whitespace"
 
@@ -231,14 +239,14 @@ task checkRelease {
     description "Verifies that everything is ready for a release"
 
     inputs.property "version", mod_version
-    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt")
-    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
+    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.txt")
+    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
 
     doLast {
         def ok = true
 
         // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt").readLines()
+        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
         if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
             ok = false
             project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
@@ -255,7 +263,7 @@ task checkRelease {
 
         // Check whatsnew and changelog match.
         def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt").getText()
+        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
         if (!changelog.startsWith(versionChangelog)) {
             ok = false
             project.logger.error("whatsnew and changelog are not in sync")
@@ -270,12 +278,22 @@ curseforge {
     apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
     project {
         id = '282001'
-        releaseType = 'release'
+        addGameVersion '1.14.2'
+        releaseType = 'beta'
         changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
 
         relations {
             incompatible "computercraft"
+            requiredDependency "fabric"
         }
+        afterEvaluate {
+            mainArtifact(remapJar.output)
+            uploadTask.dependsOn(remapJar)
+        }
+    }
+
+    options {
+        forgeGradleIntegration = false
     }
 }
 
@@ -283,7 +301,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
-            artifact sourceJar
+            // artifact sourceJar
         }
     }
 }
@@ -341,7 +359,7 @@ githubRelease {
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
     body {
-        "## " + new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
+        "## " + new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
             .readLines()
             .takeWhile { it != 'Type "help changelog" to see the full version history.' }
             .join("\n").trim()
@@ -352,7 +370,7 @@ githubRelease {
 def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
 uploadTasks.forEach { tasks.getByName(it).dependsOn checkRelease }
 
-task uploadAll(dependsOn: uploadTasks) {
+task uploadAll(dependsOn: [remapJar] + uploadTasks) {
     group "upload"
     description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
@@ -366,9 +384,7 @@ test {
 
 gradle.projectsEvaluated {
     tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" // Causes Forge build to fail << "-Werror"
     }
 }
 
-runClient.outputs.upToDateWhen { false }
-runServer.outputs.upToDateWhen { false }

gradle.properties

@@ -2,6 +2,5 @@
 mod_version=1.83.1
 
 # Minecraft properties
-mc_version=1.12.2
-forge_version=14.23.4.2749
-mappings_version=snapshot_20180724
+mc_version=1.14.2
+mappings_version=2

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -1 +1,12 @@
-rootProject.name = "cc-tweaked-${mc_version}"
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "cc-tweaked-${mc_version}-fabric"

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

@@ -1,30 +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;
-
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.network.NetworkCheckHandler;
-import net.minecraftforge.fml.relauncher.Side;
-
-import java.util.Map;
-
-/**
- * A stub mod for CC: Tweaked. This doesn't have any functionality (everything of note is done in
- * {@link ComputerCraft}), but people may depend on this if they require CC: Tweaked functionality.
- */
-@Mod(
-    modid = "cctweaked", name = ComputerCraft.NAME, version = ComputerCraft.VERSION,
-    acceptableRemoteVersions = "*"
-)
-public class CCTweaked
-{
-    @NetworkCheckHandler
-    public boolean onNetworkConnect( Map<String, String> mods, Side side )
-    {
-        return true;
-    }
-}

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

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

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

@@ -0,0 +1,150 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft;
+
+import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
+import dan200.computercraft.api.filesystem.IMount;
+import dan200.computercraft.api.filesystem.IWritableMount;
+import dan200.computercraft.api.lua.ILuaAPIFactory;
+import dan200.computercraft.api.media.IMediaProvider;
+import dan200.computercraft.api.network.IPacketNetwork;
+import dan200.computercraft.api.network.wired.IWiredElement;
+import dan200.computercraft.api.network.wired.IWiredNode;
+import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
+import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.core.apis.ApiFactories;
+import dan200.computercraft.core.filesystem.FileMount;
+import dan200.computercraft.shared.*;
+import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
+import dan200.computercraft.shared.peripheral.modem.wired.TileWiredModemFull;
+import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
+import dan200.computercraft.shared.util.IDAssigner;
+import dan200.computercraft.shared.wired.WiredNode;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.File;
+
+public final class ComputerCraftAPIImpl implements IComputerCraftAPI
+{
+    public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
+
+    private ComputerCraftAPIImpl()
+    {
+    }
+
+    @Nonnull
+    @Override
+    public String getInstalledVersion()
+    {
+        return "${version}";
+    }
+
+    @Override
+    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
+    {
+        return IDAssigner.getNextId( world, parentSubPath );
+    }
+
+    @Override
+    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
+    {
+        try
+        {
+            return new FileMount( new File( IDAssigner.getDir( world ), subPath ), capacity );
+        }
+        catch( Exception e )
+        {
+            return null;
+        }
+    }
+
+    @Override
+    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
+    {
+        return ComputerCraft.createResourceMount( domain, subPath );
+    }
+
+    @Override
+    public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
+    {
+        Peripherals.register( provider );
+    }
+
+    @Override
+    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
+    {
+        TurtleUpgrades.register( upgrade );
+    }
+
+    @Override
+    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
+    {
+        BundledRedstone.register( provider );
+    }
+
+    @Override
+    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    {
+        return BundledRedstone.getDefaultOutput( world, pos, side );
+    }
+
+    @Override
+    public void registerMediaProvider( @Nonnull IMediaProvider provider )
+    {
+        MediaProviders.register( provider );
+    }
+
+    @Override
+    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
+    {
+        PocketUpgrades.register( upgrade );
+    }
+
+    @Nonnull
+    @Override
+    public IPacketNetwork getWirelessNetwork()
+    {
+        return WirelessNetwork.getUniversal();
+    }
+
+    @Override
+    public void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
+    {
+        ApiFactories.register( factory );
+    }
+
+    @Nonnull
+    @Override
+    public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
+    {
+        return new WiredNode( element );
+    }
+
+    @Nullable
+    @Override
+    public IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    {
+        BlockEntity tile = world.getBlockEntity( pos );
+        if( tile instanceof TileCable )
+        {
+            return ((TileCable) tile).getElement( side );
+        }
+        else if( tile instanceof TileWiredModemFull )
+        {
+            return ((TileWiredModemFull) tile).getElement();
+        }
+        return null;
+    }
+}

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

@@ -8,10 +8,10 @@ package dan200.computercraft.api;
 
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleUpgradeType;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
+import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.SystemUtil;
 
 import javax.annotation.Nonnull;
 
@@ -22,59 +22,41 @@ import javax.annotation.Nonnull;
  */
 public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
 {
-    private final ResourceLocation id;
-    private final int legacyId;
+    private final Identifier id;
     private final TurtleUpgradeType type;
     private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, ItemStack stack )
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, String adjective, ItemStack stack )
     {
         this.id = id;
-        this.legacyId = legacyId;
         this.type = type;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, Item item )
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, String adjective, ItemConvertible item )
     {
-        this( id, legacyId, type, adjective, new ItemStack( item ) );
+        this( id, type, adjective, new ItemStack( item ) );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, Block block )
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemStack stack )
     {
-        this( id, legacyId, type, adjective, new ItemStack( block ) );
+        this( id, type, SystemUtil.createTranslationKey( "upgrade", id ) + ".adjective", stack );
     }
 
-    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, ItemStack stack )
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemConvertible item )
     {
-        this( id, legacyId, type, "upgrade." + id + ".adjective", stack );
-    }
-
-    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, Item item )
-    {
-        this( id, legacyId, type, new ItemStack( item ) );
-    }
-
-    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, Block block )
-    {
-        this( id, legacyId, type, new ItemStack( block ) );
+        this( id, type, new ItemStack( item ) );
     }
 
     @Nonnull
     @Override
-    public final ResourceLocation getUpgradeID()
+    public final Identifier getUpgradeID()
     {
         return id;
     }
 
-    @Override
-    public final int getLegacyUpgradeID()
-    {
-        return legacyId;
-    }
-
     @Nonnull
     @Override
     public final String getUnlocalisedAdjective()

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

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

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

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

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

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

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

@@ -9,7 +9,7 @@ package dan200.computercraft.api.media;
 import dan200.computercraft.api.filesystem.IMount;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;

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

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

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

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

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

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

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

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

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

@@ -6,9 +6,9 @@
 
 package dan200.computercraft.api.peripheral;
 
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -17,7 +17,8 @@ import javax.annotation.Nullable;
 /**
  * This interface is used to create peripheral implementations for blocks.
  *
- * If you have a {@link TileEntity} which acts as a peripheral, you may alternatively implement {@link IPeripheralTile}.
+ * If you have a {@link BlockEntity} which acts as a peripheral, you may alternatively implement
+ * {@link IPeripheralTile}.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
  */
@@ -34,5 +35,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,15 +5,15 @@
  */
 package dan200.computercraft.api.peripheral;
 
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
- * A {@link net.minecraft.tileentity.TileEntity} which may act as a peripheral.
+ * A {@link net.minecraft.block.entity.BlockEntity} which may act as a peripheral.
  *
  * If you need more complex capabilities (such as handling TEs not belonging to your mod), you should use
  * {@link IPeripheralProvider}.
@@ -25,8 +25,8 @@ public interface IPeripheralTile
      *
      * @param side The side to get the peripheral from.
      * @return A peripheral, or {@code null} if there is not a peripheral here.
-     * @see IPeripheralProvider#getPeripheral(World, BlockPos, EnumFacing)
+     * @see IPeripheralProvider#getPeripheral(World, BlockPos, Direction)
      */
     @Nullable
-    IPeripheral getPeripheral( @Nonnull EnumFacing side );
+    IPeripheral getPeripheral( @Nonnull Direction side );
 }

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

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

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

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

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

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

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

@@ -6,8 +6,10 @@
 
 package dan200.computercraft.api.pocket;
 
+import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.SystemUtil;
 
 import javax.annotation.Nonnull;
 
@@ -18,25 +20,30 @@ import javax.annotation.Nonnull;
  */
 public abstract class AbstractPocketUpgrade implements IPocketUpgrade
 {
-    private final ResourceLocation id;
+    private final Identifier id;
     private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractPocketUpgrade( ResourceLocation id, String adjective, ItemStack stack )
+    protected AbstractPocketUpgrade( Identifier id, String adjective, ItemStack stack )
     {
         this.id = id;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractPocketUpgrade( ResourceLocation id, ItemStack stack )
+    protected AbstractPocketUpgrade( Identifier identifier, String adjective, ItemConvertible item )
     {
-        this( id, "upgrade." + id + ".adjective", stack );
+        this( identifier, adjective, new ItemStack( item ) );
+    }
+
+    protected AbstractPocketUpgrade( Identifier id, ItemConvertible item )
+    {
+        this( id, SystemUtil.createTranslationKey( "upgrade", id ) + ".adjective", new ItemStack( item ) );
     }
 
     @Nonnull
     @Override
-    public final ResourceLocation getUpgradeID()
+    public final Identifier getUpgradeID()
     {
         return id;
     }

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

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

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

@@ -10,7 +10,7 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -36,7 +36,7 @@ public interface IPocketUpgrade
      * @see ComputerCraftAPI#registerPocketUpgrade(IPocketUpgrade)
      */
     @Nonnull
-    ResourceLocation getUpgradeID();
+    Identifier getUpgradeID();
 
     /**
      * Return an unlocalised string to describe the type of pocket computer this upgrade provides.

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

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

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

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

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

@@ -10,13 +10,12 @@ import com.mojang.authlib.GameProfile;
 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.inventory.Inventory;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.items.IItemHandlerModifiable;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,8 +53,7 @@ public interface ITurtleAccess
      * @param world The new world to move it to
      * @param pos   The new position to move it to.
      * @return Whether the movement was successful. It may fail if the block was not loaded or the block placement
-     * was cancelled. Note this will not check
-     * {@link dan200.computercraft.api.permissions.ITurtlePermissionProvider#isBlockEnterable(World, BlockPos)}.
+     * was cancelled.
      * @throws UnsupportedOperationException When attempting to teleport on the client side.
      */
     boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos );
@@ -84,10 +82,10 @@ public interface ITurtleAccess
      * Returns the world direction the turtle is currently facing.
      *
      * @return The world direction the turtle is currently facing.
-     * @see #setDirection(EnumFacing)
+     * @see #setDirection(Direction)
      */
     @Nonnull
-    EnumFacing getDirection();
+    Direction getDirection();
 
     /**
      * Set the direction the turtle is facing. Note that this will not play a rotation animation, you will also need to
@@ -96,7 +94,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.
@@ -148,21 +146,9 @@ public interface ITurtleAccess
      * Get the inventory of this turtle
      *
      * @return This turtle's inventory
-     * @see #getItemHandler()
      */
     @Nonnull
-    IInventory getInventory();
-
-    /**
-     * Get the inventory of this turtle as an {@link IItemHandlerModifiable}.
-     *
-     * @return This turtle's inventory
-     * @see #getInventory()
-     * @see IItemHandlerModifiable
-     * @see net.minecraftforge.items.CapabilityItemHandler#ITEM_HANDLER_CAPABILITY
-     */
-    @Nonnull
-    IItemHandlerModifiable getItemHandler();
+    Inventory getInventory();
 
     /**
      * Determine whether this turtle will require fuel when performing actions.
@@ -291,7 +277,7 @@ public interface ITurtleAccess
      * @see #updateUpgradeNBTData(TurtleSide)
      */
     @Nonnull
-    NBTTagCompound getUpgradeNBTData( @Nullable TurtleSide side );
+    CompoundTag getUpgradeNBTData( @Nullable TurtleSide side );
 
     /**
      * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the

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

@@ -10,15 +10,13 @@ import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.turtle.event.TurtleAttackEvent;
 import dan200.computercraft.api.turtle.event.TurtleBlockEvent;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.util.ModelIdentifier;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.event.entity.player.AttackEntityEvent;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
@@ -42,18 +40,7 @@ public interface ITurtleUpgrade
      * @see ComputerCraftAPI#registerTurtleUpgrade(ITurtleUpgrade)
      */
     @Nonnull
-    ResourceLocation getUpgradeID();
-
-    /**
-     * Gets a numerical identifier representing this type of turtle upgrade,
-     * for backwards compatibility with pre-1.76 worlds. If your upgrade was
-     * not released for older ComputerCraft versions, you can return -1 here.
-     * The turtle will fail registration if an already used positive ID is specified.
-     *
-     * @return The legacy ID, or -1 if is needed.
-     * @see ComputerCraftAPI#registerTurtleUpgrade(ITurtleUpgrade)
-     */
-    int getLegacyUpgradeID();
+    Identifier getUpgradeID();
 
     /**
      * Return an unlocalised string to describe this type of turtle in turtle item names.
@@ -109,8 +96,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 {@code BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig}for digging,
+     * {@code 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.
@@ -124,7 +111,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();
     }
@@ -132,8 +119,8 @@ public interface ITurtleUpgrade
     /**
      * Called to obtain the model to be used when rendering a turtle peripheral.
      *
-     * This can be obtained from {@link net.minecraft.client.renderer.ItemModelMesher#getItemModel(ItemStack)},
-     * {@link net.minecraft.client.renderer.block.model.ModelManager#getModel(ModelResourceLocation)} or any other
+     * This can be obtained from {@link net.minecraft.client.render.item.ItemModels#getModel(ItemStack)},
+     * {@link net.minecraft.client.render.model.BakedModelManager#getModel(ModelIdentifier)} or any other
      * source.
      *
      * @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!
@@ -142,8 +129,8 @@ public interface ITurtleUpgrade
      * a transformation of {@code null} has the same effect as the identify matrix.
      */
     @Nonnull
-    @SideOnly( Side.CLIENT )
-    Pair<IBakedModel, Matrix4f> getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
+    @Environment( EnvType.CLIENT )
+    Pair<BakedModel, Matrix4f> getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
 
     /**
      * Called once per tick for each turtle which has the upgrade equipped.

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.math.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.math.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/FakePlayer.java

@@ -0,0 +1,286 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.api.turtle.event;
+
+import com.mojang.authlib.GameProfile;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.GenericFutureListener;
+import net.minecraft.block.entity.CommandBlockBlockEntity;
+import net.minecraft.block.entity.SignBlockEntity;
+import net.minecraft.command.arguments.EntityAnchorArgumentType;
+import net.minecraft.container.Container;
+import net.minecraft.container.NameableContainerProvider;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.ClientConnection;
+import net.minecraft.network.NetworkSide;
+import net.minecraft.network.NetworkState;
+import net.minecraft.network.Packet;
+import net.minecraft.network.chat.ChatMessageType;
+import net.minecraft.network.chat.Component;
+import net.minecraft.recipe.Recipe;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.network.ServerPlayerInteractionManager;
+import net.minecraft.server.network.packet.RequestCommandCompletionsC2SPacket;
+import net.minecraft.server.network.packet.VehicleMoveC2SPacket;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.DefaultedList;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.village.TraderOfferList;
+import net.minecraft.world.GameMode;
+import net.minecraft.world.dimension.DimensionType;
+
+import javax.annotation.Nullable;
+import javax.crypto.SecretKey;
+import java.util.Collection;
+import java.util.OptionalInt;
+
+/**
+ * A wrapper for {@link ServerPlayerEntity} which denotes a "fake" player.
+ *
+ * Please note that this does not implement any of the traditional fake player behaviour. It simply exists to prevent
+ * me passing in normal players.
+ */
+public class FakePlayer extends ServerPlayerEntity
+{
+    public FakePlayer( ServerWorld world, GameProfile gameProfile )
+    {
+        super( world.getServer(), world, gameProfile, new ServerPlayerInteractionManager( world ) );
+        networkHandler = new FakeNetHandler( this );
+    }
+
+    // region Direct networkHandler access
+    @Override
+    public void method_6000() { }
+
+    @Override
+    public void method_6044() { }
+
+    @Override
+    public void tick() { }
+
+    @Override
+    public void method_14226() { }
+
+    @Override
+    public void onDeath( DamageSource damage ) { }
+
+    @Nullable
+    @Override
+    public Entity changeDimension( DimensionType dimension )
+    {
+        return this;
+    }
+
+    @Override
+    public void wakeUp( boolean resetTimer, boolean notify, boolean setSpawn ) { }
+
+    @Override
+    public boolean startRiding( Entity entity, boolean flag )
+    {
+        return false;
+    }
+
+    @Override
+    public void stopRiding() { }
+
+    @Override
+    public void openEditSignScreen( SignBlockEntity tile ) { }
+
+    @Override
+    public OptionalInt openContainer( @Nullable NameableContainerProvider container )
+    {
+        return OptionalInt.empty();
+    }
+
+    @Override
+    public void sendTradeOffers( int id, TraderOfferList list, int level, int experience, boolean levelled ) { }
+
+    @Override
+    public void openHorseInventory( HorseBaseEntity horse, Inventory inventory ) { }
+
+    @Override
+    public void openEditBookScreen( ItemStack stack, Hand hand ) { }
+
+    @Override
+    public void openCommandBlockScreen( CommandBlockBlockEntity block ) { }
+
+    @Override
+    public void onContainerSlotUpdate( Container container, int slot, ItemStack stack ) { }
+
+    @Override
+    public void onContainerRegistered( Container container, DefaultedList<ItemStack> defaultedList ) { }
+
+    @Override
+    public void onContainerPropertyUpdate( Container container, int key, int value ) { }
+
+    @Override
+    public void closeContainer() { }
+
+    @Override
+    public void method_14241() { }
+
+    @Override
+    public void addChatMessage( Component textComponent, boolean status ) { }
+
+    @Override
+    protected void method_6040() { }
+
+    @Override
+    public void lookAt( EntityAnchorArgumentType.EntityAnchor anchor, Vec3d vec3d ) { }
+
+    @Override
+    public void method_14222( EntityAnchorArgumentType.EntityAnchor self, Entity entity, EntityAnchorArgumentType.EntityAnchor target ) { }
+
+    @Override
+    protected void method_6020( StatusEffectInstance statusEffectInstance ) { }
+
+    @Override
+    protected void method_6009( StatusEffectInstance statusEffectInstance, boolean particles ) { }
+
+    @Override
+    protected void method_6129( StatusEffectInstance statusEffectInstance ) { }
+
+    @Override
+    public void requestTeleport( double x, double y, double z ) { }
+
+    @Override
+    public void setGameMode( GameMode gameMode ) { }
+
+    @Override
+    public void sendChatMessage( Component textComponent, ChatMessageType chatMessageType ) { }
+
+    @Override
+    public String getServerBrand()
+    {
+        return "[Fake Player]";
+    }
+
+    @Override
+    public void method_14255( String url, String hash ) { }
+
+    @Override
+    public void onStoppedTracking( Entity entity ) { }
+
+    @Override
+    public void setCameraEntity( Entity entity ) { }
+
+    @Override
+    public void teleport( ServerWorld serverWorld, double x, double y, double z, float pitch, float yaw ) { }
+
+    @Override
+    public void sendInitialChunkPackets( ChunkPos chunkPos, Packet<?> packet, Packet<?> packet2 ) { }
+
+    @Override
+    public void sendUnloadChunkPacket( ChunkPos chunkPos ) { }
+
+    @Override
+    public void playSound( SoundEvent soundEvent, SoundCategory soundCategory, float volume, float pitch ) { }
+    // endregion
+
+    // Indirect
+    @Override
+    public int lockRecipes( Collection<Recipe<?>> recipes )
+    {
+        return 0;
+    }
+
+    @Override
+    public int unlockRecipes( Collection<Recipe<?>> recipes )
+    {
+        return 0;
+    }
+    //
+
+    private static class FakeNetHandler extends ServerPlayNetworkHandler
+    {
+        FakeNetHandler( ServerPlayerEntity player )
+        {
+            super( player.server, new FakeConnection(), player );
+        }
+
+        @Override
+        public void disconnect( Component message ) { }
+
+        @Override
+        public void onRequestCommandCompletions( RequestCommandCompletionsC2SPacket packet ) { }
+
+        @Override
+        public void sendPacket( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener ) { }
+
+        @Override
+        public void onVehicleMove( VehicleMoveC2SPacket move ) { }
+    }
+
+    private static class FakeConnection extends ClientConnection
+    {
+        FakeConnection()
+        {
+            super( NetworkSide.CLIENTBOUND );
+        }
+
+        @Override
+        public void channelActive( ChannelHandlerContext active )
+        {
+        }
+
+        @Override
+        public void setState( NetworkState state )
+        {
+        }
+
+        @Override
+        public void disconnect( Component message )
+        {
+        }
+
+        @Override
+        public void exceptionCaught( ChannelHandlerContext context, Throwable err )
+        {
+        }
+
+        @Override
+        protected void method_10770( ChannelHandlerContext context, Packet<?> packet )
+        {
+        }
+
+        @Override
+        public void tick()
+        {
+        }
+
+        @Override
+        public void setupEncryption( SecretKey key )
+        {
+        }
+
+        @Override
+        public void disableAutoRead()
+        {
+        }
+
+        @Override
+        public void setMinCompressedSize( int size )
+        {
+        }
+
+        @Override
+        public void send( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
+        {
+        }
+    }
+}

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

@@ -8,7 +8,6 @@ package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleCommandResult;
-import net.minecraftforge.fml.common.eventhandler.Cancelable;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -17,11 +16,11 @@ import java.util.Objects;
 /**
  * An event fired when a turtle is performing a known action.
  */
-@Cancelable
 public class TurtleActionEvent extends TurtleEvent
 {
     private final TurtleAction action;
     private String failureMessage;
+    private boolean cancelled = false;
 
     public TurtleActionEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action )
     {
@@ -45,7 +44,6 @@ public class TurtleActionEvent extends TurtleEvent
      * @see TurtleCommandResult#failure()
      * @deprecated Use {@link #setCanceled(boolean, String)} instead.
      */
-    @Override
     @Deprecated
     public void setCanceled( boolean cancel )
     {
@@ -63,7 +61,7 @@ public class TurtleActionEvent extends TurtleEvent
      */
     public void setCanceled( boolean cancel, @Nullable String failureMessage )
     {
-        super.setCanceled( cancel );
+        this.cancelled = true;
         this.failureMessage = cancel ? failureMessage : null;
     }
 
@@ -79,4 +77,15 @@ public class TurtleActionEvent extends TurtleEvent
     {
         return failureMessage;
     }
+
+    /**
+     * Determine if this event is cancelled
+     *
+     * @return If this event is cancelled
+     * @see #setCanceled(boolean, String)
+     */
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
 }

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

@@ -11,9 +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.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.event.entity.player.AttackEntityEvent;
+import net.minecraft.util.math.Direction;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -21,10 +19,11 @@ 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.
+ * Note that such commands should also fire {@link net.fabricmc.fabric.api.event.player.AttackEntityCallback}, so you do
+ * not need to listen to both.
  *
  * @see TurtleAction#ATTACK
  */

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

@@ -12,13 +12,11 @@ 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.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.event.world.BlockEvent;
 
 import javax.annotation.Nonnull;
 import java.util.Map;
@@ -75,20 +73,21 @@ 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.
+     * Note that such commands should also fire {@link net.fabricmc.fabric.api.event.player.AttackBlockCallback}, so you
+     * do not need to listen to both.
      *
      * @see TurtleAction#DIG
      */
     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 +105,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 +184,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 +203,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
          * @return The inspected block state.
          */
         @Nonnull
-        public IBlockState getState()
+        public BlockState getState()
         {
             return state;
         }

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

@@ -6,8 +6,8 @@
 
 package dan200.computercraft.api.turtle.event;
 
+import com.google.common.eventbus.EventBus;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraftforge.fml.common.eventhandler.Event;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -20,8 +20,10 @@ import java.util.Objects;
  *
  * @see TurtleActionEvent
  */
-public abstract class TurtleEvent extends Event
+public abstract class TurtleEvent
 {
+    public static final EventBus EVENT_BUS = new EventBus();
+
     private final ITurtleAccess turtle;
 
     protected TurtleEvent( @Nonnull ITurtleAccess turtle )
@@ -40,4 +42,10 @@ public abstract class TurtleEvent extends Event
     {
         return turtle;
     }
+
+    public static boolean post( TurtleActionEvent event )
+    {
+        EVENT_BUS.post( event );
+        return event.isCancelled();
+    }
 }

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

@@ -7,11 +7,10 @@
 package dan200.computercraft.api.turtle.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
+import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.items.IItemHandler;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -22,9 +21,9 @@ import java.util.Objects;
  */
 public abstract class TurtleInventoryEvent extends TurtleBlockEvent
 {
-    private final IItemHandler handler;
+    private final Inventory handler;
 
-    protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
+    protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler )
     {
         super( turtle, action, player, world, pos );
         this.handler = handler;
@@ -36,7 +35,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      * @return The inventory being interacted with, {@code null} if the item will be dropped to/sucked from the world.
      */
     @Nullable
-    public IItemHandler getItemHandler()
+    public Inventory getItemHandler()
     {
         return handler;
     }
@@ -48,7 +47,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      */
     public static class Suck extends TurtleInventoryEvent
     {
-        public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
+        public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler )
         {
             super( turtle, TurtleAction.SUCK, player, world, pos, handler );
         }
@@ -63,7 +62,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
     {
         private final ItemStack stack;
 
-        public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler, @Nonnull ItemStack stack )
+        public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler, @Nonnull ItemStack stack )
         {
             super( turtle, TurtleAction.DROP, player, world, pos, handler );
 

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

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

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

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

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

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

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

@@ -7,179 +7,111 @@
 package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.render.TurtleModelLoader;
-import dan200.computercraft.shared.media.items.ItemDiskLegacy;
+import dan200.computercraft.shared.common.IColouredItem;
+import dan200.computercraft.shared.media.items.ItemDisk;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
-import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
 import dan200.computercraft.shared.util.Colour;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemMeshDefinition;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelBakery;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
+import net.fabricmc.fabric.api.client.render.ColorProviderRegistry;
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.ModelRotation;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.texture.SpriteAtlasTexture;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
 
-import javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.function.Consumer;
 
 /**
  * Registers textures and models for items.
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class ClientRegistry
 {
     private static final String[] EXTRA_MODELS = new String[] {
-        "turtle_modem_off_left",
-        "turtle_modem_on_left",
-        "turtle_modem_off_right",
-        "turtle_modem_on_right",
+        "turtle_modem_normal_off_left",
+        "turtle_modem_normal_on_left",
+        "turtle_modem_normal_off_right",
+        "turtle_modem_normal_on_right",
+
+        "turtle_modem_advanced_off_left",
+        "turtle_modem_advanced_on_left",
+        "turtle_modem_advanced_off_right",
+        "turtle_modem_advanced_on_right",
         "turtle_crafting_table_left",
         "turtle_crafting_table_right",
-        "advanced_turtle_modem_off_left",
-        "advanced_turtle_modem_on_left",
-        "advanced_turtle_modem_off_right",
-        "advanced_turtle_modem_on_right",
+
         "turtle_speaker_upgrade_left",
         "turtle_speaker_upgrade_right",
 
-        "turtle_white",
+        "turtle_colour",
         "turtle_elf_overlay",
     };
 
+    private static final String[] EXTRA_TEXTURES = new String[] {
+        // TODO: Gather these automatically from the model. I'm unable to get this working with Forge's current
+        //  model loading code.
+        "block/turtle_colour",
+        "block/turtle_elf_overlay",
+        "block/turtle_crafty_face",
+        "block/turtle_speaker_face",
+    };
+
     private ClientRegistry() {}
 
-    @SubscribeEvent
-    public static void registerModels( ModelRegistryEvent event )
+    public static void onTextureStitchEvent( SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry )
     {
-        ModelLoaderRegistry.registerLoader( TurtleModelLoader.INSTANCE );
-
-        // Register item models
-        registerUniversalItemModel( ComputerCraft.Items.computer, "computer" );
-        registerItemModel( ComputerCraft.Items.commandComputer, 0, "command_computer" );
-
-        registerItemModel( ComputerCraft.Items.pocketComputer, 0, "pocket_computer" );
-        registerItemModel( ComputerCraft.Items.pocketComputer, 1, "advanced_pocket_computer" );
-
-        registerItemModel( ComputerCraft.Items.peripheral, 0, "peripheral" );
-        registerItemModel( ComputerCraft.Items.peripheral, 1, "wireless_modem" );
-        registerItemModel( ComputerCraft.Items.peripheral, 2, "monitor" );
-        registerItemModel( ComputerCraft.Items.peripheral, 3, "printer" );
-        registerItemModel( ComputerCraft.Items.peripheral, 4, "advanced_monitor" );
-        registerItemModel( ComputerCraft.Items.cable, 0, "cable" );
-        registerItemModel( ComputerCraft.Items.cable, 1, "wired_modem" );
-        registerItemModel( ComputerCraft.Items.advancedModem, 0, "advanced_modem" );
-        registerItemModel( ComputerCraft.Items.peripheral, 5, "speaker" );
-        registerItemModel( ComputerCraft.Items.wiredModemFull, 0, "wired_modem_full" );
-
-        registerUniversalItemModel( ComputerCraft.Items.disk, "disk" );
-        registerItemModel( ComputerCraft.Items.diskExpanded, 0, "disk_expanded" );
-        registerItemModel( ComputerCraft.Items.treasureDisk, 0, "treasure_disk" );
-
-        registerItemModel( ComputerCraft.Items.printout, 0, "printout" );
-        registerItemModel( ComputerCraft.Items.printout, 1, "pages" );
-        registerItemModel( ComputerCraft.Items.printout, 2, "book" );
-
-        registerUniversalItemModel( ComputerCraft.Items.turtle, "turtle" );
-        registerUniversalItemModel( ComputerCraft.Items.turtleExpanded, "turtle" );
-        registerUniversalItemModel( ComputerCraft.Items.turtleAdvanced, "turtle_advanced" );
-    }
-
-    @SubscribeEvent
-    public static void onTextureStitchEvent( TextureStitchEvent.Pre event )
-    {
-        // Load all textures for the extra models
-        TextureMap map = event.getMap();
-        for( String upgrade : EXTRA_MODELS )
+        for( String extra : EXTRA_TEXTURES )
         {
-            IModel model = ModelLoaderRegistry.getModelOrMissing( new ResourceLocation( "computercraft", "block/" + upgrade ) );
-            for( ResourceLocation texture : model.getTextures() ) map.registerSprite( texture );
+            registry.register( new Identifier( ComputerCraft.MOD_ID, extra ) );
         }
     }
 
-    @SubscribeEvent
-    public static void onModelBakeEvent( ModelBakeEvent event )
+    public static void onModelBakeEvent( ResourceManager manager, Consumer<ModelIdentifier> out )
     {
-        // Load all extra models
-        for( String model : EXTRA_MODELS ) loadBlockModel( event, model );
+        for( String model : EXTRA_MODELS )
+        {
+            out.accept( new ModelIdentifier( new Identifier( ComputerCraft.MOD_ID, model ), "inventory" ) );
+        }
     }
 
-    @SubscribeEvent
-    public static void onItemColours( ColorHandlerEvent.Item event )
+    public static void onItemColours()
     {
-        event.getItemColors().registerItemColorHandler(
-            ( stack, layer ) -> layer == 1 ? ((ItemDiskLegacy) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            ComputerCraft.Items.disk, ComputerCraft.Items.diskExpanded
+        ColorProviderRegistry.ITEM.register(
+            ( stack, layer ) -> layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF,
+            ComputerCraft.Items.disk
         );
 
-        event.getItemColors().registerItemColorHandler( ( stack, layer ) -> {
+        ColorProviderRegistry.ITEM.register( ( stack, layer ) -> {
             switch( layer )
             {
                 case 0:
                 default:
                     return 0xFFFFFF;
                 case 1: // Frame colour
-                    return ComputerCraft.Items.pocketComputer.getColour( stack );
+                    return IColouredItem.getColourBasic( stack );
                 case 2: // Light colour
                 {
                     int light = ItemPocketComputer.getLightState( stack );
                     return light == -1 ? Colour.Black.getHex() : light;
                 }
             }
-        }, ComputerCraft.Items.pocketComputer );
+        }, ComputerCraft.Items.pocketComputerNormal, ComputerCraft.Items.pocketComputerAdvanced );
 
         // Setup turtle colours
-        event.getItemColors().registerItemColorHandler(
-            ( stack, tintIndex ) -> tintIndex == 0 ? ((ItemTurtleBase) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            ComputerCraft.Blocks.turtle, ComputerCraft.Blocks.turtleExpanded, ComputerCraft.Blocks.turtleAdvanced
+        ColorProviderRegistry.ITEM.register(
+            ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
+            ComputerCraft.Blocks.turtleNormal, ComputerCraft.Blocks.turtleAdvanced
         );
     }
 
-    private static void registerItemModel( Item item, int damage, String name )
+    private static BakedModel bake( ModelLoader loader, UnbakedModel model )
     {
-        ResourceLocation location = new ResourceLocation( ComputerCraft.MOD_ID, name );
-        final ModelResourceLocation res = new ModelResourceLocation( location, "inventory" );
-        ModelBakery.registerItemVariants( item, location );
-        ModelLoader.setCustomModelResourceLocation( item, damage, res );
-    }
-
-    private static void registerUniversalItemModel( Item item, String mainModel )
-    {
-        ResourceLocation mainLocation = new ResourceLocation( ComputerCraft.MOD_ID, mainModel );
-        ModelBakery.registerItemVariants( item, mainLocation );
-
-        final ModelResourceLocation mainModelLocation = new ModelResourceLocation( mainLocation, "inventory" );
-        ModelLoader.setCustomMeshDefinition( item, new ItemMeshDefinition()
-        {
-            @Nonnull
-            @Override
-            public ModelResourceLocation getModelLocation( @Nonnull ItemStack stack )
-            {
-                return mainModelLocation;
-            }
-        } );
-    }
-
-    private static void loadBlockModel( ModelBakeEvent event, String name )
-    {
-        IModel model = ModelLoaderRegistry.getModelOrMissing( new ResourceLocation( ComputerCraft.MOD_ID, "block/" + name ) );
-        IBakedModel bakedModel = model.bake(
-            model.getDefaultState(), DefaultVertexFormats.ITEM,
-            location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( location.toString() )
-        );
-
-        event.getModelRegistry().putObject( new ModelResourceLocation( ComputerCraft.MOD_ID + ":" + name, "inventory" ), bakedModel );
+        model.getTextureDependencies( loader::getOrLoadModel, new HashSet<>() );
+        SpriteAtlasTexture sprite = MinecraftClient.getInstance().getSpriteAtlas();
+        return model.bake( loader, sprite::getSprite, ModelRotation.X0_Y0 );
     }
 }

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

@@ -10,13 +10,13 @@ import dan200.computercraft.shared.command.text.ChatHelpers;
 import dan200.computercraft.shared.command.text.TableBuilder;
 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.ChatFormat;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.hud.ChatHud;
+import net.minecraft.client.util.TextComponentUtil;
+import net.minecraft.network.chat.Component;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextFormatting;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
@@ -28,25 +28,25 @@ public class ClientTableFormatter implements TableFormatter
 
     private static Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
 
-    private static FontRenderer renderer()
+    private static TextRenderer renderer()
     {
-        return Minecraft.getMinecraft().fontRenderer;
+        return MinecraftClient.getInstance().textRenderer;
     }
 
     @Override
     @Nullable
-    public ITextComponent getPadding( ITextComponent component, int width )
+    public Component getPadding( Component component, int width )
     {
         int extraWidth = width - getWidth( component );
         if( extraWidth <= 0 ) return null;
 
-        FontRenderer renderer = renderer();
+        TextRenderer renderer = renderer();
 
         float spaceWidth = renderer.getCharWidth( ' ' );
         int spaces = MathHelper.floor( extraWidth / spaceWidth );
         int extra = extraWidth - (int) (spaces * spaceWidth);
 
-        return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), TextFormatting.GRAY );
+        return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), ChatFormat.GRAY );
     }
 
     @Override
@@ -56,34 +56,34 @@ public class ClientTableFormatter implements TableFormatter
     }
 
     @Override
-    public int getWidth( ITextComponent component )
+    public int getWidth( Component component )
     {
         return renderer().getStringWidth( component.getFormattedText() );
     }
 
     @Override
-    public void writeLine( int id, ITextComponent component )
+    public void writeLine( int id, Component component )
     {
-        Minecraft mc = Minecraft.getMinecraft();
-        GuiNewChat chat = mc.ingameGUI.getChatGUI();
+        MinecraftClient mc = MinecraftClient.getInstance();
+        ChatHud chat = mc.inGameHud.getChatHud();
 
         // Trim the text if it goes over the allowed length
-        int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getChatScale() );
-        List<ITextComponent> list = GuiUtilRenderComponents.splitText( component, maxWidth, mc.fontRenderer, false, false );
-        if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
+        int maxWidth = MathHelper.floor( chat.getWidth() / chat.getScale() );
+        List<Component> list = TextComponentUtil.wrapLines( component, maxWidth, mc.textRenderer, false, false );
+        if( !list.isEmpty() ) chat.addMessage( list.get( 0 ), id );
     }
 
     @Override
     public int display( TableBuilder table )
     {
-        GuiNewChat chat = Minecraft.getMinecraft().ingameGUI.getChatGUI();
+        ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud();
 
         int lastHeight = lastHeights.get( table.getId() );
 
         int height = TableFormatter.super.display( table );
         lastHeights.put( table.getId(), height );
 
-        for( int i = height; i < lastHeight; i++ ) chat.deleteChatLine( i + table.getId() );
+        for( int i = height; i < lastHeight; i++ ) chat.removeMessage( i + table.getId() );
         return height;
     }
 }

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

@@ -6,13 +6,6 @@
 
 package dan200.computercraft.client;
 
-import dan200.computercraft.ComputerCraft;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.relauncher.Side;
-
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class FrameInfo
 {
     private static int tick;
@@ -32,15 +25,13 @@ public final class FrameInfo
         return renderFrame;
     }
 
-    @SubscribeEvent
-    public static void onTick( TickEvent.ClientTickEvent event )
+    public static void onTick()
     {
-        if( event.phase == TickEvent.Phase.START ) tick++;
+        tick++;
     }
 
-    @SubscribeEvent
-    public static void onRenderTick( TickEvent.RenderTickEvent event )
+    public static void onRenderFrame()
     {
-        if( event.phase == TickEvent.Phase.START ) renderFrame++;
+        renderFrame++;
     }
 }

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

@@ -6,23 +6,23 @@
 
 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;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.texture.TextureManager;
+import net.minecraft.util.Identifier;
 import org.lwjgl.opengl.GL11;
 
 import java.util.Arrays;
 
 public final class FixedWidthFontRenderer
 {
-    private static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
-    public static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
+    private static final Identifier FONT = new Identifier( "computercraft", "textures/gui/term_font.png" );
+    public static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/term_background.png" );
 
     public static final int FONT_HEIGHT = 9;
     public static final int FONT_WIDTH = 6;
@@ -39,7 +39,7 @@ public final class FixedWidthFontRenderer
 
     private FixedWidthFontRenderer()
     {
-        m_textureManager = Minecraft.getMinecraft().getTextureManager();
+        m_textureManager = MinecraftClient.getInstance().getTextureManager();
     }
 
     private static void greyscaleify( double[] rgb )
@@ -64,12 +64,12 @@ public final class FixedWidthFontRenderer
         int xStart = 1 + column * (FONT_WIDTH + 2);
         int yStart = 1 + row * (FONT_HEIGHT + 2);
 
-        renderer.pos( x, y, 0.0 ).tex( xStart / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).tex( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + FONT_WIDTH, y + FONT_HEIGHT, 0.0 ).tex( (xStart + FONT_WIDTH) / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.vertex( x, y, 0.0 ).texture( xStart / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x, y + FONT_HEIGHT, 0.0 ).texture( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x + FONT_WIDTH, y, 0.0 ).texture( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x + FONT_WIDTH, y, 0.0 ).texture( (xStart + FONT_WIDTH) / 256.0, yStart / 256.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x, y + FONT_HEIGHT, 0.0 ).texture( xStart / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x + FONT_WIDTH, y + FONT_HEIGHT, 0.0 ).texture( (xStart + FONT_WIDTH) / 256.0, (yStart + FONT_HEIGHT) / 256.0 ).color( r, g, b, 1.0f ).next();
     }
 
     private void drawQuad( BufferBuilder renderer, double x, double y, int color, double width, Palette p, boolean greyscale )
@@ -83,12 +83,12 @@ public final class FixedWidthFontRenderer
         float g = (float) colour[1];
         float b = (float) colour[2];
 
-        renderer.pos( x, y, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + width, y, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + width, y, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-        renderer.pos( x + width, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).endVertex();
+        renderer.vertex( x, y, 0.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x + width, y, 0.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x + width, y, 0.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).next();
+        renderer.vertex( x + width, y + FONT_HEIGHT, 0.0 ).color( r, g, b, 1.0f ).next();
     }
 
     private boolean isGreyScale( int colour )
@@ -100,8 +100,8 @@ public final class FixedWidthFontRenderer
     {
         // Draw the quads
         Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder renderer = tessellator.getBuffer();
-        renderer.begin( GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_COLOR );
+        BufferBuilder renderer = tessellator.getBufferBuilder();
+        renderer.begin( GL11.GL_TRIANGLES, VertexFormats.POSITION_COLOR );
         if( leftMarginSize > 0.0 )
         {
             int colour1 = "0123456789abcdef".indexOf( backgroundColour.charAt( 0 ) );
@@ -129,17 +129,17 @@ 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 )
     {
         // Draw the quads
         Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder renderer = tessellator.getBuffer();
-        renderer.begin( GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_TEX_COLOR );
+        BufferBuilder renderer = tessellator.getBufferBuilder();
+        renderer.begin( GL11.GL_TRIANGLES, VertexFormats.POSITION_UV_COLOR );
         for( int i = 0; i < s.length(); i++ )
         {
             // Switch colour
@@ -195,6 +195,6 @@ public final class FixedWidthFontRenderer
     public void bindFont()
     {
         m_textureManager.bindTexture( FONT );
-        GlStateManager.glTexParameteri( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
+        GlStateManager.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
     }
 }

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

@@ -6,55 +6,52 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
+import dan200.computercraft.client.gui.widgets.WidgetWrapper;
 import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.core.IComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.inventory.Container;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
+import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
+import net.minecraft.container.Container;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.util.Identifier;
+import org.lwjgl.glfw.GLFW;
 
-import java.io.IOException;
-
-public class GuiComputer extends GuiContainer
+public class GuiComputer<T extends Container> extends AbstractContainerScreen<T>
 {
-    public static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners.png" );
-    public static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
-    public static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
-    public static final ResourceLocation BACKGROUND_COLOUR = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
+    public static final Identifier BACKGROUND_NORMAL = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_normal.png" );
+    public static final Identifier BACKGROUND_ADVANCED = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
+    public static final Identifier BACKGROUND_COMMAND = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
+    public static final Identifier BACKGROUND_COLOUR = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
 
     private final ComputerFamily m_family;
     private final ClientComputer m_computer;
     private final int m_termWidth;
     private final int m_termHeight;
-    private WidgetTerminal m_terminal;
 
-    public GuiComputer( Container container, ComputerFamily family, ClientComputer computer, int termWidth, int termHeight )
+    private WidgetTerminal terminal;
+    private WidgetWrapper terminalWrapper;
+
+
+    public GuiComputer( T container, PlayerInventory player, ComputerFamily family, ClientComputer computer, int termWidth, int termHeight )
     {
-        super( container );
+        super( container, player, new TextComponent( "" ) );
+
         m_family = family;
         m_computer = computer;
         m_termWidth = termWidth;
         m_termHeight = termHeight;
-        m_terminal = null;
+        terminal = null;
     }
 
-    @Deprecated
-    public GuiComputer( Container container, ComputerFamily family, IComputer computer, int termWidth, int termHeight )
+    public static GuiComputer<ContainerComputer> create( int id, TileComputer computer, PlayerInventory player )
     {
-        this( container, family, (ClientComputer) computer, termWidth, termHeight );
-    }
-
-    public GuiComputer( TileComputer computer )
-    {
-        this(
-            new ContainerComputer( computer ),
+        return new GuiComputer<>(
+            new ContainerComputer( id, computer ), player,
             computer.getFamily(),
             computer.createClientComputer(),
             ComputerCraft.terminalWidth_computer,
@@ -63,121 +60,110 @@ public class GuiComputer extends GuiContainer
     }
 
     @Override
-    public void initGui()
+    protected void init()
     {
-        super.initGui();
-        Keyboard.enableRepeatEvents( true );
+        minecraft.keyboard.enableRepeatEvents( true );
 
-        m_terminal = new WidgetTerminal( 0, 0, m_termWidth, m_termHeight, () -> m_computer, 2, 2, 2, 2 );
-        m_terminal.setAllowFocusLoss( false );
-        xSize = m_terminal.getWidth() + 24;
-        ySize = m_terminal.getHeight() + 24;
+        int termPxWidth = m_termWidth * FixedWidthFontRenderer.FONT_WIDTH;
+        int termPxHeight = m_termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
+
+        containerWidth = termPxWidth + 4 + 24;
+        containerHeight = termPxHeight + 4 + 24;
+
+        super.init();
+
+        terminal = new WidgetTerminal( minecraft, () -> m_computer, m_termWidth, m_termHeight, 2, 2, 2, 2 );
+        terminalWrapper = new WidgetWrapper( terminal, 2 + 12 + left, 2 + 12 + top, termPxWidth, termPxHeight );
+
+        children.add( terminalWrapper );
+        setFocused( terminalWrapper );
     }
 
     @Override
-    public void onGuiClosed()
+    public void removed()
     {
-        super.onGuiClosed();
-        Keyboard.enableRepeatEvents( false );
+        super.removed();
+        children.remove( terminal );
+        terminal = null;
+        minecraft.keyboard.enableRepeatEvents( false );
     }
 
     @Override
-    public void updateScreen()
+    public void tick()
     {
-        super.updateScreen();
-        m_terminal.update();
+        super.tick();
+        terminal.update();
     }
 
     @Override
-    protected void keyTyped( char c, int k ) throws IOException
-    {
-        if( k == 1 )
-        {
-            super.keyTyped( c, k );
-        }
-        else
-        {
-            if( m_terminal.onKeyTyped( c, k ) ) keyHandled = true;
-        }
-    }
-
-    @Override
-    protected void mouseClicked( int x, int y, int button )
-    {
-        int startX = (width - m_terminal.getWidth()) / 2;
-        int startY = (height - m_terminal.getHeight()) / 2;
-        m_terminal.mouseClicked( x - startX, y - startY, button );
-    }
-
-    @Override
-    public void handleMouseInput() throws IOException
-    {
-        super.handleMouseInput();
-
-        int x = Mouse.getEventX() * width / mc.displayWidth;
-        int y = height - Mouse.getEventY() * height / mc.displayHeight - 1;
-        int startX = (width - m_terminal.getWidth()) / 2;
-        int startY = (height - m_terminal.getHeight()) / 2;
-        m_terminal.handleMouseInput( x - startX, y - startY );
-    }
-
-    @Override
-    public void handleKeyboardInput() throws IOException
-    {
-        super.handleKeyboardInput();
-        if( m_terminal.onKeyboardInput() ) keyHandled = true;
-    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer( int par1, int par2 )
-    {
-    }
-
-    @Override
-    protected void drawGuiContainerBackgroundLayer( float var1, int var2, int var3 )
-    {
-    }
-
-    @Override
-    public void drawScreen( int mouseX, int mouseY, float partialTicks )
+    public void drawBackground( float partialTicks, int mouseX, int mouseY )
     {
         // Work out where to draw
-        int startX = (width - m_terminal.getWidth()) / 2;
-        int startY = (height - m_terminal.getHeight()) / 2;
-        int endX = startX + m_terminal.getWidth();
-        int endY = startY + m_terminal.getHeight();
-
-        // Draw background
-        drawDefaultBackground();
+        int startX = terminalWrapper.getX() - 2;
+        int startY = terminalWrapper.getY() - 2;
+        int endX = startX + terminalWrapper.getWidth() + 4;
+        int endY = startY + terminalWrapper.getHeight() + 4;
 
         // Draw terminal
-        m_terminal.draw( mc, startX, startY, mouseX, mouseY );
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
 
         // Draw a border around the terminal
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         switch( m_family )
         {
             case Normal:
             default:
-                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 )
+    {
+        renderBackground( 0 );
+        super.render( mouseX, mouseY, partialTicks );
+        drawMouseoverTooltip( mouseX, mouseY );
+    }
+
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        // When pressing tab, send it to the computer first
+        return (key == GLFW.GLFW_KEY_TAB && getFocused() == terminalWrapper && terminalWrapper.keyPressed( key, scancode, modifiers ))
+            || super.keyPressed( key, scancode, modifiers );
+    }
+
+    @Override
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
+        // Make sure drag events are propagated to children
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
+            || super.mouseDragged( x, y, button, deltaX, deltaY );
+    }
+
+    @Override
+    public boolean mouseReleased( double x, double y, int button )
+    {
+        // Make sure release events are propagated to children
+        return (getFocused() != null && getFocused().mouseReleased( x, y, button ))
+            || super.mouseReleased( x, y, button );
     }
 }

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

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

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

@@ -6,45 +6,44 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
+import dan200.computercraft.ComputerCraft;
 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.util.ResourceLocation;
+import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.util.Identifier;
 
-public class GuiDiskDrive extends GuiContainer
+public class GuiDiskDrive extends AbstractContainerScreen<ContainerDiskDrive>
 {
-    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/diskdrive.png" );
+    private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/disk_drive.png" );
 
-    private final ContainerDiskDrive m_container;
-
-    public GuiDiskDrive( ContainerDiskDrive container )
+    public GuiDiskDrive( ContainerDiskDrive container, PlayerInventory inventory )
     {
-        super( container );
-        m_container = container;
+        super( container, inventory, ComputerCraft.Blocks.diskDrive.getTextComponent() );
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
+    protected void drawForeground( int par1, int par2 )
     {
-        String title = m_container.getDiskDrive().getDisplayName().getUnformattedText();
-        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2, 6, 0x404040 );
-        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
+        String title = getTitle().getFormattedText();
+        font.draw( title, (containerWidth - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
+        font.draw( I18n.translate( "container.inventory" ), 8, (containerHeight - 96) + 2, 0x404040 );
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawBackground( float partialTicks, int mouseX, int mouseY )
     {
-        GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( BACKGROUND );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+        minecraft.getTextureManager().bindTexture( BACKGROUND );
+        blit( left, top, 0, 0, containerWidth, containerHeight );
     }
 
     @Override
-    public void drawScreen( int mouseX, int mouseY, float partialTicks )
+    public void render( int mouseX, int mouseY, float partialTicks )
     {
-        drawDefaultBackground();
-        super.drawScreen( mouseX, mouseY, partialTicks );
-        renderHoveredToolTip( mouseX, mouseY );
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        drawMouseoverTooltip( mouseX, mouseY );
     }
 }

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

@@ -7,19 +7,29 @@
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.media.inventory.ContainerHeldItem;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
-public class GuiPocketComputer extends GuiComputer
+public class GuiPocketComputer extends GuiComputer<ContainerPocketComputer>
 {
-    public GuiPocketComputer( ContainerHeldItem container )
+    public GuiPocketComputer( ContainerPocketComputer container, PlayerInventory player )
     {
         super(
-            container,
-            ComputerCraft.Items.pocketComputer.getFamily( container.getStack() ),
+            container, player,
+            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,47 +6,46 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
+import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
+import net.minecraft.client.resource.language.I18n;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.util.Identifier;
 
-public class GuiPrinter extends GuiContainer
+public class GuiPrinter extends AbstractContainerScreen<ContainerPrinter>
 {
-    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/printer.png" );
+    private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/printer.png" );
 
-    private final ContainerPrinter container;
-
-    public GuiPrinter( ContainerPrinter container )
+    public GuiPrinter( ContainerPrinter container, PlayerInventory player )
     {
-        super( container );
-        this.container = container;
+        super( container, player, ComputerCraft.Blocks.printer.getTextComponent() );
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
+    protected void drawForeground( int mouseX, int mouseY )
     {
-        String title = container.getPrinter().getDisplayName().getUnformattedText();
-        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2, 6, 0x404040 );
-        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
+        String title = getTitle().getFormattedText();
+        font.draw( title, (containerWidth - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
+        font.draw( I18n.translate( "container.inventory" ), 8, containerHeight - 96 + 2, 0x404040 );
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawBackground( float f, int i, int j )
     {
-        GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( BACKGROUND );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+        minecraft.getTextureManager().bindTexture( BACKGROUND );
+        blit( left, top, 0, 0, containerWidth, containerHeight );
 
-        if( container.isPrinting() ) drawTexturedModalRect( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
+        if( container.isPrinting() ) blit( left + 34, top + 21, 176, 0, 25, 45 );
     }
 
     @Override
-    public void drawScreen( int mouseX, int mouseY, float partialTicks )
+    public void render( int mouseX, int mouseY, float partialTicks )
     {
-        drawDefaultBackground();
-        super.drawScreen( mouseX, mouseY, partialTicks );
-        renderHoveredToolTip( mouseX, mouseY );
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        drawMouseoverTooltip( mouseX, mouseY );
     }
 }

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

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

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

@@ -6,144 +6,136 @@
 
 package dan200.computercraft.client.gui;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
+import dan200.computercraft.client.gui.widgets.WidgetWrapper;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
+import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.util.Identifier;
+import org.lwjgl.glfw.GLFW;
 
-import java.io.IOException;
-
-public class GuiTurtle extends GuiContainer
+public class GuiTurtle extends AbstractContainerScreen<ContainerTurtle>
 {
-    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/turtle.png" );
-    private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( "computercraft", "textures/gui/turtle_advanced.png" );
+    private static final Identifier BACKGROUND_NORMAL = new Identifier( "computercraft", "textures/gui/turtle_normal.png" );
+    private static final Identifier BACKGROUND_ADVANCED = new Identifier( "computercraft", "textures/gui/turtle_advanced.png" );
 
     private ContainerTurtle m_container;
 
     private final ComputerFamily m_family;
     private final ClientComputer m_computer;
-    private WidgetTerminal m_terminalGui;
 
-    public GuiTurtle( TileTurtle turtle, ContainerTurtle container )
+    private WidgetTerminal terminal;
+    private WidgetWrapper terminalWrapper;
+
+    public GuiTurtle( TileTurtle turtle, ContainerTurtle container, PlayerInventory player )
     {
-        super( container );
+        super( container, player, turtle.getDisplayName() );
 
         m_container = container;
         m_family = turtle.getFamily();
         m_computer = turtle.getClientComputer();
 
-        xSize = 254;
-        ySize = 217;
+        containerWidth = 254;
+        containerHeight = 217;
     }
 
     @Override
-    public void initGui()
+    protected void init()
     {
-        super.initGui();
-        Keyboard.enableRepeatEvents( true );
-        m_terminalGui = new WidgetTerminal(
-            guiLeft + 8,
-            guiTop + 8,
+        super.init();
+        minecraft.keyboard.enableRepeatEvents( true );
+
+        int termPxWidth = ComputerCraft.terminalWidth_turtle * FixedWidthFontRenderer.FONT_WIDTH;
+        int termPxHeight = ComputerCraft.terminalHeight_turtle * FixedWidthFontRenderer.FONT_HEIGHT;
+
+        terminal = new WidgetTerminal(
+            minecraft, () -> m_computer,
             ComputerCraft.terminalWidth_turtle,
             ComputerCraft.terminalHeight_turtle,
-            () -> m_computer,
             2, 2, 2, 2
         );
-        m_terminalGui.setAllowFocusLoss( false );
+        terminalWrapper = new WidgetWrapper( terminal, 2 + 8 + left, 2 + 8 + top, termPxWidth, termPxHeight );
+
+        children.add( terminalWrapper );
+        setFocused( terminalWrapper );
     }
 
     @Override
-    public void onGuiClosed()
+    public void removed()
     {
-        super.onGuiClosed();
-        Keyboard.enableRepeatEvents( false );
+        super.removed();
+        children.remove( terminal );
+        terminal = null;
+        minecraft.keyboard.enableRepeatEvents( false );
     }
 
     @Override
-    public void updateScreen()
+    public void tick()
     {
-        super.updateScreen();
-        m_terminalGui.update();
+        super.tick();
+        terminal.update();
     }
 
-    @Override
-    protected void keyTyped( char c, int k ) throws IOException
-    {
-        if( k == 1 )
-        {
-            super.keyTyped( c, k );
-        }
-        else
-        {
-            if( m_terminalGui.onKeyTyped( c, k ) ) keyHandled = true;
-        }
-    }
-
-    @Override
-    protected void mouseClicked( int x, int y, int button ) throws IOException
-    {
-        super.mouseClicked( x, y, button );
-        m_terminalGui.mouseClicked( x, y, button );
-    }
-
-    @Override
-    public void handleMouseInput() throws IOException
-    {
-        super.handleMouseInput();
-        int x = Mouse.getEventX() * width / mc.displayWidth;
-        int y = height - Mouse.getEventY() * height / mc.displayHeight - 1;
-        m_terminalGui.handleMouseInput( x, y );
-    }
-
-    @Override
-    public void handleKeyboardInput() throws IOException
-    {
-        super.handleKeyboardInput();
-        if( m_terminalGui.onKeyboardInput() ) keyHandled = true;
-    }
-
-    protected void drawSelectionSlot( boolean advanced )
+    private void drawSelectionSlot( boolean advanced )
     {
         // Draw selection slot
         int slot = m_container.getSelectedSlot();
         if( slot >= 0 )
         {
-            GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
+            GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
             int slotX = slot % 4;
             int slotY = slot / 4;
-            mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-            drawTexturedModalRect( guiLeft + m_container.m_turtleInvStartX - 2 + slotX * 18, guiTop + m_container.m_playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
+            minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+            blit( left + m_container.m_turtleInvStartX - 2 + slotX * 18, top + m_container.m_playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
         }
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawBackground( float partialTicks, int mouseX, int mouseY )
     {
         // Draw term
         boolean advanced = m_family == ComputerFamily.Advanced;
-        m_terminalGui.draw( Minecraft.getMinecraft(), 0, 0, mouseX, mouseY );
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
 
         // Draw border/inventory
-        GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+        minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+        blit( left, top, 0, 0, containerWidth, containerHeight );
 
         drawSelectionSlot( advanced );
     }
 
     @Override
-    public void drawScreen( int mouseX, int mouseY, float partialTicks )
+    public void render( int mouseX, int mouseY, float partialTicks )
     {
-        drawDefaultBackground();
-        super.drawScreen( mouseX, mouseY, partialTicks );
-        renderHoveredToolTip( mouseX, mouseY );
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        drawMouseoverTooltip( mouseX, mouseY );
+    }
+
+    @Override
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        return (key == GLFW.GLFW_KEY_TAB && getFocused() == terminalWrapper && terminalWrapper.keyPressed( key, scancode, modifiers ))
+            || super.keyPressed( key, scancode, modifiers );
+    }
+
+    @Override
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
+            || super.mouseDragged( x, y, button, deltaX, deltaY );
+    }
+
+    @Override
+    public boolean mouseReleased( double x, double y, int button )
+    {
+        return (getFocused() != null && getFocused().mouseReleased( x, y, button ))
+            || super.mouseReleased( x, y, button );
     }
 }

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

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

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

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

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

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

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

@@ -7,56 +7,89 @@
 package dan200.computercraft.client.proxy;
 
 import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.client.ClientRegistry;
+import dan200.computercraft.client.FrameInfo;
+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.command.CommandCopy;
+import dan200.computercraft.client.render.TurtleModelLoader;
+import dan200.computercraft.shared.computer.blocks.TileComputer;
+import dan200.computercraft.shared.computer.core.ClientComputer;
+import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
+import dan200.computercraft.shared.network.container.*;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
-import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
-import net.minecraftforge.client.ClientCommandHandler;
-import net.minecraftforge.event.world.WorldEvent;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
+import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
+import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
+import net.fabricmc.fabric.api.client.render.BlockEntityRendererRegistry;
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
+import net.fabricmc.fabric.api.event.client.ClientTickCallback;
+import net.minecraft.container.ArrayPropertyDelegate;
+import net.minecraft.inventory.BasicInventory;
 
-public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
+public final class ComputerCraftProxyClient
 {
-    @Override
-    public void preInit()
+    public static void setup()
     {
-        super.preInit();
+        registerContainers();
 
-        // Register any client-specific commands
-        ClientCommandHandler.instance.registerCommand( CommandCopy.INSTANCE );
+        // Setup TESRs
+        BlockEntityRendererRegistry.INSTANCE.register( TileMonitor.class, new TileEntityMonitorRenderer() );
+        BlockEntityRendererRegistry.INSTANCE.register( TileCable.class, new TileEntityCableRenderer() );
+        BlockEntityRendererRegistry.INSTANCE.register( TileTurtle.class, new TileEntityTurtleRenderer() );
+
+        ClientRegistry.onItemColours();
+        ClientSpriteRegistryCallback.registerBlockAtlas( ClientRegistry::onTextureStitchEvent );
+        ModelLoadingRegistry.INSTANCE.registerAppender( ClientRegistry::onModelBakeEvent );
+        ModelLoadingRegistry.INSTANCE.registerResourceProvider( loader -> ( name, context ) ->
+            TurtleModelLoader.INSTANCE.accepts( name ) ? TurtleModelLoader.INSTANCE.loadModel( name ) : null
+        );
+
+        ClientTickCallback.EVENT.register( client -> FrameInfo.onTick() );
     }
 
-    @Override
-    public void init()
+    private static void registerContainers()
     {
-        super.init();
+        ContainerType.registerGui( TileEntityContainerType::computer, ( id, packet, player ) ->
+            GuiComputer.create( id, (TileComputer) packet.getTileEntity( player ), player.inventory ) );
+        ContainerType.registerGui( TileEntityContainerType::diskDrive, GuiDiskDrive::new );
+        ContainerType.registerGui( TileEntityContainerType::printer, GuiPrinter::new );
+        ContainerType.registerGui( TileEntityContainerType::turtle, ( id, packet, player ) -> {
+            TileTurtle turtle = (TileTurtle) packet.getTileEntity( player );
+            return new GuiTurtle( turtle,
+                new ContainerTurtle( id, player.inventory, new BasicInventory( TileTurtle.INVENTORY_SIZE ), new ArrayPropertyDelegate( 1 ) ),
+                player.inventory
+            );
+        } );
 
-        // Setup renderers
-        ClientRegistry.bindTileEntitySpecialRenderer( TileMonitor.class, new TileEntityMonitorRenderer() );
-        ClientRegistry.bindTileEntitySpecialRenderer( TileCable.class, new TileEntityCableRenderer() );
-        ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
+        ContainerType.registerGui( PocketComputerContainerType::new, GuiPocketComputer::new );
+        ContainerType.registerGui( PrintoutContainerType::new, GuiPrintout::new );
+        ContainerType.registerGui( ViewComputerContainerType::new, ( id, packet, player ) -> {
+            ClientComputer computer = ComputerCraft.clientComputerRegistry.get( packet.instanceId );
+            if( computer == null )
+            {
+                ComputerCraft.clientComputerRegistry.add( packet.instanceId, computer = new ClientComputer( packet.instanceId ) );
+            }
+
+            ContainerViewComputer container = new ContainerViewComputer( id, computer );
+            return new GuiComputer<>( container, player.inventory, packet.family, computer, packet.width, packet.height );
+        } );
     }
 
-    @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
+    /*
+    @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
     public static final class ForgeHandlers
     {
         @SubscribeEvent
         public static void onWorldUnload( WorldEvent.Unload event )
         {
-            if( event.getWorld().isRemote )
+            if( event.getWorld().isRemote() )
             {
                 ClientMonitor.destroyAll();
             }
         }
     }
-
-
+    */
 }

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

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

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

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

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;
@@ -16,16 +17,13 @@ import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.event.RenderSpecificHandEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
 import org.lwjgl.opengl.GL11;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
@@ -34,29 +32,19 @@ import static dan200.computercraft.client.gui.GuiComputer.*;
 /**
  * Emulates map rendering for pocket computers
  */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
+@Environment( EnvType.CLIENT )
 public final class ItemPocketRenderer extends ItemMapLikeRenderer
 {
     private static final int MARGIN = 2;
     private static final int FRAME = 12;
     private static final int LIGHT_HEIGHT = 8;
 
-    private static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
+    public static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
 
     private ItemPocketRenderer()
     {
     }
 
-    @SubscribeEvent
-    public static void renderItem( RenderSpecificHandEvent event )
-    {
-        ItemStack stack = event.getItemStack();
-        if( !(stack.getItem() instanceof ItemPocketComputer) ) return;
-
-        event.setCanceled( true );
-        INSTANCE.renderItemFirstPerson( event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack() );
-    }
-
     @Override
     protected void renderItem( ItemStack stack )
     {
@@ -83,19 +71,20 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         GlStateManager.pushMatrix();
 
         GlStateManager.disableLighting();
-        GlStateManager.disableDepth();
+        GlStateManager.disableDepthTest();
 
-        GlStateManager.rotate( 180f, 0f, 1f, 0f );
-        GlStateManager.rotate( 180f, 0f, 0f, 1f );
-        GlStateManager.scale( 0.5, 0.5, 0.5 );
+        GlStateManager.rotatef( 180f, 0f, 1f, 0f );
+        GlStateManager.rotatef( 180f, 0f, 0f, 1f );
+        GlStateManager.scalef( 0.5f, 0.5f, 0.5f );
 
         double scale = 0.75 / Math.max( width + FRAME * 2, height + FRAME * 2 + LIGHT_HEIGHT );
-        GlStateManager.scale( scale, scale, 0 );
-        GlStateManager.translate( -0.5 * width, -0.5 * height, 0 );
+        GlStateManager.scaled( scale, scale, 0 );
+        GlStateManager.translated( -0.5 * width, -0.5 * height, 0 );
 
         // Render the main frame
-        ComputerFamily family = ComputerCraft.Items.pocketComputer.getFamily( stack );
-        int frameColour = ComputerCraft.Items.pocketComputer.getColour( stack );
+        ItemPocketComputer item = (ItemPocketComputer) stack.getItem();
+        ComputerFamily family = item.getFamily();
+        int frameColour = item.getColour( stack );
         renderFrame( family, frameColour, width, height );
 
         // Render the light
@@ -111,18 +100,18 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         else
         {
             // Otherwise render a plain background
-            Minecraft.getMinecraft().getTextureManager().bindTexture( BACKGROUND );
+            MinecraftClient.getInstance().getTextureManager().bindTexture( BACKGROUND );
 
             Tessellator tessellator = Tessellator.getInstance();
-            BufferBuilder buffer = tessellator.getBuffer();
+            BufferBuilder buffer = tessellator.getBufferBuilder();
 
             Colour black = Colour.Black;
-            buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION );
+            buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION );
             renderTexture( buffer, 0, 0, 0, 0, width, height, black.getR(), black.getG(), black.getB() );
             tessellator.draw();
         }
 
-        GlStateManager.enableDepth();
+        GlStateManager.enableDepthTest();
         GlStateManager.enableLighting();
         GlStateManager.popMatrix();
     }
@@ -130,7 +119,7 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     private static void renderFrame( ComputerFamily family, int colour, int width, int height )
     {
 
-        Minecraft.getMinecraft().getTextureManager().bindTexture( colour != -1
+        MinecraftClient.getInstance().getTextureManager().bindTexture( colour != -1
             ? BACKGROUND_COLOUR
             : family == ComputerFamily.Normal ? BACKGROUND_NORMAL : BACKGROUND_ADVANCED
         );
@@ -140,8 +129,8 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
         float b = (colour & 0xFF) / 255.0f;
 
         Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR );
+        BufferBuilder buffer = tessellator.getBufferBuilder();
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_UV_COLOR );
 
         // Top left, middle, right
         renderTexture( buffer, -FRAME, -FRAME, 12, 28, FRAME, FRAME, r, g, b );
@@ -172,22 +161,22 @@ 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;
         float b = (colour & 0xFF) / 255.0f;
 
         Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR );
-        buffer.pos( width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
-        buffer.pos( width, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
-        buffer.pos( width, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
-        buffer.pos( width - LIGHT_HEIGHT * 2, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).endVertex();
+        BufferBuilder buffer = tessellator.getBufferBuilder();
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR );
+        buffer.vertex( width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).next();
+        buffer.vertex( width, height + LIGHT_HEIGHT + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).next();
+        buffer.vertex( width, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).next();
+        buffer.vertex( width - LIGHT_HEIGHT * 2, height + FRAME / 2.0f, 0.0D ).color( r, g, b, 1.0f ).next();
 
         tessellator.draw();
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
     }
 
     private static void renderTerminal( Terminal terminal, boolean greyscale, int width, int height )
@@ -245,9 +234,9 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
     private static void renderTexture( BufferBuilder builder, int x, int y, int textureX, int textureY, int width, int height, int textureWidth, int textureHeight, float r, float g, float b )
     {
         float scale = 1 / 255.0f;
-        builder.pos( x, y + height, 0 ).tex( textureX * scale, (textureY + textureHeight) * scale ).color( r, g, b, 1.0f ).endVertex();
-        builder.pos( x + width, y + height, 0 ).tex( (textureX + textureWidth) * scale, (textureY + textureHeight) * scale ).color( r, g, b, 1.0f ).endVertex();
-        builder.pos( x + width, y, 0 ).tex( (textureX + textureWidth) * scale, textureY * scale ).color( r, g, b, 1.0f ).endVertex();
-        builder.pos( x, y, 0 ).tex( textureX * scale, textureY * scale ).color( r, g, b, 1.0f ).endVertex();
+        builder.vertex( x, y + height, 0 ).texture( textureX * scale, (textureY + textureHeight) * scale ).color( r, g, b, 1.0f ).next();
+        builder.vertex( x + width, y + height, 0 ).texture( (textureX + textureWidth) * scale, (textureY + textureHeight) * scale ).color( r, g, b, 1.0f ).next();
+        builder.vertex( x + width, y, 0 ).texture( (textureX + textureWidth) * scale, textureY * scale ).color( r, g, b, 1.0f ).next();
+        builder.vertex( x, y, 0 ).texture( textureX * scale, textureY * scale ).color( r, g, b, 1.0f ).next();
     }
 }

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

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

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

@@ -6,19 +6,13 @@
 
 package dan200.computercraft.client.render;
 
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.client.model.pipeline.IVertexConsumer;
-import net.minecraftforge.client.model.pipeline.LightUtil;
-import net.minecraftforge.client.model.pipeline.VertexTransformer;
-import net.minecraftforge.common.model.TRSRTransformation;
+import net.minecraft.client.render.VertexFormat;
+import net.minecraft.client.render.VertexFormatElement;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.render.model.BakedQuad;
 
-import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
-import javax.vecmath.Point3f;
-import javax.vecmath.Vector3f;
+import javax.vecmath.Vector4f;
 import java.util.List;
 
 /**
@@ -40,6 +34,11 @@ public final class ModelTransformer
     }
 
     public static void transformQuadsTo( List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
+    {
+        transformQuadsTo( VertexFormats.POSITION_COLOR_UV_NORMAL, output, input, transform );
+    }
+
+    public static void transformQuadsTo( VertexFormat format, List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
     {
         if( transform == null || transform.equals( identity ) )
         {
@@ -47,224 +46,55 @@ public final class ModelTransformer
         }
         else
         {
-            Matrix4f normalMatrix = new Matrix4f( transform );
-            normalMatrix.invert();
-            normalMatrix.transpose();
-
-            for( BakedQuad quad : input ) output.add( doTransformQuad( quad, transform, normalMatrix ) );
+            for( BakedQuad quad : input ) output.add( doTransformQuad( format, quad, transform ) );
         }
     }
 
-    public static BakedQuad transformQuad( BakedQuad input, Matrix4f transform )
+    public static BakedQuad transformQuad( VertexFormat format, BakedQuad input, Matrix4f transform )
     {
         if( transform == null || transform.equals( identity ) ) return input;
-
-        Matrix4f normalMatrix = new Matrix4f( transform );
-        normalMatrix.invert();
-        normalMatrix.transpose();
-        return doTransformQuad( input, transform, normalMatrix );
+        return doTransformQuad( format, input, transform );
     }
 
-    private static BakedQuad doTransformQuad( BakedQuad input, Matrix4f positionMatrix, Matrix4f normalMatrix )
+    private static BakedQuad doTransformQuad( VertexFormat format, BakedQuad quad, Matrix4f transform )
     {
-
-        BakedQuadBuilder builder = new BakedQuadBuilder( input.getFormat() );
-        NormalAwareTransformer transformer = new NormalAwareTransformer( builder, positionMatrix, normalMatrix );
-        input.pipe( transformer );
-
-        if( transformer.areNormalsInverted() )
+        int[] vertexData = quad.getVertexData().clone();
+        int offset = 0;
+        BakedQuad copy = new BakedQuad( vertexData, -1, quad.getFace(), quad.getSprite() );
+        for( int i = 0; i < format.getElementCount(); ++i ) // For each vertex element
         {
-            builder.swap( 1, 3 );
-            transformer.areNormalsInverted();
-        }
-
-        return builder.build();
-    }
-
-    /**
-     * A vertex transformer that tracks whether the normals have been inverted and so the vertices
-     * should be reordered so backface culling works as expected.
-     */
-    private static class NormalAwareTransformer extends VertexTransformer
-    {
-        private final Matrix4f positionMatrix;
-        private final Matrix4f normalMatrix;
-
-        private int vertexIndex = 0, elementIndex = 0;
-        private final Point3f[] before = new Point3f[4];
-        private final Point3f[] after = new Point3f[4];
-
-        public NormalAwareTransformer( IVertexConsumer parent, Matrix4f positionMatrix, Matrix4f normalMatrix )
-        {
-            super( parent );
-            this.positionMatrix = positionMatrix;
-            this.normalMatrix = normalMatrix;
-        }
-
-        @Override
-        public void setQuadOrientation( @Nonnull EnumFacing orientation )
-        {
-            super.setQuadOrientation( orientation == null ? orientation : TRSRTransformation.rotate( positionMatrix, orientation ) );
-        }
-
-        @Override
-        public void put( int element, @Nonnull float... data )
-        {
-            switch( getVertexFormat().getElement( element ).getUsage() )
+            VertexFormatElement element = format.getElement( i );
+            if( element.isPosition() &&
+                element.getFormat() == VertexFormatElement.Format.FLOAT &&
+                element.getCount() == 3 ) // When we find a position element
             {
-                case POSITION:
+                for( int j = 0; j < 4; ++j ) // For each corner of the quad
                 {
-                    Point3f vec = new Point3f( data );
-                    Point3f newVec = new Point3f();
-                    positionMatrix.transform( vec, newVec );
+                    int start = offset + j * format.getVertexSize();
+                    if( (start % 4) == 0 )
+                    {
+                        start = start / 4;
 
-                    float[] newData = new float[4];
-                    newVec.get( newData );
-                    super.put( element, newData );
+                        // Extract the position
+                        Vector4f pos = new Vector4f(
+                            Float.intBitsToFloat( vertexData[start] ),
+                            Float.intBitsToFloat( vertexData[start + 1] ),
+                            Float.intBitsToFloat( vertexData[start + 2] ),
+                            1
+                        );
 
+                        // Transform the position
+                        transform.transform( pos );
 
-                    before[vertexIndex] = vec;
-                    after[vertexIndex] = newVec;
-                    break;
+                        // Insert the position
+                        vertexData[start] = Float.floatToRawIntBits( pos.x );
+                        vertexData[start + 1] = Float.floatToRawIntBits( pos.y );
+                        vertexData[start + 2] = Float.floatToRawIntBits( pos.z );
+                    }
                 }
-                case NORMAL:
-                {
-                    Vector3f vec = new Vector3f( data );
-                    normalMatrix.transform( vec );
-
-                    float[] newData = new float[4];
-                    vec.get( newData );
-                    super.put( element, newData );
-                    break;
-                }
-                default:
-                    super.put( element, data );
-                    break;
-            }
-
-            elementIndex++;
-            if( elementIndex == getVertexFormat().getElementCount() )
-            {
-                vertexIndex++;
-                elementIndex = 0;
             }
+            offset += element.getSize();
         }
-
-        public boolean areNormalsInverted()
-        {
-            Vector3f temp1 = new Vector3f(), temp2 = new Vector3f();
-            Vector3f crossBefore = new Vector3f(), crossAfter = new Vector3f();
-
-            // Determine what cross product we expect to have
-            temp1.sub( before[1], before[0] );
-            temp2.sub( before[1], before[2] );
-            crossBefore.cross( temp1, temp2 );
-            normalMatrix.transform( crossBefore );
-
-            // And determine what cross product we actually have
-            temp1.sub( after[1], after[0] );
-            temp2.sub( after[1], after[2] );
-            crossAfter.cross( temp1, temp2 );
-
-            // If the angle between expected and actual cross product is greater than
-            // pi/2 radians then we will need to reorder our quads.
-            return Math.abs( crossBefore.angle( crossAfter ) ) >= Math.PI / 2;
-        }
-    }
-
-    /**
-     * A vertex consumer which is capable of building {@link BakedQuad}s.
-     *
-     * Equivalent to {@link net.minecraftforge.client.model.pipeline.UnpackedBakedQuad.Builder} but more memory
-     * efficient.
-     *
-     * This also provides the ability to swap vertices through {@link #swap(int, int)} to allow reordering.
-     */
-    private static final class BakedQuadBuilder implements IVertexConsumer
-    {
-        private final VertexFormat format;
-
-        private final int[] vertexData;
-        private int vertexIndex = 0, elementIndex = 0;
-
-        private EnumFacing orientation;
-        private int quadTint;
-        private boolean diffuse;
-        private TextureAtlasSprite texture;
-
-        private BakedQuadBuilder( VertexFormat format )
-        {
-            this.format = format;
-            vertexData = new int[format.getSize()];
-        }
-
-        @Nonnull
-        @Override
-        public VertexFormat getVertexFormat()
-        {
-            return format;
-        }
-
-        @Override
-        public void setQuadTint( int tint )
-        {
-            quadTint = tint;
-        }
-
-        @Override
-        public void setQuadOrientation( @Nonnull EnumFacing orientation )
-        {
-            this.orientation = orientation;
-        }
-
-        @Override
-        public void setApplyDiffuseLighting( boolean diffuse )
-        {
-            this.diffuse = diffuse;
-        }
-
-        @Override
-        public void setTexture( @Nonnull TextureAtlasSprite texture )
-        {
-            this.texture = texture;
-        }
-
-        @Override
-        public void put( int element, @Nonnull float... data )
-        {
-            LightUtil.pack( data, vertexData, format, vertexIndex, element );
-
-            elementIndex++;
-            if( elementIndex == getVertexFormat().getElementCount() )
-            {
-                vertexIndex++;
-                elementIndex = 0;
-            }
-        }
-
-        public void swap( int a, int b )
-        {
-            int length = vertexData.length / 4;
-            for( int i = 0; i < length; i++ )
-            {
-                int temp = vertexData[a * length + i];
-                vertexData[a * length + i] = vertexData[b * length + i];
-                vertexData[b * length + i] = temp;
-            }
-        }
-
-        public BakedQuad build()
-        {
-            if( elementIndex != 0 || vertexIndex != 4 )
-            {
-                throw new IllegalStateException( "Got an unexpected number of elements/vertices" );
-            }
-            if( texture == null )
-            {
-                throw new IllegalStateException( "Texture has not been set" );
-            }
-
-            return new BakedQuad( vertexData, quadTint, orientation, texture, diffuse, format );
-        }
+        return copy;
     }
 }

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

@@ -6,29 +6,24 @@
 
 package dan200.computercraft.client.render;
 
-import dan200.computercraft.ComputerCraft;
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-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.block.entity.BlockEntity;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.DrawBlockHighlightEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
 import org.lwjgl.opengl.GL11;
 
 import java.util.EnumSet;
 
-import static net.minecraft.util.EnumFacing.*;
+import static net.minecraft.util.math.Direction.*;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class MonitorHighlightRenderer
 {
     private static final float EXPAND = 0.002f;
@@ -37,25 +32,22 @@ public final class MonitorHighlightRenderer
     {
     }
 
-    @SubscribeEvent
-    public static void drawHighlight( DrawBlockHighlightEvent event )
+    public static boolean drawHighlight( Camera camera, BlockHitResult hit )
     {
-        if( event.getTarget().typeOfHit != RayTraceResult.Type.BLOCK || event.getPlayer().isSneaking() ) return;
+        MinecraftClient mc = MinecraftClient.getInstance();
+        if( mc.player.isSneaking() ) return false;
 
-        World world = event.getPlayer().getEntityWorld();
-        BlockPos pos = event.getTarget().getBlockPos();
+        BlockPos pos = hit.getBlockPos();
+        World world = mc.world;
 
-        if( world.getBlockState( pos ).getBlock() != ComputerCraft.Blocks.peripheral ) return;
-
-        TileEntity tile = world.getTileEntity( pos );
-        if( !(tile instanceof TileMonitor) ) return;
+        BlockEntity tile = world.getBlockEntity( pos );
+        if( !(tile instanceof TileMonitor) ) return false;
 
         TileMonitor monitor = (TileMonitor) tile;
-        event.setCanceled( true );
 
         // Determine which sides are part of the external faces of the monitor, and so which need to be rendered.
-        EnumSet<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() );
@@ -63,22 +55,17 @@ public final class MonitorHighlightRenderer
         if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );
 
         GlStateManager.enableBlend();
-        GlStateManager.tryBlendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
-        GL11.glLineWidth( 2.0F );
-        GlStateManager.disableTexture2D();
+        GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
+        GlStateManager.lineWidth( Math.max( 2.5F, (float) mc.window.getFramebufferWidth() / 1920.0F * 2.5F ) );
+        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.translate( -x + pos.getX(), -y + pos.getY(), -z + pos.getZ() );
+        GlStateManager.translated( pos.getX() - camera.getPos().getX(), pos.getY() - camera.getPos().getY(), pos.getZ() - camera.getPos().getZ() );
 
         Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin( GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR );
+        BufferBuilder buffer = tessellator.getBufferBuilder();
+        buffer.begin( GL11.GL_LINES, VertexFormats.POSITION_COLOR );
 
         // I wish I could think of a better way to do this
         if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( buffer, 0, 0, 0, UP );
@@ -98,21 +85,23 @@ public final class MonitorHighlightRenderer
 
         GlStateManager.popMatrix();
         GlStateManager.depthMask( true );
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
         GlStateManager.disableBlend();
+
+        return true;
     }
 
-    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;
         double minZ = z == 0 ? -EXPAND : 1 + EXPAND;
 
-        buffer.pos( minX, minY, minZ ).color( 0, 0, 0, 0.4f ).endVertex();
-        buffer.pos(
-            minX + direction.getXOffset() * (1 + EXPAND * 2),
-            minY + direction.getYOffset() * (1 + EXPAND * 2),
-            minZ + direction.getZOffset() * (1 + EXPAND * 2)
-        ).color( 0, 0, 0, 0.4f ).endVertex();
+        buffer.vertex( minX, minY, minZ ).color( 0, 0, 0, 0.4f ).next();
+        buffer.vertex(
+            minX + direction.getOffsetX() * (1 + EXPAND * 2),
+            minY + direction.getOffsetY() * (1 + EXPAND * 2),
+            minZ + direction.getOffsetZ() * (1 + EXPAND * 2)
+        ).color( 0, 0, 0, 0.4f ).next();
     }
 }

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

@@ -6,17 +6,17 @@
 
 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;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.util.Identifier;
 import org.lwjgl.opengl.GL11;
 
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
@@ -24,7 +24,7 @@ import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAG
 
 public final class PrintoutRenderer
 {
-    private static final ResourceLocation BG = new ResourceLocation( "computercraft", "textures/gui/printout.png" );
+    private static final Identifier BG = new Identifier( "computercraft", "textures/gui/printout.png" );
     private static final double BG_SIZE = 256.0;
 
     /**
@@ -74,10 +74,10 @@ public final class PrintoutRenderer
 
     public static void drawText( int x, int y, int start, String[] text, String[] colours )
     {
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableBlend();
-        GlStateManager.enableTexture2D();
-        GlStateManager.tryBlendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
+        GlStateManager.enableTexture();
+        GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
 
         FixedWidthFontRenderer fontRenderer = FixedWidthFontRenderer.instance();
 
@@ -89,16 +89,16 @@ public final class PrintoutRenderer
 
     public static void drawBorder( double x, double y, double z, int page, int pages, boolean isBook )
     {
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+        GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         GlStateManager.enableBlend();
-        GlStateManager.enableTexture2D();
-        GlStateManager.tryBlendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
+        GlStateManager.enableTexture();
+        GlStateManager.blendFuncSeparate( SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ZERO );
 
-        Minecraft.getMinecraft().getTextureManager().bindTexture( BG );
+        MinecraftClient.getInstance().getTextureManager().bindTexture( BG );
 
         Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX );
+        BufferBuilder buffer = tessellator.getBufferBuilder();
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_UV );
 
         int leftPages = page;
         int rightPages = pages - page - 1;
@@ -159,18 +159,18 @@ public final class PrintoutRenderer
 
     private static void drawTexture( BufferBuilder buffer, double x, double y, double z, double u, double v, double width, double height )
     {
-        buffer.pos( x, y + height, z ).tex( u / BG_SIZE, (v + height) / BG_SIZE ).endVertex();
-        buffer.pos( x + width, y + height, z ).tex( (u + width) / BG_SIZE, (v + height) / BG_SIZE ).endVertex();
-        buffer.pos( x + width, y, z ).tex( (u + width) / BG_SIZE, v / BG_SIZE ).endVertex();
-        buffer.pos( x, y, z ).tex( u / BG_SIZE, v / BG_SIZE ).endVertex();
+        buffer.vertex( x, y + height, z ).texture( u / BG_SIZE, (v + height) / BG_SIZE ).next();
+        buffer.vertex( x + width, y + height, z ).texture( (u + width) / BG_SIZE, (v + height) / BG_SIZE ).next();
+        buffer.vertex( x + width, y, z ).texture( (u + width) / BG_SIZE, v / BG_SIZE ).next();
+        buffer.vertex( x, y, z ).texture( u / BG_SIZE, v / BG_SIZE ).next();
     }
 
     private static void drawTexture( BufferBuilder buffer, double x, double y, double z, double width, double height, double u, double v, double tWidth, double tHeight )
     {
-        buffer.pos( x, y + height, z ).tex( u / BG_SIZE, (v + tHeight) / BG_SIZE ).endVertex();
-        buffer.pos( x + width, y + height, z ).tex( (u + tWidth) / BG_SIZE, (v + tHeight) / BG_SIZE ).endVertex();
-        buffer.pos( x + width, y, z ).tex( (u + tWidth) / BG_SIZE, v / BG_SIZE ).endVertex();
-        buffer.pos( x, y, z ).tex( u / BG_SIZE, v / BG_SIZE ).endVertex();
+        buffer.vertex( x, y + height, z ).texture( u / BG_SIZE, (v + tHeight) / BG_SIZE ).next();
+        buffer.vertex( x + width, y + height, z ).texture( (u + tWidth) / BG_SIZE, (v + tHeight) / BG_SIZE ).next();
+        buffer.vertex( x + width, y, z ).texture( (u + tWidth) / BG_SIZE, v / BG_SIZE ).next();
+        buffer.vertex( x, y, z ).texture( u / BG_SIZE, v / BG_SIZE ).next();
     }
 
     public static double offsetAt( int page )

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

@@ -6,121 +6,104 @@
 
 package dan200.computercraft.client.render;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.peripheral.PeripheralType;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
-import dan200.computercraft.shared.peripheral.modem.wired.BlockCableModemVariant;
-import dan200.computercraft.shared.peripheral.modem.wired.CableBounds;
+import dan200.computercraft.shared.peripheral.modem.wired.CableModemVariant;
+import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.BlockRenderLayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
-import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 import org.lwjgl.opengl.GL11;
 
 import javax.annotation.Nonnull;
+import java.util.Random;
 
 /**
  * Render breaking animation only over part of a {@link TileCable}.
  */
-public class TileEntityCableRenderer extends TileEntitySpecialRenderer<TileCable>
+public class TileEntityCableRenderer extends BlockEntityRenderer<TileCable>
 {
+    private static final Random random = new Random();
+
     @Override
-    public void render( @Nonnull TileCable te, double x, double y, double z, float partialTicks, int destroyStage, float alpha )
+    public void render( @Nonnull TileCable te, double x, double y, double z, float partialTicks, int destroyStage )
     {
         if( destroyStage < 0 ) return;
 
         BlockPos pos = te.getPos();
 
-        Minecraft mc = Minecraft.getMinecraft();
+        MinecraftClient mc = MinecraftClient.getInstance();
 
-        RayTraceResult hit = mc.objectMouseOver;
-        if( hit == null || !hit.getBlockPos().equals( pos ) ) return;
-
-        if( MinecraftForgeClient.getRenderPass() != 0 ) return;
+        HitResult hit = mc.hitResult;
+        if( !(hit instanceof BlockHitResult) || !((BlockHitResult) hit).getBlockPos().equals( pos ) ) return;
 
         World world = te.getWorld();
-        IBlockState state = world.getBlockState( pos );
+        BlockState state = te.getCachedState();
         Block block = state.getBlock();
         if( block != ComputerCraft.Blocks.cable ) return;
 
-        state = state.getActualState( world, pos );
-        if( te.getPeripheralType() != PeripheralType.Cable && WorldUtil.isVecInsideInclusive( CableBounds.getModemBounds( state ), hit.hitVec.subtract( pos.getX(), pos.getY(), pos.getZ() ) ) )
-        {
-            state = block.getDefaultState().withProperty( BlockCable.MODEM, state.getValue( BlockCable.MODEM ) );
-        }
-        else
-        {
-            state = state.withProperty( BlockCable.MODEM, BlockCableModemVariant.None );
-        }
+        state = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getPos().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
+            ? block.getDefaultState().with( BlockCable.MODEM, state.get( BlockCable.MODEM ) )
+            : state.with( BlockCable.MODEM, CableModemVariant.None );
 
-        IBakedModel model = mc.getBlockRendererDispatcher().getModelForState( state );
-        if( model == null ) return;
+        BakedModel model = mc.getBlockRenderManager().getModel( state );
 
         preRenderDamagedBlocks();
 
-        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() );
+        BufferBuilder buffer = Tessellator.getInstance().getBufferBuilder();
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR_UV_LMAP );
+        buffer.setOffset( x - pos.getX(), y - pos.getY(), z - pos.getZ() );
+        buffer.disableColor();
 
         // See BlockRendererDispatcher#renderBlockDamage
-        TextureAtlasSprite breakingTexture = mc.getTextureMapBlocks().getAtlasSprite( "minecraft:blocks/destroy_stage_" + destroyStage );
-        Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModel(
-            world,
-            ForgeHooksClient.getDamageModel( model, breakingTexture, state, world, pos ),
-            state, pos, buffer, true
-        );
+        Sprite breakingTexture = mc.getSpriteAtlas().getSprite( DESTROY_STAGE_TEXTURES[destroyStage] );
+        mc.getBlockRenderManager().tesselateDamage( state, pos, breakingTexture, world );
 
-        ForgeHooksClient.setRenderLayer( BlockRenderLayer.SOLID );
-
-        buffer.setTranslation( 0, 0, 0 );
+        buffer.setOffset( 0, 0, 0 );
         Tessellator.getInstance().draw();
 
         postRenderDamagedBlocks();
     }
 
     /**
-     * @see RenderGlobal#preRenderDamagedBlocks()
+     * @see WorldRenderer#preRenderDamagedBlocks()
      */
     private void preRenderDamagedBlocks()
     {
         GlStateManager.disableLighting();
 
         GlStateManager.enableBlend();
-        GlStateManager.tryBlendFuncSeparate( GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
+        GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.DST_COLOR, GlStateManager.DestFactor.SRC_COLOR, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO );
         GlStateManager.enableBlend();
-        GlStateManager.color( 1.0F, 1.0F, 1.0F, 0.5F );
-        GlStateManager.doPolygonOffset( -3.0F, -3.0F );
+        GlStateManager.color4f( 1.0F, 1.0F, 1.0F, 0.5F );
+        GlStateManager.polygonOffset( -3.0F, -3.0F );
         GlStateManager.enablePolygonOffset();
         GlStateManager.alphaFunc( 516, 0.1F );
-        GlStateManager.enableAlpha();
+        GlStateManager.enableAlphaTest();
         GlStateManager.pushMatrix();
     }
 
     /**
-     * @see RenderGlobal#postRenderDamagedBlocks()
+     * @see WorldRenderer#postRenderDamagedBlocks()
      */
     private void postRenderDamagedBlocks()
     {
-        GlStateManager.disableAlpha();
-        GlStateManager.doPolygonOffset( 0.0F, 0.0F );
+        GlStateManager.disableAlphaTest();
+        GlStateManager.polygonOffset( 0.0F, 0.0F );
         GlStateManager.disablePolygonOffset();
         GlStateManager.disablePolygonOffset();
         GlStateManager.depthMask( true );

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

@@ -6,6 +6,8 @@
 
 package dan200.computercraft.client.render;
 
+import com.mojang.blaze3d.platform.GLX;
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
@@ -15,21 +17,19 @@ import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import org.lwjgl.opengl.GL11;
 
-public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMonitor>
+public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
 {
     @Override
-    public void render( TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i, float f2 )
+    public void render( TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i )
     {
         if( tileEntity != null )
         {
@@ -64,39 +64,39 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
         posZ += originPos.getZ() - monitorPos.getZ();
 
         // Determine orientation
-        EnumFacing dir = origin.getDirection();
-        EnumFacing front = origin.getFront();
-        float yaw = dir.getHorizontalAngle();
+        Direction dir = origin.getDirection();
+        Direction front = origin.getFront();
+        float yaw = dir.asRotation();
         float pitch = DirectionUtil.toPitchAngle( front );
 
         GlStateManager.pushMatrix();
         try
         {
             // Setup initial transform
-            GlStateManager.translate( posX + 0.5, posY + 0.5, posZ + 0.5 );
-            GlStateManager.rotate( -yaw, 0.0f, 1.0f, 0.0f );
-            GlStateManager.rotate( pitch, 1.0f, 0.0f, 0.0f );
-            GlStateManager.translate(
+            GlStateManager.translated( posX + 0.5, posY + 0.5, posZ + 0.5 );
+            GlStateManager.rotatef( -yaw, 0.0f, 1.0f, 0.0f );
+            GlStateManager.rotatef( pitch, 1.0f, 0.0f, 0.0f );
+            GlStateManager.translated(
                 -0.5 + TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN,
-                origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN),
+                origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN) + 0,
                 0.5
             );
             double xSize = origin.getWidth() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
             double ySize = origin.getHeight() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
 
             // Get renderers
-            Minecraft mc = Minecraft.getMinecraft();
+            MinecraftClient mc = MinecraftClient.getInstance();
             Tessellator tessellator = Tessellator.getInstance();
-            BufferBuilder renderer = tessellator.getBuffer();
+            BufferBuilder renderer = tessellator.getBufferBuilder();
 
             // Get terminal
             boolean redraw = originTerminal.pollTerminalChanged();
 
             // Draw the contents
             GlStateManager.depthMask( false );
-            OpenGlHelper.setLightmapTextureCoords( OpenGlHelper.lightmapTexUnit, 0xFF, 0xFF );
+            GLX.glMultiTexCoord2f( GLX.GL_TEXTURE1, 0xFFFF, 0xFFFF );
             GlStateManager.disableLighting();
-            mc.entityRenderer.disableLightmap();
+            mc.gameRenderer.disableLightmap();
             try
             {
                 Terminal terminal = originTerminal.getTerminal();
@@ -124,14 +124,14 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                     {
                         double xScale = xSize / (width * FixedWidthFontRenderer.FONT_WIDTH);
                         double yScale = ySize / (height * FixedWidthFontRenderer.FONT_HEIGHT);
-                        GlStateManager.scale( xScale, -yScale, 1.0 );
+                        GlStateManager.scaled( xScale, -yScale, 1.0 );
 
                         // Draw background
                         mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
                         if( redraw )
                         {
                             // Build background display list
-                            GlStateManager.glNewList( originTerminal.renderDisplayLists[0], GL11.GL_COMPILE );
+                            GlStateManager.newList( originTerminal.renderDisplayLists[0], GL11.GL_COMPILE );
                             try
                             {
                                 double marginXSize = TileMonitor.RENDER_MARGIN / xScale;
@@ -142,10 +142,10 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                                 GlStateManager.pushMatrix();
                                 try
                                 {
-                                    GlStateManager.scale( 1.0, marginSquash, 1.0 );
-                                    GlStateManager.translate( 0.0, -marginYSize / marginSquash, 0.0 );
+                                    GlStateManager.scaled( 1.0, marginSquash, 1.0 );
+                                    GlStateManager.translated( 0.0, -marginYSize / marginSquash, 0.0 );
                                     fontRenderer.drawStringBackgroundPart( 0, 0, terminal.getBackgroundColourLine( 0 ), marginXSize, marginXSize, greyscale, palette );
-                                    GlStateManager.translate( 0.0, (marginYSize + height * FixedWidthFontRenderer.FONT_HEIGHT) / marginSquash, 0.0 );
+                                    GlStateManager.translated( 0.0, (marginYSize + height * FixedWidthFontRenderer.FONT_HEIGHT) / marginSquash, 0.0 );
                                     fontRenderer.drawStringBackgroundPart( 0, 0, terminal.getBackgroundColourLine( height - 1 ), marginXSize, marginXSize, greyscale, palette );
                                 }
                                 finally
@@ -167,18 +167,18 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                             }
                             finally
                             {
-                                GlStateManager.glEndList();
+                                GlStateManager.endList();
                             }
                         }
                         GlStateManager.callList( originTerminal.renderDisplayLists[0] );
-                        GlStateManager.resetColor();
+                        GlStateManager.clearCurrentColor();
 
                         // Draw text
                         fontRenderer.bindFont();
                         if( redraw )
                         {
                             // Build text display list
-                            GlStateManager.glNewList( originTerminal.renderDisplayLists[1], GL11.GL_COMPILE );
+                            GlStateManager.newList( originTerminal.renderDisplayLists[1], GL11.GL_COMPILE );
                             try
                             {
                                 // Lines
@@ -195,18 +195,18 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                             }
                             finally
                             {
-                                GlStateManager.glEndList();
+                                GlStateManager.endList();
                             }
                         }
                         GlStateManager.callList( originTerminal.renderDisplayLists[1] );
-                        GlStateManager.resetColor();
+                        GlStateManager.clearCurrentColor();
 
                         // Draw cursor
                         fontRenderer.bindFont();
                         if( redraw )
                         {
                             // Build cursor display list
-                            GlStateManager.glNewList( originTerminal.renderDisplayLists[2], GL11.GL_COMPILE );
+                            GlStateManager.newList( originTerminal.renderDisplayLists[2], GL11.GL_COMPILE );
                             try
                             {
                                 // Cursor
@@ -227,13 +227,13 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                             }
                             finally
                             {
-                                GlStateManager.glEndList();
+                                GlStateManager.endList();
                             }
                         }
                         if( FrameInfo.getGlobalCursorBlink() )
                         {
                             GlStateManager.callList( originTerminal.renderDisplayLists[2] );
-                            GlStateManager.resetColor();
+                            GlStateManager.clearCurrentColor();
                         }
                     }
                     finally
@@ -251,18 +251,18 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
                     final float g = colour.getG();
                     final float b = colour.getB();
 
-                    renderer.begin( GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX_COLOR );
-                    renderer.pos( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).tex( 0.0, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-                    renderer.pos( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).tex( 0.0, 1.0 ).color( r, g, b, 1.0f ).endVertex();
-                    renderer.pos( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).tex( 1.0, 0.0 ).color( r, g, b, 1.0f ).endVertex();
-                    renderer.pos( xSize + TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).tex( 1.0, 1.0 ).color( r, g, b, 1.0f ).endVertex();
+                    renderer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION_UV_COLOR );
+                    renderer.vertex( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).texture( 0.0, 0.0 ).color( r, g, b, 1.0f ).next();
+                    renderer.vertex( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).texture( 0.0, 1.0 ).color( r, g, b, 1.0f ).next();
+                    renderer.vertex( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0D ).texture( 1.0, 0.0 ).color( r, g, b, 1.0f ).next();
+                    renderer.vertex( xSize + TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).texture( 1.0, 1.0 ).color( r, g, b, 1.0f ).next();
                     tessellator.draw();
                 }
             }
             finally
             {
                 GlStateManager.depthMask( true );
-                mc.entityRenderer.enableLightmap();
+                mc.gameRenderer.enableLightmap();
                 GlStateManager.enableLighting();
             }
 
@@ -271,11 +271,11 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
             try
             {
                 mc.getTextureManager().bindTexture( FixedWidthFontRenderer.BACKGROUND );
-                renderer.begin( GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION );
-                renderer.pos( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                renderer.pos( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                renderer.pos( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
-                renderer.pos( xSize + TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).endVertex();
+                renderer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION );
+                renderer.vertex( -TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).next();
+                renderer.vertex( -TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).next();
+                renderer.vertex( xSize + TileMonitor.RENDER_MARGIN, TileMonitor.RENDER_MARGIN, 0.0 ).next();
+                renderer.vertex( xSize + TileMonitor.RENDER_MARGIN, -ySize - TileMonitor.RENDER_MARGIN, 0.0 ).next();
                 tessellator.draw();
             }
             finally
@@ -285,7 +285,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
         }
         finally
         {
-            GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+            GlStateManager.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
             GlStateManager.popMatrix();
         }
     }

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

@@ -6,51 +6,53 @@
 
 package dan200.computercraft.client.render;
 
+import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
+import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ModelManager;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.*;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.BakedModelManager;
+import net.minecraft.client.render.model.BakedQuad;
+import net.minecraft.client.texture.SpriteAtlasTexture;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.model.pipeline.LightUtil;
+import net.minecraft.util.math.Vec3i;
 import org.apache.commons.lang3.tuple.Pair;
+import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL11;
 
 import javax.vecmath.Matrix4f;
+import java.nio.FloatBuffer;
 import java.util.List;
+import java.util.Random;
 
-public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurtle>
+public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
 {
-    private static final ModelResourceLocation NORMAL_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle", "inventory" );
-    private static final ModelResourceLocation ADVANCED_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_advanced", "inventory" );
-    private static final ModelResourceLocation COLOUR_TURTLE_MODEL = new ModelResourceLocation( "computercraft:turtle_white", "inventory" );
-    private static final ModelResourceLocation ELF_OVERLAY_MODEL = new ModelResourceLocation( "computercraft:turtle_elf_overlay", "inventory" );
+    private static final ModelIdentifier NORMAL_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_normal", "inventory" );
+    private static final ModelIdentifier ADVANCED_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_advanced", "inventory" );
+    private static final ModelIdentifier COLOUR_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_colour", "inventory" );
+    private static final ModelIdentifier ELF_OVERLAY_MODEL = new ModelIdentifier( "computercraft:turtle_elf_overlay", "inventory" );
+
+    private static final FloatBuffer matrixBuf = BufferUtils.createFloatBuffer( 16 );
 
     @Override
-    public void render( TileTurtle tileEntity, double posX, double posY, double posZ, float partialTicks, int breaking, float f2 )
+    public void render( TileTurtle tileEntity, double posX, double posY, double posZ, float partialTicks, int breaking )
     {
         if( tileEntity != null ) renderTurtleAt( tileEntity, posX, posY, posZ, partialTicks );
     }
 
-    public static ModelResourceLocation getTurtleModel( ComputerFamily family, boolean coloured )
+    public static ModelIdentifier getTurtleModel( ComputerFamily family, boolean coloured )
     {
         switch( family )
         {
@@ -62,11 +64,11 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
         }
     }
 
-    public static ModelResourceLocation getTurtleOverlayModel( ResourceLocation overlay, boolean christmas )
+    public static ModelIdentifier getTurtleOverlayModel( Identifier overlay, boolean christmas )
     {
         if( overlay != null )
         {
-            return new ModelResourceLocation( overlay, "inventory" );
+            return new ModelIdentifier( overlay, "inventory" );
         }
         else if( christmas )
         {
@@ -82,45 +84,44 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
     {
         // Render the label
         String label = turtle.createProxy().getLabel();
-        if( label != null && rendererDispatcher.cameraHitResult != null && turtle.getPos().equals( rendererDispatcher.cameraHitResult.getBlockPos() ) )
+        if( label != null && renderManager.hitResult != null && renderManager.hitResult instanceof BlockHitResult && turtle.getPos().equals( ((BlockHitResult) renderManager.hitResult).getBlockPos() ) )
         {
-            setLightmapDisabled( true );
-            EntityRenderer.drawNameplate(
+            disableLightmap( true );
+            GameRenderer.renderFloatingText(
                 getFontRenderer(), label,
                 (float) posX + 0.5F, (float) posY + 1.2F, (float) posZ + 0.5F, 0,
-                rendererDispatcher.entityYaw, rendererDispatcher.entityPitch, false, false
+                renderManager.cameraEntity.getYaw(), renderManager.cameraEntity.getPitch(), false
             );
-            setLightmapDisabled( false );
+            disableLightmap( false );
         }
 
         GlStateManager.pushMatrix();
         try
         {
-            IBlockState state = turtle.getWorld().getBlockState( turtle.getPos() );
+            BlockState state = turtle.getCachedState();
             // Setup the transform
             Vec3d offset = turtle.getRenderOffset( partialTicks );
             float yaw = turtle.getRenderYaw( partialTicks );
-            GlStateManager.translate( posX + offset.x, posY + offset.y, posZ + offset.z );
-
+            GlStateManager.translated( posX + offset.x, posY + offset.y, posZ + offset.z );
             // Render the turtle
-            GlStateManager.translate( 0.5f, 0.5f, 0.5f );
-            GlStateManager.rotate( 180.0f - yaw, 0.0f, 1.0f, 0.0f );
+            GlStateManager.translatef( 0.5f, 0.5f, 0.5f );
+            GlStateManager.rotatef( 180.0f - yaw, 0.0f, 1.0f, 0.0f );
             if( label != null && (label.equals( "Dinnerbone" ) || label.equals( "Grumm" )) )
             {
                 // Flip the model and swap the cull face as winding order will have changed.
-                GlStateManager.scale( 1.0f, -1.0f, 1.0f );
-                GlStateManager.cullFace( GlStateManager.CullFace.FRONT );
+                GlStateManager.scalef( 1.0f, -1.0f, 1.0f );
+                GlStateManager.cullFace( GlStateManager.FaceSides.FRONT );
             }
-            GlStateManager.translate( -0.5f, -0.5f, -0.5f );
+            GlStateManager.translatef( -0.5f, -0.5f, -0.5f );
             // Render the turtle
             int colour = turtle.getColour();
             ComputerFamily family = turtle.getFamily();
-            ResourceLocation overlay = turtle.getOverlay();
+            Identifier overlay = turtle.getOverlay();
 
             renderModel( state, getTurtleModel( family, colour != -1 ), colour == -1 ? null : new int[] { colour } );
 
             // Render the overlay
-            ModelResourceLocation overlayModel = getTurtleOverlayModel(
+            ModelIdentifier overlayModel = getTurtleOverlayModel(
                 overlay,
                 HolidayUtil.getCurrentHoliday() == Holiday.Christmas
             );
@@ -147,11 +148,11 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
         finally
         {
             GlStateManager.popMatrix();
-            GlStateManager.cullFace( GlStateManager.CullFace.BACK );
+            GlStateManager.cullFace( GlStateManager.FaceSides.BACK );
         }
     }
 
-    private static 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 )
@@ -160,16 +161,25 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
             try
             {
                 float toolAngle = turtle.getToolRenderAngle( side, f );
-                GlStateManager.translate( 0.0f, 0.5f, 0.5f );
-                GlStateManager.rotate( -toolAngle, 1.0f, 0.0f, 0.0f );
-                GlStateManager.translate( 0.0f, -0.5f, -0.5f );
+                GlStateManager.translatef( 0.0f, 0.5f, 0.5f );
+                GlStateManager.rotatef( -toolAngle, 1.0f, 0.0f, 0.0f );
+                GlStateManager.translatef( 0.0f, -0.5f, -0.5f );
 
-                Pair<IBakedModel, Matrix4f> pair = upgrade.getModel( turtle.getAccess(), side );
+                Pair<BakedModel, Matrix4f> pair = upgrade.getModel( turtle.getAccess(), side );
                 if( pair != null )
                 {
                     if( pair.getRight() != null )
                     {
-                        ForgeHooksClient.multiplyCurrentGlMatrix( pair.getRight() );
+                        matrixBuf.clear();
+                        float[] t = new float[4];
+                        for( int i = 0; i < 4; i++ )
+                        {
+                            pair.getRight().getColumn( i, t );
+                            matrixBuf.put( t );
+                        }
+                        matrixBuf.flip();
+
+                        GlStateManager.multMatrix( matrixBuf );
                     }
                     if( pair.getLeft() != null )
                     {
@@ -184,48 +194,43 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
         }
     }
 
-    private static void renderModel( IBlockState state, ModelResourceLocation modelLocation, int[] tints )
+    private void renderModel( BlockState state, ModelIdentifier modelLocation, int[] tints )
     {
-        Minecraft mc = Minecraft.getMinecraft();
-        ModelManager modelManager = mc.getRenderItem().getItemModelMesher().getModelManager();
+        MinecraftClient mc = MinecraftClient.getInstance();
+        BakedModelManager modelManager = mc.getItemRenderer().getModels().getModelManager();
         renderModel( state, modelManager.getModel( modelLocation ), tints );
     }
 
-    private static void renderModel( IBlockState state, IBakedModel model, int[] tints )
+    private void renderModel( BlockState state, BakedModel model, int[] tints )
     {
-        Minecraft mc = Minecraft.getMinecraft();
+        Random random = new Random( 0 );
         Tessellator tessellator = Tessellator.getInstance();
-        mc.getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-        renderQuads( tessellator, model.getQuads( state, null, 0 ), tints );
-        for( EnumFacing facing : EnumFacing.VALUES )
+        renderManager.textureManager.bindTexture( SpriteAtlasTexture.BLOCK_ATLAS_TEX );
+        renderQuads( tessellator, model.getQuads( state, null, random ), tints );
+        for( Direction facing : DirectionUtil.FACINGS )
         {
-            renderQuads( tessellator, model.getQuads( state, facing, 0 ), tints );
+            renderQuads( tessellator, model.getQuads( state, facing, random ), tints );
         }
     }
 
     private static void renderQuads( Tessellator tessellator, List<BakedQuad> quads, int[] tints )
     {
-        BufferBuilder buffer = tessellator.getBuffer();
-        VertexFormat format = DefaultVertexFormats.ITEM;
+        BufferBuilder buffer = tessellator.getBufferBuilder();
+        VertexFormat format = VertexFormats.POSITION_COLOR_UV_NORMAL;
         buffer.begin( GL11.GL_QUADS, format );
         for( BakedQuad quad : quads )
         {
-            VertexFormat quadFormat = quad.getFormat();
-            if( quadFormat != format )
-            {
-                tessellator.draw();
-                format = quadFormat;
-                buffer.begin( GL11.GL_QUADS, format );
-            }
-
             int colour = 0xFFFFFFFF;
-            if( quad.hasTintIndex() && tints != null )
+            if( quad.hasColor() && tints != null )
             {
-                int index = quad.getTintIndex();
+                int index = quad.getColorIndex();
                 if( index >= 0 && index < tints.length ) colour = tints[index] | 0xFF000000;
             }
 
-            LightUtil.renderQuadColor( buffer, quad, colour );
+            buffer.putVertexData( quad.getVertexData() );
+            buffer.setQuadColor( colour );
+            Vec3i normal = quad.getFace().getVector();
+            buffer.postNormal( normal.getX(), normal.getY(), normal.getZ() );
         }
         tessellator.draw();
     }

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

@@ -6,26 +6,27 @@
 
 package dan200.computercraft.client.render;
 
-import com.google.common.collect.ImmutableMap;
 import dan200.computercraft.ComputerCraft;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.client.resources.IResourceManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.model.ICustomModelLoader;
-import net.minecraftforge.client.model.IModel;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
-import net.minecraftforge.common.model.IModelState;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.ModelBakeSettings;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.util.Identifier;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
-public final class TurtleModelLoader implements ICustomModelLoader
+public final class TurtleModelLoader
 {
-    private static final ResourceLocation NORMAL_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle" );
-    private static final ResourceLocation ADVANCED_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/advanced_turtle" );
-    private static final ResourceLocation COLOUR_TURTLE_MODEL = new ResourceLocation( ComputerCraft.MOD_ID, "block/turtle_white" );
+    private static final Identifier NORMAL_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_normal" );
+    private static final Identifier ADVANCED_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_advanced" );
+    private static final Identifier COLOUR_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_colour" );
 
     public static final TurtleModelLoader INSTANCE = new TurtleModelLoader();
 
@@ -33,89 +34,59 @@ public final class TurtleModelLoader implements ICustomModelLoader
     {
     }
 
-    @Override
-    public void onResourceManagerReload( @Nonnull IResourceManager manager )
-    {
-    }
-
-    @Override
-    public boolean accepts( @Nonnull ResourceLocation name )
+    public boolean accepts( @Nonnull Identifier name )
     {
         return name.getNamespace().equals( ComputerCraft.MOD_ID )
-            && (name.getPath().equals( "turtle" ) || name.getPath().equals( "turtle_advanced" ));
+            && (name.getPath().equals( "item/turtle_normal" ) || name.getPath().equals( "item/turtle_advanced" ));
     }
 
     @Nonnull
-    @Override
-    public IModel loadModel( @Nonnull ResourceLocation name ) throws Exception
+    public UnbakedModel loadModel( @Nonnull Identifier name )
     {
         if( name.getNamespace().equals( ComputerCraft.MOD_ID ) )
         {
-            IModel colourModel = ModelLoaderRegistry.getModel( COLOUR_TURTLE_MODEL );
             switch( name.getPath() )
             {
-                case "turtle":
-                    return new TurtleModel( ModelLoaderRegistry.getModel( NORMAL_TURTLE_MODEL ), colourModel );
-                case "turtle_advanced":
-                    return new TurtleModel( ModelLoaderRegistry.getModel( ADVANCED_TURTLE_MODEL ), colourModel );
+                case "item/turtle_normal":
+                    return new TurtleModel( NORMAL_TURTLE_MODEL );
+                case "item/turtle_advanced":
+                    return new TurtleModel( ADVANCED_TURTLE_MODEL );
             }
         }
 
         throw new IllegalStateException( "Loader does not accept " + name );
     }
 
-    private static final class TurtleModel implements IModel
+    private static final class TurtleModel implements UnbakedModel
     {
-        private final IModel family;
-        private final IModel colour;
+        private final Identifier family;
 
-        private TurtleModel( IModel family, IModel colour )
+        private TurtleModel( Identifier family ) {this.family = family;}
+
+        @Nonnull
+        @Override
+        public Collection<Identifier> getModelDependencies()
         {
-            this.family = family;
-            this.colour = colour;
+            return Arrays.asList( family, COLOUR_TURTLE_MODEL );
         }
 
         @Nonnull
         @Override
-        public IBakedModel bake( @Nonnull IModelState state, @Nonnull VertexFormat format, @Nonnull Function<ResourceLocation, TextureAtlasSprite> function )
+        public Collection<Identifier> getTextureDependencies( @Nonnull Function<Identifier, UnbakedModel> modelGetter, @Nonnull Set<String> missingTextureErrors )
+        {
+            return getModelDependencies().stream()
+                .flatMap( x -> modelGetter.apply( x ).getTextureDependencies( modelGetter, missingTextureErrors ).stream() )
+                .collect( Collectors.toSet() );
+        }
+
+        @Nullable
+        @Override
+        public BakedModel bake( @Nonnull ModelLoader loader, @Nonnull Function<Identifier, Sprite> spriteGetter, @Nonnull ModelBakeSettings state )
         {
             return new TurtleSmartItemModel(
-                family.bake( state, format, function ),
-                colour.bake( state, format, function )
+                loader.getOrLoadModel( family ).bake( loader, spriteGetter, state ),
+                loader.getOrLoadModel( COLOUR_TURTLE_MODEL ).bake( loader, spriteGetter, state )
             );
         }
-
-        private TurtleModel copy( IModel family, IModel colour )
-        {
-            return this.family == family && this.colour == colour ? this : new TurtleModel( family, colour );
-        }
-
-        @Nonnull
-        @Override
-        public IModel smoothLighting( boolean value )
-        {
-            return copy( family.smoothLighting( value ), colour.smoothLighting( value ) );
-        }
-
-        @Nonnull
-        @Override
-        public IModel gui3d( boolean value )
-        {
-            return copy( family.gui3d( value ), colour.gui3d( value ) );
-        }
-
-        @Nonnull
-        @Override
-        public IModel uvlock( boolean value )
-        {
-            return copy( family.uvlock( value ), colour.uvlock( value ) );
-        }
-
-        @Nonnull
-        @Override
-        public IModel retexture( ImmutableMap<String, String> textures )
-        {
-            return copy( family.retexture( textures ), colour.retexture( textures ) );
-        }
     }
 }

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

@@ -6,34 +6,31 @@
 
 package dan200.computercraft.client.render;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.block.model.ItemOverrideList;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.BakedQuad;
+import net.minecraft.client.render.model.json.ModelItemPropertyOverrideList;
+import net.minecraft.client.render.model.json.ModelTransformation;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.util.math.Direction;
 
 import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-public class TurtleMultiModel implements IBakedModel
+public class TurtleMultiModel implements BakedModel
 {
-    private final IBakedModel m_baseModel;
-    private final IBakedModel m_overlayModel;
+    private final BakedModel m_baseModel;
+    private final BakedModel m_overlayModel;
     private final Matrix4f m_generalTransform;
-    private final IBakedModel m_leftUpgradeModel;
+    private final BakedModel m_leftUpgradeModel;
     private final Matrix4f m_leftUpgradeTransform;
-    private final IBakedModel m_rightUpgradeModel;
+    private final BakedModel 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 )
+    public TurtleMultiModel( BakedModel baseModel, BakedModel overlayModel, Matrix4f generalTransform, BakedModel leftUpgradeModel, Matrix4f leftUpgradeTransform, BakedModel rightUpgradeModel, Matrix4f rightUpgradeTransform )
     {
         // Get the models
         m_baseModel = baseModel;
@@ -47,7 +44,7 @@ public class TurtleMultiModel implements IBakedModel
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing side, long rand )
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
     {
         if( side != null )
         {
@@ -61,7 +58,7 @@ public class TurtleMultiModel implements IBakedModel
         }
     }
 
-    private List<BakedQuad> buildQuads( IBlockState state, EnumFacing side, long rand )
+    private List<BakedQuad> buildQuads( BlockState state, Direction side, Random rand )
     {
         ArrayList<BakedQuad> quads = new ArrayList<>();
         ModelTransformer.transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand ), m_generalTransform );
@@ -69,10 +66,6 @@ public class TurtleMultiModel implements IBakedModel
         {
             ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
         }
-        if( m_overlayModel != null )
-        {
-            ModelTransformer.transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
-        }
         if( m_leftUpgradeModel != null )
         {
             Matrix4f upgradeTransform = m_generalTransform;
@@ -98,42 +91,38 @@ public class TurtleMultiModel implements IBakedModel
     }
 
     @Override
-    public boolean isAmbientOcclusion()
+    public boolean useAmbientOcclusion()
     {
-        return m_baseModel.isAmbientOcclusion();
+        return m_baseModel.useAmbientOcclusion();
     }
 
     @Override
-    public boolean isGui3d()
+    public boolean hasDepthInGui()
     {
-        return m_baseModel.isGui3d();
+        return m_baseModel.hasDepthInGui();
     }
 
     @Override
-    public boolean isBuiltInRenderer()
+    public boolean isBuiltin()
     {
-        return m_baseModel.isBuiltInRenderer();
+        return m_baseModel.isBuiltin();
     }
 
-    @Nonnull
     @Override
-    public TextureAtlasSprite getParticleTexture()
+    public Sprite getSprite()
     {
-        return m_baseModel.getParticleTexture();
+        return m_baseModel.getSprite();
     }
 
-    @Nonnull
     @Override
-    @Deprecated
-    public ItemCameraTransforms getItemCameraTransforms()
+    public ModelTransformation getTransformation()
     {
-        return m_baseModel.getItemCameraTransforms();
+        return m_baseModel.getTransformation();
     }
 
-    @Nonnull
     @Override
-    public ItemOverrideList getOverrides()
+    public ModelItemPropertyOverrideList getItemPropertyOverrides()
     {
-        return ItemOverrideList.NONE;
+        return ModelItemPropertyOverrideList.EMPTY;
     }
 }

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

@@ -9,28 +9,34 @@ package dan200.computercraft.client.render;
 import com.google.common.base.Objects;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
+import dan200.computercraft.shared.turtle.items.ItemTurtle;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.model.*;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.block.BlockState;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.client.render.model.BakedModelManager;
+import net.minecraft.client.render.model.BakedQuad;
+import net.minecraft.client.render.model.json.ModelItemPropertyOverrideList;
+import net.minecraft.client.render.model.json.ModelTransformation;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.Pair;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.vecmath.Matrix4f;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Random;
 
-public class TurtleSmartItemModel implements IBakedModel
+public class TurtleSmartItemModel implements BakedModel
 {
     private static final Matrix4f s_identity, s_flip;
 
@@ -50,11 +56,11 @@ public class TurtleSmartItemModel implements IBakedModel
         final boolean m_colour;
         final ITurtleUpgrade m_leftUpgrade;
         final ITurtleUpgrade m_rightUpgrade;
-        final ResourceLocation m_overlay;
+        final Identifier m_overlay;
         final boolean m_christmas;
         final boolean m_flip;
 
-        TurtleModelCombination( boolean colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, ResourceLocation overlay, boolean christmas, boolean flip )
+        TurtleModelCombination( boolean colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, Identifier overlay, boolean christmas, boolean flip )
         {
             m_colour = colour;
             m_leftUpgrade = leftUpgrade;
@@ -94,35 +100,35 @@ public class TurtleSmartItemModel implements IBakedModel
         }
     }
 
-    private final IBakedModel familyModel;
-    private final IBakedModel colourModel;
+    private final BakedModel familyModel;
+    private final BakedModel colourModel;
 
-    private HashMap<TurtleModelCombination, IBakedModel> m_cachedModels;
-    private ItemOverrideList m_overrides;
+    private HashMap<TurtleModelCombination, BakedModel> m_cachedModels;
+    private ModelItemPropertyOverrideList m_overrides;
 
-    public TurtleSmartItemModel( IBakedModel familyModel, IBakedModel colourModel )
+    public TurtleSmartItemModel( BakedModel familyModel, BakedModel colourModel )
     {
         this.familyModel = familyModel;
         this.colourModel = colourModel;
 
         m_cachedModels = new HashMap<>();
-        m_overrides = new ItemOverrideList( new ArrayList<>() )
+        m_overrides = new ModelItemPropertyOverrideList( null, null, null, Collections.emptyList() )
         {
             @Nonnull
             @Override
-            public IBakedModel handleItemState( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity )
+            public BakedModel apply( @Nonnull BakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable LivingEntity entity )
             {
-                ItemTurtleBase turtle = (ItemTurtleBase) stack.getItem();
+                ItemTurtle turtle = (ItemTurtle) stack.getItem();
                 int colour = turtle.getColour( stack );
                 ITurtleUpgrade leftUpgrade = turtle.getUpgrade( stack, TurtleSide.Left );
                 ITurtleUpgrade rightUpgrade = turtle.getUpgrade( stack, TurtleSide.Right );
-                ResourceLocation overlay = turtle.getOverlay( stack );
+                Identifier overlay = turtle.getOverlay( stack );
                 boolean christmas = HolidayUtil.getCurrentHoliday() == Holiday.Christmas;
                 String label = turtle.getLabel( stack );
                 boolean flip = label != null && (label.equals( "Dinnerbone" ) || label.equals( "Grumm" ));
                 TurtleModelCombination combo = new TurtleModelCombination( colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip );
 
-                IBakedModel model = m_cachedModels.get( combo );
+                BakedModel model = m_cachedModels.get( combo );
                 if( model == null ) m_cachedModels.put( combo, model = buildModel( combo ) );
                 return model;
             }
@@ -131,22 +137,22 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
-    public ItemOverrideList getOverrides()
+    public ModelItemPropertyOverrideList getItemPropertyOverrides()
     {
         return m_overrides;
     }
 
-    private IBakedModel buildModel( TurtleModelCombination combo )
+    private BakedModel buildModel( TurtleModelCombination combo )
     {
-        Minecraft mc = Minecraft.getMinecraft();
-        ModelManager modelManager = mc.getRenderItem().getItemModelMesher().getModelManager();
-        ModelResourceLocation overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.m_overlay, combo.m_christmas );
+        MinecraftClient mc = MinecraftClient.getInstance();
+        BakedModelManager modelManager = mc.getItemRenderer().getModels().getModelManager();
+        ModelIdentifier overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.m_overlay, combo.m_christmas );
 
-        IBakedModel baseModel = combo.m_colour ? colourModel : familyModel;
-        IBakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel( overlayModelLocation ) : null;
+        BakedModel baseModel = combo.m_colour ? colourModel : familyModel;
+        BakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel( overlayModelLocation ) : null;
         Matrix4f transform = combo.m_flip ? s_flip : s_identity;
-        Pair<IBakedModel, Matrix4f> leftModel = combo.m_leftUpgrade != null ? combo.m_leftUpgrade.getModel( null, TurtleSide.Left ) : null;
-        Pair<IBakedModel, Matrix4f> rightModel = combo.m_rightUpgrade != null ? combo.m_rightUpgrade.getModel( null, TurtleSide.Right ) : null;
+        Pair<BakedModel, Matrix4f> leftModel = combo.m_leftUpgrade != null ? combo.m_leftUpgrade.getModel( null, TurtleSide.Left ) : null;
+        Pair<BakedModel, Matrix4f> rightModel = combo.m_rightUpgrade != null ? combo.m_rightUpgrade.getModel( null, TurtleSide.Right ) : null;
         if( leftModel != null && rightModel != null )
         {
             return new TurtleMultiModel( baseModel, overlayModel, transform, leftModel.getLeft(), leftModel.getRight(), rightModel.getLeft(), rightModel.getRight() );
@@ -167,42 +173,39 @@ public class TurtleSmartItemModel implements IBakedModel
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads( IBlockState state, EnumFacing facing, long rand )
+    @Deprecated
+    public List<BakedQuad> getQuads( BlockState state, Direction facing, Random rand )
     {
         return familyModel.getQuads( state, facing, rand );
     }
 
     @Override
-    public boolean isAmbientOcclusion()
+    public boolean useAmbientOcclusion()
     {
-        return familyModel.isAmbientOcclusion();
+        return familyModel.useAmbientOcclusion();
     }
 
     @Override
-    public boolean isGui3d()
+    public boolean hasDepthInGui()
     {
-        return familyModel.isGui3d();
+        return familyModel.hasDepthInGui();
     }
 
     @Override
-    public boolean isBuiltInRenderer()
+    public boolean isBuiltin()
     {
-        return familyModel.isBuiltInRenderer();
+        return familyModel.isBuiltin();
     }
 
-    @Nonnull
     @Override
-    public TextureAtlasSprite getParticleTexture()
+    public Sprite getSprite()
     {
-        return familyModel.getParticleTexture();
+        return null;
     }
 
-    @Nonnull
     @Override
-    @Deprecated
-    public ItemCameraTransforms getItemCameraTransforms()
+    public ModelTransformation getTransformation()
     {
-        return familyModel.getItemCameraTransforms();
+        return familyModel.getTransformation();
     }
-
 }

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

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

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

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

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

@@ -7,9 +7,7 @@
 package dan200.computercraft.core.computer;
 
 import com.google.common.base.Objects;
-import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.lua.ILuaAPI;
-import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IWorkMonitor;
 import dan200.computercraft.core.apis.IAPIEnvironment;
 import dan200.computercraft.core.filesystem.FileSystem;
@@ -219,38 +217,4 @@ public class Computer
     {
         executor.addApi( api );
     }
-
-    @Deprecated
-    public IPeripheral getPeripheral( int side )
-    {
-        return internalEnvironment.getPeripheral( ComputerSide.valueOf( side ) );
-    }
-
-    @Deprecated
-    public void setPeripheral( int side, IPeripheral peripheral )
-    {
-        internalEnvironment.setPeripheral( ComputerSide.valueOf( side ), peripheral );
-    }
-
-    @Deprecated
-    public void addAPI( dan200.computercraft.core.apis.ILuaAPI api )
-    {
-        addApi( api );
-    }
-
-    @Deprecated
-    @SuppressWarnings( "unused" )
-    public void advance( double dt )
-    {
-        tick();
-    }
-
-    @Deprecated
-    public IWritableMount getRootMount()
-    {
-        return executor.getRootMount();
-    }
-
-    @Deprecated
-    public static final String[] s_sideNames = ComputerSide.NAMES;
 }

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

@@ -10,7 +10,7 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.peripheral.IWorkMonitor;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.shared.turtle.core.TurtleBrain;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.block.entity.BlockEntity;
 
 import javax.annotation.Nonnull;
 import java.util.ArrayDeque;
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  * this tick. At the beginning of the tick, we execute as many {@link MainThread} tasks as possible, until our
  * time-frame or the global time frame has expired.
  *
- * Then, when other objects (such as {@link TileEntity}) are ticked, we update how much time we've used using
+ * Then, when other objects (such as {@link BlockEntity}) are ticked, we update how much time we've used using
  * {@link IWorkMonitor#trackWork(long, TimeUnit)}.
  *
  * Now, if anywhere during this period, we use more than our allocated time slice, the executor is marked as

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

@@ -0,0 +1,278 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.core.filesystem;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.io.ByteStreams;
+import dan200.computercraft.api.filesystem.IMount;
+import dan200.computercraft.core.apis.handles.ArrayByteChannel;
+import net.minecraft.resource.ReloadableResourceManager;
+import net.minecraft.resource.Resource;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceReloadListener;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.profiler.Profiler;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+public class ResourceMount implements IMount
+{
+    /**
+     * Only cache files smaller than 1MiB.
+     */
+    private static final int MAX_CACHED_SIZE = 1 << 20;
+
+    /**
+     * Limit the entire cache to 64MiB.
+     */
+    private static final int MAX_CACHE_SIZE = 64 << 20;
+
+    private static final byte[] TEMP_BUFFER = new byte[8192];
+
+    /**
+     * We maintain a cache of the contents of all files in the mount. This allows us to allow
+     * seeking within ROM files, and reduces the amount we need to access disk for computer startup.
+     */
+    private static final Cache<FileEntry, byte[]> CONTENTS_CACHE = CacheBuilder.newBuilder()
+        .concurrencyLevel( 4 )
+        .expireAfterAccess( 60, TimeUnit.SECONDS )
+        .maximumWeight( MAX_CACHE_SIZE )
+        .weakKeys()
+        .<FileEntry, byte[]>weigher( ( k, v ) -> v.length )
+        .build();
+
+    private final String namespace;
+    private final String subPath;
+    private final ReloadableResourceManager manager;
+
+    @Nullable
+    private FileEntry root;
+
+    public ResourceMount( String namespace, String subPath, ReloadableResourceManager manager )
+    {
+        this.namespace = namespace;
+        this.subPath = subPath;
+        this.manager = manager;
+
+        Listener.INSTANCE.add( manager, this );
+        if( root == null ) load();
+    }
+
+    private void load()
+    {
+        boolean hasAny = false;
+        FileEntry newRoot = new FileEntry( new Identifier( namespace, subPath ) );
+        for( Identifier file : manager.findResources( subPath, s -> true ) )
+        {
+            if( !file.getNamespace().equals( namespace ) ) continue;
+
+            String localPath = FileSystem.toLocal( file.getPath(), subPath );
+            create( newRoot, localPath );
+            hasAny = true;
+        }
+
+        root = hasAny ? newRoot : null;
+    }
+
+    private FileEntry get( String path )
+    {
+        FileEntry lastEntry = root;
+        int lastIndex = 0;
+
+        while( lastEntry != null && lastIndex < path.length() )
+        {
+            int nextIndex = path.indexOf( '/', lastIndex );
+            if( nextIndex < 0 ) nextIndex = path.length();
+
+            lastEntry = lastEntry.children == null ? null : lastEntry.children.get( path.substring( lastIndex, nextIndex ) );
+            lastIndex = nextIndex + 1;
+        }
+
+        return lastEntry;
+    }
+
+    private void create( FileEntry lastEntry, String path )
+    {
+        int lastIndex = 0;
+        while( lastIndex < path.length() )
+        {
+            int nextIndex = path.indexOf( '/', lastIndex );
+            if( nextIndex < 0 ) nextIndex = path.length();
+
+            String part = path.substring( lastIndex, nextIndex );
+            if( lastEntry.children == null ) lastEntry.children = new HashMap<>();
+
+            FileEntry nextEntry = lastEntry.children.get( part );
+            if( nextEntry == null )
+            {
+                lastEntry.children.put( part, nextEntry = new FileEntry( new Identifier( namespace, subPath + "/" + path ) ) );
+            }
+
+            lastEntry = nextEntry;
+            lastIndex = nextIndex + 1;
+        }
+    }
+
+    @Override
+    public boolean exists( @Nonnull String path )
+    {
+        return get( path ) != null;
+    }
+
+    @Override
+    public boolean isDirectory( @Nonnull String path )
+    {
+        FileEntry file = get( path );
+        return file != null && file.isDirectory();
+    }
+
+    @Override
+    public void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException
+    {
+        FileEntry file = get( path );
+        if( file == null || !file.isDirectory() ) throw new IOException( "/" + path + ": Not a directory" );
+
+        file.list( contents );
+    }
+
+    @Override
+    public long getSize( @Nonnull String path ) throws IOException
+    {
+        FileEntry file = get( path );
+        if( file != null )
+        {
+            if( file.size != -1 ) return file.size;
+            if( file.isDirectory() ) return file.size = 0;
+
+            byte[] contents = CONTENTS_CACHE.getIfPresent( file );
+            if( contents != null ) return file.size = contents.length;
+
+            try
+            {
+                Resource resource = manager.getResource( file.identifier );
+                InputStream s = resource.getInputStream();
+                int total = 0, read = 0;
+                do
+                {
+                    total += read;
+                    read = s.read( TEMP_BUFFER );
+                } while( read > 0 );
+
+                return file.size = total;
+            }
+            catch( IOException e )
+            {
+                return file.size = 0;
+            }
+        }
+
+        throw new IOException( "/" + path + ": No such file" );
+    }
+
+    @Nonnull
+    @Override
+    @Deprecated
+    public InputStream openForRead( @Nonnull String path ) throws IOException
+    {
+        return Channels.newInputStream( openChannelForRead( path ) );
+    }
+
+    @Nonnull
+    @Override
+    public ReadableByteChannel openChannelForRead( @Nonnull String path ) throws IOException
+    {
+        FileEntry file = get( path );
+        if( file != null && !file.isDirectory() )
+        {
+            byte[] contents = CONTENTS_CACHE.getIfPresent( file );
+            if( contents != null ) return new ArrayByteChannel( contents );
+
+            try( InputStream stream = manager.getResource( file.identifier ).getInputStream() )
+            {
+                if( stream.available() > MAX_CACHED_SIZE ) return Channels.newChannel( stream );
+
+                contents = ByteStreams.toByteArray( stream );
+                CONTENTS_CACHE.put( file, contents );
+                return new ArrayByteChannel( contents );
+            }
+            catch( FileNotFoundException ignored )
+            {
+            }
+        }
+
+        throw new IOException( "/" + path + ": No such file" );
+    }
+
+    private static class FileEntry
+    {
+        final Identifier identifier;
+        Map<String, FileEntry> children;
+        long size = -1;
+
+        FileEntry( Identifier identifier )
+        {
+            this.identifier = identifier;
+        }
+
+        boolean isDirectory()
+        {
+            return children != null;
+        }
+
+        void list( List<String> contents )
+        {
+            if( children != null ) contents.addAll( children.keySet() );
+        }
+    }
+
+    /**
+     * A {@link ResourceReloadListener} which reloads any associated mounts.
+     *
+     * While people should really be keeping a permanent reference to this, some people construct it every
+     * method call, so let's make this as small as possible.
+     */
+    static class Listener implements ResourceReloadListener
+    {
+        private static final Listener INSTANCE = new Listener();
+
+        private final Set<ResourceMount> mounts = Collections.newSetFromMap( new WeakHashMap<>() );
+        private final Set<ReloadableResourceManager> managers = Collections.newSetFromMap( new WeakHashMap<>() );
+
+        @Override
+        public CompletableFuture<Void> reload( Synchronizer synchronizer, ResourceManager resourceManager, Profiler profiler, Profiler profiler1, Executor executor, Executor executor1 )
+        {
+            return CompletableFuture.runAsync( () -> {
+                profiler.push( "Mount reloading" );
+                try
+                {
+                    for( ResourceMount mount : mounts ) mount.load();
+                }
+                finally
+                {
+                    profiler.pop();
+                }
+            }, executor );
+        }
+
+        synchronized void add( ReloadableResourceManager manager, ResourceMount mount )
+        {
+            if( managers.add( manager ) ) manager.registerListener( this );
+            mounts.add( mount );
+        }
+    }
+}

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.CompoundTag;
 
 public class Terminal
 {
@@ -334,18 +334,18 @@ public class Terminal
         m_changed = false;
     }
 
-    public synchronized NBTTagCompound writeToNBT( NBTTagCompound nbt )
+    public synchronized CompoundTag writeToNBT( CompoundTag nbt )
     {
-        nbt.setInteger( "term_cursorX", m_cursorX );
-        nbt.setInteger( "term_cursorY", m_cursorY );
-        nbt.setBoolean( "term_cursorBlink", m_cursorBlink );
-        nbt.setInteger( "term_textColour", m_cursorColour );
-        nbt.setInteger( "term_bgColour", m_cursorBackgroundColour );
+        nbt.putInt( "term_cursorX", m_cursorX );
+        nbt.putInt( "term_cursorY", m_cursorY );
+        nbt.putBoolean( "term_cursorBlink", m_cursorBlink );
+        nbt.putInt( "term_textColour", m_cursorColour );
+        nbt.putInt( "term_bgColour", m_cursorBackgroundColour );
         for( int n = 0; n < m_height; n++ )
         {
-            nbt.setString( "term_text_" + n, m_text[n].toString() );
-            nbt.setString( "term_textColour_" + n, m_textColour[n].toString() );
-            nbt.setString( "term_textBgColour_" + n, m_backgroundColour[n].toString() );
+            nbt.putString( "term_text_" + n, m_text[n].toString() );
+            nbt.putString( "term_textColour_" + n, m_textColour[n].toString() );
+            nbt.putString( "term_textBgColour_" + n, m_backgroundColour[n].toString() );
         }
         if( m_palette != null )
         {
@@ -354,28 +354,28 @@ public class Terminal
         return nbt;
     }
 
-    public synchronized void readFromNBT( NBTTagCompound nbt )
+    public synchronized void readFromNBT( CompoundTag nbt )
     {
-        m_cursorX = nbt.getInteger( "term_cursorX" );
-        m_cursorY = nbt.getInteger( "term_cursorY" );
+        m_cursorX = nbt.getInt( "term_cursorX" );
+        m_cursorY = nbt.getInt( "term_cursorY" );
         m_cursorBlink = nbt.getBoolean( "term_cursorBlink" );
-        m_cursorColour = nbt.getInteger( "term_textColour" );
-        m_cursorBackgroundColour = nbt.getInteger( "term_bgColour" );
+        m_cursorColour = nbt.getInt( "term_textColour" );
+        m_cursorBackgroundColour = nbt.getInt( "term_bgColour" );
 
         for( int n = 0; n < m_height; n++ )
         {
             m_text[n].fill( ' ' );
-            if( nbt.hasKey( "term_text_" + n ) )
+            if( nbt.containsKey( "term_text_" + n ) )
             {
                 m_text[n].write( nbt.getString( "term_text_" + n ) );
             }
             m_textColour[n].fill( base16.charAt( m_cursorColour ) );
-            if( nbt.hasKey( "term_textColour_" + n ) )
+            if( nbt.containsKey( "term_textColour_" + n ) )
             {
                 m_textColour[n].write( nbt.getString( "term_textColour_" + n ) );
             }
             m_backgroundColour[n].fill( base16.charAt( m_cursorBackgroundColour ) );
-            if( nbt.hasKey( "term_textBgColour_" + n ) )
+            if( nbt.containsKey( "term_textBgColour_" + n ) )
             {
                 m_backgroundColour[n].write( nbt.getString( "term_textBgColour_" + n ) );
             }

src/main/java/dan200/computercraft/core/tracking/Tracker.java

@@ -10,11 +10,6 @@ import dan200.computercraft.core.computer.Computer;
 
 public interface Tracker
 {
-    @Deprecated
-    default void addTiming( Computer computer, long time )
-    {
-    }
-
     /**
      * Report how long a task executed on the computer thread took.
      *
@@ -25,8 +20,6 @@ public interface Tracker
      */
     default void addTaskTiming( Computer computer, long time )
     {
-        //noinspection deprecation
-        addTiming( computer, time );
     }
 
     /**

src/main/java/dan200/computercraft/core/tracking/TrackingField.java

@@ -6,8 +6,6 @@
 
 package dan200.computercraft.core.tracking;
 
-import dan200.computercraft.shared.util.StringUtil;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -15,31 +13,29 @@ import java.util.function.LongFunction;
 
 public final class TrackingField
 {
-    public static final String TRANSLATE_PREFIX = "tracking_field.computercraft.";
-
     private static final Map<String, TrackingField> fields = new HashMap<>();
 
-    public static final TrackingField TASKS = TrackingField.of( "tasks", "Tasks", x -> String.format( "%4d", x ) );
-    public static final TrackingField TOTAL_TIME = TrackingField.of( "total", "Total time", x -> String.format( "%7.1fms", x / 1e6 ) );
-    public static final TrackingField AVERAGE_TIME = TrackingField.of( "average", "Average time", x -> String.format( "%4.1fms", x / 1e6 ) );
-    public static final TrackingField MAX_TIME = TrackingField.of( "max", "Max time", x -> String.format( "%5.1fms", x / 1e6 ) );
+    public static final TrackingField TASKS = TrackingField.of( "tasks", x -> String.format( "%4d", x ) );
+    public static final TrackingField TOTAL_TIME = TrackingField.of( "total", x -> String.format( "%7.1fms", x / 1e6 ) );
+    public static final TrackingField AVERAGE_TIME = TrackingField.of( "average", x -> String.format( "%4.1fms", x / 1e6 ) );
+    public static final TrackingField MAX_TIME = TrackingField.of( "max", x -> String.format( "%5.1fms", x / 1e6 ) );
 
-    public static final TrackingField SERVER_COUNT = TrackingField.of( "server_count", "Server task count", x -> String.format( "%4d", x ) );
-    public static final TrackingField SERVER_TIME = TrackingField.of( "server_time", "Server task time", x -> String.format( "%7.1fms", x / 1e6 ) );
+    public static final TrackingField SERVER_COUNT = TrackingField.of( "server_count", x -> String.format( "%4d", x ) );
+    public static final TrackingField SERVER_TIME = TrackingField.of( "server_time", x -> String.format( "%7.1fms", x / 1e6 ) );
 
-    public static final TrackingField PERIPHERAL_OPS = TrackingField.of( "peripheral", "Peripheral calls", TrackingField::formatDefault );
-    public static final TrackingField FS_OPS = TrackingField.of( "fs", "Filesystem operations", TrackingField::formatDefault );
-    public static final TrackingField TURTLE_OPS = TrackingField.of( "turtle", "Turtle operations", TrackingField::formatDefault );
+    public static final TrackingField PERIPHERAL_OPS = TrackingField.of( "peripheral", TrackingField::formatDefault );
+    public static final TrackingField FS_OPS = TrackingField.of( "fs", TrackingField::formatDefault );
+    public static final TrackingField TURTLE_OPS = TrackingField.of( "turtle", TrackingField::formatDefault );
 
-    public static final TrackingField HTTP_REQUESTS = TrackingField.of( "http", "HTTP requests", TrackingField::formatDefault );
-    public static final TrackingField HTTP_UPLOAD = TrackingField.of( "http_upload", "HTTP upload", TrackingField::formatBytes );
-    public static final TrackingField HTTP_DOWNLOAD = TrackingField.of( "http_download", "HTTP download", TrackingField::formatBytes );
+    public static final TrackingField HTTP_REQUESTS = TrackingField.of( "http", TrackingField::formatDefault );
+    public static final TrackingField HTTP_UPLOAD = TrackingField.of( "http_upload", TrackingField::formatBytes );
+    public static final TrackingField HTTP_DOWNLOAD = TrackingField.of( "http_download", TrackingField::formatBytes );
 
-    public static final TrackingField WEBSOCKET_INCOMING = TrackingField.of( "websocket_incoming", "Websocket incoming", TrackingField::formatBytes );
-    public static final TrackingField WEBSOCKET_OUTGOING = TrackingField.of( "websocket_outgoing", "Websocket outgoing", TrackingField::formatBytes );
+    public static final TrackingField WEBSOCKET_INCOMING = TrackingField.of( "websocket_incoming", TrackingField::formatBytes );
+    public static final TrackingField WEBSOCKET_OUTGOING = TrackingField.of( "websocket_outgoing", TrackingField::formatBytes );
 
-    public static final TrackingField COROUTINES_CREATED = TrackingField.of( "coroutines_created", "Coroutines created", x -> String.format( "%4d", x ) );
-    public static final TrackingField COROUTINES_DISPOSED = TrackingField.of( "coroutines_dead", "Coroutines disposed", x -> String.format( "%4d", x ) );
+    public static final TrackingField COROUTINES_CREATED = TrackingField.of( "coroutines_created", x -> String.format( "%4d", x ) );
+    public static final TrackingField COROUTINES_DISPOSED = TrackingField.of( "coroutines_dead", x -> String.format( "%4d", x ) );
 
     private final String id;
     private final String translationKey;
@@ -55,12 +51,6 @@ public final class TrackingField
         return translationKey;
     }
 
-    @Deprecated
-    public String displayName()
-    {
-        return StringUtil.translate( translationKey() );
-    }
-
     private TrackingField( String id, LongFunction<String> format )
     {
         this.id = id;
@@ -73,7 +63,7 @@ public final class TrackingField
         return format.apply( value );
     }
 
-    public static TrackingField of( String id, String displayName, LongFunction<String> format )
+    public static TrackingField of( String id, LongFunction<String> format )
     {
         TrackingField field = new TrackingField( id, format );
         fields.put( id, field );

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

@@ -9,8 +9,8 @@ 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.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -30,14 +30,14 @@ 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;
+        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;
+        if( !World.isValid( pos ) ) return -1;
 
         // Try the providers in order:
         int combinedSignal = -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

@@ -1,507 +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.shared;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Converter;
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.api.turtle.event.TurtleAction;
-import dan200.computercraft.core.apis.AddressPredicate;
-import dan200.computercraft.core.apis.http.websocket.Websocket;
-import net.minecraftforge.common.config.ConfigCategory;
-import net.minecraftforge.common.config.ConfigElement;
-import net.minecraftforge.common.config.Configuration;
-import net.minecraftforge.common.config.Property;
-import net.minecraftforge.fml.client.config.IConfigElement;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import static dan200.computercraft.ComputerCraft.DEFAULT_HTTP_BLACKLIST;
-import static dan200.computercraft.ComputerCraft.DEFAULT_HTTP_WHITELIST;
-
-public final class Config
-{
-    private static final int MODEM_MAX_RANGE = 100000;
-
-    private static final String CATEGORY_GENERAL = "general";
-    private static final String CATEGORY_EXECUTION = "execution";
-    private static final String CATEGORY_HTTP = "http";
-    private static final String CATEGORY_PERIPHERAL = "peripheral";
-    private static final String CATEGORY_TURTLE = "turtle";
-
-    private static Configuration config;
-
-    private static Property computerSpaceLimit;
-    private static Property floppySpaceLimit;
-    private static Property maximumFilesOpen;
-    private static Property disableLua51Features;
-    private static Property defaultComputerSettings;
-    private static Property debugEnabled;
-    private static Property logComputerErrors;
-
-    private static Property computerThreads;
-    private static Property maxMainGlobalTime;
-    private static Property maxMainComputerTime;
-
-    private static Property httpEnable;
-    private static Property httpWebsocketEnable;
-    private static Property httpWhitelist;
-    private static Property httpBlacklist;
-
-    private static Property httpTimeout;
-    private static Property httpMaxRequests;
-    private static Property httpMaxDownload;
-    private static Property httpMaxUpload;
-    private static Property httpMaxWebsockets;
-    private static Property httpMaxWebsocketMessage;
-
-    private static Property commandBlockEnabled;
-    private static Property modemRange;
-    private static Property modemHighAltitudeRange;
-    private static Property modemRangeDuringStorm;
-    private static Property modemHighAltitudeRangeDuringStorm;
-    private static Property maxNotesPerTick;
-
-    private static Property turtlesNeedFuel;
-    private static Property turtleFuelLimit;
-    private static Property advancedTurtleFuelLimit;
-    private static Property turtlesObeyBlockProtection;
-    private static Property turtlesCanPush;
-    private static Property turtleDisabledActions;
-
-    private Config() {}
-
-    public static void load( File configFile )
-    {
-        config = new Configuration( configFile, ComputerCraft.getVersion() );
-
-        config.load();
-
-        { // General computers
-            renameProperty( CATEGORY_GENERAL, "computerSpaceLimit", CATEGORY_GENERAL, "computer_space_limit" );
-            renameProperty( CATEGORY_GENERAL, "floppySpaceLimit", CATEGORY_GENERAL, "floppy_space_limit" );
-            renameProperty( CATEGORY_GENERAL, "maximumFilesOpen", CATEGORY_GENERAL, "maximum_open_files" );
-            renameProperty( CATEGORY_GENERAL, "debug_enable", CATEGORY_GENERAL, "debug_enabled" );
-            renameProperty( CATEGORY_GENERAL, "logPeripheralErrors", CATEGORY_GENERAL, "log_computer_errors" );
-
-            computerSpaceLimit = config.get( CATEGORY_GENERAL, "computer_space_limit", ComputerCraft.computerSpaceLimit );
-            computerSpaceLimit.setComment( "The disk space limit for computers and turtles, in bytes" );
-
-            floppySpaceLimit = config.get( CATEGORY_GENERAL, "floppy_space_limit", ComputerCraft.floppySpaceLimit );
-            floppySpaceLimit.setComment( "The disk space limit for floppy disks, in bytes" );
-
-            maximumFilesOpen = config.get( CATEGORY_GENERAL, "maximum_open_files", ComputerCraft.maximumFilesOpen );
-            maximumFilesOpen.setComment( "Set how many files a computer can have open at the same time. Set to 0 for unlimited." );
-            maximumFilesOpen.setMinValue( 0 );
-
-            disableLua51Features = config.get( CATEGORY_GENERAL, "disable_lua51_features", ComputerCraft.disable_lua51_features );
-            disableLua51Features.setComment( "Set this to true to disable Lua 5.1 functions that will be removed in a future " +
-                "update. Useful for ensuring forward compatibility of your programs now." );
-
-            defaultComputerSettings = config.get( CATEGORY_GENERAL, "default_computer_settings", ComputerCraft.default_computer_settings );
-            defaultComputerSettings.setComment( "A comma separated list of default system settings to set on new computers. Example: " +
-                "\"shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false\" will disable all autocompletion" );
-
-            debugEnabled = config.get( CATEGORY_GENERAL, "debug_enabled", ComputerCraft.debug_enable );
-            debugEnabled.setComment( "Enable Lua's debug library. This is sandboxed to each computer, so is generally safe to be used by players." );
-
-            logComputerErrors = config.get( CATEGORY_GENERAL, "log_computer_errors", ComputerCraft.logPeripheralErrors );
-            logComputerErrors.setComment( "Log exceptions thrown by peripherals and other Lua objects.\n" +
-                "This makes it easier for mod authors to debug problems, but may result in log spam should people use buggy methods." );
-
-            setOrder(
-                CATEGORY_GENERAL,
-                computerSpaceLimit, floppySpaceLimit, maximumFilesOpen,
-                disableLua51Features, defaultComputerSettings, debugEnabled, logComputerErrors
-            );
-        }
-
-        { // Execution
-            renameProperty( CATEGORY_GENERAL, "computer_threads", CATEGORY_EXECUTION, "computer_threads" );
-
-            config.getCategory( CATEGORY_EXECUTION )
-                .setComment( "Controls execution behaviour of computers. This is largely intended for fine-tuning " +
-                    "servers, and generally shouldn't need to be touched" );
-
-            computerThreads = config.get( CATEGORY_EXECUTION, "computer_threads", ComputerCraft.computer_threads );
-            computerThreads
-                .setMinValue( 1 )
-                .setRequiresMcRestart( true )
-                .setComment( "Set the number of threads computers can run on. A higher number means more computers can " +
-                    "run at once, but may induce lag.\n" +
-                    "Please note that some mods may not work with a thread count higher than 1. Use with caution." );
-
-            maxMainGlobalTime = config.get( CATEGORY_EXECUTION, "max_main_global_time", (int) TimeUnit.NANOSECONDS.toMillis( ComputerCraft.maxMainGlobalTime ) );
-            maxMainGlobalTime
-                .setMinValue( 1 )
-                .setComment( "The maximum time that can be spent executing tasks in a single tick, in milliseconds.\n" +
-                    "Note, we will quite possibly go over this limit, as there's no way to tell how long a will take - this aims " +
-                    "to be the upper bound of the average time." );
-
-            maxMainComputerTime = config.get( CATEGORY_EXECUTION, "max_main_computer_time", (int) TimeUnit.NANOSECONDS.toMillis( ComputerCraft.maxMainComputerTime ) );
-            maxMainComputerTime
-                .setMinValue( 1 )
-                .setComment( "The ideal maximum time a computer can execute for in a tick, in milliseconds.\n" +
-                    "Note, we will quite possibly go over this limit, as there's no way to tell how long a will take - this aims " +
-                    "to be the upper bound of the average time." );
-
-            setOrder(
-                CATEGORY_EXECUTION,
-                computerThreads, maxMainGlobalTime, maxMainComputerTime
-            );
-        }
-
-        { // HTTP
-            renameProperty( CATEGORY_GENERAL, "http_enable", CATEGORY_HTTP, "enabled" );
-            renameProperty( CATEGORY_GENERAL, "http_websocket_enable", CATEGORY_HTTP, "websocket_enabled" );
-            renameProperty( CATEGORY_GENERAL, "http_whitelist", CATEGORY_HTTP, "whitelist" );
-            renameProperty( CATEGORY_GENERAL, "http_blacklist", CATEGORY_HTTP, "blacklist" );
-
-            config.getCategory( CATEGORY_HTTP )
-                .setComment( "Controls the HTTP API" );
-
-            httpEnable = config.get( CATEGORY_HTTP, "enabled", ComputerCraft.http_enable );
-            httpEnable.setComment( "Enable the \"http\" API on Computers (see \"http_whitelist\" and \"http_blacklist\" for " +
-                "more fine grained control than this)" );
-
-            httpWebsocketEnable = config.get( CATEGORY_HTTP, "websocket_enabled", ComputerCraft.http_websocket_enable );
-            httpWebsocketEnable.setComment( "Enable use of http websockets. This requires the \"http_enable\" option to also be true." );
-
-            httpWhitelist = config.get( CATEGORY_HTTP, "whitelist", DEFAULT_HTTP_WHITELIST );
-            httpWhitelist.setComment( "A list of wildcards for domains or IP ranges that can be accessed through the " +
-                "\"http\" API on Computers.\n" +
-                "Set this to \"*\" to access to the entire internet. Example: \"*.pastebin.com\" will restrict access to " +
-                "just subdomains of pastebin.com.\n" +
-                "You can use domain names (\"pastebin.com\"), wilcards (\"*.pastebin.com\") or CIDR notation (\"127.0.0.0/8\")." );
-
-            httpBlacklist = config.get( CATEGORY_HTTP, "blacklist", DEFAULT_HTTP_BLACKLIST );
-            httpBlacklist.setComment( "A list of wildcards for domains or IP ranges that cannot be accessed through the " +
-                "\"http\" API on Computers.\n" +
-                "If this is empty then all whitelisted domains will be accessible. Example: \"*.github.com\" will block " +
-                "access to all subdomains of github.com.\n" +
-                "You can use domain names (\"pastebin.com\"), wilcards (\"*.pastebin.com\") or CIDR notation (\"127.0.0.0/8\")." );
-
-            httpTimeout = config.get( CATEGORY_HTTP, "timeout", ComputerCraft.httpTimeout );
-            httpTimeout.setComment( "The period of time (in milliseconds) to wait before a HTTP request times out. Set to 0 for unlimited." );
-            httpTimeout.setMinValue( 0 );
-
-            httpMaxRequests = config.get( CATEGORY_HTTP, "max_requests", ComputerCraft.httpMaxRequests );
-            httpMaxRequests.setComment( "The number of http requests a computer can make at one time. Additional requests " +
-                "will be queued, and sent when the running requests have finished. Set to 0 for unlimited." );
-            httpMaxRequests.setMinValue( 0 );
-
-            httpMaxDownload = config.get( CATEGORY_HTTP, "max_download", (int) ComputerCraft.httpMaxDownload );
-            httpMaxDownload.setComment( "The maximum size (in bytes) that a computer can download in a single request. " +
-                "Note that responses may receive more data than allowed, but this data will not be returned to the client." );
-            httpMaxDownload.setMinValue( 0 );
-
-            httpMaxUpload = config.get( CATEGORY_HTTP, "max_upload", (int) ComputerCraft.httpMaxUpload );
-            httpMaxUpload.setComment( "The maximum size (in bytes) that a computer can upload in a single request. This " +
-                "includes headers and POST text." );
-            httpMaxUpload.setMinValue( 0 );
-
-            httpMaxWebsockets = config.get( CATEGORY_HTTP, "max_websockets", ComputerCraft.httpMaxWebsockets );
-            httpMaxWebsockets.setComment( "The number of websockets a computer can have open at one time. Set to 0 for unlimited." );
-            httpMaxWebsockets.setMinValue( 1 );
-
-            httpMaxWebsocketMessage = config.get( CATEGORY_HTTP, "max_websocket_message", ComputerCraft.httpMaxWebsocketMessage );
-            httpMaxWebsocketMessage.setComment( "The maximum size (in bytes) that a computer can send or receive in one websocket packet." );
-            httpMaxWebsocketMessage.setMinValue( 0 );
-            httpMaxWebsocketMessage.setMaxValue( Websocket.MAX_MESSAGE_SIZE );
-
-            setOrder(
-                CATEGORY_HTTP,
-                httpEnable, httpWebsocketEnable, httpWhitelist, httpBlacklist,
-                httpTimeout, httpMaxRequests, httpMaxDownload, httpMaxUpload, httpMaxWebsockets, httpMaxWebsocketMessage
-            );
-        }
-
-        { // Peripherals
-            renameProperty( CATEGORY_GENERAL, "enableCommandBlock", CATEGORY_PERIPHERAL, "command_block_enabled" );
-            renameProperty( CATEGORY_GENERAL, "modem_range", CATEGORY_PERIPHERAL, "modem_range" );
-            renameProperty( CATEGORY_GENERAL, "modem_highAltitudeRange", CATEGORY_PERIPHERAL, "modem_high_altitude_range" );
-            renameProperty( CATEGORY_GENERAL, "modem_rangeDuringStorm", CATEGORY_PERIPHERAL, "modem_range_during_storm" );
-            renameProperty( CATEGORY_GENERAL, "modem_highAltitudeRangeDuringStorm", CATEGORY_PERIPHERAL, "modem_high_altitude_range_during_storm" );
-            renameProperty( CATEGORY_GENERAL, "maxNotesPerTick", CATEGORY_PERIPHERAL, "max_notes_per_tick" );
-
-            config.getCategory( CATEGORY_PERIPHERAL )
-                .setComment( "Various options relating to peripherals." );
-
-            commandBlockEnabled = config.get( CATEGORY_PERIPHERAL, "command_block_enabled", ComputerCraft.enableCommandBlock );
-            commandBlockEnabled.setComment( "Enable Command Block peripheral support" );
-
-            modemRange = config.get( CATEGORY_PERIPHERAL, "modem_range", ComputerCraft.modem_range );
-            modemRange.setComment( "The range of Wireless Modems at low altitude in clear weather, in meters" );
-            modemRange.setMinValue( 0 );
-            modemRange.setMaxValue( MODEM_MAX_RANGE );
-
-            modemHighAltitudeRange = config.get( CATEGORY_PERIPHERAL, "modem_high_altitude_range", ComputerCraft.modem_highAltitudeRange );
-            modemHighAltitudeRange.setComment( "The range of Wireless Modems at maximum altitude in clear weather, in meters" );
-            modemHighAltitudeRange.setMinValue( 0 );
-            modemHighAltitudeRange.setMaxValue( MODEM_MAX_RANGE );
-
-            modemRangeDuringStorm = config.get( CATEGORY_PERIPHERAL, "modem_range_during_storm", ComputerCraft.modem_rangeDuringStorm );
-            modemRangeDuringStorm.setComment( "The range of Wireless Modems at low altitude in stormy weather, in meters" );
-            modemRangeDuringStorm.setMinValue( 0 );
-            modemRangeDuringStorm.setMaxValue( MODEM_MAX_RANGE );
-
-            modemHighAltitudeRangeDuringStorm = config.get( CATEGORY_PERIPHERAL, "modem_high_altitude_range_during_storm", ComputerCraft.modem_highAltitudeRangeDuringStorm );
-            modemHighAltitudeRangeDuringStorm.setComment( "The range of Wireless Modems at maximum altitude in stormy weather, in meters" );
-            modemHighAltitudeRangeDuringStorm.setMinValue( 0 );
-            modemHighAltitudeRangeDuringStorm.setMaxValue( MODEM_MAX_RANGE );
-
-            maxNotesPerTick = config.get( CATEGORY_PERIPHERAL, "max_notes_per_tick", ComputerCraft.maxNotesPerTick );
-            maxNotesPerTick.setComment( "Maximum amount of notes a speaker can play at once" );
-            maxNotesPerTick.setMinValue( 1 );
-
-            setOrder(
-                CATEGORY_PERIPHERAL,
-                commandBlockEnabled, modemRange, modemHighAltitudeRange, modemRangeDuringStorm, modemHighAltitudeRangeDuringStorm, maxNotesPerTick
-            );
-        }
-
-        { // Turtles
-            renameProperty( CATEGORY_GENERAL, "turtlesNeedFuel", CATEGORY_TURTLE, "need_fuel" );
-            renameProperty( CATEGORY_GENERAL, "turtleFuelLimit", CATEGORY_TURTLE, "normal_fuel_limit" );
-            renameProperty( CATEGORY_GENERAL, "advancedTurtleFuelLimit", CATEGORY_TURTLE, "advanced_fuel_limit" );
-            renameProperty( CATEGORY_GENERAL, "turtlesObeyBlockProtection", CATEGORY_TURTLE, "obey_block_protection" );
-            renameProperty( CATEGORY_GENERAL, "turtlesCanPush", CATEGORY_TURTLE, "can_push" );
-            renameProperty( CATEGORY_GENERAL, "turtle_disabled_actions", CATEGORY_TURTLE, "disabled_actions" );
-
-            config.getCategory( CATEGORY_HTTP )
-                .setComment( "Various options relating to turtles." );
-
-            turtlesNeedFuel = config.get( CATEGORY_TURTLE, "need_fuel", ComputerCraft.turtlesNeedFuel );
-            turtlesNeedFuel.setComment( "Set whether Turtles require fuel to move" );
-
-            turtleFuelLimit = config.get( CATEGORY_TURTLE, "normal_fuel_limit", ComputerCraft.turtleFuelLimit );
-            turtleFuelLimit.setComment( "The fuel limit for Turtles" );
-            turtleFuelLimit.setMinValue( 0 );
-
-            advancedTurtleFuelLimit = config.get( CATEGORY_TURTLE, "advanced_fuel_limit", ComputerCraft.advancedTurtleFuelLimit );
-            advancedTurtleFuelLimit.setComment( "The fuel limit for Advanced Turtles" );
-            advancedTurtleFuelLimit.setMinValue( 0 );
-
-            turtlesObeyBlockProtection = config.get( CATEGORY_TURTLE, "obey_block_protection", ComputerCraft.turtlesObeyBlockProtection );
-            turtlesObeyBlockProtection.setComment( "If set to true, Turtles will be unable to build, dig, or enter protected " +
-                "areas (such as near the server spawn point)" );
-
-            turtlesCanPush = config.get( CATEGORY_TURTLE, "can_push", ComputerCraft.turtlesCanPush );
-            turtlesCanPush.setComment( "If set to true, Turtles will push entities out of the way instead of stopping if " +
-                "there is space to do so" );
-
-            turtleDisabledActions = config.get( CATEGORY_TURTLE, "disabled_actions", new String[0] );
-            turtleDisabledActions.setComment( "A list of turtle actions which are disabled." );
-
-            setOrder(
-                CATEGORY_TURTLE,
-                turtlesNeedFuel, turtleFuelLimit, advancedTurtleFuelLimit, turtlesObeyBlockProtection, turtlesCanPush, turtleDisabledActions
-            );
-        }
-
-        for( String child : config.getCategoryNames() )
-        {
-            setupLanguage(
-                config.getCategory( child ),
-                child.equals( CATEGORY_GENERAL ) ? "gui.computercraft:config" : "gui.computercraft:config." + child
-            );
-        }
-
-        sync();
-    }
-
-    private static void setOrder( String category, Property... properties )
-    {
-        List<String> names = new ArrayList<>( properties.length );
-        for( Property property : properties ) names.add( property.getName() );
-        config.getCategory( category ).setPropertyOrder( names );
-    }
-
-    private static void renameProperty( String oldCat, String oldProp, String newCat, String newProp )
-    {
-        if( !config.hasCategory( oldCat ) ) return;
-
-        ConfigCategory cat = config.getCategory( oldCat );
-        if( !cat.containsKey( oldProp ) ) return;
-
-        Property prop = cat.remove( oldProp );
-        prop.setName( newProp );
-        config.getCategory( newCat ).put( newProp, prop );
-
-        // Clean up old categories
-        if( cat.isEmpty() ) config.removeCategory( cat );
-    }
-
-    private static void setupLanguage( ConfigCategory category, String key )
-    {
-        category.setLanguageKey( key );
-        for( Property property : category.getOrderedValues() )
-        {
-            property.setLanguageKey( key + "." + property.getName() );
-        }
-
-        for( ConfigCategory child : category.getChildren() )
-        {
-            setupLanguage( child, key + "." + child.getName() );
-        }
-    }
-
-    public static void reload()
-    {
-        Configuration newConfig = new Configuration( config.getConfigFile(), ComputerCraft.getVersion() );
-        Set<String> oldCategories = config.getCategoryNames(), newCategories = newConfig.getCategoryNames();
-
-        // Sync any categories on the original config
-        for( String category : oldCategories )
-        {
-            if( newCategories.contains( category ) )
-            {
-                reloadCategory( config.getCategory( category ), newConfig.getCategory( category ) );
-            }
-            else
-            {
-                for( Property property : config.getCategory( category ).getValues().values() ) property.setToDefault();
-            }
-        }
-
-        // And drop any unexpected ones.
-        for( String category : newCategories )
-        {
-            if( !oldCategories.contains( category ) )
-            {
-                ComputerCraft.log.warn( "Cannot sync unknown config category {}", category );
-            }
-        }
-
-        sync();
-    }
-
-    private static void reloadCategory( ConfigCategory oldCat, ConfigCategory newCat )
-    {
-        // Copy the config values across to the original config.
-        for( Map.Entry<String, Property> child : newCat.getValues().entrySet() )
-        {
-            Property oldProperty = oldCat.get( child.getKey() ), newProperty = child.getValue();
-            if( oldProperty.getType() != newProperty.getType() || oldProperty.isList() != newProperty.isList() )
-            {
-                ComputerCraft.log.warn(
-                    "Cannot sync config property {} (type changed from {} to {})",
-                    child.getKey(), getType( oldProperty ), getType( newProperty )
-                );
-                continue;
-            }
-
-            if( oldProperty.isList() )
-            {
-                oldProperty.setValues( newProperty.getStringList() );
-            }
-            else
-            {
-                oldProperty.setValue( newProperty.getString() );
-            }
-        }
-
-        // Reset any missing properties.
-        for( Map.Entry<String, Property> child : oldCat.getValues().entrySet() )
-        {
-            if( !newCat.containsKey( child.getKey() ) ) child.getValue().setToDefault();
-        }
-    }
-
-    private static String getType( Property property )
-    {
-        return property.getType() + (property.isList() ? " list" : "");
-    }
-
-    public static void sync()
-    {
-        // General
-        ComputerCraft.computerSpaceLimit = computerSpaceLimit.getInt();
-        ComputerCraft.floppySpaceLimit = floppySpaceLimit.getInt();
-        ComputerCraft.maximumFilesOpen = Math.max( 0, maximumFilesOpen.getInt() );
-        ComputerCraft.disable_lua51_features = disableLua51Features.getBoolean();
-        ComputerCraft.default_computer_settings = defaultComputerSettings.getString();
-        ComputerCraft.debug_enable = debugEnabled.getBoolean();
-        ComputerCraft.logPeripheralErrors = logComputerErrors.getBoolean();
-
-        // Execution
-        ComputerCraft.computer_threads = computerThreads.getInt();
-        ComputerCraft.maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( Math.max( 1, maxMainGlobalTime.getLong() ) );
-        ComputerCraft.maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( Math.max( 1, maxMainComputerTime.getLong() ) );
-
-        // HTTP
-        ComputerCraft.http_enable = httpEnable.getBoolean();
-        ComputerCraft.http_websocket_enable = httpWebsocketEnable.getBoolean();
-        ComputerCraft.http_whitelist = new AddressPredicate( httpWhitelist.getStringList() );
-        ComputerCraft.http_blacklist = new AddressPredicate( httpBlacklist.getStringList() );
-
-        ComputerCraft.httpTimeout = Math.max( 0, httpTimeout.getInt() );
-        ComputerCraft.httpMaxRequests = Math.max( 1, httpMaxRequests.getInt() );
-        ComputerCraft.httpMaxDownload = Math.max( 0, httpMaxDownload.getLong() );
-        ComputerCraft.httpMaxUpload = Math.max( 0, httpMaxUpload.getLong() );
-        ComputerCraft.httpMaxWebsockets = Math.max( 1, httpMaxWebsockets.getInt() );
-        ComputerCraft.httpMaxWebsocketMessage = Math.max( 0, httpMaxWebsocketMessage.getInt() );
-
-        // Peripheral
-        ComputerCraft.enableCommandBlock = commandBlockEnabled.getBoolean();
-        ComputerCraft.maxNotesPerTick = Math.max( 1, maxNotesPerTick.getInt() );
-        ComputerCraft.modem_range = Math.min( modemRange.getInt(), MODEM_MAX_RANGE );
-        ComputerCraft.modem_highAltitudeRange = Math.min( modemHighAltitudeRange.getInt(), MODEM_MAX_RANGE );
-        ComputerCraft.modem_rangeDuringStorm = Math.min( modemRangeDuringStorm.getInt(), MODEM_MAX_RANGE );
-        ComputerCraft.modem_highAltitudeRangeDuringStorm = Math.min( modemHighAltitudeRangeDuringStorm.getInt(), MODEM_MAX_RANGE );
-
-        // Turtles
-        ComputerCraft.turtlesNeedFuel = turtlesNeedFuel.getBoolean();
-        ComputerCraft.turtleFuelLimit = turtleFuelLimit.getInt();
-        ComputerCraft.advancedTurtleFuelLimit = advancedTurtleFuelLimit.getInt();
-        ComputerCraft.turtlesObeyBlockProtection = turtlesObeyBlockProtection.getBoolean();
-        ComputerCraft.turtlesCanPush = turtlesCanPush.getBoolean();
-
-        ComputerCraft.turtleDisabledActions.clear();
-        Converter<String, String> converter = CaseFormat.LOWER_CAMEL.converterTo( CaseFormat.UPPER_UNDERSCORE );
-        for( String value : turtleDisabledActions.getStringList() )
-        {
-            try
-            {
-                ComputerCraft.turtleDisabledActions.add( TurtleAction.valueOf( converter.convert( value ) ) );
-            }
-            catch( IllegalArgumentException e )
-            {
-                ComputerCraft.log.error( "Unknown turtle action " + value );
-            }
-        }
-
-        config.save();
-    }
-
-    public static List<IConfigElement> getConfigElements()
-    {
-        ArrayList<IConfigElement> elements = new ArrayList<>();
-
-        // Add all child categories
-        for( String categoryName : config.getCategoryNames() )
-        {
-            if( categoryName.equals( CATEGORY_GENERAL ) ) continue;
-            ConfigCategory category = config.getCategory( categoryName );
-            elements.add( new ConfigElement( category ) );
-        }
-
-        // Add the general category
-        for( Property property : config.getCategory( CATEGORY_GENERAL ).getOrderedValues() )
-        {
-            elements.add( new ConfigElement( property ) );
-        }
-
-        return elements;
-    }
-
-}

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

@@ -22,7 +22,7 @@ public final class MediaProviders
 
     private MediaProviders() {}
 
-    public static void register( @Nonnull IMediaProvider provider )
+    public static synchronized void register( @Nonnull IMediaProvider provider )
     {
         Objects.requireNonNull( provider, "provider cannot be null" );
         providers.add( provider );

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

@@ -9,32 +9,33 @@ 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.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.Objects;
 
 public final class Peripherals
 {
-    private static final Collection<IPeripheralProvider> providers = ComputerCraft.peripheralProviders;
+    private static final Collection<IPeripheralProvider> providers = new LinkedHashSet<>();
 
     private Peripherals() {}
 
-    public static void register( @Nonnull IPeripheralProvider provider )
+    public static synchronized void register( @Nonnull IPeripheralProvider provider )
     {
         Objects.requireNonNull( provider, "provider cannot be null" );
-        if( !providers.contains( provider ) ) providers.add( provider );
+        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;
+        return World.isValid( pos ) && !world.isClient ? 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/PocketUpgrades.java

@@ -10,21 +10,17 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.shared.util.InventoryUtil;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.ModContainer;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
 
 public final class PocketUpgrades
 {
     private static final Map<String, IPocketUpgrade> upgrades = new HashMap<>();
-    private static final IdentityHashMap<IPocketUpgrade, String> upgradeOwners = new IdentityHashMap<>();
 
     private PocketUpgrades() {}
 
-    public static void register( @Nonnull IPocketUpgrade upgrade )
+    public static synchronized void register( @Nonnull IPocketUpgrade upgrade )
     {
         Objects.requireNonNull( upgrade, "upgrade cannot be null" );
 
@@ -36,9 +32,6 @@ public final class PocketUpgrades
         }
 
         upgrades.put( id, upgrade );
-
-        ModContainer mc = Loader.instance().activeModContainer();
-        if( mc != null && mc.getModId() != null ) upgradeOwners.put( upgrade, mc.getModId() );
     }
 
     public static IPocketUpgrade get( String id )
@@ -65,17 +58,11 @@ public final class PocketUpgrades
         return null;
     }
 
-    @Nullable
-    public static String getOwner( IPocketUpgrade upgrade )
-    {
-        return upgradeOwners.get( upgrade );
-    }
-
     public static Iterable<IPocketUpgrade> getVanillaUpgrades()
     {
         List<IPocketUpgrade> vanilla = new ArrayList<>();
-        vanilla.add( ComputerCraft.PocketUpgrades.wirelessModem );
-        vanilla.add( ComputerCraft.PocketUpgrades.advancedModem );
+        vanilla.add( ComputerCraft.PocketUpgrades.wirelessModemNormal );
+        vanilla.add( ComputerCraft.PocketUpgrades.wirelessModemAdvanced );
         vanilla.add( ComputerCraft.PocketUpgrades.speaker );
         return vanilla;
     }

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

@@ -8,322 +8,294 @@ package dan200.computercraft.shared;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.shared.computer.blocks.BlockCommandComputer;
+import dan200.computercraft.shared.common.ColourableRecipe;
 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.items.ItemCommandComputer;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.items.ItemComputer;
-import dan200.computercraft.shared.media.items.ItemDiskExpanded;
-import dan200.computercraft.shared.media.items.ItemDiskLegacy;
+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.peripheral.common.BlockPeripheral;
-import dan200.computercraft.shared.peripheral.common.ItemPeripheral;
+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.TileDiskDrive;
 import dan200.computercraft.shared.peripheral.modem.wired.*;
-import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem;
-import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem;
-import dan200.computercraft.shared.peripheral.modem.wireless.TileAdvancedModem;
+import dan200.computercraft.shared.peripheral.modem.wireless.BlockWirelessModem;
 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.TilePrinter;
+import dan200.computercraft.shared.peripheral.speaker.BlockSpeaker;
 import dan200.computercraft.shared.peripheral.speaker.TileSpeaker;
 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.blocks.TileTurtleAdvanced;
-import dan200.computercraft.shared.turtle.blocks.TileTurtleExpanded;
-import dan200.computercraft.shared.turtle.items.ItemTurtleAdvanced;
-import dan200.computercraft.shared.turtle.items.ItemTurtleLegacy;
-import dan200.computercraft.shared.turtle.items.ItemTurtleNormal;
+import dan200.computercraft.shared.turtle.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.ImpostorRecipe;
+import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.minecraft.block.Block;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.registries.IForgeRegistry;
+import net.minecraft.block.Material;
+import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.item.*;
+import net.minecraft.recipe.RecipeSerializer;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.MutableRegistry;
 
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID )
 public final class Registry
 {
+    private static final ItemGroup mainItemGroup = FabricItemGroupBuilder
+        .create( new Identifier( ComputerCraft.MOD_ID, "main" ) )
+        .icon( () -> new ItemStack( ComputerCraft.Items.computerNormal ) )
+        .build();
+
     private Registry()
     {
     }
 
-    @SubscribeEvent
-    public static void registerBlocks( RegistryEvent.Register<Block> event )
+    public static void registerBlocks( MutableRegistry<Block> registry )
     {
-        IForgeRegistry<Block> registry = event.getRegistry();
-
         // Computers
-        ComputerCraft.Blocks.computer = new BlockComputer();
-        ComputerCraft.Blocks.commandComputer = new BlockCommandComputer();
-
-        registry.registerAll(
-            ComputerCraft.Blocks.computer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ),
-            ComputerCraft.Blocks.commandComputer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "command_computer" ) )
+        ComputerCraft.Blocks.computerNormal = new BlockComputer(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2.0f ).build(),
+            ComputerFamily.Normal, TileComputer.FACTORY_NORMAL
         );
 
-        // Turtle
-        ComputerCraft.Blocks.turtle = new BlockTurtle();
-        ComputerCraft.Blocks.turtleExpanded = new BlockTurtle();
-        ComputerCraft.Blocks.turtleAdvanced = new BlockTurtle();
-
-        registry.registerAll(
-            ComputerCraft.Blocks.turtle.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ) ),
-            ComputerCraft.Blocks.turtleExpanded.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_expanded" ) ),
-            ComputerCraft.Blocks.turtleAdvanced.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ) )
+        ComputerCraft.Blocks.computerAdvanced = new BlockComputer(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2.0f ).build(),
+            ComputerFamily.Advanced, TileComputer.FACTORY_ADVANCED
         );
 
-        // Peripheral
-        ComputerCraft.Blocks.peripheral = new BlockPeripheral();
-        registry.register( ComputerCraft.Blocks.peripheral.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "peripheral" ) ) );
-
-        // Cable
-        ComputerCraft.Blocks.cable = new BlockCable();
-        registry.register( ComputerCraft.Blocks.cable.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "cable" ) ) );
-
-        // Advanced modem
-        ComputerCraft.Blocks.advancedModem = new BlockAdvancedModem();
-        registry.register( ComputerCraft.Blocks.advancedModem.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "advanced_modem" ) ) );
-
-        // Full block modem
-        ComputerCraft.Blocks.wiredModemFull = new BlockWiredModemFull();
-        registry.register( ComputerCraft.Blocks.wiredModemFull.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "wired_modem_full" ) ) );
-
-        registerTileEntities();
-    }
-
-    private static void registerTileEntities()
-    {
-        GameRegistry.registerTileEntity( TileComputer.class, new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) );
-        GameRegistry.registerTileEntity( TileCommandComputer.class, new ResourceLocation( ComputerCraft.MOD_ID, "command_computer" ) );
-
-        GameRegistry.registerTileEntity( TileTurtle.class, new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ) );
-        GameRegistry.registerTileEntity( TileTurtleExpanded.class, new ResourceLocation( ComputerCraft.MOD_ID, "turtleex" ) );
-        GameRegistry.registerTileEntity( TileTurtleAdvanced.class, new ResourceLocation( ComputerCraft.MOD_ID, "turtleadv" ) );
-
-        GameRegistry.registerTileEntity( TileDiskDrive.class, new ResourceLocation( ComputerCraft.MOD_ID, "diskdrive" ) );
-        GameRegistry.registerTileEntity( TileWirelessModem.class, new ResourceLocation( ComputerCraft.MOD_ID, "wirelessmodem" ) );
-        GameRegistry.registerTileEntity( TileMonitor.class, new ResourceLocation( ComputerCraft.MOD_ID, "monitor" ) );
-        GameRegistry.registerTileEntity( TilePrinter.class, new ResourceLocation( ComputerCraft.MOD_ID, "ccprinter" ) );
-        GameRegistry.registerTileEntity( TileCable.class, new ResourceLocation( ComputerCraft.MOD_ID, "wiredmodem" ) );
-        GameRegistry.registerTileEntity( TileAdvancedModem.class, new ResourceLocation( ComputerCraft.MOD_ID, "advanced_modem" ) );
-        GameRegistry.registerTileEntity( TileSpeaker.class, new ResourceLocation( ComputerCraft.MOD_ID, "speaker" ) );
-        GameRegistry.registerTileEntity( TileWiredModemFull.class, new ResourceLocation( ComputerCraft.MOD_ID, "wired_modem_full" ) );
-    }
-
-    private static <T extends ItemBlock> T setupItemBlock( T item )
-    {
-        item.setRegistryName( item.getBlock().getRegistryName() );
-        return item;
-    }
-
-    @SubscribeEvent
-    public static void registerItems( RegistryEvent.Register<Item> event )
-    {
-        IForgeRegistry<Item> registry = event.getRegistry();
-
-        // Computers
-        ComputerCraft.Items.computer = new ItemComputer( ComputerCraft.Blocks.computer );
-        ComputerCraft.Items.commandComputer = new ItemCommandComputer( ComputerCraft.Blocks.commandComputer );
-
-        registry.registerAll(
-            setupItemBlock( ComputerCraft.Items.computer ),
-            setupItemBlock( ComputerCraft.Items.commandComputer )
+        ComputerCraft.Blocks.computerCommand = new BlockComputer(
+            FabricBlockSettings.of( Material.STONE ).strength( -1, 6000000.0F ).build(),
+            ComputerFamily.Command, TileCommandComputer.FACTORY
         );
 
-        // Pocket computer
-        ComputerCraft.Items.pocketComputer = new ItemPocketComputer();
-        registry.register(
-            ComputerCraft.Items.pocketComputer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "pocket_computer" ) )
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "computer_normal" ), ComputerCraft.Blocks.computerNormal );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "computer_advanced" ), ComputerCraft.Blocks.computerAdvanced );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "computer_command" ), ComputerCraft.Blocks.computerCommand );
+
+        // Turtles
+        ComputerCraft.Blocks.turtleNormal = new BlockTurtle(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2.5f ).build(),
+            ComputerFamily.Normal, TileTurtle.FACTORY_NORMAL
         );
 
-        // Turtle
-        ComputerCraft.Items.turtle = new ItemTurtleLegacy( ComputerCraft.Blocks.turtle );
-        ComputerCraft.Items.turtleExpanded = new ItemTurtleNormal( ComputerCraft.Blocks.turtleExpanded );
-        ComputerCraft.Items.turtleAdvanced = new ItemTurtleAdvanced( ComputerCraft.Blocks.turtleAdvanced );
-
-        registry.registerAll(
-            setupItemBlock( ComputerCraft.Items.turtle ),
-            setupItemBlock( ComputerCraft.Items.turtleExpanded ),
-            setupItemBlock( ComputerCraft.Items.turtleAdvanced )
+        ComputerCraft.Blocks.turtleAdvanced = new BlockTurtle(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2.5f ).build(),
+            ComputerFamily.Advanced, TileTurtle.FACTORY_ADVANCED
         );
 
-        // Printouts
-        ComputerCraft.Items.printout = new ItemPrintout();
-        registry.register( ComputerCraft.Items.printout.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "printout" ) ) );
-
-        // Disks
-        ComputerCraft.Items.disk = new ItemDiskLegacy();
-        ComputerCraft.Items.diskExpanded = new ItemDiskExpanded();
-        ComputerCraft.Items.treasureDisk = new ItemTreasureDisk();
-
-        registry.registerAll(
-            ComputerCraft.Items.disk.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk" ) ),
-            ComputerCraft.Items.diskExpanded.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk_expanded" ) ),
-            ComputerCraft.Items.treasureDisk.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "treasure_disk" ) )
-        );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "turtle_normal" ), ComputerCraft.Blocks.turtleNormal );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "turtle_advanced" ), ComputerCraft.Blocks.turtleAdvanced );
 
         // Peripherals
-        ComputerCraft.Items.peripheral = new ItemPeripheral( ComputerCraft.Blocks.peripheral );
-        ComputerCraft.Items.advancedModem = new ItemAdvancedModem( ComputerCraft.Blocks.advancedModem );
-        ComputerCraft.Items.cable = new ItemCable( ComputerCraft.Blocks.cable );
-        ComputerCraft.Items.wiredModemFull = new ItemWiredModemFull( ComputerCraft.Blocks.wiredModemFull );
-
-        registry.registerAll(
-            setupItemBlock( ComputerCraft.Items.peripheral ),
-            setupItemBlock( ComputerCraft.Items.advancedModem ),
-            setupItemBlock( ComputerCraft.Items.cable ),
-            setupItemBlock( ComputerCraft.Items.wiredModemFull )
+        ComputerCraft.Blocks.speaker = new BlockSpeaker(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build()
         );
 
+        ComputerCraft.Blocks.diskDrive = new BlockDiskDrive(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build()
+        );
+
+        ComputerCraft.Blocks.monitorNormal = new BlockMonitor(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build(),
+            TileMonitor.FACTORY_NORMAL
+        );
+
+        ComputerCraft.Blocks.monitorAdvanced = new BlockMonitor(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build(),
+            TileMonitor.FACTORY_ADVANCED
+        );
+
+        ComputerCraft.Blocks.printer = new BlockPrinter(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build()
+        );
+
+        ComputerCraft.Blocks.wirelessModemNormal = new BlockWirelessModem(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build(),
+            TileWirelessModem.FACTORY_NORMAL
+        );
+
+        ComputerCraft.Blocks.wirelessModemAdvanced = new BlockWirelessModem(
+            FabricBlockSettings.of( Material.STONE ).hardness( 2 ).build(),
+            TileWirelessModem.FACTORY_ADVANCED
+        );
+
+        ComputerCraft.Blocks.wiredModemFull = new BlockWiredModemFull(
+            FabricBlockSettings.of( Material.STONE ).hardness( 1.5f ).build()
+        );
+
+        ComputerCraft.Blocks.cable = new BlockCable(
+            FabricBlockSettings.of( Material.STONE ).hardness( 1.5f ).build()
+        );
+
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "speaker" ), ComputerCraft.Blocks.speaker );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "disk_drive" ), ComputerCraft.Blocks.diskDrive );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "monitor_normal" ), ComputerCraft.Blocks.monitorNormal );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "monitor_advanced" ), ComputerCraft.Blocks.monitorAdvanced );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "printer" ), ComputerCraft.Blocks.printer );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "wireless_modem_normal" ), ComputerCraft.Blocks.wirelessModemNormal );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "wireless_modem_advanced" ), ComputerCraft.Blocks.wirelessModemAdvanced );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "wired_modem_full" ), ComputerCraft.Blocks.wiredModemFull );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "cable" ), ComputerCraft.Blocks.cable );
+    }
+
+    public static void registerTileEntities( MutableRegistry<BlockEntityType<?>> registry )
+    {
+        // Computers
+        registry.add( TileComputer.FACTORY_NORMAL.getId(), TileComputer.FACTORY_NORMAL );
+        registry.add( TileComputer.FACTORY_ADVANCED.getId(), TileComputer.FACTORY_ADVANCED );
+        registry.add( TileCommandComputer.FACTORY.getId(), TileCommandComputer.FACTORY );
+
+        // Turtles
+        registry.add( TileTurtle.FACTORY_NORMAL.getId(), TileTurtle.FACTORY_NORMAL );
+        registry.add( TileTurtle.FACTORY_ADVANCED.getId(), TileTurtle.FACTORY_ADVANCED );
+
+        // Peripherals
+        registry.add( TileSpeaker.FACTORY.getId(), TileSpeaker.FACTORY );
+        registry.add( TileDiskDrive.FACTORY.getId(), TileDiskDrive.FACTORY );
+        registry.add( TilePrinter.FACTORY.getId(), TilePrinter.FACTORY );
+
+        registry.add( TileMonitor.FACTORY_NORMAL.getId(), TileMonitor.FACTORY_NORMAL );
+        registry.add( TileMonitor.FACTORY_ADVANCED.getId(), TileMonitor.FACTORY_ADVANCED );
+
+        registry.add( TileWirelessModem.FACTORY_NORMAL.getId(), TileWirelessModem.FACTORY_NORMAL );
+        registry.add( TileWirelessModem.FACTORY_ADVANCED.getId(), TileWirelessModem.FACTORY_ADVANCED );
+        registry.add( TileCable.FACTORY.getId(), TileCable.FACTORY );
+        registry.add( TileWiredModemFull.FACTORY.getId(), TileWiredModemFull.FACTORY );
+    }
+
+    private static void registerItemBlock( MutableRegistry<Item> registry, BlockItem item )
+    {
+        registry.add( net.minecraft.util.registry.Registry.BLOCK.getId( item.getBlock() ), item );
+    }
+
+    private static Item.Settings defaultItem()
+    {
+        return new Item.Settings().itemGroup( mainItemGroup );
+    }
+
+    public static void registerItems( MutableRegistry<Item> registry )
+    {
+        // Computer
+        ComputerCraft.Items.computerNormal = new ItemComputer( ComputerCraft.Blocks.computerNormal, defaultItem() );
+        ComputerCraft.Items.computerAdvanced = new ItemComputer( ComputerCraft.Blocks.computerAdvanced, defaultItem() );
+        ComputerCraft.Items.computerCommand = new ItemComputer( ComputerCraft.Blocks.computerCommand, defaultItem() );
+
+        registerItemBlock( registry, ComputerCraft.Items.computerNormal );
+        registerItemBlock( registry, ComputerCraft.Items.computerAdvanced );
+        registerItemBlock( registry, ComputerCraft.Items.computerCommand );
+
+        // Turtle
+        ComputerCraft.Items.turtleNormal = new ItemTurtle( ComputerCraft.Blocks.turtleNormal, defaultItem() );
+        ComputerCraft.Items.turtleAdvanced = new ItemTurtle( ComputerCraft.Blocks.turtleAdvanced, defaultItem() );
+
+        registerItemBlock( registry, ComputerCraft.Items.turtleNormal );
+        registerItemBlock( registry, ComputerCraft.Items.turtleAdvanced );
+
+        // Pocket computer
+        ComputerCraft.Items.pocketComputerNormal = new ItemPocketComputer( defaultItem().stackSize( 1 ), ComputerFamily.Normal );
+        ComputerCraft.Items.pocketComputerAdvanced = new ItemPocketComputer( defaultItem().stackSize( 1 ), ComputerFamily.Advanced );
+
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "pocket_computer_normal" ), ComputerCraft.Items.pocketComputerNormal );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "pocket_computer_advanced" ), ComputerCraft.Items.pocketComputerAdvanced );
+
+        // Floppy disk
+        ComputerCraft.Items.disk = new ItemDisk( defaultItem().stackSize( 1 ) );
+        ComputerCraft.Items.treasureDisk = new ItemTreasureDisk( defaultItem().stackSize( 1 ) );
+
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "disk" ), ComputerCraft.Items.disk );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "treasure_disk" ), ComputerCraft.Items.treasureDisk );
+
+        // Printouts
+        ComputerCraft.Items.printedPage = new ItemPrintout( defaultItem().stackSize( 1 ), ItemPrintout.Type.PAGE );
+        ComputerCraft.Items.printedPages = new ItemPrintout( defaultItem().stackSize( 1 ), ItemPrintout.Type.PAGES );
+        ComputerCraft.Items.printedBook = new ItemPrintout( defaultItem().stackSize( 1 ), ItemPrintout.Type.BOOK );
+
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "printed_page" ), ComputerCraft.Items.printedPage );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "printed_pages" ), ComputerCraft.Items.printedPages );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "printed_book" ), ComputerCraft.Items.printedBook );
+
+        // Peripherals
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.speaker, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.diskDrive, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.printer, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.monitorNormal, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.monitorAdvanced, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.wirelessModemNormal, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.wirelessModemAdvanced, defaultItem() ) );
+        registerItemBlock( registry, new BlockItem( ComputerCraft.Blocks.wiredModemFull, defaultItem() ) );
+
+        ComputerCraft.Items.cable = new ItemBlockCable.Cable( ComputerCraft.Blocks.cable, defaultItem() );
+        ComputerCraft.Items.wiredModem = new ItemBlockCable.WiredModem( ComputerCraft.Blocks.cable, defaultItem() );
+
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "cable" ), ComputerCraft.Items.cable );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "wired_modem" ), ComputerCraft.Items.wiredModem );
+
         registerTurtleUpgrades();
         registerPocketUpgrades();
-        registerLegacyUpgrades();
     }
 
     private static void registerTurtleUpgrades()
     {
         // Upgrades
-        ComputerCraft.TurtleUpgrades.wirelessModem = new TurtleModem( false, new ResourceLocation( "computercraft", "wireless_modem" ), 1 );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.wirelessModem );
+        ComputerCraft.TurtleUpgrades.wirelessModemNormal = new TurtleModem( false, new Identifier( ComputerCraft.MOD_ID, "wireless_modem_normal" ) );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.wirelessModemNormal );
 
-        ComputerCraft.TurtleUpgrades.advancedModem = new TurtleModem( true, new ResourceLocation( "computercraft", "advanced_modem" ), -1 );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.advancedModem );
+        ComputerCraft.TurtleUpgrades.wirelessModemAdvanced = new TurtleModem( true, new Identifier( ComputerCraft.MOD_ID, "wireless_modem_advanced" ) );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.wirelessModemAdvanced );
 
-        ComputerCraft.TurtleUpgrades.speaker = new TurtleSpeaker( new ResourceLocation( "computercraft", "speaker" ), 8 );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.speaker );
+        ComputerCraft.TurtleUpgrades.speaker = new TurtleSpeaker( new Identifier( ComputerCraft.MOD_ID, "speaker" ) );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.speaker );
 
-        ComputerCraft.TurtleUpgrades.craftingTable = new TurtleCraftingTable( new ResourceLocation( "minecraft", "crafting_table" ), 2 );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.craftingTable );
+        ComputerCraft.TurtleUpgrades.craftingTable = new TurtleCraftingTable( new Identifier( "minecraft", "crafting_table" ) );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.craftingTable );
 
-        ComputerCraft.TurtleUpgrades.diamondSword = new TurtleSword( new ResourceLocation( "minecraft", "diamond_sword" ), 3, Items.DIAMOND_SWORD );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.diamondSword );
+        ComputerCraft.TurtleUpgrades.diamondSword = new TurtleSword( new Identifier( "minecraft", "diamond_sword" ), Items.DIAMOND_SWORD );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondSword );
 
-        ComputerCraft.TurtleUpgrades.diamondShovel = new TurtleShovel( new ResourceLocation( "minecraft", "diamond_shovel" ), 4, Items.DIAMOND_SHOVEL );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.diamondShovel );
+        ComputerCraft.TurtleUpgrades.diamondShovel = new TurtleShovel( new Identifier( "minecraft", "diamond_shovel" ), Items.DIAMOND_SHOVEL );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondShovel );
 
-        ComputerCraft.TurtleUpgrades.diamondPickaxe = new TurtleTool( new ResourceLocation( "minecraft", "diamond_pickaxe" ), 5, Items.DIAMOND_PICKAXE );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.diamondPickaxe );
+        ComputerCraft.TurtleUpgrades.diamondPickaxe = new TurtleTool( new Identifier( "minecraft", "diamond_pickaxe" ), Items.DIAMOND_PICKAXE );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondPickaxe );
 
-        ComputerCraft.TurtleUpgrades.diamondAxe = new TurtleAxe( new ResourceLocation( "minecraft", "diamond_axe" ), 6, Items.DIAMOND_AXE );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.diamondAxe );
+        ComputerCraft.TurtleUpgrades.diamondAxe = new TurtleAxe( new Identifier( "minecraft", "diamond_axe" ), Items.DIAMOND_AXE );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondAxe );
 
-        ComputerCraft.TurtleUpgrades.diamondHoe = new TurtleHoe( new ResourceLocation( "minecraft", "diamond_hoe" ), 7, Items.DIAMOND_HOE );
-        TurtleUpgrades.registerInternal( ComputerCraft.TurtleUpgrades.diamondHoe );
+        ComputerCraft.TurtleUpgrades.diamondHoe = new TurtleHoe( new Identifier( "minecraft", "diamond_hoe" ), Items.DIAMOND_HOE );
+        ComputerCraftAPI.registerTurtleUpgrade( ComputerCraft.TurtleUpgrades.diamondHoe );
     }
 
     private static void registerPocketUpgrades()
     {
-        // Register pocket upgrades
-        ComputerCraft.PocketUpgrades.wirelessModem = new PocketModem( false );
-        ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.wirelessModem );
-        ComputerCraft.PocketUpgrades.advancedModem = new PocketModem( true );
-        ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.advancedModem );
-
-        ComputerCraft.PocketUpgrades.speaker = new PocketSpeaker();
-        ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.speaker );
+        ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.wirelessModemNormal = new PocketModem( false ) );
+        ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.wirelessModemAdvanced = new PocketModem( true ) );
+        ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.speaker = new PocketSpeaker() );
     }
 
-    @SuppressWarnings( "deprecation" )
-    private static void registerLegacyUpgrades()
+    public static void registerRecipes( MutableRegistry<RecipeSerializer<?>> registry )
     {
-        ComputerCraft.PocketUpgrades.pocketSpeaker = ComputerCraft.PocketUpgrades.speaker;
-        ComputerCraft.Upgrades.advancedModem = ComputerCraft.TurtleUpgrades.advancedModem;
-    }
-
-    @SubscribeEvent
-    public static void remapItems( RegistryEvent.MissingMappings<Item> mappings )
-    {
-        // We have to use mappings.getAllMappings() as the mod ID is upper case but the domain lower.
-        for( RegistryEvent.MissingMappings.Mapping<Item> mapping : mappings.getAllMappings() )
-        {
-            String domain = mapping.key.getNamespace();
-            if( !domain.equalsIgnoreCase( ComputerCraft.MOD_ID ) ) continue;
-
-            String key = mapping.key.getPath();
-            if( key.equalsIgnoreCase( "CC-Computer" ) )
-            {
-                mapping.remap( ComputerCraft.Items.computer );
-            }
-            else if( key.equalsIgnoreCase( "CC-Peripheral" ) )
-            {
-                mapping.remap( ComputerCraft.Items.peripheral );
-            }
-            else if( key.equalsIgnoreCase( "CC-Cable" ) )
-            {
-                mapping.remap( ComputerCraft.Items.cable );
-            }
-            else if( key.equalsIgnoreCase( "diskExpanded" ) )
-            {
-                mapping.remap( ComputerCraft.Items.diskExpanded );
-            }
-            else if( key.equalsIgnoreCase( "treasureDisk" ) )
-            {
-                mapping.remap( ComputerCraft.Items.treasureDisk );
-            }
-            else if( key.equalsIgnoreCase( "pocketComputer" ) )
-            {
-                mapping.remap( ComputerCraft.Items.pocketComputer );
-            }
-            else if( key.equalsIgnoreCase( "CC-Turtle" ) )
-            {
-                mapping.remap( ComputerCraft.Items.turtle );
-            }
-            else if( key.equalsIgnoreCase( "CC-TurtleExpanded" ) )
-            {
-                mapping.remap( ComputerCraft.Items.turtleExpanded );
-            }
-            else if( key.equalsIgnoreCase( "CC-TurtleAdvanced" ) )
-            {
-                mapping.remap( ComputerCraft.Items.turtleAdvanced );
-            }
-        }
-    }
-
-    @SubscribeEvent
-    public static void remapBlocks( RegistryEvent.MissingMappings<Block> mappings )
-    {
-        // We have to use mappings.getAllMappings() as the mod ID is upper case but the domain lower.
-        for( RegistryEvent.MissingMappings.Mapping<Block> mapping : mappings.getAllMappings() )
-        {
-            String domain = mapping.key.getNamespace();
-            if( !domain.equalsIgnoreCase( ComputerCraft.MOD_ID ) ) continue;
-
-            String key = mapping.key.getPath();
-            if( key.equalsIgnoreCase( "CC-Computer" ) )
-            {
-                mapping.remap( ComputerCraft.Blocks.computer );
-            }
-            else if( key.equalsIgnoreCase( "CC-Peripheral" ) )
-            {
-                mapping.remap( ComputerCraft.Blocks.peripheral );
-            }
-            else if( key.equalsIgnoreCase( "CC-Cable" ) )
-            {
-                mapping.remap( ComputerCraft.Blocks.cable );
-            }
-            else if( key.equalsIgnoreCase( "CC-Turtle" ) )
-            {
-                mapping.remap( ComputerCraft.Blocks.turtle );
-            }
-            else if( key.equalsIgnoreCase( "CC-TurtleExpanded" ) )
-            {
-                mapping.remap( ComputerCraft.Blocks.turtleExpanded );
-            }
-            else if( key.equalsIgnoreCase( "CC-TurtleAdvanced" ) )
-            {
-                mapping.remap( ComputerCraft.Blocks.turtleAdvanced );
-            }
-        }
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "colour" ), ColourableRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "computer_upgrade" ), ComputerUpgradeRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "pocket_computer_upgrade" ), PocketComputerUpgradeRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "disk" ), DiskRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "printout" ), PrintoutRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "turtle" ), TurtleRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "turtle_upgrade" ), TurtleUpgradeRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "impostor_shaped" ), ImpostorRecipe.SERIALIZER );
+        registry.add( new Identifier( ComputerCraft.MOD_ID, "impostor_shapeless" ), ImpostorShapelessRecipe.SERIALIZER );
     }
 }

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

@@ -6,69 +6,30 @@
 
 package dan200.computercraft.shared;
 
+import com.google.common.eventbus.Subscribe;
 import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
 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;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-import javax.annotation.Nonnull;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.Objects;
-
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID )
 public final class TurtlePermissions
 {
-    private static final Collection<ITurtlePermissionProvider> providers = new LinkedHashSet<>();
-
-    private TurtlePermissions()
+    public static boolean isBlockEnterable( World world, BlockPos pos, PlayerEntity player )
     {
+        MinecraftServer server = world.getServer();
+        return server == null || world.isClient || !server.isSpawnProtected( world, pos, player );
     }
 
-    public static void register( @Nonnull ITurtlePermissionProvider upgrade )
+    public static boolean isBlockEditable( World world, BlockPos pos, PlayerEntity player )
     {
-        Objects.requireNonNull( upgrade, "upgrade cannot be null" );
-
-        providers.add( upgrade );
+        MinecraftServer server = world.getServer();
+        return server == null || world.isClient || !server.isSpawnProtected( world, pos, player );
     }
 
-    public static boolean isBlockEnterable( World world, BlockPos pos, EntityPlayer player )
-    {
-        MinecraftServer server = player.getServer();
-        if( server != null && !world.isRemote && server.isBlockProtected( world, pos, player ) )
-        {
-            return false;
-        }
-
-        for( ITurtlePermissionProvider provider : providers )
-        {
-            if( !provider.isBlockEnterable( world, pos ) ) return false;
-        }
-        return true;
-    }
-
-    public static boolean isBlockEditable( World world, BlockPos pos, EntityPlayer player )
-    {
-        MinecraftServer server = player.getServer();
-        if( server != null && !world.isRemote && server.isBlockProtected( world, pos, player ) )
-        {
-            return false;
-        }
-
-        for( ITurtlePermissionProvider provider : providers )
-        {
-            if( !provider.isBlockEditable( world, pos ) ) return false;
-        }
-        return true;
-    }
-
-    @SubscribeEvent
-    public static void onTurtleAction( TurtleActionEvent event )
+    @Subscribe
+    public void onTurtleAction( TurtleActionEvent event )
     {
         if( ComputerCraft.turtleDisabledActions.contains( event.getAction() ) )
         {

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

@@ -10,21 +10,14 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.util.InventoryUtil;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.ModContainer;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.*;
 
 public final class TurtleUpgrades
 {
     private static final Map<String, ITurtleUpgrade> upgrades = new HashMap<>();
-    private static final Int2ObjectMap<ITurtleUpgrade> legacyUpgrades = new Int2ObjectOpenHashMap<>();
-    private static final IdentityHashMap<ITurtleUpgrade, String> upgradeOwners = new IdentityHashMap<>();
 
     private TurtleUpgrades() {}
 
@@ -32,73 +25,22 @@ public final class TurtleUpgrades
     {
         Objects.requireNonNull( upgrade, "upgrade cannot be null" );
 
-        int id = upgrade.getLegacyUpgradeID();
-        if( id >= 0 && id < 64 )
-        {
-            String message = getMessage( upgrade, "Legacy UpgradeID '" + id + "' is reserved by ComputerCraft" );
-            ComputerCraft.log.error( message );
-            throw new RuntimeException( message );
-        }
-
-        registerInternal( upgrade );
-    }
-
-    static void registerInternal( ITurtleUpgrade upgrade )
-    {
-        Objects.requireNonNull( upgrade, "upgrade cannot be null" );
-
-        // Check conditions
-        int legacyId = upgrade.getLegacyUpgradeID();
-        if( legacyId >= 0 )
-        {
-            if( legacyId >= Short.MAX_VALUE )
-            {
-                String message = getMessage( upgrade, "UpgradeID '" + legacyId + "' is out of range" );
-                ComputerCraft.log.error( message );
-                throw new RuntimeException( message );
-            }
-
-            ITurtleUpgrade existing = legacyUpgrades.get( legacyId );
-            if( existing != null )
-            {
-                String message = getMessage( upgrade, "UpgradeID '" + legacyId + "' is already registered by '" + existing.getUnlocalisedAdjective() + " Turtle'" );
-                ComputerCraft.log.error( message );
-                throw new RuntimeException( message );
-            }
-        }
-
         String id = upgrade.getUpgradeID().toString();
         ITurtleUpgrade existing = upgrades.get( id );
         if( existing != null )
         {
-            String message = getMessage( upgrade, "UpgradeID '" + id + "' is already registered by '" + existing.getUnlocalisedAdjective() + " Turtle'" );
-            ComputerCraft.log.error( message );
-            throw new RuntimeException( message );
+            throw new IllegalStateException( "Error registering '" + upgrade.getUnlocalisedAdjective() + " Turle'. UpgradeID '" + id + "' is already registered by '" + existing.getUnlocalisedAdjective() + " Turtle'" );
         }
 
-        // Register
-        if( legacyId >= 0 ) legacyUpgrades.put( legacyId, upgrade );
         upgrades.put( id, upgrade );
-
-        ModContainer mc = Loader.instance().activeModContainer();
-        if( mc != null && mc.getModId() != null ) upgradeOwners.put( upgrade, mc.getModId() );
     }
 
-    private static String getMessage( ITurtleUpgrade upgrade, String rest )
-    {
-        return "Error registering '" + upgrade.getUnlocalisedAdjective() + " Turtle'. " + rest;
-    }
 
     public static ITurtleUpgrade get( String id )
     {
         return upgrades.get( id );
     }
 
-    public static ITurtleUpgrade get( int id )
-    {
-        return legacyUpgrades.get( id );
-    }
-
     public static ITurtleUpgrade get( @Nonnull ItemStack stack )
     {
         if( stack.isEmpty() ) return null;
@@ -118,24 +60,23 @@ public final class TurtleUpgrades
     public static Iterable<ITurtleUpgrade> getVanillaUpgrades()
     {
         List<ITurtleUpgrade> vanilla = new ArrayList<>();
+
+
+        // ComputerCraft upgrades
+        vanilla.add( ComputerCraft.TurtleUpgrades.wirelessModemNormal );
+        vanilla.add( ComputerCraft.TurtleUpgrades.wirelessModemAdvanced );
+        vanilla.add( ComputerCraft.TurtleUpgrades.speaker );
+
+        // Vanilla Minecraft upgrades
         vanilla.add( ComputerCraft.TurtleUpgrades.diamondPickaxe );
         vanilla.add( ComputerCraft.TurtleUpgrades.diamondAxe );
         vanilla.add( ComputerCraft.TurtleUpgrades.diamondSword );
         vanilla.add( ComputerCraft.TurtleUpgrades.diamondShovel );
         vanilla.add( ComputerCraft.TurtleUpgrades.diamondHoe );
         vanilla.add( ComputerCraft.TurtleUpgrades.craftingTable );
-        vanilla.add( ComputerCraft.TurtleUpgrades.wirelessModem );
-        vanilla.add( ComputerCraft.TurtleUpgrades.advancedModem );
-        vanilla.add( ComputerCraft.TurtleUpgrades.speaker );
         return vanilla;
     }
 
-    @Nullable
-    public static String getOwner( @Nonnull ITurtleUpgrade upgrade )
-    {
-        return upgradeOwners.get( upgrade );
-    }
-
     public static Iterable<ITurtleUpgrade> getUpgrades()
     {
         return Collections.unmodifiableCollection( upgrades.values() );

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

@@ -6,7 +6,9 @@
 
 package dan200.computercraft.shared.command;
 
-import com.google.common.collect.Sets;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.core.computer.Computer;
@@ -15,30 +17,36 @@ import dan200.computercraft.core.tracking.ComputerTracker;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.core.tracking.TrackingContext;
 import dan200.computercraft.core.tracking.TrackingField;
-import dan200.computercraft.shared.Config;
-import dan200.computercraft.shared.command.framework.*;
 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 net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import java.util.*;
-import java.util.function.Consumer;
 
+import static dan200.computercraft.shared.command.CommandUtils.isPlayer;
+import static dan200.computercraft.shared.command.Exceptions.*;
+import static dan200.computercraft.shared.command.arguments.ComputerArgumentType.getComputerArgument;
+import static dan200.computercraft.shared.command.arguments.ComputerArgumentType.oneComputer;
+import static dan200.computercraft.shared.command.arguments.ComputersArgumentType.*;
+import static dan200.computercraft.shared.command.arguments.TrackingFieldArgumentType.trackingField;
+import static dan200.computercraft.shared.command.builder.CommandBuilder.args;
+import static dan200.computercraft.shared.command.builder.CommandBuilder.command;
+import static dan200.computercraft.shared.command.builder.HelpingArgumentBuilder.choice;
 import static dan200.computercraft.shared.command.text.ChatHelpers.*;
+import static net.minecraft.server.command.CommandManager.literal;
 
-public final class CommandComputerCraft extends CommandDelegate
+public final class CommandComputerCraft
 {
     public static final UUID SYSTEM_UUID = new UUID( 0, 0 );
 
@@ -46,346 +54,220 @@ public final class CommandComputerCraft extends CommandDelegate
     private static final int DUMP_SINGLE_ID = 1844510720;
     private static final int TRACK_ID = 373882880;
 
-    public CommandComputerCraft()
+    private CommandComputerCraft()
     {
-        super( create() );
     }
 
-    private static ISubCommand create()
+    public static void register( CommandDispatcher<ServerCommandSource> dispatcher )
     {
-        CommandRoot root = new CommandRoot( "computercraft" );
-
-        root.register( new SubCommandBase( "dump", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                if( arguments.isEmpty() )
-                {
+        dispatcher.register( choice( "computercraft" )
+            .then( literal( "dump" )
+                .requires( UserLevel.OWNER_OP )
+                .executes( context -> {
                     TableBuilder table = new TableBuilder( DUMP_LIST_ID, "Computer", "On", "Position" );
 
+                    ServerCommandSource source = context.getSource();
                     List<ServerComputer> computers = new ArrayList<>( ComputerCraft.serverComputerRegistry.getComputers() );
 
                     // Unless we're on a server, limit the number of rows we can send.
-                    if( !(context.getSender() instanceof MinecraftServer) )
-                    {
-                        World world = context.getSender().getEntityWorld();
-                        BlockPos pos = context.getSender().getPosition();
+                    World world = source.getWorld();
+                    BlockPos pos = new BlockPos( source.getPosition() );
 
-                        computers.sort( ( a, b ) -> {
-                            if( a.getWorld() == b.getWorld() && a.getWorld() == world )
-                            {
-                                return Double.compare( a.getPosition().distanceSq( pos ), b.getPosition().distanceSq( pos ) );
-                            }
-                            else if( a.getWorld() == world )
-                            {
-                                return -1;
-                            }
-                            else if( b.getWorld() == world )
-                            {
-                                return 1;
-                            }
-                            else
-                            {
-                                return Integer.compare( a.getInstanceID(), b.getInstanceID() );
-                            }
-                        } );
-                    }
+                    computers.sort( ( a, b ) -> {
+                        if( a.getWorld() == b.getWorld() && a.getWorld() == world )
+                        {
+                            return Double.compare( a.getPosition().getSquaredDistance( pos ), b.getPosition().getSquaredDistance( pos ) );
+                        }
+                        else if( a.getWorld() == world )
+                        {
+                            return -1;
+                        }
+                        else if( b.getWorld() == world )
+                        {
+                            return 1;
+                        }
+                        else
+                        {
+                            return Integer.compare( a.getInstanceID(), b.getInstanceID() );
+                        }
+                    } );
 
                     for( ServerComputer computer : computers )
                     {
                         table.row(
-                            linkComputer( context, computer, computer.getID() ),
+                            linkComputer( source, computer, computer.getID() ),
                             bool( computer.isOn() ),
-                            linkPosition( context, computer )
+                            linkPosition( source, computer )
                         );
                     }
 
-                    table.display( context.getSender() );
-                }
-                else if( arguments.size() == 1 )
-                {
-                    ServerComputer computer = ComputerSelector.getComputer( arguments.get( 0 ) );
+                    table.display( context.getSource() );
+                    return computers.size();
+                } )
+                .then( args()
+                    .arg( "computer", oneComputer() )
+                    .executes( context -> {
+                        ServerComputer computer = getComputerArgument( context, "computer" );
 
-                    TableBuilder table = new TableBuilder( DUMP_SINGLE_ID );
-                    table.row( header( "Instance" ), text( Integer.toString( computer.getInstanceID() ) ) );
-                    table.row( header( "Id" ), text( Integer.toString( computer.getID() ) ) );
-                    table.row( header( "Label" ), text( computer.getLabel() ) );
-                    table.row( header( "On" ), bool( computer.isOn() ) );
-                    table.row( header( "Position" ), linkPosition( context, computer ) );
-                    table.row( header( "Family" ), text( computer.getFamily().toString() ) );
+                        TableBuilder table = new TableBuilder( DUMP_SINGLE_ID );
+                        table.row( header( "Instance" ), text( Integer.toString( computer.getInstanceID() ) ) );
+                        table.row( header( "Id" ), text( Integer.toString( computer.getID() ) ) );
+                        table.row( header( "Label" ), text( computer.getLabel() ) );
+                        table.row( header( "On" ), bool( computer.isOn() ) );
+                        table.row( header( "Position" ), linkPosition( context.getSource(), computer ) );
+                        table.row( header( "Family" ), text( computer.getFamily().toString() ) );
 
-                    for( ComputerSide side : ComputerSide.values() )
-                    {
-                        IPeripheral peripheral = computer.getPeripheral( side );
-                        if( peripheral != null )
+                        for( ComputerSide side : ComputerSide.values() )
                         {
-                            table.row( header( "Peripheral " + side.getName() ), text( peripheral.getType() ) );
+                            IPeripheral peripheral = computer.getPeripheral( side );
+                            if( peripheral != null )
+                            {
+                                table.row( header( "Peripheral " + side.getName() ), text( peripheral.getType() ) );
+                            }
                         }
-                    }
 
-                    table.display( context.getSender() );
-                }
-                else
-                {
-                    throw new CommandException( context.getFullUsage() );
-                }
-            }
+                        table.display( context.getSource() );
+                        return 1;
+                    } ) ) )
 
-            @Nonnull
-            @Override
-            public List<String> getCompletion( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                return arguments.size() == 1
-                    ? ComputerSelector.completeComputer( arguments.get( 0 ) )
-                    : Collections.emptyList();
-            }
-        } );
-
-        root.register( new SubCommandBase( "shutdown", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                withComputers( arguments, computers -> {
+            .then( command( "shutdown" )
+                .requires( UserLevel.OWNER_OP )
+                .argManyValue( "computers", manyComputers(), s -> ComputerCraft.serverComputerRegistry.getComputers() )
+                .executes( ( context, computers ) -> {
                     int shutdown = 0;
-                    for( ServerComputer computer : computers )
+                    for( ServerComputer computer : unwrap( context.getSource(), computers ) )
                     {
                         if( computer.isOn() ) shutdown++;
                         computer.shutdown();
                     }
-                    context.getSender().sendMessage( translate( "commands.computercraft.shutdown.done", shutdown, computers.size() ) );
-                } );
-            }
+                    context.getSource().sendFeedback( translate( "commands.computercraft.shutdown.done", shutdown, computers.size() ), false );
+                    return shutdown;
+                } ) )
 
-            @Nonnull
-            @Override
-            public List<String> getCompletion( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                return arguments.isEmpty()
-                    ? Collections.emptyList()
-                    : ComputerSelector.completeComputer( arguments.get( arguments.size() - 1 ) );
-            }
-        } );
-
-        root.register( new SubCommandBase( "turn-on", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                withComputers( arguments, computers -> {
+            .then( command( "turn-on" )
+                .requires( UserLevel.OWNER_OP )
+                .argManyValue( "computers", manyComputers(), s -> ComputerCraft.serverComputerRegistry.getComputers() )
+                .executes( ( context, computers ) -> {
                     int on = 0;
-                    for( ServerComputer computer : computers )
+                    for( ServerComputer computer : unwrap( context.getSource(), computers ) )
                     {
                         if( !computer.isOn() ) on++;
                         computer.turnOn();
                     }
-                    context.getSender().sendMessage( translate( "commands.computercraft.turn_on.done", on, computers.size() ) );
-                } );
-            }
+                    context.getSource().sendFeedback( translate( "commands.computercraft.turn_on.done", on, computers.size() ), false );
+                    return on;
+                } ) )
 
-            @Nonnull
-            @Override
-            public List<String> getCompletion( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                return arguments.isEmpty()
-                    ? Collections.emptyList()
-                    : ComputerSelector.completeComputer( arguments.get( arguments.size() - 1 ) );
-            }
-        } );
+            .then( command( "tp" )
+                .requires( UserLevel.OP )
+                .arg( "computer", oneComputer() )
+                .executes( context -> {
+                    ServerComputer computer = getComputerArgument( context, "computer" );
+                    World world = computer.getWorld();
+                    BlockPos pos = computer.getPosition();
 
-        root.register( new SubCommandBase( "tp", UserLevel.OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                if( arguments.size() != 1 ) throw new CommandException( context.getFullUsage() );
+                    if( world == null || pos == null ) throw TP_NOT_THERE.create();
 
-                ServerComputer computer = ComputerSelector.getComputer( arguments.get( 0 ) );
-                World world = computer.getWorld();
-                BlockPos pos = computer.getPosition();
+                    Entity entity = context.getSource().getEntityOrThrow();
+                    if( !(entity instanceof ServerPlayerEntity) ) throw TP_NOT_PLAYER.create();
 
-                if( world == null || pos == null ) throw new CommandException( "commands.computercraft.tp.not_there" );
-
-                ICommandSender sender = context.getSender();
-                if( !(sender instanceof Entity) ) throw new CommandException( "commands.computercraft.tp.not_entity" );
-
-                if( sender instanceof EntityPlayerMP )
-                {
-                    EntityPlayerMP entity = (EntityPlayerMP) sender;
-                    if( entity.getEntityWorld() != world )
+                    ServerPlayerEntity player = (ServerPlayerEntity) entity;
+                    if( player.getEntityWorld() == world )
                     {
-                        context.getServer().getPlayerList().changePlayerDimension( entity, world.provider.getDimension() );
+                        player.networkHandler.teleportRequest( pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0, Collections.emptySet() );
+                    }
+                    else
+                    {
+                        player.teleport( (ServerWorld) world, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 0, 0 );
                     }
 
-                    entity.setPositionAndUpdate( pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5 );
-                }
-                else
-                {
-                    Entity entity = (Entity) sender;
-                    if( entity.getEntityWorld() != world )
+                    return 1;
+                } ) )
+
+            .then( command( "queue" )
+                .requires( UserLevel.ANYONE )
+                .arg( "computer", manyComputers() )
+                .argManyValue( "args", StringArgumentType.string(), Collections.emptyList() )
+                .executes( ( ctx, args ) -> {
+                    Collection<ServerComputer> computers = getComputersArgument( ctx, "computer" );
+                    Object[] rest = args.toArray();
+
+                    int queued = 0;
+                    for( ServerComputer computer : computers )
                     {
-                        entity.changeDimension( world.provider.getDimension() );
+                        if( computer.getFamily() == ComputerFamily.Command && computer.isOn() )
+                        {
+                            computer.queueEvent( "computer_command", rest );
+                            queued++;
+                        }
                     }
 
-                    entity.setLocationAndAngles(
-                        pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5,
-                        entity.rotationYaw, entity.rotationPitch
-                    );
-                }
-            }
+                    return queued;
+                } ) )
 
-            @Nonnull
-            @Override
-            public List<String> getCompletion( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                return arguments.size() == 1
-                    ? ComputerSelector.completeComputer( arguments.get( 0 ) )
-                    : Collections.emptyList();
-            }
-        } );
+            .then( command( "view" )
+                .requires( UserLevel.OP )
+                .arg( "computer", oneComputer() )
+                .executes( context -> {
+                    ServerPlayerEntity player = context.getSource().getPlayer();
+                    ServerComputer computer = getComputerArgument( context, "computer" );
+                    Containers.openComputerGUI( player, computer );
+                    return 1;
+                } ) )
 
-        root.register( new SubCommandBase( "view", UserLevel.OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                if( arguments.size() != 1 ) throw new CommandException( context.getFullUsage() );
+            .then( choice( "track" )
+                .then( command( "start" )
+                    .requires( UserLevel.OWNER_OP )
+                    .executes( context -> {
+                        getTimingContext( context.getSource() ).start();
 
-                ICommandSender sender = context.getSender();
-                if( !(sender instanceof EntityPlayerMP) )
-                {
-                    throw new CommandException( "commands.computercraft.view.not_player" );
-                }
+                        String stopCommand = "/computercraft track stop";
+                        context.getSource().sendFeedback( translate( "commands.computercraft.track.start.stop",
+                            link( text( stopCommand ), stopCommand, translate( "commands.computercraft.track.stop.action" ) ) ), false );
+                        return 1;
+                    } ) )
 
-                ServerComputer computer = ComputerSelector.getComputer( arguments.get( 0 ) );
-                Containers.openComputerGUI( (EntityPlayerMP) sender, computer );
-            }
+                .then( command( "stop" )
+                    .requires( UserLevel.OWNER_OP )
+                    .executes( context -> {
+                        TrackingContext timings = getTimingContext( context.getSource() );
+                        if( !timings.stop() ) throw NOT_TRACKING_EXCEPTION.create();
+                        displayTimings( context.getSource(), timings.getImmutableTimings(), TrackingField.AVERAGE_TIME, DEFAULT_FIELDS );
+                        return 1;
+                    } ) )
 
-            @Nonnull
-            @Override
-            public List<String> getCompletion( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                return arguments.size() == 1
-                    ? ComputerSelector.completeComputer( arguments.get( 0 ) )
-                    : Collections.emptyList();
-            }
-        } );
+                .then( command( "dump" )
+                    .requires( UserLevel.OWNER_OP )
+                    .argManyValue( "fields", trackingField(), DEFAULT_FIELDS )
+                    .executes( ( context, fields ) -> {
+                        TrackingField sort;
+                        if( fields.size() == 1 && DEFAULT_FIELDS.contains( fields.get( 0 ) ) )
+                        {
+                            sort = fields.get( 0 );
+                            fields = DEFAULT_FIELDS;
+                        }
+                        else
+                        {
+                            sort = fields.get( 0 );
+                        }
 
-        root.register( new CommandRoot( "track" ).register( new SubCommandBase( "start", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                getTimingContext( context ).start();
-
-                String stopCommand = "/" + context.parent().getFullPath() + " stop";
-                context.getSender().sendMessage( list(
-                    translate( "commands.computercraft.track.start.stop",
-                        link( text( stopCommand ), stopCommand, translate( "commands.computercraft.track.stop.action" ) ) )
-                ) );
-            }
-        } ).register( new SubCommandBase( "stop", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                TrackingContext timings = getTimingContext( context );
-                if( !timings.stop() ) throw new CommandException( "commands.computercraft.track.stop.not_enabled" );
-                displayTimings( context, timings.getImmutableTimings(), TrackingField.AVERAGE_TIME );
-            }
-        } ).register( new SubCommandBase( "dump", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                TrackingField field = TrackingField.AVERAGE_TIME;
-                if( arguments.size() >= 1 )
-                {
-                    field = TrackingField.fields().get( arguments.get( 0 ) );
-                    if( field == null )
-                    {
-                        throw new CommandException( "commands.computercraft.track.dump.no_field", arguments.get( 0 ) );
-                    }
-                }
-
-                displayTimings( context, getTimingContext( context ).getImmutableTimings(), field );
-            }
-
-            @Nonnull
-            @Override
-            public List<String> getCompletion( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                if( arguments.size() == 1 )
-                {
-                    String match = arguments.get( 0 );
-
-                    List<String> out = new ArrayList<>();
-                    for( String key : TrackingField.fields().keySet() )
-                    {
-                        if( CommandBase.doesStringStartWith( match, key ) ) out.add( key );
-                    }
-
-                    out.sort( Comparator.naturalOrder() );
-                    return out;
-                }
-                else
-                {
-                    return super.getCompletion( context, arguments );
-                }
-            }
-        } ) );
-
-        root.register( new SubCommandBase( "reload", UserLevel.OWNER_OP )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments )
-            {
-                Config.reload();
-                context.getSender().sendMessage( translate( "commands.computercraft.reload.done" ) );
-            }
-        } );
-
-        root.register( new SubCommandBase( "queue", UserLevel.ANYONE )
-        {
-            @Override
-            public void execute( @Nonnull CommandContext context, @Nonnull List<String> arguments ) throws CommandException
-            {
-                if( arguments.size() < 1 ) throw new CommandException( context.getFullUsage() );
-
-                String selector = arguments.get( 0 );
-                Object[] rest = arguments.subList( 1, arguments.size() ).toArray();
-
-                boolean found = false;
-                for( ServerComputer computer : ComputerSelector.getComputers( selector ) )
-                {
-                    if( computer.getFamily() != ComputerFamily.Command || !computer.isOn() ) continue;
-                    found = true;
-                    computer.queueEvent( "computer_command", rest );
-                }
-
-                if( !found )
-                {
-                    throw new CommandException( "commands.computercraft.argument.no_matching", selector );
-                }
-            }
-        } );
-
-        return root;
+                        return displayTimings( context.getSource(), sort, fields );
+                    } ) ) )
+        );
     }
 
-    private static ITextComponent linkComputer( CommandContext context, ServerComputer serverComputer, int computerId )
+    private static Component linkComputer( ServerCommandSource source, ServerComputer serverComputer, int computerId )
     {
-        ITextComponent out = new TextComponentString( "" );
+        TextComponent out = new TextComponent( "" );
 
         // Append the computer instance
         if( serverComputer == null )
         {
-            out.appendSibling( text( "?" ) );
+            out.append( text( "?" ) );
         }
         else
         {
-            out.appendSibling( link(
+            out.append( link(
                 text( Integer.toString( serverComputer.getInstanceID() ) ),
                 "/computercraft dump " + serverComputer.getInstanceID(),
                 translate( "commands.computercraft.dump.action" )
@@ -393,20 +275,20 @@ public final class CommandComputerCraft extends CommandDelegate
         }
 
         // And ID
-        out.appendText( " (id " + computerId + ")" );
+        out.append( " (id " + computerId + ")" );
 
         // And, if we're a player, some useful links
-        if( serverComputer != null && UserLevel.OP.canExecute( context ) && context.fromPlayer() )
+        if( serverComputer != null && UserLevel.OP.test( source ) && isPlayer( source ) )
         {
             out
-                .appendText( " " )
-                .appendSibling( link(
+                .append( " " )
+                .append( link(
                     text( "\u261b" ),
                     "/computercraft tp " + serverComputer.getInstanceID(),
                     translate( "commands.computercraft.tp.action" )
                 ) )
-                .appendText( " " )
-                .appendSibling( link(
+                .append( " " )
+                .append( link(
                     text( "\u20e2" ),
                     "/computercraft view " + serverComputer.getInstanceID(),
                     translate( "commands.computercraft.view.action" )
@@ -416,9 +298,9 @@ public final class CommandComputerCraft extends CommandDelegate
         return out;
     }
 
-    private static ITextComponent linkPosition( CommandContext context, ServerComputer computer )
+    private static Component linkPosition( ServerCommandSource context, ServerComputer computer )
     {
-        if( UserLevel.OP.canExecute( context ) )
+        if( UserLevel.OP.test( context ) )
         {
             return link(
                 position( computer.getPosition() ),
@@ -432,22 +314,23 @@ public final class CommandComputerCraft extends CommandDelegate
         }
     }
 
-    private static TrackingContext getTimingContext( CommandContext context )
+    @Nonnull
+    private static TrackingContext getTimingContext( ServerCommandSource source )
     {
-        Entity entity = context.getSender().getCommandSenderEntity();
-        if( entity instanceof EntityPlayerMP )
-        {
-            return Tracking.getContext( entity.getUniqueID() );
-        }
-        else
-        {
-            return Tracking.getContext( SYSTEM_UUID );
-        }
+        Entity entity = source.getEntity();
+        return entity instanceof PlayerEntity ? Tracking.getContext( entity.getUuid() ) : Tracking.getContext( SYSTEM_UUID );
     }
 
-    private static void displayTimings( CommandContext context, List<ComputerTracker> timings, TrackingField field ) throws CommandException
+    private static final List<TrackingField> DEFAULT_FIELDS = Arrays.asList( TrackingField.TASKS, TrackingField.TOTAL_TIME, TrackingField.AVERAGE_TIME, TrackingField.MAX_TIME );
+
+    private static int displayTimings( ServerCommandSource source, TrackingField sortField, List<TrackingField> fields ) throws CommandSyntaxException
     {
-        if( timings.isEmpty() ) throw new CommandException( "commands.computercraft.track.dump.no_timings" );
+        return displayTimings( source, getTimingContext( source ).getTimings(), sortField, fields );
+    }
+
+    private static int displayTimings( ServerCommandSource source, @Nonnull List<ComputerTracker> timings, @Nonnull TrackingField sortField, @Nonnull List<TrackingField> fields ) throws CommandSyntaxException
+    {
+        if( timings.isEmpty() ) throw NO_TIMINGS_EXCEPTION.create();
 
         Map<Computer, ServerComputer> lookup = new HashMap<>();
         int maxId = 0, maxInstance = 0;
@@ -459,74 +342,27 @@ public final class CommandComputerCraft extends CommandDelegate
             if( server.getID() > maxId ) maxId = server.getID();
         }
 
-        timings.sort( Comparator.<ComputerTracker, Long>comparing( x -> x.get( field ) ).reversed() );
+        timings.sort( Comparator.<ComputerTracker, Long>comparing( x -> x.get( sortField ) ).reversed() );
 
-        boolean defaultLayout = field == TrackingField.TASKS || field == TrackingField.TOTAL_TIME
-            || field == TrackingField.AVERAGE_TIME || field == TrackingField.MAX_TIME;
-
-
-        TableBuilder table = defaultLayout ? new TableBuilder(
-            TRACK_ID,
-            translate( "commands.computercraft.track.dump.computer" ),
-            translate( TrackingField.TASKS.translationKey() ),
-            translate( TrackingField.TOTAL_TIME.translationKey() ),
-            translate( TrackingField.AVERAGE_TIME.translationKey() ),
-            translate( TrackingField.MAX_TIME.translationKey() )
-        ) : new TableBuilder(
-            TRACK_ID,
-            translate( "commands.computercraft.track.dump.computer" ),
-            translate( field.translationKey() )
-        );
+        Component[] headers = new Component[1 + fields.size()];
+        headers[0] = translate( "commands.computercraft.track.dump.computer" );
+        for( int i = 0; i < fields.size(); i++ ) headers[i + 1] = translate( fields.get( i ).translationKey() );
+        TableBuilder table = new TableBuilder( TRACK_ID, headers );
 
         for( ComputerTracker entry : timings )
         {
             Computer computer = entry.getComputer();
             ServerComputer serverComputer = computer == null ? null : lookup.get( computer );
 
-            ITextComponent computerComponent = linkComputer( context, serverComputer, entry.getComputerId() );
+            Component computerComponent = linkComputer( source, serverComputer, entry.getComputerId() );
 
-            if( defaultLayout )
-            {
-                table.row(
-                    computerComponent,
-                    text( entry.getFormatted( TrackingField.TASKS ) ),
-                    text( entry.getFormatted( TrackingField.TOTAL_TIME ) ),
-                    text( entry.getFormatted( TrackingField.AVERAGE_TIME ) ),
-                    text( entry.getFormatted( TrackingField.MAX_TIME ) )
-                );
-            }
-            else
-            {
-                table.row( computerComponent, text( entry.getFormatted( field ) ) );
-            }
+            Component[] row = new Component[1 + fields.size()];
+            row[0] = computerComponent;
+            for( int i = 0; i < fields.size(); i++ ) row[i + 1] = text( entry.getFormatted( fields.get( i ) ) );
+            table.row( row );
         }
 
-        table.display( context.getSender() );
-    }
-
-    private static void withComputers( List<String> selectors, Consumer<Collection<ServerComputer>> action ) throws CommandException
-    {
-        Set<ServerComputer> computers = Sets.newHashSet();
-        List<String> failed = new ArrayList<>();
-        if( selectors.isEmpty() )
-        {
-            computers.addAll( ComputerCraft.serverComputerRegistry.getComputers() );
-        }
-        else
-        {
-            for( String selector : selectors )
-            {
-                List<ServerComputer> selected = ComputerSelector.getComputers( selector );
-                computers.addAll( selected );
-                if( selected.isEmpty() ) failed.add( selector );
-            }
-        }
-
-        action.accept( computers );
-
-        if( !failed.isEmpty() )
-        {
-            throw new CommandException( "commands.computercraft.argument.no_matching", String.join( ", ", failed ) );
-        }
+        table.display( source );
+        return timings.size();
     }
 }

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

@@ -6,74 +6,56 @@
 
 package dan200.computercraft.shared.command;
 
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentString;
-import net.minecraft.util.text.TextComponentTranslation;
-import net.minecraft.util.text.event.ClickEvent;
-import net.minecraft.util.text.event.HoverEvent;
-import net.minecraftforge.client.IClientCommand;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.server.command.ServerCommandSource;
 
-import javax.annotation.Nonnull;
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
 
-public final class CommandCopy extends CommandBase implements IClientCommand
+public final class CommandCopy
 {
-    public static final CommandCopy INSTANCE = new CommandCopy();
-
-    /**
-     * We start with a "~" so we're less likely to show up on completions.
-     */
-    private static final String NAME = "~computercraft_copy";
+    private static final String PREFIX = "/computercraft copy ";
 
     private CommandCopy()
     {
     }
 
-    @Override
-    public boolean allowUsageWithoutPrefix( ICommandSender sender, String message )
+    public static void register( CommandDispatcher<ServerCommandSource> registry )
     {
+        registry.register( literal( "computercraft" )
+            .then( literal( "copy" ) )
+            .then( argument( "message", StringArgumentType.greedyString() ) )
+            .executes( context -> {
+                MinecraftClient.getInstance().keyboard.setClipboard( context.getArgument( "message", String.class ) );
+                return 1;
+            } )
+        );
+    }
+
+    public static boolean onClientSendMessage( String message )
+    {
+        // Emulate the command on the client side
+        if( message.startsWith( PREFIX ) )
+        {
+            MinecraftClient.getInstance().keyboard.setClipboard( message.substring( PREFIX.length() ) );
+            return true;
+        }
+
         return false;
     }
 
-    @Nonnull
-    @Override
-    public String getName()
+    public static TextComponent createCopyText( String text )
     {
-        return NAME;
-    }
-
-    @Nonnull
-    @Override
-    public String getUsage( @Nonnull ICommandSender sender )
-    {
-        return "/" + NAME + " <text>";
-    }
-
-    @Override
-    public int getRequiredPermissionLevel()
-    {
-        return 0;
-    }
-
-    @Override
-    @SideOnly( Side.CLIENT )
-    public void execute( @Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String[] args )
-    {
-        String message = String.join( " ", args );
-        if( !message.isEmpty() ) GuiScreen.setClipboardString( message );
-    }
-
-    public static ITextComponent createCopyText( String text )
-    {
-        TextComponentString name = new TextComponentString( text );
+        TextComponent name = new TextComponent( text );
         name.getStyle()
-            .setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, "/" + NAME + " " + text ) )
-            .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TextComponentTranslation( "gui.computercraft.tooltip.copy" ) ) );
+            .setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, PREFIX + text ) )
+            .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TranslatableComponent( "gui.computercraft.tooltip.copy" ) ) );
         return name;
     }
 }

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

@@ -6,18 +6,65 @@
 
 package dan200.computercraft.shared.command;
 
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraftforge.common.util.FakePlayer;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import dan200.computercraft.api.turtle.event.FakePlayer;
+import net.minecraft.entity.Entity;
+import net.minecraft.server.command.CommandSource;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.network.ServerPlayerEntity;
+
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 
 public final class CommandUtils
 {
     private CommandUtils() {}
 
-    public static boolean isPlayer( ICommandSender sender )
+    public static boolean isPlayer( ServerCommandSource output )
     {
-        return sender instanceof EntityPlayerMP
+        Entity sender = output.getEntity();
+        return sender instanceof ServerPlayerEntity
             && !(sender instanceof FakePlayer)
-            && ((EntityPlayerMP) sender).connection != null;
+            && ((ServerPlayerEntity) sender).networkHandler != null;
+    }
+
+    @SuppressWarnings( "unchecked" )
+    public static CompletableFuture<Suggestions> suggestOnServer( CommandContext<?> context, SuggestionsBuilder builder, Function<CommandContext<ServerCommandSource>, CompletableFuture<Suggestions>> supplier )
+    {
+        Object source = context.getSource();
+        if( !(source instanceof CommandSource) )
+        {
+            return Suggestions.empty();
+        }
+        else if( source instanceof ServerCommandSource )
+        {
+            return supplier.apply( (CommandContext<ServerCommandSource>) context );
+        }
+        else
+        {
+            return ((CommandSource) source).getCompletions( (CommandContext<CommandSource>) context, builder );
+        }
+    }
+
+    public static <T> CompletableFuture<Suggestions> suggest( SuggestionsBuilder builder, Iterable<T> candidates, Function<T, String> toString )
+    {
+        String remaining = builder.getRemaining().toLowerCase( Locale.ROOT );
+        for( T choice : candidates )
+        {
+            String name = toString.apply( choice );
+            if( !name.toLowerCase( Locale.ROOT ).startsWith( remaining ) ) continue;
+            builder.suggest( name );
+        }
+
+        return builder.buildFuture();
+    }
+
+    public static <T> CompletableFuture<Suggestions> suggest( SuggestionsBuilder builder, T[] candidates, Function<T, String> toString )
+    {
+        return suggest( builder, Arrays.asList( candidates ), toString );
     }
 }

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

@@ -1,163 +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.shared.command;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.core.ServerComputer;
-import net.minecraft.command.CommandException;
-
-import java.util.*;
-import java.util.function.Predicate;
-
-final class ComputerSelector
-{
-    private ComputerSelector() {}
-
-    private static List<ServerComputer> getComputers( Predicate<ServerComputer> predicate )
-    {
-        // We copy it to prevent concurrent modifications.
-        ArrayList<ServerComputer> computers = new ArrayList<>( ComputerCraft.serverComputerRegistry.getComputers() );
-        computers.removeIf( predicate.negate() );
-        return computers;
-    }
-
-    static ServerComputer getComputer( String selector ) throws CommandException
-    {
-        List<ServerComputer> computers = getComputers( selector );
-        if( computers.isEmpty() )
-        {
-            throw new CommandException( "commands.computercraft.argument.no_matching", selector );
-        }
-        else if( computers.size() == 1 )
-        {
-            return computers.get( 0 );
-        }
-        else
-        {
-            StringBuilder builder = new StringBuilder();
-
-            for( int i = 0; i < computers.size(); i++ )
-            {
-                if( i > 0 ) builder.append( ", " );
-                builder.append( computers.get( i ).getInstanceID() );
-            }
-
-            throw new CommandException( "commands.computercraft.argument.many_matching", selector, builder.toString() );
-        }
-    }
-
-    static List<ServerComputer> getComputers( String selector ) throws CommandException
-    {
-        if( !selector.isEmpty() && selector.charAt( 0 ) == '#' )
-        {
-            selector = selector.substring( 1 );
-
-            int id;
-            try
-            {
-                id = Integer.parseInt( selector );
-            }
-            catch( NumberFormatException e )
-            {
-                throw new CommandException( "commands.computercraft.argument.not_number", selector );
-            }
-
-            return getComputers( x -> x.getID() == id );
-        }
-        else if( !selector.isEmpty() && selector.charAt( 0 ) == '@' )
-        {
-            String label = selector.substring( 1 );
-            return getComputers( x -> Objects.equals( label, x.getLabel() ) );
-        }
-        else if( !selector.isEmpty() && selector.charAt( 0 ) == '~' )
-        {
-            String familyName = selector.substring( 1 );
-            return getComputers( x -> x.getFamily().name().equalsIgnoreCase( familyName ) );
-        }
-        else
-        {
-            int instance;
-            try
-            {
-                instance = Integer.parseInt( selector );
-            }
-            catch( NumberFormatException e )
-            {
-                throw new CommandException( "commands.computercraft.argument.not_number", selector );
-            }
-
-            ServerComputer computer = ComputerCraft.serverComputerRegistry.get( instance );
-            return computer == null ? Collections.emptyList() : Collections.singletonList( computer );
-        }
-    }
-
-    static List<String> completeComputer( String selector )
-    {
-        TreeSet<String> options = Sets.newTreeSet();
-
-        // We copy it to prevent concurrent modifications.
-        List<ServerComputer> computers = Lists.newArrayList( ComputerCraft.serverComputerRegistry.getComputers() );
-
-        if( !selector.isEmpty() && selector.charAt( 0 ) == '#' )
-        {
-            selector = selector.substring( 1 );
-
-            for( ServerComputer computer : computers )
-            {
-                String id = Integer.toString( computer.getID() );
-                if( id.startsWith( selector ) ) options.add( "#" + id );
-            }
-        }
-        else if( !selector.isEmpty() && selector.charAt( 0 ) == '@' )
-        {
-            String label = selector.substring( 1 );
-            for( ServerComputer computer : computers )
-            {
-                String thisLabel = computer.getLabel();
-                if( thisLabel != null && thisLabel.startsWith( label ) ) options.add( "@" + thisLabel );
-            }
-        }
-        else if( !selector.isEmpty() && selector.charAt( 0 ) == '~' )
-        {
-            String familyName = selector.substring( 1 ).toLowerCase( Locale.ENGLISH );
-            for( ComputerFamily family : ComputerFamily.values() )
-            {
-                if( family.name().toLowerCase( Locale.ENGLISH ).startsWith( familyName ) )
-                {
-                    options.add( "~" + family.name() );
-                }
-            }
-        }
-        else
-        {
-            for( ServerComputer computer : computers )
-            {
-                String id = Integer.toString( computer.getInstanceID() );
-                if( id.startsWith( selector ) ) options.add( id );
-            }
-        }
-
-        if( options.size() > 100 )
-        {
-            ArrayList<String> result = Lists.newArrayListWithCapacity( 100 );
-            for( String element : options )
-            {
-                if( result.size() > 100 ) break;
-                result.add( element );
-            }
-
-            return result;
-        }
-        else
-        {
-            return Lists.newArrayList( options );
-        }
-    }
-}

src/main/java/dan200/computercraft/shared/command/Exceptions.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.command;
+
+import com.mojang.brigadier.exceptions.Dynamic2CommandExceptionType;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import net.minecraft.network.chat.TranslatableComponent;
+
+public final class Exceptions
+{
+    public static final DynamicCommandExceptionType COMPUTER_ARG_NONE = translated1( "argument.computercraft.computer.no_matching" );
+    public static final Dynamic2CommandExceptionType COMPUTER_ARG_MANY = translated2( "argument.computercraft.computer.many_matching" );
+
+    public static final DynamicCommandExceptionType TRACKING_FIELD_ARG_NONE = translated1( "argument.computercraft.tracking_field.no_field" );
+
+    static final SimpleCommandExceptionType NOT_TRACKING_EXCEPTION = translated( "commands.computercraft.track.stop.not_enabled" );
+    static final SimpleCommandExceptionType NO_TIMINGS_EXCEPTION = translated( "commands.computercraft.track.dump.no_timings" );
+
+    static final SimpleCommandExceptionType TP_NOT_THERE = translated( "commands.computercraft.tp.not_there" );
+    static final SimpleCommandExceptionType TP_NOT_PLAYER = translated( "commands.computercraft.tp.not_player" );
+
+    public static final SimpleCommandExceptionType ARGUMENT_EXPECTED = translated( "argument.computercraft.argument_expected" );
+
+    private static SimpleCommandExceptionType translated( String key )
+    {
+        return new SimpleCommandExceptionType( new TranslatableComponent( key ) );
+    }
+
+    private static DynamicCommandExceptionType translated1( String key )
+    {
+        return new DynamicCommandExceptionType( x -> new TranslatableComponent( key, x ) );
+    }
+
+    private static Dynamic2CommandExceptionType translated2( String key )
+    {
+        return new Dynamic2CommandExceptionType( ( x, y ) -> new TranslatableComponent( key, x, y ) );
+    }
+}

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

@@ -6,15 +6,17 @@
 
 package dan200.computercraft.shared.command;
 
-import dan200.computercraft.shared.command.framework.CommandContext;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.util.function.Predicate;
 
 /**
  * The level a user must be at in order to execute a command.
  */
-public enum UserLevel
+public enum UserLevel implements Predicate<ServerCommandSource>
 {
     /**
      * Only can be used by the owner of the server: namely the server console or the player in SSP.
@@ -51,20 +53,21 @@ public enum UserLevel
         }
     }
 
-    public boolean canExecute( CommandContext context )
+    @Override
+    public boolean test( ServerCommandSource source )
     {
         if( this == ANYONE ) return true;
 
         // We *always* allow level 0 stuff, even if the
-        MinecraftServer server = context.getServer();
-        ICommandSender sender = context.getSender();
+        MinecraftServer server = source.getMinecraftServer();
+        Entity sender = source.getEntity();
 
-        if( server.isSinglePlayer() && sender instanceof EntityPlayerMP &&
-            ((EntityPlayerMP) sender).getGameProfile().getName().equalsIgnoreCase( server.getServerOwner() ) )
+        if( server.isSinglePlayer() && sender instanceof PlayerEntity &&
+            ((PlayerEntity) sender).getGameProfile().getName().equalsIgnoreCase( server.getUserName() ) )
         {
             if( this == OWNER || this == OWNER_OP ) return true;
         }
 
-        return sender.canUseCommand( toLevel(), context.getRootCommand() );
+        return source.hasPermissionLevel( toLevel() );
     }
 }

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

@@ -0,0 +1,41 @@
+/*
+ * 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.command.arguments;
+
+import com.mojang.brigadier.arguments.ArgumentType;
+import dan200.computercraft.ComputerCraft;
+import net.minecraft.command.arguments.ArgumentTypes;
+import net.minecraft.command.arguments.serialize.ArgumentSerializer;
+import net.minecraft.command.arguments.serialize.ConstantArgumentSerializer;
+import net.minecraft.util.Identifier;
+
+public final class ArgumentSerializers
+{
+    @SuppressWarnings( "unchecked" )
+    private static <T extends ArgumentType<?>> void registerUnsafe( Identifier id, Class<T> type, ArgumentSerializer<?> serializer )
+    {
+        ArgumentTypes.register( id.toString(), type, (ArgumentSerializer<T>) serializer );
+    }
+
+    private static <T extends ArgumentType<?>> void register( Identifier id, Class<T> type, ArgumentSerializer<T> serializer )
+    {
+        ArgumentTypes.register( id.toString(), type, serializer );
+    }
+
+    private static <T extends ArgumentType<?>> void register( Identifier id, T instance )
+    {
+        registerUnsafe( id, instance.getClass(), new ConstantArgumentSerializer<>( () -> instance ) );
+    }
+
+    public static void register()
+    {
+        register( new Identifier( ComputerCraft.MOD_ID, "tracking_field" ), TrackingFieldArgumentType.trackingField() );
+        register( new Identifier( ComputerCraft.MOD_ID, "computer" ), ComputerArgumentType.oneComputer() );
+        register( new Identifier( ComputerCraft.MOD_ID, "computers" ), ComputersArgumentType.class, new ComputersArgumentType.Serializer() );
+        registerUnsafe( new Identifier( ComputerCraft.MOD_ID, "repeat" ), RepeatArgumentType.class, new RepeatArgumentType.Serializer() );
+    }
+}

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

@@ -0,0 +1,75 @@
+/*
+ * 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.command.arguments;
+
+import com.mojang.brigadier.Message;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+public abstract class ChoiceArgumentType<T> implements ArgumentType<T>
+{
+    private final Iterable<T> choices;
+    private final Function<T, String> name;
+    private final Function<T, Message> tooltip;
+    private final DynamicCommandExceptionType exception;
+
+    protected ChoiceArgumentType( Iterable<T> choices, Function<T, String> name, Function<T, Message> tooltip, DynamicCommandExceptionType exception )
+    {
+        this.choices = choices;
+        this.name = name;
+        this.tooltip = tooltip;
+        this.exception = exception;
+    }
+
+    @Override
+    public T parse( StringReader reader ) throws CommandSyntaxException
+    {
+        int start = reader.getCursor();
+        String name = reader.readUnquotedString();
+
+        for( T choice : choices )
+        {
+            String choiceName = this.name.apply( choice );
+            if( name.equals( choiceName ) ) return choice;
+        }
+
+        reader.setCursor( start );
+        throw exception.createWithContext( reader, name );
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions( CommandContext<S> context, SuggestionsBuilder builder )
+    {
+        String remaining = builder.getRemaining().toLowerCase( Locale.ROOT );
+        for( T choice : choices )
+        {
+            String name = this.name.apply( choice );
+            if( !name.toLowerCase( Locale.ROOT ).startsWith( remaining ) ) continue;
+            builder.suggest( name, tooltip.apply( choice ) );
+        }
+
+        return builder.buildFuture();
+    }
+
+    @Override
+    public Collection<String> getExamples()
+    {
+        List<String> items = choices instanceof Collection<?> ? new ArrayList<>( ((Collection<T>) choices).size() ) : new ArrayList<>();
+        for( T choice : choices ) items.add( name.apply( choice ) );
+        items.sort( Comparator.naturalOrder() );
+        return items;
+    }
+}

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

@@ -0,0 +1,94 @@
+/*
+ * 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.command.arguments;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import dan200.computercraft.shared.command.arguments.ComputersArgumentType.ComputersSupplier;
+import dan200.computercraft.shared.computer.core.ServerComputer;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+
+import static dan200.computercraft.shared.command.Exceptions.COMPUTER_ARG_MANY;
+
+public final class ComputerArgumentType implements ArgumentType<ComputerArgumentType.ComputerSupplier>
+{
+    private static final ComputerArgumentType INSTANCE = new ComputerArgumentType();
+
+    public static ComputerArgumentType oneComputer()
+    {
+        return INSTANCE;
+    }
+
+    public static ServerComputer getComputerArgument( CommandContext<ServerCommandSource> context, String name ) throws CommandSyntaxException
+    {
+        return context.getArgument( name, ComputerSupplier.class ).unwrap( context.getSource() );
+    }
+
+    private ComputerArgumentType()
+    {
+    }
+
+    @Override
+    public ComputerSupplier parse( StringReader reader ) throws CommandSyntaxException
+    {
+        int start = reader.getCursor();
+        ComputersSupplier supplier = ComputersArgumentType.someComputers().parse( reader );
+        String selector = reader.getString().substring( start, reader.getCursor() );
+
+        return s -> {
+            Collection<ServerComputer> computers = supplier.unwrap( s );
+
+            if( computers.size() == 1 ) return computers.iterator().next();
+
+            StringBuilder builder = new StringBuilder();
+            boolean first = true;
+            for( ServerComputer computer : computers )
+            {
+                if( first )
+                {
+                    first = false;
+                }
+                else
+                {
+                    builder.append( ", " );
+                }
+
+                builder.append( computer.getInstanceID() );
+            }
+
+
+            // We have an incorrect number of computers: reset and throw an error
+            reader.setCursor( start );
+            throw COMPUTER_ARG_MANY.createWithContext( reader, selector, builder.toString() );
+        };
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions( CommandContext<S> context, SuggestionsBuilder builder )
+    {
+        return ComputersArgumentType.someComputers().listSuggestions( context, builder );
+    }
+
+    @Override
+    public Collection<String> getExamples()
+    {
+        return ComputersArgumentType.someComputers().getExamples();
+    }
+
+    @FunctionalInterface
+    public interface ComputerSupplier
+    {
+        ServerComputer unwrap( ServerCommandSource source ) throws CommandSyntaxException;
+    }
+}

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

@@ -0,0 +1,210 @@
+/*
+ * 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.command.arguments;
+
+import com.google.gson.JsonObject;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import dan200.computercraft.ComputerCraft;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.computer.core.ServerComputer;
+import net.minecraft.command.arguments.serialize.ArgumentSerializer;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.util.PacketByteBuf;
+
+import javax.annotation.Nonnull;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import static dan200.computercraft.shared.command.CommandUtils.suggest;
+import static dan200.computercraft.shared.command.CommandUtils.suggestOnServer;
+import static dan200.computercraft.shared.command.Exceptions.COMPUTER_ARG_NONE;
+
+public final class ComputersArgumentType implements ArgumentType<ComputersArgumentType.ComputersSupplier>
+{
+    private static final ComputersArgumentType MANY = new ComputersArgumentType( false );
+    private static final ComputersArgumentType SOME = new ComputersArgumentType( true );
+
+    private static final List<String> EXAMPLES = Arrays.asList(
+        "0", "#0", "@Label", "~Advanced"
+    );
+
+    public static ComputersArgumentType manyComputers()
+    {
+        return MANY;
+    }
+
+    public static ComputersArgumentType someComputers()
+    {
+        return SOME;
+    }
+
+    public static Collection<ServerComputer> getComputersArgument( CommandContext<ServerCommandSource> context, String name ) throws CommandSyntaxException
+    {
+        return context.getArgument( name, ComputersSupplier.class ).unwrap( context.getSource() );
+    }
+
+    private final boolean requireSome;
+
+    private ComputersArgumentType( boolean requireSome )
+    {
+        this.requireSome = requireSome;
+    }
+
+    @Override
+    public ComputersSupplier parse( StringReader reader ) throws CommandSyntaxException
+    {
+        int start = reader.getCursor();
+        char kind = reader.peek();
+        ComputersSupplier computers;
+        if( kind == '@' )
+        {
+            reader.skip();
+            String label = reader.readUnquotedString();
+            computers = getComputers( x -> Objects.equals( label, x.getLabel() ) );
+        }
+        else if( kind == '~' )
+        {
+            reader.skip();
+            String family = reader.readUnquotedString();
+            computers = getComputers( x -> x.getFamily().name().equalsIgnoreCase( family ) );
+        }
+        else if( kind == '#' )
+        {
+            reader.skip();
+            int id = reader.readInt();
+            computers = getComputers( x -> x.getID() == id );
+        }
+        else
+        {
+            int instance = reader.readInt();
+            computers = s -> {
+                ServerComputer computer = ComputerCraft.serverComputerRegistry.get( instance );
+                return computer == null ? Collections.emptyList() : Collections.singletonList( computer );
+            };
+        }
+
+        if( requireSome )
+        {
+            String selector = reader.getString().substring( start, reader.getCursor() );
+            return source -> {
+                Collection<ServerComputer> matched = computers.unwrap( source );
+                if( matched.isEmpty() ) throw COMPUTER_ARG_NONE.create( selector );
+                return matched;
+            };
+        }
+        else
+        {
+            return computers;
+        }
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions( CommandContext<S> context, SuggestionsBuilder builder )
+    {
+        String remaining = builder.getRemaining();
+
+        // We can run this one on the client, for obvious reasons.
+        if( remaining.startsWith( "~" ) )
+        {
+            return suggest( builder, ComputerFamily.values(), x -> "~" + x.name() );
+        }
+
+        // Verify we've a command source and we're running on the server
+        return suggestOnServer( context, builder, s -> {
+            if( remaining.startsWith( "@" ) )
+            {
+                suggestComputers( builder, remaining, x -> {
+                    String label = x.getLabel();
+                    return label == null ? null : "@" + label;
+                } );
+            }
+            else if( remaining.startsWith( "#" ) )
+            {
+                suggestComputers( builder, remaining, c -> "#" + c.getID() );
+            }
+            else
+            {
+                suggestComputers( builder, remaining, c -> Integer.toString( c.getInstanceID() ) );
+            }
+
+            return builder.buildFuture();
+        } );
+    }
+
+    @Override
+    public Collection<String> getExamples()
+    {
+        return EXAMPLES;
+    }
+
+    private static void suggestComputers( SuggestionsBuilder builder, String remaining, Function<ServerComputer, String> renderer )
+    {
+        remaining = remaining.toLowerCase( Locale.ROOT );
+        for( ServerComputer computer : ComputerCraft.serverComputerRegistry.getComputers() )
+        {
+            String converted = renderer.apply( computer );
+            if( converted != null && converted.toLowerCase( Locale.ROOT ).startsWith( remaining ) )
+            {
+                builder.suggest( converted );
+            }
+        }
+    }
+
+    private static ComputersSupplier getComputers( Predicate<ServerComputer> predicate )
+    {
+        return s -> Collections.unmodifiableList( ComputerCraft.serverComputerRegistry
+            .getComputers()
+            .stream()
+            .filter( predicate )
+            .collect( Collectors.toList() )
+        );
+    }
+
+    public static class Serializer implements ArgumentSerializer<ComputersArgumentType>
+    {
+
+        @Override
+        public void toPacket( @Nonnull ComputersArgumentType arg, @Nonnull PacketByteBuf buf )
+        {
+            buf.writeBoolean( arg.requireSome );
+        }
+
+        @Nonnull
+        @Override
+        public ComputersArgumentType fromPacket( @Nonnull PacketByteBuf buf )
+        {
+            return buf.readBoolean() ? SOME : MANY;
+        }
+
+        @Override
+        public void toJson( @Nonnull ComputersArgumentType arg, @Nonnull JsonObject json )
+        {
+            json.addProperty( "requireSome", arg.requireSome );
+        }
+    }
+
+    @FunctionalInterface
+    public interface ComputersSupplier
+    {
+        Collection<ServerComputer> unwrap( ServerCommandSource source ) throws CommandSyntaxException;
+    }
+
+    public static Set<ServerComputer> unwrap( ServerCommandSource source, Collection<ComputersSupplier> suppliers ) throws CommandSyntaxException
+    {
+        Set<ServerComputer> computers = new HashSet<>();
+        for( ComputersSupplier supplier : suppliers ) computers.addAll( supplier.unwrap( source ) );
+        return computers;
+    }
+}

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

@@ -0,0 +1,166 @@
+/*
+ * 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.command.arguments;
+
+import com.google.gson.JsonObject;
+import com.mojang.brigadier.Message;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import net.minecraft.command.arguments.ArgumentTypes;
+import net.minecraft.command.arguments.serialize.ArgumentSerializer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.util.PacketByteBuf;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+/**
+ * Reads one argument multiple times.
+ *
+ * Note that this must be the last element in an argument chain: in order to improve the quality of error messages,
+ * we will always try to consume another argument while there is input remaining.
+ *
+ * One problem with how parsers function, is that they must consume some input: and thus we
+ *
+ * @param <T> The type of each value returned
+ * @param <U> The type of the inner parser. This will normally be a {@link List} or {@code T}.
+ */
+public final class RepeatArgumentType<T, U> implements ArgumentType<List<T>>
+{
+    private final ArgumentType<U> child;
+    private final BiConsumer<List<T>, U> appender;
+    private final boolean flatten;
+    private final SimpleCommandExceptionType some;
+
+    private RepeatArgumentType( ArgumentType<U> child, BiConsumer<List<T>, U> appender, boolean flatten, SimpleCommandExceptionType some )
+    {
+        this.child = child;
+        this.appender = appender;
+        this.flatten = flatten;
+        this.some = some;
+    }
+
+    public static <T> RepeatArgumentType<T, T> some( ArgumentType<T> appender, SimpleCommandExceptionType missing )
+    {
+        return new RepeatArgumentType<>( appender, List::add, true, missing );
+    }
+
+    public static <T> RepeatArgumentType<T, List<T>> someFlat( ArgumentType<List<T>> appender, SimpleCommandExceptionType missing )
+    {
+        return new RepeatArgumentType<>( appender, List::addAll, true, missing );
+    }
+
+    @Override
+    public List<T> parse( StringReader reader ) throws CommandSyntaxException
+    {
+        boolean hadSome = false;
+        List<T> out = new ArrayList<>();
+        while( true )
+        {
+            reader.skipWhitespace();
+            if( !reader.canRead() ) break;
+
+            int startParse = reader.getCursor();
+            appender.accept( out, child.parse( reader ) );
+            hadSome = true;
+
+            if( reader.getCursor() == startParse )
+            {
+                throw new IllegalStateException( child + " did not consume any input on " + reader.getRemaining() );
+            }
+        }
+
+        // Note that each child may return an empty list, we just require that some actual input
+        // was consumed.
+        // We should probably review that this is sensible in the future.
+        if( !hadSome ) throw some.createWithContext( reader );
+
+        return Collections.unmodifiableList( out );
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions( CommandContext<S> context, SuggestionsBuilder builder )
+    {
+        StringReader reader = new StringReader( builder.getInput() );
+        reader.setCursor( builder.getStart() );
+        int previous = reader.getCursor();
+        while( reader.canRead() )
+        {
+            try
+            {
+                child.parse( reader );
+            }
+            catch( CommandSyntaxException e )
+            {
+                break;
+            }
+
+            int cursor = reader.getCursor();
+            reader.skipWhitespace();
+            if( cursor == reader.getCursor() ) break;
+            previous = reader.getCursor();
+        }
+
+        reader.setCursor( previous );
+        return child.listSuggestions( context, builder.createOffset( previous ) );
+    }
+
+    @Override
+    public Collection<String> getExamples()
+    {
+        return child.getExamples();
+    }
+
+    public static class Serializer implements ArgumentSerializer<RepeatArgumentType<?, ?>>
+    {
+        @Override
+        public void toPacket( RepeatArgumentType<?, ?> arg, PacketByteBuf buf )
+        {
+            buf.writeBoolean( arg.flatten );
+            ArgumentTypes.toPacket( buf, arg.child );
+            buf.writeTextComponent( getMessage( arg ) );
+        }
+
+        @Nonnull
+        @Override
+        @SuppressWarnings( { "unchecked", "rawtypes" } )
+        public RepeatArgumentType<?, ?> fromPacket( @Nonnull PacketByteBuf buf )
+        {
+            boolean isList = buf.readBoolean();
+            ArgumentType<?> child = ArgumentTypes.fromPacket( buf );
+            Component message = buf.readTextComponent();
+            BiConsumer<List<Object>, ?> appender = isList ? ( list, x ) -> list.addAll( (Collection) x ) : List::add;
+            return new RepeatArgumentType( child, appender, isList, new SimpleCommandExceptionType( message ) );
+        }
+
+        @Override
+        public void toJson( @Nonnull RepeatArgumentType<?, ?> arg, @Nonnull JsonObject json )
+        {
+            json.addProperty( "flatten", arg.flatten );
+            json.addProperty( "child", "<<cannot serialize>>" ); // TODO: Potentially serialize this using reflection.
+            json.addProperty( "error", TextComponent.Serializer.toJsonString( getMessage( arg ) ) );
+        }
+
+        private static TextComponent getMessage( RepeatArgumentType<?, ?> arg )
+        {
+            Message message = arg.some.create().getRawMessage();
+            if( message instanceof TextComponent ) return (TextComponent) message;
+            return new TextComponent( message.getString() );
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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.command.arguments;
+
+import dan200.computercraft.core.tracking.TrackingField;
+import dan200.computercraft.shared.command.Exceptions;
+
+import static dan200.computercraft.shared.command.text.ChatHelpers.translate;
+
+public final class TrackingFieldArgumentType extends ChoiceArgumentType<TrackingField>
+{
+    private static final TrackingFieldArgumentType INSTANCE = new TrackingFieldArgumentType();
+
+    private TrackingFieldArgumentType()
+    {
+        super( TrackingField.fields().values(), TrackingField::id, x -> translate( x.translationKey() ), Exceptions.TRACKING_FIELD_ARG_NONE );
+    }
+
+    public static TrackingFieldArgumentType trackingField()
+    {
+        return INSTANCE;
+    }
+}

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

@@ -0,0 +1,20 @@
+/*
+ * 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.command.builder;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
+/**
+ * A {@link Command} which accepts an argument
+ */
+@FunctionalInterface
+public interface ArgCommand<S, T>
+{
+    int run( CommandContext<S> ctx, T arg ) throws CommandSyntaxException;
+}

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

@@ -0,0 +1,126 @@
+/*
+ * 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.command.builder;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.builder.ArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.tree.CommandNode;
+import dan200.computercraft.shared.command.arguments.RepeatArgumentType;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+import static dan200.computercraft.shared.command.Exceptions.ARGUMENT_EXPECTED;
+import static dan200.computercraft.shared.command.builder.HelpingArgumentBuilder.literal;
+
+/**
+ * An alternative way of building command nodes, so one does not have to nest
+ * {@link ArgumentBuilder#then(CommandNode)}s.
+ */
+public class CommandBuilder<S> implements CommandNodeBuilder<S, Command<S>>
+{
+    private List<ArgumentBuilder<S, ?>> args = new ArrayList<>();
+    private Predicate<S> requires;
+
+    public static CommandBuilder<ServerCommandSource> args()
+    {
+        return new CommandBuilder<>();
+    }
+
+    public static CommandBuilder<ServerCommandSource> command( String literal )
+    {
+        CommandBuilder<ServerCommandSource> builder = new CommandBuilder<>();
+        builder.args.add( literal( literal ) );
+        return builder;
+    }
+
+    public CommandBuilder<S> requires( Predicate<S> predicate )
+    {
+        requires = requires == null ? predicate : requires.and( predicate );
+        return this;
+    }
+
+    public CommandBuilder<S> arg( String name, ArgumentType<?> type )
+    {
+        args.add( RequiredArgumentBuilder.argument( name, type ) );
+        return this;
+    }
+
+    public <T> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argManyValue( String name, ArgumentType<T> type, List<T> empty )
+    {
+        return argMany( name, type, () -> empty );
+    }
+
+    public <T> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argManyValue( String name, ArgumentType<T> type, T defaultValue )
+    {
+        return argManyValue( name, type, Collections.singletonList( defaultValue ) );
+    }
+
+    public <T> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argMany( String name, ArgumentType<T> type, Supplier<List<T>> empty )
+    {
+        return argMany( name, RepeatArgumentType.some( type, ARGUMENT_EXPECTED ), empty );
+    }
+
+    public <T> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argManyFlatten( String name, ArgumentType<List<T>> type, Supplier<List<T>> empty )
+    {
+        return argMany( name, RepeatArgumentType.someFlat( type, ARGUMENT_EXPECTED ), empty );
+    }
+
+    private <T, U> CommandNodeBuilder<S, ArgCommand<S, List<T>>> argMany( String name, RepeatArgumentType<T, ?> type, Supplier<List<T>> empty )
+    {
+        if( args.isEmpty() ) throw new IllegalStateException( "Cannot have empty arg chain builder" );
+
+        return command -> {
+            // The node for no arguments
+            ArgumentBuilder<S, ?> tail = tail( ctx -> command.run( ctx, empty.get() ) );
+
+            // The node for one or more arguments
+            ArgumentBuilder<S, ?> moreArg = RequiredArgumentBuilder
+                .<S, List<T>>argument( name, type )
+                .executes( ctx -> command.run( ctx, getList( ctx, name ) ) );
+
+            // Chain all of them together!
+            tail.then( moreArg );
+            return link( tail );
+        };
+    }
+
+    @SuppressWarnings( "unchecked" )
+    private static <T> List<T> getList( CommandContext<?> context, String name )
+    {
+        return (List<T>) context.getArgument( name, List.class );
+    }
+
+    @Override
+    public CommandNode<S> executes( Command<S> command )
+    {
+        if( args.isEmpty() ) throw new IllegalStateException( "Cannot have empty arg chain builder" );
+
+        return link( tail( command ) );
+    }
+
+    private ArgumentBuilder<S, ?> tail( Command<S> command )
+    {
+        ArgumentBuilder<S, ?> defaultTail = args.get( args.size() - 1 );
+        defaultTail.executes( command );
+        if( requires != null ) defaultTail.requires( requires );
+        return defaultTail;
+    }
+
+    private CommandNode<S> link( ArgumentBuilder<S, ?> tail )
+    {
+        for( int i = args.size() - 2; i >= 0; i-- ) tail = args.get( i ).then( tail );
+        return tail.build();
+    }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * 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.command.builder;
+
+import com.mojang.brigadier.tree.CommandNode;
+
+/**
+ * A builder which generates a {@link CommandNode} from the provided action.
+ */
+@FunctionalInterface
+public interface CommandNodeBuilder<S, T>
+{
+    /**
+     * Generate a command node which executes this command.
+     *
+     * @param command The command to run
+     * @return The constructed node.
+     */
+    CommandNode<S> executes( T command );
+}

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

@@ -0,0 +1,205 @@
+/*
+ * 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.command.builder;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.builder.ArgumentBuilder;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.tree.CommandNode;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import net.minecraft.ChatFormat;
+import net.minecraft.network.chat.ClickEvent;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TextComponent;
+import net.minecraft.server.command.ServerCommandSource;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static dan200.computercraft.shared.command.text.ChatHelpers.coloured;
+import static dan200.computercraft.shared.command.text.ChatHelpers.translate;
+
+/**
+ * An alternative to {@link LiteralArgumentBuilder} which also provides a {@code /... help} command, and defaults
+ * to that command when no arguments are given.
+ */
+public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<ServerCommandSource>
+{
+    private final Collection<HelpingArgumentBuilder> children = new ArrayList<>();
+
+    private HelpingArgumentBuilder( String literal )
+    {
+        super( literal );
+    }
+
+    public static HelpingArgumentBuilder choice( String literal )
+    {
+        return new HelpingArgumentBuilder( literal );
+    }
+
+    @Override
+    public LiteralArgumentBuilder<ServerCommandSource> executes( final Command<ServerCommandSource> command )
+    {
+        throw new IllegalStateException( "Cannot use executes on a HelpingArgumentBuilder" );
+    }
+
+    @Override
+    public LiteralArgumentBuilder<ServerCommandSource> then( final ArgumentBuilder<ServerCommandSource, ?> argument )
+    {
+        if( getRedirect() != null ) throw new IllegalStateException( "Cannot add children to a redirected node" );
+
+        if( argument instanceof HelpingArgumentBuilder )
+        {
+            children.add( (HelpingArgumentBuilder) argument );
+        }
+        else if( argument instanceof LiteralArgumentBuilder )
+        {
+            super.then( argument );
+        }
+        else
+        {
+            throw new IllegalStateException( "HelpingArgumentBuilder can only accept literal children" );
+        }
+
+        return this;
+    }
+
+    @Override
+    public LiteralArgumentBuilder<ServerCommandSource> then( CommandNode<ServerCommandSource> argument )
+    {
+        if( !(argument instanceof LiteralCommandNode) )
+        {
+            throw new IllegalStateException( "HelpingArgumentBuilder can only accept literal children" );
+        }
+        return super.then( argument );
+    }
+
+    @Override
+    public LiteralCommandNode<ServerCommandSource> build()
+    {
+        return buildImpl( getLiteral().replace( '-', '_' ), getLiteral() );
+    }
+
+    private LiteralCommandNode<ServerCommandSource> build( @Nonnull String id, @Nonnull String command )
+    {
+        return buildImpl( id + "." + getLiteral().replace( '-', '_' ), command + " " + getLiteral() );
+    }
+
+    private LiteralCommandNode<ServerCommandSource> buildImpl( String id, String command )
+    {
+        HelpCommand helpCommand = new HelpCommand( id, command );
+        LiteralCommandNode<ServerCommandSource> node = new LiteralCommandNode<>( getLiteral(), helpCommand, getRequirement(), getRedirect(), getRedirectModifier(), isFork() );
+        helpCommand.node = node;
+
+        // Set up a /... help command
+        LiteralArgumentBuilder<ServerCommandSource> helpNode = LiteralArgumentBuilder.<ServerCommandSource>literal( "help" )
+            .requires( x -> getArguments().stream().anyMatch( y -> y.getRequirement().test( x ) ) )
+            .executes( helpCommand );
+
+        // Add all normal command children to this and the help node
+        for( CommandNode<ServerCommandSource> child : getArguments() )
+        {
+            node.addChild( child );
+
+            helpNode.then( LiteralArgumentBuilder.<ServerCommandSource>literal( child.getName() )
+                .requires( child.getRequirement() )
+                .executes( helpForChild( child, id, command ) )
+                .build()
+            );
+        }
+
+        // And add alternative versions of which forward instead
+        for( HelpingArgumentBuilder childBuilder : children )
+        {
+            LiteralCommandNode<ServerCommandSource> child = childBuilder.build( id, command );
+            node.addChild( child );
+            helpNode.then( LiteralArgumentBuilder.<ServerCommandSource>literal( child.getName() )
+                .requires( child.getRequirement() )
+                .executes( helpForChild( child, id, command ) )
+                .redirect( child.getChild( "help" ) )
+                .build()
+            );
+        }
+
+        node.addChild( helpNode.build() );
+
+        return node;
+    }
+
+    private static final ChatFormat HEADER = ChatFormat.LIGHT_PURPLE;
+    private static final ChatFormat SYNOPSIS = ChatFormat.AQUA;
+    private static final ChatFormat NAME = ChatFormat.GREEN;
+
+    private static final class HelpCommand implements Command<ServerCommandSource>
+    {
+        private final String id;
+        private final String command;
+        LiteralCommandNode<ServerCommandSource> node;
+
+        private HelpCommand( String id, String command )
+        {
+            this.id = id;
+            this.command = command;
+        }
+
+        @Override
+        public int run( CommandContext<ServerCommandSource> context )
+        {
+            context.getSource().sendFeedback( getHelp( context, node, id, command ), false );
+            return 0;
+        }
+    }
+
+    private static Command<ServerCommandSource> helpForChild( CommandNode<ServerCommandSource> node, String id, String command )
+    {
+        return context -> {
+            context.getSource().sendFeedback( getHelp( context, node, id + "." + node.getName().replace( '-', '_' ), command + " " + node.getName() ), false );
+            return 0;
+        };
+    }
+
+    private static Component getHelp( CommandContext<ServerCommandSource> context, CommandNode<ServerCommandSource> node, String id, String command )
+    {
+        // An ugly hack to extract usage information from the dispatcher. We generate a temporary node, generate
+        // the shorthand usage, and emit that.
+        CommandDispatcher<ServerCommandSource> dispatcher = context.getSource().getMinecraftServer().getCommandManager().getDispatcher();
+        CommandNode<ServerCommandSource> temp = new LiteralCommandNode<>( "_", null, x -> true, null, null, false );
+        temp.addChild( node );
+        String usage = dispatcher.getSmartUsage( temp, context.getSource() ).get( node ).substring( node.getName().length() );
+
+        Component output = new TextComponent( "" )
+            .append( coloured( "/" + command + usage, HEADER ) )
+            .append( " " )
+            .append( coloured( translate( "commands." + id + ".synopsis" ), SYNOPSIS ) )
+            .append( "\n" )
+            .append( translate( "commands." + id + ".desc" ) );
+
+        for( CommandNode<ServerCommandSource> child : node.getChildren() )
+        {
+            if( !child.getRequirement().test( context.getSource() ) || !(child instanceof LiteralCommandNode) )
+            {
+                continue;
+            }
+
+            output.append( "\n" );
+
+            Component component = coloured( child.getName(), NAME );
+            component.getStyle().setClickEvent( new ClickEvent(
+                ClickEvent.Action.SUGGEST_COMMAND,
+                "/" + command + " " + child.getName()
+            ) );
+            output.append( component );
+
+            output.append( " - " ).append( translate( "commands." + id + "." + child.getName() + ".synopsis" ) );
+        }
+
+        return output;
+    }
+}