Merge pull request #316 from SquidDev-CC/feature/minecraft-1.12.2

Update to 1.12. Bam!

.travis.yml

@@ -9,3 +9,6 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/s
+
+jdk:
+    - oraclejdk8

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
         classpath 'org.ajoberstar:gradle-git:1.6.0'
     }
 }
@@ -28,7 +28,7 @@ group = "dan200.computercraft"
 archivesBaseName = "ComputerCraft"
 
 minecraft {
-    version = "1.11.2-13.20.0.2294"
+    version = "1.12-14.21.1.2387"
     runDir = "run"
     replace '${version}', project.version
 
@@ -37,7 +37,7 @@ minecraft {
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not allways work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20161227"
+    mappings = "snapshot_20170629"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 

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

@@ -239,11 +239,11 @@ public class ComputerCraft
     public static Logger log;
 
     // API users
-    private static List<IPeripheralProvider> peripheralProviders = new ArrayList<IPeripheralProvider>();
-    private static List<IBundledRedstoneProvider> bundledRedstoneProviders = new ArrayList<IBundledRedstoneProvider>();
-    private static List<IMediaProvider> mediaProviders = new ArrayList<IMediaProvider>();
-    private static List<ITurtlePermissionProvider> permissionProviders = new ArrayList<ITurtlePermissionProvider>();
-    private static final Map<String, IPocketUpgrade> pocketUpgrades = new HashMap<String, IPocketUpgrade>();
+    private static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
+    private static List<IBundledRedstoneProvider> bundledRedstoneProviders = new ArrayList<>();
+    private static List<IMediaProvider> mediaProviders = new ArrayList<>();
+    private static List<ITurtlePermissionProvider> permissionProviders = new ArrayList<>();
+    private static final Map<String, IPocketUpgrade> pocketUpgrades = new HashMap<>();
 
     // Implementation
     @Mod.Instance( value = ComputerCraft.MOD_ID )
@@ -397,14 +397,6 @@ public class ComputerCraft
         turtleProxy.init();
     }
 
-
-    @Mod.EventHandler
-    public void onMissingMappings( FMLMissingMappingsEvent event )
-    {
-        proxy.remap( event );
-        turtleProxy.remap( event );
-    }
-
     @Mod.EventHandler
     public void onServerStarting( FMLServerStartingEvent event )
     {
@@ -764,7 +756,7 @@ public class ComputerCraft
     }
 
     public static Iterable<IPocketUpgrade> getVanillaPocketUpgrades() {
-        List<IPocketUpgrade> upgrades = new ArrayList<IPocketUpgrade>();
+        List<IPocketUpgrade> upgrades = new ArrayList<>();
         for(IPocketUpgrade upgrade : pocketUpgrades.values()) {
             if(upgrade instanceof PocketModem || upgrade instanceof PocketSpeaker) {
                 upgrades.add( upgrade );
@@ -799,7 +791,7 @@ public class ComputerCraft
     public static IMount createResourceMount( Class<?> modClass, String domain, String subPath )
     {
         // Start building list of mounts
-        List<IMount> mounts = new ArrayList<IMount>();
+        List<IMount> mounts = new ArrayList<>();
         subPath = "assets/" + domain + "/" + subPath;
 
         // Mount from debug dir

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

@@ -16,6 +16,7 @@ import javax.annotation.Nullable;
  * @see ILuaContext#executeMainThreadTask(ILuaTask)
  * @see ILuaContext#issueMainThreadTask(ILuaTask)
  */
+@FunctionalInterface
 public interface ILuaTask
 {
     /**

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

@@ -16,6 +16,7 @@ import javax.annotation.Nullable;
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
  */
+@FunctionalInterface
 public interface IMediaProvider
 {
     /**

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

@@ -91,7 +91,9 @@ public interface IPeripheral
      *                 computers can be attached to a peripheral at once.
      * @see #detach
      */
-    void attach( @Nonnull IComputerAccess computer );
+    default void attach( @Nonnull IComputerAccess computer )
+    {
+    }
 
     /**
      * Is called when a computer is detaching from the peripheral.
@@ -108,7 +110,9 @@ public interface IPeripheral
      *                 computers can be attached to a peripheral at once.
      * @see #detach
      */
-    void detach( @Nonnull IComputerAccess computer );
+    default void detach( @Nonnull IComputerAccess computer )
+    {
+    }
 
     /**
      * Determine whether this peripheral is equivalent to another one.

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

@@ -18,6 +18,7 @@ import javax.annotation.Nullable;
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
  */
+@FunctionalInterface
 public interface IPeripheralProvider
 {
     /**

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

@@ -74,7 +74,9 @@ public interface IPocketUpgrade
      * @param peripheral The peripheral for this upgrade.
      * @see #createPeripheral(IPocketAccess)
      */
-    void update( @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral );
+    default void update( @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
+    {
+    }
 
     /**
      * Called when the pocket computer is right clicked.
@@ -87,5 +89,8 @@ public interface IPocketUpgrade
      * access the GUI.
      * @see #createPeripheral(IPocketAccess)
      */
-    boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral );
+    default boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
+    {
+        return false;
+    }
 }

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

@@ -17,6 +17,7 @@ import javax.annotation.Nonnull;
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
  */
+@FunctionalInterface
 public interface IBundledRedstoneProvider
 {
     /**

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

@@ -15,6 +15,7 @@ import javax.annotation.Nonnull;
  *
  * @see ITurtleAccess#executeCommand(ILuaContext, ITurtleCommand)
  */
+@FunctionalInterface
 public interface ITurtleCommand
 {
     /**

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

@@ -136,5 +136,7 @@ public interface ITurtleUpgrade
      * @param turtle Access to the turtle that the upgrade resides on.
      * @param side   Which side of the turtle (left or right) the upgrade resides on.
      */
-    void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side );
+    default void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
+    {
+    }
 }

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

@@ -8,9 +8,9 @@ package dan200.computercraft.client.gui;
 
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
@@ -38,7 +38,7 @@ public class FixedWidthFontRenderer
         Arrays.fill( rgb, ( rgb[0] + rgb[1] + rgb[2] ) / 3.0f );
     }
 
-    private void drawChar( VertexBuffer renderer, double x, double y, int index, int color, Palette p, boolean greyscale )
+    private void drawChar( BufferBuilder renderer, double x, double y, int index, int color, Palette p, boolean greyscale )
     {
         int column = index % 16;
         int row = index / 16;
@@ -63,7 +63,7 @@ public class FixedWidthFontRenderer
         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();
     }
 
-    private void drawQuad( VertexBuffer renderer, double x, double y, int color, double width, Palette p, boolean greyscale )
+    private void drawQuad( BufferBuilder renderer, double x, double y, int color, double width, Palette p, boolean greyscale )
     {
         double[] colour = p.getColour( 15 - color );
         if(greyscale)
@@ -91,7 +91,7 @@ public class FixedWidthFontRenderer
     {
         // Draw the quads
         Tessellator tessellator = Tessellator.getInstance();
-        VertexBuffer renderer = tessellator.getBuffer();
+        BufferBuilder renderer = tessellator.getBuffer();
         renderer.begin( GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_COLOR );
         if( leftMarginSize > 0.0 )
         {
@@ -129,7 +129,7 @@ public class FixedWidthFontRenderer
     {
         // Draw the quads
         Tessellator tessellator = Tessellator.getInstance();
-        VertexBuffer renderer = tessellator.getBuffer();
+        BufferBuilder renderer = tessellator.getBuffer();
         renderer.begin( GL11.GL_TRIANGLES, DefaultVertexFormats.POSITION_TEX_COLOR );
         for( int i = 0; i < s.length(); i++ )
         {

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

@@ -11,7 +11,6 @@ import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.IComputer;
-import dan200.computercraft.shared.computer.core.IComputerContainer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
@@ -61,14 +60,7 @@ public class GuiComputer extends GuiContainer
         super.initGui();
         Keyboard.enableRepeatEvents( true );
 
-        m_terminal = new WidgetTerminal( 0, 0, m_termWidth, m_termHeight, new IComputerContainer()
-        {
-            @Override
-            public IComputer getComputer()
-            {
-                return m_computer;
-            }
-        }, 2, 2, 2, 2 );
+        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;

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

@@ -23,7 +23,7 @@ public class GuiConfigCC extends GuiConfig
 
     private static List<IConfigElement> getConfigElements()
     {
-        ArrayList<IConfigElement> elements = new ArrayList<IConfigElement>();
+        ArrayList<IConfigElement> elements = new ArrayList<>();
         for (Property property : ComputerCraft.Config.config.getCategory( Configuration.CATEGORY_GENERAL ).getOrderedValues())
         {
             elements.add( new ConfigElement( property ) );
@@ -52,24 +52,10 @@ public class GuiConfigCC extends GuiConfig
             return new GuiConfigCC( parentScreen );
         }
 
-        @Override
-        @Deprecated
-        public Class<? extends GuiScreen> mainConfigGuiClass()
-        {
-            return GuiConfigCC.class;
-        }
-
         @Override
         public Set<RuntimeOptionCategoryElement> runtimeGuiCategories()
         {
             return null;
         }
-
-        @Override
-        @Deprecated
-        public RuntimeOptionGuiHandler getHandlerFor( RuntimeOptionCategoryElement runtimeOptionCategoryElement )
-        {
-            return null;
-        }
     }
 }

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

@@ -30,8 +30,8 @@ public class GuiDiskDrive extends GuiContainer
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
     {
         String title = m_diskDrive.getDisplayName().getUnformattedText();
-        fontRendererObj.drawString( title, (xSize - fontRendererObj.getStringWidth(title)) / 2, 6, 0x404040 );
-        fontRendererObj.drawString( I18n.format("container.inventory"), 8, (ySize - 96) + 2, 0x404040 );
+        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth(title)) / 2, 6, 0x404040 );
+        fontRenderer.drawString( I18n.format("container.inventory"), 8, (ySize - 96) + 2, 0x404040 );
     }
 
     @Override

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

@@ -32,8 +32,8 @@ public class GuiPrinter extends GuiContainer
     protected void drawGuiContainerForegroundLayer(int par1, int par2)
     {
         String title = m_printer.getDisplayName().getUnformattedText();
-        fontRendererObj.drawString( title, (xSize - fontRendererObj.getStringWidth(title)) / 2, 6, 0x404040 );
-        fontRendererObj.drawString( I18n.format("container.inventory"), 8, (ySize - 96) + 2, 0x404040 );
+        fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth(title)) / 2, 6, 0x404040 );
+        fontRenderer.drawString( I18n.format("container.inventory"), 8, (ySize - 96) + 2, 0x404040 );
     }
 
     @Override

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

@@ -11,7 +11,6 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.IComputer;
-import dan200.computercraft.shared.computer.core.IComputerContainer;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
 import net.minecraft.client.Minecraft;
@@ -67,14 +66,7 @@ public class GuiTurtle extends GuiContainer
             ( height - ySize ) / 2 + 8,
             ComputerCraft.terminalWidth_turtle,
             ComputerCraft.terminalHeight_turtle,
-            new IComputerContainer()
-            {
-                @Override
-                public IComputer getComputer()
-                {
-                    return m_computer;
-                }
-            },
+            () -> m_computer,
             2, 2, 2, 2
         );
         m_terminalGui.setAllowFocusLoss( false );

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

@@ -265,7 +265,7 @@ public abstract class Widget extends Gui
     protected void drawTooltip( String[] lines, int x, int y )
     {
         Minecraft mc = Minecraft.getMinecraft();
-        FontRenderer fontRenderer = mc.fontRendererObj;
+        FontRenderer fontRenderer = mc.fontRenderer;
 
         int width = 0;
         for( String line : lines )
@@ -340,7 +340,7 @@ public abstract class Widget extends Gui
                 if( renderItem != null )
                 {
                     renderItem.renderItemAndEffectIntoGUI( stack, x, y );
-                    renderItem.renderItemOverlayIntoGUI( mc.fontRendererObj, stack, x, y, null );
+                    renderItem.renderItemOverlayIntoGUI( mc.fontRenderer, stack, x, y, null );
                 }
             }
             finally
@@ -360,7 +360,7 @@ public abstract class Widget extends Gui
         Minecraft mc = Minecraft.getMinecraft();
         try
         {
-            mc.fontRendererObj.drawString( s, x, y, color );
+            mc.fontRenderer.drawString( s, x, y, color );
         }
         finally
         {
@@ -371,7 +371,7 @@ public abstract class Widget extends Gui
     protected int getStringWidth( String s )
     {
         Minecraft mc = Minecraft.getMinecraft();
-        return mc.fontRendererObj.getStringWidth( s );
+        return mc.fontRenderer.getStringWidth( s );
     }
 
     protected void playClickSound()

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

@@ -21,7 +21,7 @@ public class WidgetContainer extends Widget
 	public WidgetContainer( int x, int y, int w, int h )
 	{
 		super( x, y, w, h );
-		m_widgets = new ArrayList<Widget>();
+		m_widgets = new ArrayList<>();
 		m_modalWidget = null;
 	}
 
@@ -203,7 +203,8 @@ public class WidgetContainer extends Widget
 		return false;
 	}
 
-	public boolean suppressKeyPress( char c, int k )
+	@Override
+    public boolean suppressKeyPress( char c, int k )
 	{
 		if( m_modalWidget == null )
 		{

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

@@ -76,7 +76,7 @@ public class WidgetTerminal extends Widget
         m_topMargin = topMargin;
         m_bottomMargin = bottomMargin;
 
-        m_keysDown = new ArrayList<Integer>();
+        m_keysDown = new ArrayList<>();
     }
 
     public void setAllowFocusLoss( boolean allowFocusLoss )

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

@@ -6,7 +6,6 @@
 
 package dan200.computercraft.client.proxy;
 
-import com.google.common.base.Function;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.client.render.TurtleSmartItemModel;
@@ -21,7 +20,6 @@ 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.color.IItemColor;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
@@ -29,6 +27,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 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;
@@ -49,6 +48,13 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
     {    
         super.preInit();
 
+        // Setup client forge handlers
+        registerForgeHandlers();
+    }
+
+    @SubscribeEvent
+    public void registerModels( ModelRegistryEvent event )
+    {
         // Register item models
         ItemMeshDefinition turtleMeshDefinition = new ItemMeshDefinition()
         {
@@ -70,9 +76,6 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
         registerItemModel( ComputerCraft.Blocks.turtle, turtleMeshDefinition, turtleModelNames );
         registerItemModel( ComputerCraft.Blocks.turtleExpanded, turtleMeshDefinition, turtleModelNames );
         registerItemModel( ComputerCraft.Blocks.turtleAdvanced, turtleMeshDefinition, turtleModelNames );
-
-        // Setup client forge handlers
-        registerForgeHandlers();
     }
 
     @Override
@@ -168,14 +171,7 @@ public class CCTurtleProxyClient extends CCTurtleProxyCommon
             IBakedModel bakedModel = model.bake(
                 model.getDefaultState(),
                 DefaultVertexFormats.ITEM,
-                new Function<ResourceLocation, TextureAtlasSprite>()
-                {
-                    @Override
-                    public TextureAtlasSprite apply( ResourceLocation location )
-                    {
-                        return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( location.toString() );
-                    }
-                }
+                location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( location.toString() )
             );
             event.getModelRegistry().putObject(
                 new ModelResourceLocation( "computercraft:" + name, "inventory" ),

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

@@ -34,6 +34,7 @@ import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelBakery;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.color.IItemColor;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.Item;
@@ -44,6 +45,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
@@ -76,6 +78,13 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
         m_tick = 0;
         m_renderFrame = 0;
 
+        // Setup client forge handlers
+        registerForgeHandlers();
+    }
+
+    @SubscribeEvent
+    public void registerModels( ModelRegistryEvent event )
+    {
         // Register item models
         registerItemModel( ComputerCraft.Blocks.computer, new ItemMeshDefinition()
         {
@@ -174,9 +183,6 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
             "advanced_pocket_computer", "advanced_pocket_computer_on", "advanced_pocket_computer_blinking",
             "pocket_computer_colour", "pocket_computer_colour_on", "pocket_computer_colour_blinking",
         } );
-
-        // Setup client forge handlers
-        registerForgeHandlers();
     }
 
     @Override
@@ -192,28 +198,24 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
         mc.getItemColors().registerItemColorHandler( new DiskColorHandler( ComputerCraft.Items.disk ), ComputerCraft.Items.disk );
         mc.getItemColors().registerItemColorHandler( new DiskColorHandler( ComputerCraft.Items.diskExpanded ), ComputerCraft.Items.diskExpanded );
 
-        mc.getItemColors().registerItemColorHandler( new IItemColor()
+        mc.getItemColors().registerItemColorHandler( ( stack, layer ) ->
         {
-            @Override
-            public int getColorFromItemstack( @Nonnull ItemStack stack, int layer )
+            switch( layer )
             {
-                switch( layer )
+                case 0:
+                default:
+                    return 0xFFFFFF;
+                case 1:
                 {
-                    case 0:
-                    default:
-                        return 0xFFFFFF;
-                    case 1:
-                    {
-                        // Frame colour
-                        int colour = ComputerCraft.Items.pocketComputer.getColour( stack );
-                        return colour == -1 ? 0xFFFFFF : colour;
-                    }
-                    case 2:
-                    {
-                        // Light colour
-                        int colour = ComputerCraft.Items.pocketComputer.getLightState( stack );
-                        return colour == -1 ? Colour.Black.getHex() : colour;
-                    }
+                    // Frame colour
+                    int colour = ComputerCraft.Items.pocketComputer.getColour( stack );
+                    return colour == -1 ? 0xFFFFFF : colour;
+                }
+                case 2:
+                {
+                    // Light colour
+                    int colour = ComputerCraft.Items.pocketComputer.getLightState( stack );
+                    return colour == -1 ? Colour.Black.getHex() : colour;
                 }
             }
         }, ComputerCraft.Items.pocketComputer );
@@ -303,8 +305,8 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
     @Override
     public String getRecordInfo( @Nonnull ItemStack recordStack )
     {
-        List<String> info = new ArrayList<String>( 1 );
-        recordStack.getItem().addInformation( recordStack, null, info, false );
+        List<String> info = new ArrayList<>( 1 );
+        recordStack.getItem().addInformation( recordStack, null, info, ITooltipFlag.TooltipFlags.NORMAL );
         if( info.size() > 0 ) {
             return info.get( 0 );
         } else {
@@ -393,14 +395,7 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
                     }
                     else
                     {
-                        listener.addScheduledTask( new Runnable()
-                        {
-                            @Override
-                            public void run()
-                            {
-                                processPacket( packet, player );
-                            }
-                        } );
+                        listener.addScheduledTask( () -> processPacket( packet, player ) );
                     }
                 }
                 break;

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

@@ -16,17 +16,15 @@ 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.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import org.lwjgl.opengl.GL11;
 
-import javax.annotation.Nonnull;
-
 public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMonitor>
 {
     public TileEntityMonitorRenderer()
@@ -34,7 +32,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
     }
 
     @Override
-    public void renderTileEntityAt( @Nonnull TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i )
+    public void render( TileMonitor tileEntity, double posX, double posY, double posZ, float f, int i, float f2 )
     {
         if( tileEntity != null )
         {
@@ -93,7 +91,7 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer<TileMon
             // Get renderers
             Minecraft mc = Minecraft.getMinecraft();
             Tessellator tessellator = Tessellator.getInstance();
-            VertexBuffer renderer = tessellator.getBuffer();
+            BufferBuilder renderer = tessellator.getBuffer();
 
             // Get terminal
             ClientTerminal clientTerminal = (ClientTerminal)origin.getTerminal();

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

@@ -17,9 +17,9 @@ import dan200.computercraft.shared.util.HolidayUtil;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.block.model.ModelManager;
@@ -40,7 +40,6 @@ import net.minecraftforge.client.model.pipeline.LightUtil;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.opengl.GL11;
 
-import javax.annotation.Nonnull;
 import javax.vecmath.Matrix4f;
 import java.util.List;
 
@@ -58,7 +57,7 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
     }
 
     @Override
-    public void renderTileEntityAt( @Nonnull TileTurtle tileEntity, double posX, double posY, double posZ, float f, int i )
+    public void render( TileTurtle tileEntity, double posX, double posY, double posZ, float f, int i, float f2 )
     {
         if( tileEntity != null )
         {
@@ -66,7 +65,7 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
             Entity viewEntity = Minecraft.getMinecraft().getRenderViewEntity();
             if( viewEntity != null && viewEntity instanceof TurtleVisionCamera )
             {
-                TurtleVisionCamera camera = (TurtleVisionCamera)viewEntity;
+                TurtleVisionCamera camera = (TurtleVisionCamera) viewEntity;
                 if( camera.getTurtle() == tileEntity.getAccess() )
                 {
                     return;
@@ -127,7 +126,7 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
                 offset = new Vec3d( 0.0, 0.0, 0.0 );
                 yaw = 0.0f;
             }
-            GlStateManager.translate( posX + offset.xCoord, posY + offset.yCoord, posZ + offset.zCoord );
+            GlStateManager.translate( posX + offset.x, posY + offset.y, posZ + offset.z );
 
             // Render the label
             IComputer computer = (turtle != null) ? turtle.getComputer() : null;
@@ -250,7 +249,7 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
 
     private void renderQuads( Tessellator tessellator, List<BakedQuad> quads, int[] tints )
     {
-        VertexBuffer buffer = tessellator.getBuffer();
+        BufferBuilder buffer = tessellator.getBuffer();
         VertexFormat format = DefaultVertexFormats.ITEM;
         buffer.begin( GL11.GL_QUADS, format );
         for (BakedQuad quad : quads)
@@ -309,7 +308,7 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
                     try
                     {
                         Tessellator tessellator = Tessellator.getInstance();
-                        VertexBuffer renderer = tessellator.getBuffer();
+                        BufferBuilder renderer = tessellator.getBuffer();
                         renderer.begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR );
                         renderer.pos( (double) ( -xOffset - 1 ), (double) ( -1 + yOffset ), 0.0D ).color( 0.0F, 0.0F, 0.0F, 0.25F ).endVertex();
                         renderer.pos( (double) ( -xOffset - 1 ), (double) ( 8 + yOffset ), 0.0D ).color( 0.0F, 0.0F, 0.0F, 0.25F ).endVertex();

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

@@ -39,7 +39,7 @@ public class TurtleMultiModel implements IBakedModel
         m_rightUpgradeModel = rightUpgradeModel;
         m_rightUpgradeTransform = rightUpgradeTransform;
         m_generalQuads = null;
-        m_faceQuads = new HashMap<EnumFacing, List<BakedQuad>>();
+        m_faceQuads = new HashMap<>();
     }
 
     @Nonnull
@@ -50,7 +50,7 @@ public class TurtleMultiModel implements IBakedModel
         {
             if( !m_faceQuads.containsKey( side ) )
             {
-                ArrayList<BakedQuad> quads = new ArrayList<BakedQuad>();
+                ArrayList<BakedQuad> quads = new ArrayList<>();
                 if( m_overlayModel != null )
                 {
                     quads.addAll( m_overlayModel.getQuads( state, side, rand ) );
@@ -72,7 +72,7 @@ public class TurtleMultiModel implements IBakedModel
         {
             if( m_generalQuads == null )
             {
-                ArrayList<BakedQuad> quads = new ArrayList<BakedQuad>();
+                ArrayList<BakedQuad> quads = new ArrayList<>();
                 quads.addAll( m_baseModel.getQuads( state, side, rand ) );
                 if( m_overlayModel != null )
                 {
@@ -141,7 +141,7 @@ public class TurtleMultiModel implements IBakedModel
         }
         else
         {
-            List<BakedQuad> output = new ArrayList<BakedQuad>( input.size() );
+            List<BakedQuad> output = new ArrayList<>( input.size() );
             for( BakedQuad quad : input )
             {
                 output.add( transformQuad( quad, transform ) );

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

@@ -11,7 +11,6 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
-import dan200.computercraft.shared.turtle.items.TurtleItemFactory;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
 import net.minecraft.block.state.IBlockState;
@@ -90,16 +89,16 @@ public class TurtleSmartItemModel implements IBakedModel, IResourceManagerReload
             return result;
         }
     }
-
-    private ItemStack m_defaultItem;
+    
     private HashMap<TurtleModelCombination, IBakedModel> m_cachedModels;
     private ItemOverrideList m_overrides;
+    private final TurtleModelCombination m_defaultCombination;
 
     public TurtleSmartItemModel()
     {
-        m_defaultItem = TurtleItemFactory.create( -1, null, -1, ComputerFamily.Normal, null, null, 0, null );
-        m_cachedModels = new HashMap<TurtleModelCombination, IBakedModel>();
-        m_overrides = new ItemOverrideList( new ArrayList<ItemOverride>() )
+        m_cachedModels = new HashMap<>();
+        m_defaultCombination = new TurtleModelCombination( ComputerFamily.Normal, false, null, null, null, false );
+        m_overrides = new ItemOverrideList( new ArrayList<>() )
         {
             @Nonnull
             @Override
@@ -216,6 +215,13 @@ public class TurtleSmartItemModel implements IBakedModel, IResourceManagerReload
 
     private IBakedModel getDefaultModel()
     {
-        return m_overrides.handleItemState( this, m_defaultItem, null, null );
+        IBakedModel model = m_cachedModels.get( m_defaultCombination );
+        if( model == null )
+        {
+            model = buildModel( m_defaultCombination );
+            m_cachedModels.put( m_defaultCombination, model );
+        }
+
+        return model;
     }
 }

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

@@ -94,7 +94,7 @@ public class FSAPI implements ILuaAPI
                 String path = getString( args, 0 );
                 try {
                     String[] results = m_fileSystem.list( path );
-                    Map<Object,Object> table = new HashMap<Object,Object>();
+                    Map<Object,Object> table = new HashMap<>();
                     for(int i=0; i<results.length; ++i ) {
                         table.put( i+1, results[i] );
                     }
@@ -213,39 +213,46 @@ public class FSAPI implements ILuaAPI
                 String path = getString( args, 0 );
                 String mode = getString( args, 1 );
                 try {
-                    if( mode.equals( "r" ) ) {
-                        // Open the file for reading, then create a wrapper around the reader
-                        InputStream reader = m_fileSystem.openForRead( path );
-                        return new Object[] { new EncodedInputHandle( reader ) };
-                        
-                    } else if( mode.equals( "w" ) ) {
-                        // Open the file for writing, then create a wrapper around the writer
-                        OutputStream writer = m_fileSystem.openForWrite( path, false );
-                        return new Object[] { new EncodedOutputHandle( writer ) };
-                    
-                    } else if( mode.equals( "a" ) ) {
-                        // Open the file for appending, then create a wrapper around the writer
-                        OutputStream writer = m_fileSystem.openForWrite( path, true );
-                        return new Object[] { new EncodedOutputHandle( writer ) };
-                                            
-                    } else if( mode.equals( "rb" ) ) {
-                        // Open the file for binary reading, then create a wrapper around the reader
-                        InputStream reader = m_fileSystem.openForRead( path );
-                        return new Object[] { new BinaryInputHandle( reader ) };
-                        
-                    } else if( mode.equals( "wb" ) ) {
-                        // Open the file for binary writing, then create a wrapper around the writer
-                        OutputStream writer = m_fileSystem.openForWrite( path, false );
-                        return new Object[] { new BinaryOutputHandle( writer ) };
-                    
-                    } else if( mode.equals( "ab" ) ) {
-                        // Open the file for binary appending, then create a wrapper around the reader
-                        OutputStream writer = m_fileSystem.openForWrite( path, true );
-                        return new Object[] { new BinaryOutputHandle( writer ) };
-                        
-                    } else {
-                        throw new LuaException( "Unsupported mode" );
-                        
+                    switch( mode )
+                    {
+                        case "r":
+                        {
+                            // Open the file for reading, then create a wrapper around the reader
+                            InputStream reader = m_fileSystem.openForRead( path );
+                            return new Object[] { new EncodedInputHandle( reader ) };
+                        }
+                        case "w":
+                        {
+                            // Open the file for writing, then create a wrapper around the writer
+                            OutputStream writer = m_fileSystem.openForWrite( path, false );
+                            return new Object[] { new EncodedOutputHandle( writer ) };
+                        }
+                        case "a":
+                        {
+                            // Open the file for appending, then create a wrapper around the writer
+                            OutputStream writer = m_fileSystem.openForWrite( path, true );
+                            return new Object[] { new EncodedOutputHandle( writer ) };
+                        }
+                        case "rb":
+                        {
+                            // Open the file for binary reading, then create a wrapper around the reader
+                            InputStream reader = m_fileSystem.openForRead( path );
+                            return new Object[] { new BinaryInputHandle( reader ) };
+                        }
+                        case "wb":
+                        {
+                            // Open the file for binary writing, then create a wrapper around the writer
+                            OutputStream writer = m_fileSystem.openForWrite( path, false );
+                            return new Object[] { new BinaryOutputHandle( writer ) };
+                        }
+                        case "ab":
+                        {
+                            // Open the file for binary appending, then create a wrapper around the reader
+                            OutputStream writer = m_fileSystem.openForWrite( path, true );
+                            return new Object[] { new BinaryOutputHandle( writer ) };
+                        }
+                        default:
+                            throw new LuaException( "Unsupported mode" );
                     }
                 } catch( FileSystemException e ) {
                     return new Object[] { null, e.getMessage() };
@@ -286,7 +293,7 @@ public class FSAPI implements ILuaAPI
                 String path = getString( args, 0 );
                 try {
                     String[] results = m_fileSystem.find( path );
-                    Map<Object,Object> table = new HashMap<Object,Object>();
+                    Map<Object,Object> table = new HashMap<>();
                     for(int i=0; i<results.length; ++i ) {
                         table.put( i+1, results[i] );
                     }

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

@@ -26,7 +26,7 @@ public class HTTPAPI implements ILuaAPI
     public HTTPAPI( IAPIEnvironment environment )
     {
         m_apiEnvironment = environment;
-        m_httpTasks = new ArrayList<HTTPTask>();
+        m_httpTasks = new ArrayList<>();
     }
     
     @Override
@@ -103,7 +103,7 @@ public class HTTPAPI implements ILuaAPI
                 Map<Object, Object> table = optTable( args, 2, null );
                 if( table != null )
                 {
-                    headers = new HashMap<String, String>( table.size() );
+                    headers = new HashMap<>( table.size() );
                     for( Object key : table.keySet() )
                     {
                         Object value = table.get( key );

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

@@ -0,0 +1,245 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.core.apis;
+
+import com.google.common.base.Joiner;
+import com.google.common.io.ByteStreams;
+import dan200.computercraft.ComputerCraft;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class HTTPRequest
+{
+    public static URL checkURL( String urlString ) throws HTTPRequestException
+    {
+        URL url;
+        try
+        {
+            url = new URL( urlString );
+        }
+        catch( MalformedURLException e )
+        {
+            throw new HTTPRequestException( "URL malformed" );
+        }
+
+        // Validate the URL
+        String protocol = url.getProtocol().toLowerCase();
+        if( !protocol.equals("http") && !protocol.equals("https") )
+        {
+            throw new HTTPRequestException( "URL not http" );
+        }
+
+        // Compare the URL to the whitelist
+        if( !ComputerCraft.http_whitelist.matches( url.getHost() ) || ComputerCraft.http_blacklist.matches( url.getHost() ) )
+        {
+            throw new HTTPRequestException( "Domain not permitted" );
+        }
+
+        return url;
+    }
+
+    public HTTPRequest( String url, final String postText, final Map<String, String> headers, boolean binary ) throws HTTPRequestException
+    {
+        // Parse the URL
+        m_urlString = url;
+        m_url = checkURL( m_urlString );
+        m_binary = binary;
+
+        // Start the thread
+        m_cancelled = false;
+        m_complete = false;
+        m_success = false;
+        m_result = null;
+        m_responseCode = -1;
+
+        Thread thread = new Thread( () ->
+        {
+            try
+            {
+                // Connect to the URL
+                HttpURLConnection connection = (HttpURLConnection)m_url.openConnection();
+
+                if( postText != null )
+                {
+                    connection.setRequestMethod( "POST" );
+                    connection.setDoOutput( true );
+                }
+                else
+                {
+                    connection.setRequestMethod( "GET" );
+                }
+
+                // Set headers
+                connection.setRequestProperty( "accept-charset", "UTF-8" );
+                if( postText != null )
+                {
+                    connection.setRequestProperty( "content-type", "application/x-www-form-urlencoded; charset=utf-8" );
+                    connection.setRequestProperty( "content-encoding", "UTF-8" );
+                }
+                if( headers != null )
+                {
+                    for( Map.Entry<String, String> header : headers.entrySet() )
+                    {
+                        connection.setRequestProperty( header.getKey(), header.getValue() );
+                    }
+                }
+
+                // Send POST text
+                if( postText != null )
+                {
+                    OutputStream os = connection.getOutputStream();
+                    OutputStreamWriter osw;
+                    try
+                    {
+                        osw = new OutputStreamWriter( os, "UTF-8" );
+                    }
+                    catch( UnsupportedEncodingException e )
+                    {
+                        osw = new OutputStreamWriter( os );
+                    }
+                    BufferedWriter writer = new BufferedWriter( osw );
+                    writer.write( postText, 0, postText.length() );
+                    writer.close();
+                }
+
+                // Read response
+                InputStream is;
+                int code = connection.getResponseCode();
+                boolean responseSuccess;
+                if (code >= 200 && code < 400) {
+                    is = connection.getInputStream();
+                    responseSuccess = true;
+                } else {
+                    is = connection.getErrorStream();
+                    responseSuccess = false;
+                }
+                
+                byte[] result = ByteStreams.toByteArray( is );
+                is.close();
+                
+                synchronized( m_lock )
+                {
+                    if( m_cancelled )
+                    {
+                        // We cancelled
+                        m_complete = true;
+                        m_success = false;
+                        m_result = null;
+                    }
+                    else
+                    {
+                        // We completed
+                        m_complete = true;
+                        m_success = responseSuccess;
+                        m_result = result;
+                        m_responseCode = connection.getResponseCode();
+                        m_encoding = connection.getContentEncoding();
+
+                        Joiner joiner = Joiner.on( ',' );
+                        Map<String, String> headers1 = m_responseHeaders = new HashMap<>();
+                        for (Map.Entry<String, List<String>> header : connection.getHeaderFields().entrySet()) {
+                            headers1.put(header.getKey(), joiner.join( header.getValue() ));
+                        }
+                    }
+                }
+
+                connection.disconnect(); // disconnect
+
+            }
+            catch( IOException e )
+            {
+                synchronized( m_lock )
+                {
+                    // There was an error
+                    m_complete = true;
+                    m_success = false;
+                    m_result = null;
+                }
+            }
+        } );
+        thread.setDaemon(true);
+        thread.start();
+    }
+    
+    public String getURL() {
+        return m_urlString;
+    }
+    
+    public void cancel()
+    {
+        synchronized(m_lock) {
+            m_cancelled = true;
+        }
+    }
+    
+    public boolean isComplete()
+    {
+        synchronized(m_lock) {
+            return m_complete;
+        }
+    }
+
+    public int getResponseCode() {
+        synchronized(m_lock) {
+            return m_responseCode;
+        }
+    }
+
+    public Map<String, String> getResponseHeaders() {
+        synchronized (m_lock) {
+            return m_responseHeaders;
+        }
+    }
+
+    public boolean wasSuccessful()
+    {
+        synchronized(m_lock) {
+            return m_success;
+        }
+    }
+
+    public boolean isBinary()
+    {
+        return m_binary;
+    }
+    
+    public InputStream getContents()
+    {
+        byte[] result;
+        synchronized(m_lock) {
+            result = m_result;
+        }
+        
+        if( result != null ) {
+            return new ByteArrayInputStream( result );
+        }
+        return null;
+    }
+    
+    public String getEncoding() {
+        return m_encoding;
+    }
+    
+    private final Object m_lock = new Object();
+    private final URL m_url;
+    private final String m_urlString;
+    
+    private boolean m_complete;
+    private boolean m_cancelled;
+    private boolean m_success;
+    private String m_encoding;
+    private byte[] m_result;
+    private boolean m_binary;
+    private int m_responseCode;
+    private Map<String, String> m_responseHeaders;
+}

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

@@ -69,8 +69,8 @@ public class OSAPI implements ILuaAPI
         m_apiEnvironment = environment;
         m_nextTimerToken = 0;
         m_nextAlarmToken = 0;
-        m_timers = new HashMap<Integer, Timer>();
-        m_alarms = new HashMap<Integer, Alarm>();
+        m_timers = new HashMap<>();
+        m_alarms = new HashMap<>();
     }
     
     // ILuaAPI implementation
@@ -303,49 +303,56 @@ public class OSAPI implements ILuaAPI
             {
                 // time
                 String param = optString( args, 0, "ingame" );
-
-                if (param.equals("utc")) {
-                    // Get Hour of day (UTC)
-                    Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-                    return new Object[] {getTimeForCalendar(c)};
-
-                } else if (param.equals("local")) {
-                    // Get Hour of day (local time)
-                    Calendar c = Calendar.getInstance();
-                    return new Object[] {getTimeForCalendar(c)};
-
-                } else if (param.equals("ingame")) {
-                    // Get ingame hour
-                    synchronized (m_alarms) {
-                        return new Object[]{m_time};
+                switch( param )
+                {
+                    case "utc":
+                    {
+                        // Get Hour of day (UTC)
+                        Calendar c = Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) );
+                        return new Object[] { getTimeForCalendar( c ) };
                     }
-
-                } else {
-                    throw new LuaException("Unsupported operation");
+                    case "local":
+                    {
+                        // Get Hour of day (local time)
+                        Calendar c = Calendar.getInstance();
+                        return new Object[] { getTimeForCalendar( c ) };
+                    }
+                    case "ingame":
+                        // Get ingame hour
+                        synchronized( m_alarms )
+                        {
+                            return new Object[] { m_time };
+                        }
+                    default:
+                        throw new LuaException( "Unsupported operation" );
                 }
             }
             case 12:
             {
                 // day
                 String param = optString( args, 0, "ingame" );
-                if (param.equals("utc")) {
-                    // Get numbers of days since 1970-01-01 (utc)
-                    Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-                    return new Object[] {getDayForCalendar(c)};
-
-                } else if (param.equals("local")) {
-                    // Get numbers of days since 1970-01-01 (local time)
-                    Calendar c = Calendar.getInstance();
-                    return new Object[] {getDayForCalendar(c)};
-
-                } else if (param.equals("ingame")){
-                    // Get game day
-                    synchronized (m_alarms) {
-                        return new Object[]{m_day};
+                switch( param )
+                {
+                    case "utc":
+                    {
+                        // Get numbers of days since 1970-01-01 (utc)
+                        Calendar c = Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) );
+                        return new Object[] { getDayForCalendar( c ) };
                     }
-
-                } else {
-                    throw new LuaException("Unsupported operation");
+                    case "local":
+                    {
+                        // Get numbers of days since 1970-01-01 (local time)
+                        Calendar c = Calendar.getInstance();
+                        return new Object[] { getDayForCalendar( c ) };
+                    }
+                    case "ingame":
+                        // Get game day
+                        synchronized( m_alarms )
+                        {
+                            return new Object[] { m_day };
+                        }
+                    default:
+                        throw new LuaException( "Unsupported operation" );
                 }
             }
             case 13:
@@ -378,26 +385,30 @@ public class OSAPI implements ILuaAPI
             {
                 // epoch
                 String param = optString( args, 0, "ingame" );
-                if (param.equals("utc")) {
-                    // Get utc epoch
-                    Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-                    return new Object[] {getEpochForCalendar(c)};
-
-                } else if (param.equals("local")) {
-                    // Get local epoch
-                    Calendar c = Calendar.getInstance();
-                    return new Object[] {getEpochForCalendar(c)};
-
-                } else if (param.equals("ingame")){
-                    // Get in-game epoch
-                    synchronized (m_alarms) {
-                        return new Object[] {
-                            m_day * 86400000 + (int)(m_time * 3600000.0f)
-                        };
+                switch( param )
+                {
+                    case "utc":
+                    {
+                        // Get utc epoch
+                        Calendar c = Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) );
+                        return new Object[] { getEpochForCalendar( c ) };
                     }
-
-                } else {
-                    throw new LuaException("Unsupported operation");
+                    case "local":
+                    {
+                        // Get local epoch
+                        Calendar c = Calendar.getInstance();
+                        return new Object[] { getEpochForCalendar( c ) };
+                    }
+                    case "ingame":
+                        // Get in-game epoch
+                        synchronized( m_alarms )
+                        {
+                            return new Object[] {
+                                m_day * 86400000 + (int) (m_time * 3600000.0f)
+                            };
+                        }
+                    default:
+                        throw new LuaException( "Unsupported operation" );
                 }
             }
             default:

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

@@ -48,14 +48,14 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
             assert( m_type != null );
             assert( m_methods != null );
             
-            m_methodMap = new HashMap<String, Integer>();
+            m_methodMap = new HashMap<>();
             for(int i=0; i<m_methods.length; ++i ) {
                 if( m_methods[i] != null ) {
                     m_methodMap.put( m_methods[i], i );
                 }
             }
             
-            m_mounts = new HashSet<String>();
+            m_mounts = new HashSet<>();
         }
         
         public IPeripheral getPeripheral()
@@ -451,7 +451,7 @@ public class PeripheralAPI implements ILuaAPI, IAPIEnvironment.IPeripheralChange
                 }
                 if( methods != null )
                 {
-                    Map<Object,Object> table = new HashMap<Object,Object>();
+                    Map<Object,Object> table = new HashMap<>();
                     for(int i=0; i<methods.length; ++i ) {
                         table.put( i+1, methods[i] );
                     }

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

@@ -78,7 +78,7 @@ public class RedstoneAPI implements ILuaAPI
             case 0:
             {
                 // getSides
-                Map<Object,Object> table = new HashMap<Object,Object>();
+                Map<Object,Object> table = new HashMap<>();
                 for(int i=0; i< Computer.s_sideNames.length; ++i )
                 {
                     table.put( i+1, Computer.s_sideNames[i] );

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

@@ -224,7 +224,7 @@ public class Computer
         m_fileSystem = null;
 
         m_machine = null;
-        m_apis = new ArrayList<ILuaAPI>();
+        m_apis = new ArrayList<>();
         m_apiEnvironment = new APIEnvironment( this );
 
         m_internalOutput = new int[6];

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

@@ -31,9 +31,9 @@ public class ComputerThread
     {
         m_lock = new Object();    
         m_thread = null;
-        m_computerTasks = new WeakHashMap<Object, LinkedBlockingQueue<ITask>>();
-        m_computerTasksPending = new ArrayList<LinkedBlockingQueue<ITask>>();
-        m_computerTasksActive = new ArrayList<LinkedBlockingQueue<ITask>>();
+        m_computerTasks = new WeakHashMap<>();
+        m_computerTasksPending = new ArrayList<>();
+        m_computerTasksActive = new ArrayList<>();
         m_defaultQueue = new Object();
         m_monitor = new Object();
         m_running = false;
@@ -50,126 +50,123 @@ public class ComputerThread
                 return;
             }
         
-            m_thread = new Thread( new Runnable() {
-                public void run()
+            m_thread = new Thread( () ->
+            {
+                while( true )
                 {
-                    while( true )
+                    synchronized( m_computerTasksPending )
                     {
-                        synchronized( m_computerTasksPending )
+                        if (!m_computerTasksPending.isEmpty())
                         {
-                            if (!m_computerTasksPending.isEmpty())
+                            Iterator<LinkedBlockingQueue<ITask>> it = m_computerTasksPending.iterator();
+                            while(it.hasNext())
                             {
-                                Iterator<LinkedBlockingQueue<ITask>> it = m_computerTasksPending.iterator();
-                                while(it.hasNext())
+                                LinkedBlockingQueue<ITask> queue = it.next();
+                                
+                                if (!m_computerTasksActive.contains(queue))
                                 {
-                                    LinkedBlockingQueue<ITask> queue = it.next();
-                                    
-                                    if (!m_computerTasksActive.contains(queue))
-                                    {
-                                        m_computerTasksActive.add(queue);
-                                    }
-                                    it.remove();
+                                    m_computerTasksActive.add(queue);
                                 }
-                                /*
-                                m_computerTasksActive.addAll(m_computerTasksPending); // put any that have been added since
-                                m_computerTasksPending.clear();
-                                */
+                                it.remove();
+                            }
+                            /*
+                            m_computerTasksActive.addAll(m_computerTasksPending); // put any that have been added since
+                            m_computerTasksPending.clear();
+                            */
+                        }
+                    }
+                    
+                    Iterator<LinkedBlockingQueue<ITask>> it = m_computerTasksActive.iterator();
+                    
+                    while (it.hasNext())
+                    {
+                        LinkedBlockingQueue<ITask> queue = it.next();
+                        
+                        if (queue == null || queue.isEmpty()) // we don't need the blocking part of the queue. Null check to ensure it exists due to a weird NPE I got
+                        {
+                            continue;
+                        }
+                        
+                        synchronized( m_lock )
+                        {
+                            if( m_stopped )
+                            {
+                                m_running = false;
+                                m_thread = null;
+                                return;
                             }
                         }
                         
-                        Iterator<LinkedBlockingQueue<ITask>> it = m_computerTasksActive.iterator();
-                        
-                        while (it.hasNext())
+                        try
                         {
-                            LinkedBlockingQueue<ITask> queue = it.next();
-                            
-                            if (queue == null || queue.isEmpty()) // we don't need the blocking part of the queue. Null check to ensure it exists due to a weird NPE I got
-                            {
-                                continue;
-                            }
-                            
-                            synchronized( m_lock )
-                            {
-                                if( m_stopped )
-                                {
-                                    m_running = false;
-                                    m_thread = null;
-                                    return;
-                                }
-                            }
-                            
-                            try
-                            {
-                                final ITask task = queue.take();
+                            final ITask task = queue.take();
 
-                                // Create the task
-                                Thread worker = new Thread( new Runnable() {
-                                    public void run() {
-                                        try {
-                                            task.execute();
-                                        } catch( Throwable e ) {
-                                            ComputerCraft.log.error( "Error running task", e );
-                                        }
-                                    }
-                                } );
-                                
-                                // Run the task
-                                worker.setDaemon(true);
-                                worker.start();
-                                worker.join( 7000 );
-                                
-                                if( worker.isAlive() )
+                            // Create the task
+                            Thread worker = new Thread( () ->
+                            {
+                                try {
+                                    task.execute();
+                                } catch( Throwable e ) {
+                                    ComputerCraft.log.error( "Error running task", e );
+                                }
+                            } );
+                            
+                            // Run the task
+                            worker.setDaemon(true);
+                            worker.start();
+                            worker.join( 7000 );
+                            
+                            if( worker.isAlive() )
+                            {
+                                // Task ran for too long
+                                // Initiate escape plan
+                                Computer computer = task.getOwner();
+                                if( computer != null )
                                 {
-                                    // Task ran for too long
-                                    // Initiate escape plan
-                                    Computer computer = task.getOwner();
-                                    if( computer != null )
-                                    {
-                                        // Step 1: Soft abort
-                                        computer.abort( false );
-                                        worker.join( 1500 );
-                                
-                                        if( worker.isAlive() )
-                                        {
-                                            // Step 2: Hard abort
-                                            computer.abort( true );
-                                            worker.join( 1500 );
-                                        }
-                                    }
-                                    
-                                    // Step 3: abandon
+                                    // Step 1: Soft abort
+                                    computer.abort( false );
+                                    worker.join( 1500 );
+                            
                                     if( worker.isAlive() )
                                     {
-                                        // ComputerCraft.log.warn( "Failed to abort Computer " + computer.getID() + ". Dangling lua thread could cause errors." );
-                                        worker.interrupt();
+                                        // Step 2: Hard abort
+                                        computer.abort( true );
+                                        worker.join( 1500 );
                                     }
-                                }                
+                                }
+                                
+                                // Step 3: abandon
+                                if( worker.isAlive() )
+                                {
+                                    // ComputerCraft.log.warn( "Failed to abort Computer " + computer.getID() + ". Dangling lua thread could cause errors." );
+                                    worker.interrupt();
+                                }
+                            }                
+                        }
+                        catch( InterruptedException e )
+                        {
+                            continue;
+                        }
+
+                        synchronized (queue)
+                        {
+                            if (queue.isEmpty())
+                            {
+                                it.remove();
+                            }
+                        }
+                    }
+                    
+                    while (m_computerTasksActive.isEmpty() && m_computerTasksPending.isEmpty())
+                    {
+                        synchronized (m_monitor)
+                        {
+                            try 
+                            {
+                                m_monitor.wait();
                             }
                             catch( InterruptedException e )
                             {
-                                continue;
-                            }
-
-                            synchronized (queue)
-                            {
-                                if (queue.isEmpty())
-                                {
-                                    it.remove();
-                                }
-                            }
-                        }
-                        
-                        while (m_computerTasksActive.isEmpty() && m_computerTasksPending.isEmpty())
-                        {
-                            synchronized (m_monitor)
-                            {
-                                try 
-                                {
-                                    m_monitor.wait();
-                                }
-                                catch( InterruptedException e )
-                                {
-                                }
                             }
                         }
                     }
@@ -207,7 +204,7 @@ public class ComputerThread
 
         if (queue == null)
         {
-            m_computerTasks.put(queueObject, queue = new LinkedBlockingQueue<ITask>(256));
+            m_computerTasks.put(queueObject, queue = new LinkedBlockingQueue<>( 256 ));
         }
         
         synchronized ( m_computerTasksPending )

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

@@ -13,7 +13,7 @@ public class MainThread
     private static final int MAX_TASKS_PER_TICK = 1000;
     private static final int MAX_TASKS_TOTAL = 50000;
 
-    private static final LinkedList<ITask> m_outstandingTasks = new LinkedList<ITask>();
+    private static final LinkedList<ITask> m_outstandingTasks = new LinkedList<>();
     private static final Object m_nextUnusedTaskIDLock = new Object();
     private static long m_nextUnusedTaskID = 0;
 

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

@@ -68,7 +68,7 @@ public class ComboMount implements IMount
             {
                 if( foundFiles == null )
                 {
-                    foundFiles = new ArrayList<String>();
+                    foundFiles = new ArrayList<>();
                 }
                 part.list(  path, foundFiles );
                 foundDirs++;
@@ -83,7 +83,7 @@ public class ComboMount implements IMount
         else if( foundDirs > 1 )
         {
             // We found multiple directories, so filter for duplicates
-            Set<String> seen = new HashSet<String>();
+            Set<String> seen = new HashSet<>();
             for(String file : foundFiles)
             {
                 if( seen.add( file ) )

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

@@ -9,7 +9,6 @@ package dan200.computercraft.core.filesystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
-import net.minecraftforge.fml.common.FMLLog;
 
 import java.io.*;
 import java.util.*;
@@ -291,7 +290,7 @@ public class FileSystem
         }
     }
 
-    private final Map<String, MountWrapper> m_mounts = new HashMap<String, MountWrapper>();
+    private final Map<String, MountWrapper> m_mounts = new HashMap<>();
     private final Set<Closeable> m_openFiles = Collections.newSetFromMap( new WeakHashMap<Closeable, Boolean>() );
     
     public FileSystem( String rootLabel, IMount rootMount ) throws FileSystemException
@@ -424,7 +423,7 @@ public class FileSystem
         MountWrapper mount = getMount( path );
         
         // Gets a list of the files in the mount
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         mount.list( path, list );
         
         // Add any mounts that are mounted at this location
@@ -481,7 +480,7 @@ public class FileSystem
 
         // Scan as normal, starting from this directory
         Pattern wildPattern = Pattern.compile( "^\\Q" + wildPath.replaceAll( "\\*", "\\\\E[^\\\\/]*\\\\Q" ) + "\\E$" );
-        List<String> matches = new ArrayList<String>();
+        List<String> matches = new ArrayList<>();
         findIn( startDir, matches, wildPattern );
 
         // Return matches
@@ -585,7 +584,7 @@ public class FileSystem
             destinationMount.makeDirectory( destinationPath );
             
             // Copy the source contents into it
-            List<String> sourceChildren = new ArrayList<String>();
+            List<String> sourceChildren = new ArrayList<>();
             sourceMount.list( sourcePath, sourceChildren );
             for( String child : sourceChildren )
             {
@@ -762,7 +761,7 @@ public class FileSystem
         
         // Collapse the string into its component parts, removing ..'s
         String[] parts = path.split("/");
-        Stack<String> outputParts = new Stack<String>();
+        Stack<String> outputParts = new Stack<>();
         for( String part : parts )
         {
             if( part.length() == 0 || part.equals( "." ) )

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

@@ -34,7 +34,7 @@ public class JarMount implements IMount
             m_path = path;
             m_directory = directory;
             m_size = m_directory ? 0 : size;
-            m_children = new LinkedHashMap<String, FileInZip>();
+            m_children = new LinkedHashMap<>();
         }
         
         public String getPath()

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

@@ -535,7 +535,7 @@ public class LuaJLuaMachine implements ILuaMachine
             {
                 if( m_valuesInProgress == null )
                 {
-                    m_valuesInProgress = new IdentityHashMap<Object, LuaValue>();
+                    m_valuesInProgress = new IdentityHashMap<>();
                     clearWhenDone = true;
                 }
                 else if( m_valuesInProgress.containsKey( object ) )
@@ -629,14 +629,14 @@ public class LuaJLuaMachine implements ILuaMachine
                     // Start remembering stuff
                     if( m_objectsInProgress == null )
                     {
-                        m_objectsInProgress = new IdentityHashMap<LuaValue, Object>();
+                        m_objectsInProgress = new IdentityHashMap<>();
                         clearWhenDone = true;
                     }
                     else if( m_objectsInProgress.containsKey( value ) )
                     {
                         return m_objectsInProgress.get( value );
                     }
-                    Map<Object, Object> table = new HashMap<Object, Object>();
+                    Map<Object, Object> table = new HashMap<>();
                     m_objectsInProgress.put( value, table );
 
                     // Convert all keys

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

@@ -15,16 +15,18 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.Explosion;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,18 +48,15 @@ public abstract class BlockGeneric extends Block implements
     {
     }
 
-    @Nonnull
     @Override
-    public final List<ItemStack> getDrops( IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune )
+    public final void getDrops( @Nonnull NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, @Nonnull IBlockState state, int fortune )
     {
-        ArrayList<ItemStack> drops = new ArrayList<ItemStack>( 1 );
         TileEntity tile = world.getTileEntity( pos );
         if( tile != null && tile instanceof TileGeneric )
         {
-            TileGeneric generic = (TileGeneric)tile;
+            TileGeneric generic = (TileGeneric) tile;
             generic.getDroppedItems( drops, false );
         }
-        return drops;
     }
 
     @Nonnull
@@ -85,11 +84,11 @@ public abstract class BlockGeneric extends Block implements
     public final void dropAllItems( World world, BlockPos pos, boolean creative )
     {
         // Get items to drop
-        List<ItemStack> drops = new ArrayList<ItemStack>( 1 );
+        NonNullList<ItemStack> drops = NonNullList.create();
         TileEntity tile = world.getTileEntity( pos );
         if( tile != null && tile instanceof TileGeneric )
         {
-            TileGeneric generic = (TileGeneric)tile;
+            TileGeneric generic = (TileGeneric) tile;
             generic.getDroppedItems( drops, creative );
         }
 
@@ -170,6 +169,7 @@ public abstract class BlockGeneric extends Block implements
     }
 
     @Override
+    @Deprecated
     public final boolean isSideSolid( IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side )
     {
         TileEntity tile = world.getTileEntity( pos );
@@ -188,7 +188,7 @@ public abstract class BlockGeneric extends Block implements
     }
 
     @Override
-    public float getExplosionResistance( World world, BlockPos pos, @Nonnull Entity exploder, Explosion explosion )
+    public float getExplosionResistance( World world, BlockPos pos, @Nullable Entity exploder, Explosion explosion )
     {
         TileEntity tile = world.getTileEntity( pos );
         if( tile != null && tile instanceof TileGeneric && tile.hasWorld() )
@@ -199,7 +199,7 @@ public abstract class BlockGeneric extends Block implements
                 return 2000.0f;
             }
         }
-        return super.getExplosionResistance( exploder );
+        return super.getExplosionResistance( world, pos, exploder, explosion );
     }
 
     @Nonnull
@@ -234,7 +234,7 @@ public abstract class BlockGeneric extends Block implements
             TileGeneric generic = (TileGeneric)tile;
 
             // Get collision bounds
-            List<AxisAlignedBB> collision = new ArrayList<AxisAlignedBB>( 1 );
+            List<AxisAlignedBB> collision = new ArrayList<>( 1 );
             generic.getCollisionBounds( collision );
 
             // Return the union of the collision bounds
@@ -262,7 +262,7 @@ public abstract class BlockGeneric extends Block implements
             TileGeneric generic = (TileGeneric)tile;
 
             // Get collision bounds
-            List<AxisAlignedBB> collision = new ArrayList<AxisAlignedBB>( 1 );
+            List<AxisAlignedBB> collision = new ArrayList<>( 1 );
             generic.getCollisionBounds( collision );
 
             // Add collision bounds to list

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

@@ -9,10 +9,11 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.registries.IForgeRegistryEntry;
 
 import javax.annotation.Nonnull;
 
-public class ColourableRecipe implements IRecipe
+public class ColourableRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe
 {
     @Override
     public boolean matches( @Nonnull InventoryCrafting inv, @Nonnull World worldIn )
@@ -79,9 +80,15 @@ public class ColourableRecipe implements IRecipe
     }
 
     @Override
-    public int getRecipeSize()
+    public boolean canFit( int x, int y )
     {
-        return 2;
+        return x >= 2 && y >= 2;
+    }
+
+    @Override
+    public boolean isHidden()
+    {
+        return true;
     }
 
     @Nonnull

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

@@ -17,6 +17,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
@@ -79,7 +80,7 @@ public abstract class TileGeneric extends TileEntity
         getWorld().setBlockState( getPos(), newState, 3 );
     }
 
-    public void getDroppedItems( @Nonnull List<ItemStack> drops, boolean creative )
+    public void getDroppedItems( @Nonnull NonNullList<ItemStack> drops, boolean creative )
     {
     }
 

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

@@ -9,7 +9,6 @@ package dan200.computercraft.shared.computer.apis;
 import com.google.common.collect.ImmutableMap;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.lua.ILuaTask;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.core.apis.ILuaAPI;
 import dan200.computercraft.shared.computer.blocks.TileCommandComputer;
@@ -81,7 +80,7 @@ public class CommandAPI implements ILuaAPI
 
     private Map<Object, Object> createOutput( String output )
     {
-        Map<Object, Object> result = new HashMap<Object, Object>( 1 );
+        Map<Object, Object> result = new HashMap<>( 1 );
         result.put( 1, output );
         return result;
     }
@@ -123,11 +122,11 @@ public class CommandAPI implements ILuaAPI
         String name = Block.REGISTRY.getNameForObject( block ).toString();
         int metadata = block.getMetaFromState( state );
 
-        Map<Object, Object> table = new HashMap<Object, Object>();
+        Map<Object, Object> table = new HashMap<>();
         table.put( "name", name );
         table.put( "metadata", metadata );
 
-        Map<Object, Object> stateTable = new HashMap<Object, Object>();
+        Map<Object, Object> stateTable = new HashMap<>();
         for( ImmutableMap.Entry<IProperty<?>, Comparable<?>> entry : state.getActualState( world, pos ).getProperties().entrySet() )
         {
             String propertyName = entry.getKey().getName();
@@ -155,68 +154,50 @@ public class CommandAPI implements ILuaAPI
             {
                 // exec
                 final String command = getString( arguments, 0 );
-                return context.executeMainThreadTask( new ILuaTask()
-                {
-                    @Override
-                    public Object[] execute() throws LuaException
-                    {
-                        return doCommand( command );
-                    }
-                } );
+                return context.executeMainThreadTask( () -> doCommand( command ) );
             }
             case 1:
             {
                 // execAsync
                 final String command = getString( arguments, 0 );
-                long taskID = context.issueMainThreadTask( new ILuaTask()
-                {
-                    @Override
-                    public Object[] execute() throws LuaException
-                    {
-                        return doCommand( command );
-                    }
-                } );
+                long taskID = context.issueMainThreadTask( () -> doCommand( command ) );
                 return new Object[] { taskID };
             }
             case 2:
             {
                 // list
-                return context.executeMainThreadTask( new ILuaTask()
+                return context.executeMainThreadTask( () ->
                 {
-                    @Override
-                    public Object[] execute() throws LuaException
+                    int i = 1;
+                    Map<Object, Object> result = new HashMap<>();
+                    MinecraftServer server = m_computer.getWorld().getMinecraftServer();
+                    if( server != null )
                     {
-                        int i = 1;
-                        Map<Object, Object> result = new HashMap<Object, Object>();
-                        MinecraftServer server = m_computer.getWorld().getMinecraftServer();
-                        if( server != null )
+                        ICommandManager commandManager = server.getCommandManager();
+                        ICommandSender commmandSender = m_computer.getCommandSender();
+                        Map<String, ICommand> commands = commandManager.getCommands();
+                        for( Map.Entry<String, ICommand> entry : commands.entrySet() )
                         {
-                            ICommandManager commandManager = server.getCommandManager();
-                            ICommandSender commmandSender = m_computer.getCommandSender();
-                            Map<String, ICommand> commands = commandManager.getCommands();
-                            for( Map.Entry<String, ICommand> entry : commands.entrySet() )
+                            String name = entry.getKey();
+                            ICommand command = entry.getValue();
+                            try
                             {
-                                String name = entry.getKey();
-                                ICommand command = entry.getValue();
-                                try
+                                if( command.checkPermission( server, commmandSender ) )
                                 {
-                                    if( command.checkPermission( server, commmandSender ) )
-                                    {
-                                        result.put( i++, name );
-                                    }
+                                    result.put( i++, name );
                                 }
-                                catch( Throwable t )
+                            }
+                            catch( Throwable t )
+                            {
+                                // Ignore buggy command
+                                if( ComputerCraft.logPeripheralErrors )
                                 {
-                                    // Ignore buggy command
-                                    if( ComputerCraft.logPeripheralErrors )
-                                    {
-                                        ComputerCraft.log.error( "Error checking permissions of command.", t );
-                                    }
+                                    ComputerCraft.log.error( "Error checking permissions of command.", t );
                                 }
                             }
                         }
-                        return new Object[]{ result };
                     }
+                    return new Object[]{ result };
                 } );
             }
             case 3:
@@ -235,46 +216,42 @@ public class CommandAPI implements ILuaAPI
                 final int maxx = getInt( arguments, 3 );
                 final int maxy = getInt( arguments, 4 );
                 final int maxz = getInt( arguments, 5 );
-                return context.executeMainThreadTask( new ILuaTask()
+                return context.executeMainThreadTask( () ->
                 {
-                    @Override
-                    public Object[] execute() throws LuaException
+                    // Get the details of the block
+                    World world = m_computer.getWorld();
+                    BlockPos min = new BlockPos(
+                            Math.min( minx, maxx ),
+                            Math.min( miny, maxy ),
+                            Math.min( minz, maxz )
+                    );
+                    BlockPos max = new BlockPos(
+                            Math.max( minx, maxx ),
+                            Math.max( miny, maxy ),
+                            Math.max( minz, maxz )
+                    );
+                    if( !WorldUtil.isBlockInWorld( world, min ) || !WorldUtil.isBlockInWorld( world, max ) )
                     {
-                        // Get the details of the block
-                        World world = m_computer.getWorld();
-                        BlockPos min = new BlockPos(
-                                Math.min( minx, maxx ),
-                                Math.min( miny, maxy ),
-                                Math.min( minz, maxz )
-                        );
-                        BlockPos max = new BlockPos(
-                                Math.max( minx, maxx ),
-                                Math.max( miny, maxy ),
-                                Math.max( minz, maxz )
-                        );
-                        if( !WorldUtil.isBlockInWorld( world, min ) || !WorldUtil.isBlockInWorld( world, max ) )
+                        throw new LuaException( "Co-ordinates out or range" );
+                    }
+                    if( ( max.getX() - min.getX() + 1 ) * ( max.getY() - min.getY() + 1 ) * ( max.getZ() - min.getZ() + 1 ) > 4096 )
+                    {
+                        throw new LuaException( "Too many blocks" );
+                    }
+                    int i=1;
+                    Map<Object, Object> results = new HashMap<>();
+                    for( int y=min.getY(); y<= max.getY(); ++y )
+                    {
+                        for( int z = min.getZ(); z <= max.getZ(); ++z )
                         {
-                            throw new LuaException( "Co-ordinates out or range" );
-                        }
-                        if( ( max.getX() - min.getX() + 1 ) * ( max.getY() - min.getY() + 1 ) * ( max.getZ() - min.getZ() + 1 ) > 4096 )
-                        {
-                            throw new LuaException( "Too many blocks" );
-                        }
-                        int i=1;
-                        Map<Object, Object> results = new HashMap<Object, Object>();
-                        for( int y=min.getY(); y<= max.getY(); ++y )
-                        {
-                            for( int z = min.getZ(); z <= max.getZ(); ++z )
+                            for( int x = min.getX(); x <= max.getX(); ++x )
                             {
-                                for( int x = min.getX(); x <= max.getX(); ++x )
-                                {
-                                    BlockPos pos = new BlockPos( x, y, z );
-                                    results.put( i++, getBlockInfo( world, pos ) );
-                                }
+                                BlockPos pos = new BlockPos( x, y, z );
+                                results.put( i++, getBlockInfo( world, pos ) );
                             }
                         }
-                        return new Object[]{ results };
                     }
+                    return new Object[]{ results };
                 } );
             }
             case 5:
@@ -283,22 +260,18 @@ public class CommandAPI implements ILuaAPI
                 final int x = getInt( arguments, 0 );
                 final int y = getInt( arguments, 1 );
                 final int z = getInt( arguments, 2 );
-                return context.executeMainThreadTask( new ILuaTask()
+                return context.executeMainThreadTask( () ->
                 {
-                    @Override
-                    public Object[] execute() throws LuaException
+                    // Get the details of the block
+                    World world = m_computer.getWorld();
+                    BlockPos position = new BlockPos( x, y, z );
+                    if( WorldUtil.isBlockInWorld( world, position ) )
                     {
-                        // Get the details of the block
-                        World world = m_computer.getWorld();
-                        BlockPos position = new BlockPos( x, y, z );
-                        if( WorldUtil.isBlockInWorld( world, position ) )
-                        {
-                            return new Object[]{ getBlockInfo( world, position ) };
-                        }
-                        else
-                        {
-                            throw new LuaException( "co-ordinates out or range" );
-                        }
+                        return new Object[]{ getBlockInfo( world, position ) };
+                    }
+                    else
+                    {
+                        throw new LuaException( "co-ordinates out or range" );
                     }
                 } );
             }

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

@@ -94,16 +94,6 @@ public class ComputerPeripheral
         }
     }
 
-    @Override
-    public void attach( @Nonnull IComputerAccess computer )
-    {
-    }
-
-    @Override
-    public void detach( @Nonnull IComputerAccess computer )
-    {
-    }
-
     @Override
     public boolean equals( IPeripheral other )
     {

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

@@ -33,7 +33,7 @@ public class TileCommandComputer extends TileComputer
 
         public CommandSender()
         {
-            m_outputTable = new HashMap<Integer, String>();
+            m_outputTable = new HashMap<>();
         }
 
         public void clearOutput()
@@ -48,7 +48,7 @@ public class TileCommandComputer extends TileComputer
 
         public Map<Integer, String> copyOutput()
         {
-            return new HashMap<Integer, String>( m_outputTable );
+            return new HashMap<>( m_outputTable );
         }
 
         // ICommandSender

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

@@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
 
 import javax.annotation.Nonnull;
 import java.util.List;
@@ -48,7 +49,7 @@ public class TileComputer extends TileComputerBase
     }
 
     @Override
-    public void getDroppedItems( @Nonnull List<ItemStack> drops, boolean creative )
+    public void getDroppedItems( @Nonnull NonNullList<ItemStack> drops, boolean creative )
     {
         IComputer computer = getComputer();
         if( !creative || (computer != null && computer.getLabel() != null) )

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

@@ -153,6 +153,7 @@ public class ClientComputer extends ClientTerminal
         ComputerCraft.sendToServer( packet );
     }
 
+    @Override
     public void readDescription( NBTTagCompound nbttagcompound )
     {
         super.readDescription( nbttagcompound );

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

@@ -19,7 +19,7 @@ public class ComputerRegistry<TComputer extends IComputer>
 
     protected ComputerRegistry()
     {
-        m_computers = new HashMap<Integer, TComputer>();
+        m_computers = new HashMap<>();
         reset();
     }
 

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

@@ -337,6 +337,7 @@ public class ServerComputer extends ServerTerminal
 
     // Networking stuff
 
+    @Override
     public void writeDescription( NBTTagCompound nbttagcompound )
     {
         super.writeDescription( nbttagcompound );

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

@@ -10,7 +10,6 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.NonNullList;
@@ -29,6 +28,7 @@ public class ItemCommandComputer extends ItemComputer
         setCreativeTab( ComputerCraft.mainCreativeTab );
     }
 
+    @Override
     public ItemStack create( int id, String label, ComputerFamily family )
     {
         // Ignore types we can't handle
@@ -40,9 +40,12 @@ public class ItemCommandComputer extends ItemComputer
         // Build the stack
         ItemStack result = new ItemStack( this, 1, 0 );
 
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger( "computerID", id );
-        result.setTagCompound( nbt );
+        if( id >= 0 )
+        {
+            NBTTagCompound nbt = new NBTTagCompound();
+            nbt.setInteger( "computerID", id );
+            result.setTagCompound( nbt );
+        }
 
         if( label != null )
         {
@@ -53,8 +56,9 @@ public class ItemCommandComputer extends ItemComputer
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
+    public void getSubItems( @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         list.add( ComputerItemFactory.create( -1, null, ComputerFamily.Command ) );
     }
 

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

@@ -13,7 +13,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
@@ -73,8 +72,9 @@ public class ItemComputer extends ItemComputerBase
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
+    public void getSubItems( @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         list.add( ComputerItemFactory.create( -1, null, ComputerFamily.Normal ) );
         list.add( ComputerItemFactory.create( -1, null, ComputerFamily.Advanced ) );
     }

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

@@ -11,13 +11,14 @@ import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.List;
 
 public abstract class ItemComputerBase extends ItemBlock implements IComputerItem, IMedia
@@ -36,9 +37,9 @@ public abstract class ItemComputerBase extends ItemBlock implements IComputerIte
     }
 
     @Override
-    public void addInformation( @Nonnull ItemStack stack, @Nonnull EntityPlayer player, @Nonnull List<String> list, boolean debug )
+    public void addInformation( @Nonnull ItemStack stack, @Nullable World world, @Nonnull List<String> list, @Nonnull ITooltipFlag flag )
     {
-        if( debug )
+        if( flag.isAdvanced() )
         {
             int id = getComputerID( stack );
             if( id >= 0 )

src/main/java/dan200/computercraft/shared/media/items/ItemDiskLegacy.java

@@ -12,6 +12,7 @@ import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.shared.common.IColouredItem;
 import dan200.computercraft.shared.util.Colour;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -37,8 +38,9 @@ public class ItemDiskLegacy extends Item
     }
     
     @Override
-    public void getSubItems( @Nonnull Item itemID, CreativeTabs tabs, NonNullList<ItemStack> list )
+    public void getSubItems( @Nonnull CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         for( int colour=0; colour<16; ++colour )
         {
             ItemStack stack = createFromIDAndColour( -1, null, Colour.values()[ colour ].getHex() );
@@ -83,9 +85,9 @@ public class ItemDiskLegacy extends Item
     }
 
     @Override
-    public void addInformation( @Nonnull ItemStack stack, EntityPlayer player, List<String> list, boolean debug )
+    public void addInformation( @Nonnull ItemStack stack, World world, List<String> list, ITooltipFlag flag )
     {
-        if( debug )
+        if( flag.isAdvanced() )
         {
             int id = getDiskID( stack );
             if( id >= 0 )

src/main/java/dan200/computercraft/shared/media/items/ItemPrintout.java

@@ -7,6 +7,7 @@
 package dan200.computercraft.shared.media.items;
 
 import dan200.computercraft.ComputerCraft;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -43,15 +44,16 @@ public class ItemPrintout extends Item
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, CreativeTabs tabs, NonNullList<ItemStack> list )
+    public void getSubItems( @Nonnull CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         list.add( createSingleFromTitleAndText( null, new String[ LINES_PER_PAGE ], new String[ LINES_PER_PAGE ] ) );
         list.add( createMultipleFromTitleAndText( null, new String[ 2*LINES_PER_PAGE ], new String[ 2*LINES_PER_PAGE ] ) );
         list.add( createBookFromTitleAndText( null, new String[ 2*LINES_PER_PAGE ], new String[ 2*LINES_PER_PAGE ] ) );
     }
 
     @Override
-    public void addInformation( @Nonnull ItemStack itemstack, EntityPlayer par2EntityPlayer, List<String> list, boolean flag )
+    public void addInformation( @Nonnull ItemStack itemstack, World world, List<String> list, ITooltipFlag flag )
     {
         String title = getTitle( itemstack );
         if( title != null && title.length() > 0 )
@@ -91,7 +93,7 @@ public class ItemPrintout extends Item
         {
             ComputerCraft.openPrintoutGUI( player, hand );
         }
-        return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) );
+        return new ActionResult<>( EnumActionResult.SUCCESS, player.getHeldItem( hand ) );
     }
 
     @Nonnull

src/main/java/dan200/computercraft/shared/media/items/ItemTreasureDisk.java

@@ -11,6 +11,7 @@ import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.core.filesystem.SubMount;
 import dan200.computercraft.shared.util.Colour;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -37,12 +38,12 @@ public class ItemTreasureDisk extends Item
     }
     
     @Override
-    public void getSubItems( @Nonnull Item itemID, CreativeTabs tabs, NonNullList<ItemStack> list )
+    public void getSubItems( @Nonnull CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
     }
     
     @Override
-    public void addInformation( @Nonnull ItemStack stack, EntityPlayer player, List<String> list, boolean bool )
+    public void addInformation( @Nonnull ItemStack stack, World world, List<String> list, ITooltipFlag flag )
     {
         String label = getTitle( stack );
         if( label != null && label.length() > 0 )

src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java

@@ -1,107 +1,114 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-
-package dan200.computercraft.shared.media.recipes;
-
-import dan200.computercraft.shared.media.items.ItemDiskLegacy;
-import dan200.computercraft.shared.util.Colour;
-import dan200.computercraft.shared.util.ColourTracker;
-import dan200.computercraft.shared.util.ColourUtils;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.util.NonNullList;
-import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeHooks;
-
-import javax.annotation.Nonnull;
-
-public class DiskRecipe implements IRecipe
-{
-    @Override
-    public boolean matches( @Nonnull InventoryCrafting inv, @Nonnull World world )
-    {
-        boolean paperFound = false;
-        boolean redstoneFound = false;
-
-        for( int i = 0; i < inv.getSizeInventory(); ++i )
-        {
-            ItemStack stack = inv.getStackInSlot( i );
-
-            if( !stack.isEmpty() )
-            {
-                if( stack.getItem() == Items.PAPER )
-                {
-                    if( paperFound ) return false;
-                    paperFound = true;
-                }
-                else if( stack.getItem() == Items.REDSTONE )
-                {
-                    if( redstoneFound ) return false;
-                    redstoneFound = true;
-                }
-                else if( ColourUtils.getStackColour( stack ) < 0 )
-                {
-                    return false;
-                }
-            }
-        }
-
-        return redstoneFound && paperFound;
-    }
-
-    @Nonnull
-    @Override
-    public ItemStack getCraftingResult( @Nonnull InventoryCrafting inv )
-    {
-        ColourTracker tracker = new ColourTracker();
-
-        for( int i = 0; i < inv.getSizeInventory(); ++i )
-        {
-            ItemStack stack = inv.getStackInSlot( i );
-
-            if( stack.isEmpty() ) continue;
-            
-            if( stack.getItem() != Items.PAPER && stack.getItem() != Items.REDSTONE )
-            {
-                int index = ColourUtils.getStackColour( stack );
-                if( index < 0 ) continue;
-
-                Colour colour = Colour.values()[ index ];
-                tracker.addColour( colour.getR(), colour.getG(), colour.getB() );
-            }
-        }
-
-        return ItemDiskLegacy.createFromIDAndColour( -1, null, tracker.hasColour() ? tracker.getColour() : Colour.Blue.getHex() );
-    }
-
-    @Override
-    public int getRecipeSize()
-    {
-        return 2;
-    }
-
-    @Nonnull
-    @Override
-    public ItemStack getRecipeOutput()
-    {
-        return ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.Blue.getHex() );
-    }
-
-    @Nonnull
-    @Override
-    public NonNullList<ItemStack> getRemainingItems( @Nonnull InventoryCrafting inventoryCrafting )
-    {
-        NonNullList<ItemStack> results = NonNullList.withSize( inventoryCrafting.getSizeInventory(), ItemStack.EMPTY );
-        for( int i = 0; i < results.size(); ++i )
-        {
-            ItemStack stack = inventoryCrafting.getStackInSlot( i );
-            results.set( i, ForgeHooks.getContainerItem( stack ) );
-        }
-        return results;
-    }
-}
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2017. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.shared.media.recipes;
+
+import dan200.computercraft.shared.media.items.ItemDiskLegacy;
+import dan200.computercraft.shared.util.Colour;
+import dan200.computercraft.shared.util.ColourTracker;
+import dan200.computercraft.shared.util.ColourUtils;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.NonNullList;
+import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.registries.IForgeRegistryEntry;
+
+import javax.annotation.Nonnull;
+
+public class DiskRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe
+{
+    @Override
+    public boolean matches( @Nonnull InventoryCrafting inv, @Nonnull World world )
+    {
+        boolean paperFound = false;
+        boolean redstoneFound = false;
+
+        for( int i = 0; i < inv.getSizeInventory(); ++i )
+        {
+            ItemStack stack = inv.getStackInSlot( i );
+
+            if( !stack.isEmpty() )
+            {
+                if( stack.getItem() == Items.PAPER )
+                {
+                    if( paperFound ) return false;
+                    paperFound = true;
+                }
+                else if( stack.getItem() == Items.REDSTONE )
+                {
+                    if( redstoneFound ) return false;
+                    redstoneFound = true;
+                }
+                else if( ColourUtils.getStackColour( stack ) < 0 )
+                {
+                    return false;
+                }
+            }
+        }
+
+        return redstoneFound && paperFound;
+    }
+
+    @Nonnull
+    @Override
+    public ItemStack getCraftingResult( @Nonnull InventoryCrafting inv )
+    {
+        ColourTracker tracker = new ColourTracker();
+
+        for( int i = 0; i < inv.getSizeInventory(); ++i )
+        {
+            ItemStack stack = inv.getStackInSlot( i );
+
+            if( stack.isEmpty() ) continue;
+            
+            if( stack.getItem() != Items.PAPER && stack.getItem() != Items.REDSTONE )
+            {
+                int index = ColourUtils.getStackColour( stack );
+                if( index < 0 ) continue;
+
+                Colour colour = Colour.values()[ index ];
+                tracker.addColour( colour.getR(), colour.getG(), colour.getB() );
+            }
+        }
+
+        return ItemDiskLegacy.createFromIDAndColour( -1, null, tracker.hasColour() ? tracker.getColour() : Colour.Blue.getHex() );
+    }
+
+    @Override
+    public boolean canFit( int x, int y )
+    {
+        return x >= 2 && y >= 2;
+    }
+
+    @Override
+    public boolean isHidden()
+    {
+        return true;
+    }
+
+    @Nonnull
+    @Override
+    public ItemStack getRecipeOutput()
+    {
+        return ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.Blue.getHex() );
+    }
+
+    @Nonnull
+    @Override
+    public NonNullList<ItemStack> getRemainingItems( @Nonnull InventoryCrafting inventoryCrafting )
+    {
+        NonNullList<ItemStack> results = NonNullList.withSize( inventoryCrafting.getSizeInventory(), ItemStack.EMPTY );
+        for( int i = 0; i < results.size(); ++i )
+        {
+            ItemStack stack = inventoryCrafting.getStackInSlot( i );
+            results.set( i, ForgeHooks.getContainerItem( stack ) );
+        }
+        return results;
+    }
+}

src/main/java/dan200/computercraft/shared/media/recipes/PrintoutRecipe.java

@@ -15,19 +15,26 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.registries.IForgeRegistryEntry;
 
 import javax.annotation.Nonnull;
 
-public class PrintoutRecipe implements IRecipe
+public class PrintoutRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe
 {
     public PrintoutRecipe( )
     {
     }
 
     @Override
-    public int getRecipeSize()
+    public boolean canFit( int x, int y )
     {
-        return 3;
+        return x >= 3 && y >= 3;
+    }
+
+    @Override
+    public boolean isHidden()
+    {
+        return true;
     }
     
     @Nonnull

src/main/java/dan200/computercraft/shared/network/PacketHandler.java

@@ -35,7 +35,7 @@ public class PacketHandler
         {
             ComputerCraftPacket packet = new ComputerCraftPacket();
             packet.fromBytes( event.getPacket().payload() );
-            ComputerCraft.handlePacket( packet, ((NetHandlerPlayServer)event.getHandler()).playerEntity );
+            ComputerCraft.handlePacket( packet, ((NetHandlerPlayServer)event.getHandler()).player );
         }
         catch( Exception e )
         {

src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java

@@ -7,7 +7,6 @@
 package dan200.computercraft.shared.peripheral.commandblock;
 
 import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.lua.ILuaTask;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
@@ -55,52 +54,37 @@ public class CommandBlockPeripheral implements IPeripheral
             case 0:
             {
                 // getCommand
-                return context.executeMainThreadTask( new ILuaTask()
-                {
-                    @Override
-                    public Object[] execute() throws LuaException
-                    {
-                        return new Object[] {
-                            m_commandBlock.getCommandBlockLogic().getCommand()
-                        };
-                    }
+                return context.executeMainThreadTask( () -> new Object[] {
+                    m_commandBlock.getCommandBlockLogic().getCommand()
                 } );
             }
             case 1:
             {
                 // setCommand
                 final String command = getString( arguments, 0 );
-                context.issueMainThreadTask( new ILuaTask()
+                context.issueMainThreadTask( () ->
                 {
-                    @Override
-                    public Object[] execute() throws LuaException
-                    {
-                        BlockPos pos = m_commandBlock.getPos();
-                        m_commandBlock.getCommandBlockLogic().setCommand( command );
-                        m_commandBlock.getWorld().markBlockRangeForRenderUpdate( pos, pos );
-                        return null;
-                    }
+                    BlockPos pos = m_commandBlock.getPos();
+                    m_commandBlock.getCommandBlockLogic().setCommand( command );
+                    m_commandBlock.getWorld().markBlockRangeForRenderUpdate( pos, pos );
+                    return null;
                 } );
                 return null;
             }
             case 2:
             {
                 // runCommand
-                return context.executeMainThreadTask( new ILuaTask()
+                return context.executeMainThreadTask( () ->
                 {
-                    @Override
-                    public Object[] execute() throws LuaException
+                    m_commandBlock.getCommandBlockLogic().trigger( m_commandBlock.getWorld() );
+                    int result = m_commandBlock.getCommandBlockLogic().getSuccessCount();
+                    if( result > 0 )
                     {
-                        m_commandBlock.getCommandBlockLogic().trigger( m_commandBlock.getWorld() );
-                        int result = m_commandBlock.getCommandBlockLogic().getSuccessCount();
-                        if( result > 0 )
-                        {
-                            return new Object[] { true };
-                        }
-                        else
-                        {
-                            return new Object[] { false, "Command failed" };
-                        }
+                        return new Object[] { true };
+                    }
+                    else
+                    {
+                        return new Object[] { false, "Command failed" };
                     }
                 } );
             }
@@ -108,16 +92,6 @@ public class CommandBlockPeripheral implements IPeripheral
         return null;
     }
 
-    @Override
-    public void attach( @Nonnull IComputerAccess computer )
-    {    
-    }
-
-    @Override
-    public void detach( @Nonnull IComputerAccess computer )
-    {
-    }
-
     @Override
     public boolean equals( IPeripheral other )
     {

src/main/java/dan200/computercraft/shared/peripheral/common/BlockPeripheral.java

@@ -51,6 +51,7 @@ public class BlockPeripheral extends BlockPeripheralBase
         );
     }
 
+    @Override
     @Nonnull
     @SideOnly( Side.CLIENT)
     public BlockRenderLayer getBlockLayer()

src/main/java/dan200/computercraft/shared/peripheral/common/ItemAdvancedModem.java

@@ -10,7 +10,6 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.PeripheralType;
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 
@@ -51,8 +50,9 @@ public class ItemAdvancedModem extends ItemPeripheralBase
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
+    public void getSubItems( @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         list.add( PeripheralItemFactory.create( PeripheralType.AdvancedModem, null, 1 ) );
     }
 

src/main/java/dan200/computercraft/shared/peripheral/common/ItemCable.java

@@ -14,7 +14,6 @@ import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
@@ -62,8 +61,9 @@ public class ItemCable extends ItemPeripheralBase
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
+    public void getSubItems( @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         list.add( PeripheralItemFactory.create( PeripheralType.WiredModem, null, 1 ) );
         list.add( PeripheralItemFactory.create( PeripheralType.Cable, null, 1 ) );
     }
@@ -108,7 +108,7 @@ public class ItemCable extends ItemPeripheralBase
         }
 
         // Try to add on the side of something
-        if( !existing.isAir( existingState, world, pos ) && (type == PeripheralType.Cable || existing.isSideSolid( existingState, world, pos, side )) )
+        if( !existing.isAir( existingState, world, pos ) && (type == PeripheralType.Cable || existingState.isSideSolid( world, pos, side )) )
         {
             BlockPos offset = pos.offset( side );
             Block offsetExisting = world.getBlockState( offset ).getBlock();

src/main/java/dan200/computercraft/shared/peripheral/common/ItemPeripheral.java

@@ -10,12 +10,10 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.PeripheralType;
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 public class ItemPeripheral extends ItemPeripheralBase
 {
@@ -77,8 +75,9 @@ public class ItemPeripheral extends ItemPeripheralBase
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
+    public void getSubItems( @Nonnull CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         list.add( PeripheralItemFactory.create( PeripheralType.DiskDrive, null, 1 ) );
         list.add( PeripheralItemFactory.create( PeripheralType.Printer, null, 1 ) );
         list.add( PeripheralItemFactory.create( PeripheralType.Monitor, null, 1 ) );

src/main/java/dan200/computercraft/shared/peripheral/common/TilePeripheralBase.java

@@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ITickable;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
 
 import javax.annotation.Nonnull;
 import java.util.List;
@@ -46,7 +47,7 @@ public abstract class TilePeripheralBase extends TileGeneric
     }
 
     @Override
-    public void getDroppedItems( @Nonnull List<ItemStack> drops, boolean creative )
+    public void getDroppedItems( @Nonnull NonNullList<ItemStack> drops, boolean creative )
     {
         if( !creative )
         {

src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java

@@ -72,7 +72,7 @@ public class TileDiskDrive extends TilePeripheralBase
 
     public TileDiskDrive()
     {
-        m_computers = new HashMap<IComputerAccess, MountInfo>();
+        m_computers = new HashMap<>();
 
         m_diskStack = ItemStack.EMPTY;
         m_diskMount = null;

src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java

@@ -30,6 +30,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
@@ -130,7 +131,7 @@ public class TileCable extends TileModemBase
                     synchronized( m_entity.m_peripheralsByName )
                     {
                         int idx = 1;
-                        Map<Object,Object> table = new HashMap<Object,Object>();
+                        Map<Object,Object> table = new HashMap<>();
                         for( String name : m_entity.m_peripheralWrappersByName.keySet() )
                         {
                             table.put( idx++, name );
@@ -160,7 +161,7 @@ public class TileCable extends TileModemBase
                     String[] methodNames = m_entity.getMethodNamesRemote( getString( arguments, 0 ) );
                     if( methodNames != null )
                     {
-                        Map<Object,Object> table = new HashMap<Object,Object>();
+                        Map<Object,Object> table = new HashMap<>();
                         for(int i=0; i<methodNames.length; ++i ) {
                             table.put( i+1, methodNames[i] );
                         }
@@ -246,14 +247,14 @@ public class TileCable extends TileModemBase
     
     public TileCable()
     {
-        m_receivers = new HashSet<IPacketReceiver>();
-        m_transmitQueue = new LinkedList<PacketWrapper>();
+        m_receivers = new HashSet<>();
+        m_transmitQueue = new LinkedList<>();
         
         m_peripheralAccessAllowed = false;
         m_attachedPeripheralID = -1;
         
-        m_peripheralsByName = new HashMap<String, IPeripheral>();
-        m_peripheralWrappersByName = new HashMap<String, RemotePeripheralWrapper>();
+        m_peripheralsByName = new HashMap<>();
+        m_peripheralWrappersByName = new HashMap<>();
         m_peripheralsKnown = false;
         m_destroyed = false;
         
@@ -298,7 +299,7 @@ public class TileCable extends TileModemBase
     }
 
     @Override
-    public void getDroppedItems( @Nonnull List<ItemStack> drops, boolean creative )
+    public void getDroppedItems( @Nonnull NonNullList<ItemStack> drops, boolean creative )
     {
         if( !creative )
         {
@@ -684,13 +685,11 @@ public class TileCable extends TileModemBase
             if( !m_destroyed )
             {
                 // If this modem is alive, rebuild the network
-                searchNetwork( new ICableVisitor() {
-                    public void visit( TileCable modem, int distance )
+                searchNetwork( ( modem, distance ) ->
+                {
+                    synchronized( modem.m_peripheralsByName )
                     {
-                        synchronized( modem.m_peripheralsByName )
-                        {
-                            modem.m_peripheralsKnown = false;
-                        }
+                        modem.m_peripheralsKnown = false;
                     }
                 } );
             }
@@ -732,13 +731,11 @@ public class TileCable extends TileModemBase
         
     private void dispatchPacket( final PacketWrapper packet )
     {
-        searchNetwork( new ICableVisitor() {
-            public void visit( TileCable modem, int distance )
+        searchNetwork( ( modem, distance ) ->
+        {
+            if( distance <= packet.m_range)
             {
-                if( distance <= packet.m_range)
-                {
-                    modem.receivePacket( packet.m_packet, distance );
-                }
+                modem.receivePacket( packet.m_packet, distance );
             }
         } );
     }
@@ -777,7 +774,7 @@ public class TileCable extends TileModemBase
             assert( m_type != null );
             assert( m_methods != null );
             
-            m_methodMap = new HashMap<String, Integer>();
+            m_methodMap = new HashMap<>();
             for( int i=0; i<m_methods.length; ++i ) {
                 if( m_methods[i] != null ) {
                     m_methodMap.put( m_methods[i], i );
@@ -875,22 +872,20 @@ public class TileCable extends TileModemBase
         synchronized( m_peripheralsByName )
         {
             // Collect the peripherals
-            final Map<String, IPeripheral> newPeripheralsByName = new HashMap<String, IPeripheral>();
+            final Map<String, IPeripheral> newPeripheralsByName = new HashMap<>();
             if( getPeripheralType() == PeripheralType.WiredModemWithCable )
             {
-                searchNetwork( new ICableVisitor() {
-                    public void visit( TileCable modem, int distance )
+                searchNetwork( ( modem, distance ) ->
+                {
+                if( modem != origin )
+                {
+                    IPeripheral peripheral = modem.getConnectedPeripheral();
+                    String periphName = modem.getConnectedPeripheralName();
+                    if( peripheral != null && periphName != null )
                     {
-                    if( modem != origin )
-                    {
-                        IPeripheral peripheral = modem.getConnectedPeripheral();
-                        String periphName = modem.getConnectedPeripheralName();
-                        if( peripheral != null && periphName != null )
-                        {
-                            newPeripheralsByName.put( periphName, peripheral );
-                        }
-                    }
+                        newPeripheralsByName.put( periphName, peripheral );
                     }
+                }
                 } );
             }
             //System.out.println( newPeripheralsByName.size()+" peripherals discovered" );
@@ -1034,7 +1029,7 @@ public class TileCable extends TileModemBase
     private void searchNetwork( ICableVisitor visitor )
     {
         int searchID = ++s_nextUniqueSearchID;
-        Queue<SearchLoc> queue = new LinkedList<SearchLoc>();
+        Queue<SearchLoc> queue = new LinkedList<>();
         enqueue( queue, getWorld(), getPos(), 1 );
         
         int visited = 0;

src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java

@@ -46,9 +46,9 @@ public abstract class WirelessModemPeripheral extends ModemPeripheral
                     minRange = (double) ComputerCraft.modem_rangeDuringStorm;
                     maxRange = (double) ComputerCraft.modem_highAltitudeRangeDuringStorm;
                 }
-                if( position.yCoord > 96.0 && maxRange > minRange )
+                if( position.y > 96.0 && maxRange > minRange )
                 {
-                    return minRange + ( position.yCoord - 96.0 ) * ( ( maxRange - minRange ) / ( ( world.getHeight() - 1 ) - 96.0 ) );
+                    return minRange + ( position.y - 96.0 ) * ( ( maxRange - minRange ) / ( ( world.getHeight() - 1 ) - 96.0 ) );
                 }
                 return minRange;
             }

src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessNetwork.java

@@ -38,7 +38,7 @@ public class WirelessNetwork implements IPacketNetwork
 
     private WirelessNetwork()
     {
-        m_receivers = new HashSet<IPacketReceiver>();
+        m_receivers = new HashSet<>();
     }
 
     @Override

src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java

@@ -65,7 +65,7 @@ public class TileMonitor extends TilePeripheralBase
 
     public TileMonitor()
     {
-        m_computers = new HashSet<IComputerAccess>();
+        m_computers = new HashSet<>();
 
         m_destroyed = false;
         m_ignoreMe = false;

src/main/java/dan200/computercraft/shared/peripheral/printer/ContainerPrinter.java

@@ -66,7 +66,7 @@ public class ContainerPrinter extends Container
     public void addListener( IContainerListener crafting )
     {
         super.addListener( crafting );
-        crafting.sendProgressBarUpdate( this, 0, m_printer.isPrinting() ? 1 : 0 );
+        crafting.sendWindowProperty( this, 0, m_printer.isPrinting() ? 1 : 0 );
     }
     
     @Override
@@ -81,7 +81,7 @@ public class ContainerPrinter extends Container
             {
                 if( printing != m_lastPrinting )
                 {
-                    listener.sendProgressBarUpdate( this, 0, printing ? 1 : 0 );
+                    listener.sendWindowProperty( this, 0, printing ? 1 : 0 );
                 }
             }
             m_lastPrinting = printing;

src/main/java/dan200/computercraft/shared/peripheral/printer/PrinterPeripheral.java

@@ -131,16 +131,6 @@ public class PrinterPeripheral implements IPeripheral
         }
     }
 
-    @Override
-    public void attach( @Nonnull IComputerAccess computer )
-    {
-    }
-
-    @Override
-    public void detach( @Nonnull IComputerAccess computer )
-    {
-    }
-
     @Override
     public boolean equals( IPeripheral other )
     {

src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java

@@ -75,17 +75,6 @@ public class SpeakerPeripheral implements IPeripheral {
         }
     }
 
-
-    @Override
-    public void attach( @Nonnull IComputerAccess computerAccess )
-    {
-    }
-
-    @Override
-    public void detach( @Nonnull IComputerAccess computerAccess )
-    {
-    }
-
     @Nonnull
     @Override
     public String getType()

src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java

@@ -32,6 +32,7 @@ public class TileSpeaker extends TilePeripheralBase
 
     // IPeripheralTile implementation
 
+    @Override
     public IPeripheral getPeripheral( EnumFacing side )
     {
         return m_peripheral;

src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java

@@ -8,7 +8,6 @@ package dan200.computercraft.shared.pocket.apis;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.lua.ILuaTask;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.core.apis.ILuaAPI;
@@ -72,84 +71,76 @@ public class PocketAPI implements ILuaAPI
         {
             case 0:
                 // equipBack
-                return context.executeMainThreadTask( new ILuaTask()
+                return context.executeMainThreadTask( () ->
                 {
-                    @Override
-                    public Object[] execute() throws LuaException
+                    if( !(m_computer.getEntity() instanceof EntityPlayer) )
                     {
-                        if( !(m_computer.getEntity() instanceof EntityPlayer) )
-                        {
-                            throw new LuaException( "Cannot find player" );
-                        }
-
-                        EntityPlayer player = (EntityPlayer) m_computer.getEntity();
-                        InventoryPlayer inventory = player.inventory;
-
-                        IPocketUpgrade previousUpgrade = m_computer.getUpgrade();
-
-                        // Attempt to find the upgrade, starting in the main segment, and then looking in the opposite
-                        // one. We start from the position the item is currently in and loop round to the start.
-                        IPocketUpgrade newUpgrade = findUpgrade( inventory.mainInventory, inventory.currentItem, previousUpgrade );
-                        if( newUpgrade == null )
-                        {
-                            newUpgrade = findUpgrade( inventory.offHandInventory, 0, previousUpgrade );
-                        }
-                        if( newUpgrade == null ) throw new LuaException( "Cannot find a valid upgrade" );
-
-                        // Remove the current upgrade
-                        if( previousUpgrade != null )
-                        {
-                            ItemStack stack = previousUpgrade.getCraftingItem();
-                            if( !stack.isEmpty() )
-                            {
-                                stack = InventoryUtil.storeItems( stack, new PlayerMainInvWrapper( inventory ), inventory.currentItem );
-                                if( !stack.isEmpty() )
-                                {
-                                    WorldUtil.dropItemStack( stack, player.getEntityWorld(), player.posX, player.posY, player.posZ );
-                                }
-                            }
-                        }
-
-                        // Set the new upgrade
-                        m_computer.setUpgrade( newUpgrade );
-
-                        return null;
+                        throw new LuaException( "Cannot find player" );
                     }
-                } );
 
-            case 1:
-                // unequipBack
-                return context.executeMainThreadTask( new ILuaTask()
-                {
-                    @Override
-                    public Object[] execute() throws LuaException
+                    EntityPlayer player = (EntityPlayer) m_computer.getEntity();
+                    InventoryPlayer inventory = player.inventory;
+
+                    IPocketUpgrade previousUpgrade = m_computer.getUpgrade();
+
+                    // Attempt to find the upgrade, starting in the main segment, and then looking in the opposite
+                    // one. We start from the position the item is currently in and loop round to the start.
+                    IPocketUpgrade newUpgrade = findUpgrade( inventory.mainInventory, inventory.currentItem, previousUpgrade );
+                    if( newUpgrade == null )
                     {
-                        if( !(m_computer.getEntity() instanceof EntityPlayer) )
-                        {
-                            throw new LuaException( "Cannot find player" );
-                        }
-
-                        EntityPlayer player = (EntityPlayer) m_computer.getEntity();
-                        InventoryPlayer inventory = player.inventory;
-
-                        IPocketUpgrade previousUpgrade = m_computer.getUpgrade();
-
-                        if( previousUpgrade == null ) throw new LuaException( "Nothing to unequip" );
-
-                        m_computer.setUpgrade( null );
+                        newUpgrade = findUpgrade( inventory.offHandInventory, 0, previousUpgrade );
+                    }
+                    if( newUpgrade == null ) throw new LuaException( "Cannot find a valid upgrade" );
 
+                    // Remove the current upgrade
+                    if( previousUpgrade != null )
+                    {
                         ItemStack stack = previousUpgrade.getCraftingItem();
                         if( !stack.isEmpty() )
                         {
                             stack = InventoryUtil.storeItems( stack, new PlayerMainInvWrapper( inventory ), inventory.currentItem );
-                            if( stack.isEmpty() )
+                            if( !stack.isEmpty() )
                             {
                                 WorldUtil.dropItemStack( stack, player.getEntityWorld(), player.posX, player.posY, player.posZ );
                             }
                         }
-
-                        return null;
                     }
+
+                    // Set the new upgrade
+                    m_computer.setUpgrade( newUpgrade );
+
+                    return null;
+                } );
+
+            case 1:
+                // unequipBack
+                return context.executeMainThreadTask( () ->
+                {
+                    if( !(m_computer.getEntity() instanceof EntityPlayer) )
+                    {
+                        throw new LuaException( "Cannot find player" );
+                    }
+
+                    EntityPlayer player = (EntityPlayer) m_computer.getEntity();
+                    InventoryPlayer inventory = player.inventory;
+
+                    IPocketUpgrade previousUpgrade = m_computer.getUpgrade();
+
+                    if( previousUpgrade == null ) throw new LuaException( "Nothing to unequip" );
+
+                    m_computer.setUpgrade( null );
+
+                    ItemStack stack = previousUpgrade.getCraftingItem();
+                    if( !stack.isEmpty() )
+                    {
+                        stack = InventoryUtil.storeItems( stack, new PlayerMainInvWrapper( inventory ), inventory.currentItem );
+                        if( stack.isEmpty() )
+                        {
+                            WorldUtil.dropItemStack( stack, player.getEntityWorld(), player.posX, player.posY, player.posZ );
+                        }
+                    }
+
+                    return null;
                 } );
             default:
                 return null;

src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java

@@ -20,6 +20,7 @@ import dan200.computercraft.shared.computer.items.IComputerItem;
 import dan200.computercraft.shared.pocket.apis.PocketAPI;
 import dan200.computercraft.shared.pocket.core.PocketServerComputer;
 import dan200.computercraft.shared.util.StringUtil;
+import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -86,8 +87,9 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
     }
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, CreativeTabs tabs, NonNullList<ItemStack> list )
+    public void getSubItems( @Nonnull CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         getSubItems( list, ComputerFamily.Normal );
         getSubItems( list, ComputerFamily.Advanced );
     }
@@ -182,7 +184,7 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
 
             if( !stop ) ComputerCraft.openPocketComputerGUI( player, hand );
         }
-        return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, stack );
+        return new ActionResult<>( EnumActionResult.SUCCESS, stack );
     }
 
     @Nonnull
@@ -223,9 +225,9 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
     }
 
     @Override
-    public void addInformation( @Nonnull ItemStack stack, EntityPlayer player, List<String> list, boolean debug )
+    public void addInformation( @Nonnull ItemStack stack, World world, List<String> list, ITooltipFlag flag )
     {
-        if( debug )
+        if( flag.isAdvanced() )
         {
             int id = getComputerID( stack );
             if( id >= 0 )

src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModem.java

@@ -9,7 +9,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -79,10 +78,4 @@ public class PocketModem implements IPocketUpgrade
             access.setLight( modem.isActive() ? 0xBA0000 : -1 );
         }
     }
-
-    @Override
-    public boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
-    {
-        return false;
-    }
 }

src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeaker.java

@@ -15,7 +15,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -76,12 +75,4 @@ public class PocketSpeaker implements IPocketUpgrade
             speaker.update();
         }
     }
-
-    @Override
-    public boolean onRightClick(@Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
-    {
-        return false;
-    }
-
-
 }

src/main/java/dan200/computercraft/shared/pocket/recipes/PocketComputerUpgradeRecipe.java

@@ -17,19 +17,26 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.registries.IForgeRegistryEntry;
 
 import javax.annotation.Nonnull;
 
-public class PocketComputerUpgradeRecipe implements IRecipe
+public class PocketComputerUpgradeRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe
 {
     public PocketComputerUpgradeRecipe()
     {
     }
 
     @Override
-    public int getRecipeSize()
+    public boolean canFit( int x, int y )
     {
-        return 2;
+        return x >= 2 && y >= 2;
+    }
+
+    @Override
+    public boolean isHidden()
+    {
+        return true;
     }
 
     @Nonnull

src/main/java/dan200/computercraft/shared/proxy/CCTurtleProxyCommon.java

@@ -8,10 +8,7 @@ package dan200.computercraft.shared.proxy;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.core.computer.Computer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.items.ComputerItemFactory;
-import dan200.computercraft.shared.peripheral.speaker.SpeakerPeripheral;
 import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
 import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.blocks.TileTurtleAdvanced;
@@ -21,7 +18,6 @@ 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.TurtleItemFactory;
-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.IEntityDropConsumer;
@@ -30,22 +26,19 @@ import dan200.computercraft.shared.util.InventoryUtil;
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
-import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.RecipeSorter;
+import net.minecraftforge.registries.IForgeRegistry;
 
 import javax.annotation.Nonnull;
 import java.util.*;
@@ -58,9 +51,9 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
 
     public CCTurtleProxyCommon()
     {
-        m_legacyTurtleUpgrades = new HashMap<Integer, ITurtleUpgrade>();
-        m_turtleUpgrades = new HashMap<String, ITurtleUpgrade>();
-        m_dropConsumers = new WeakHashMap<Entity, IEntityDropConsumer>();
+        m_legacyTurtleUpgrades = new HashMap<>();
+        m_turtleUpgrades = new HashMap<>();
+        m_dropConsumers = new WeakHashMap<>();
     }
     
     // ICCTurtleProxy implementation
@@ -68,11 +61,18 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
     @Override        
     public void preInit()
     {
+        MinecraftForge.EVENT_BUS.register( this );
+
         EntityRegistry.registerModEntity(
             new ResourceLocation( ComputerCraft.MOD_ID, "turtle_player" ), TurtlePlayer.class, "turtle_player",
             0, ComputerCraft.instance, Integer.MAX_VALUE, Integer.MAX_VALUE, false
         );
-        registerItems();
+
+        registerUpgrades();
+
+        // Recipe types
+        // RecipeSorter.register( "computercraft:turtle", TurtleRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shapeless" );
+        // RecipeSorter.register( "computercraft:turtle_upgrade", TurtleUpgradeRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shapeless" );
     }
     
     @Override        
@@ -264,12 +264,48 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
             m_legacyTurtleUpgrades.put( legacyID, upgrade );
         }
         m_turtleUpgrades.put( id, upgrade );
+    }
+
+    @SubscribeEvent
+    public void registerBlocks( RegistryEvent.Register<Block> event )
+    {
+        IForgeRegistry<Block> registry = event.getRegistry();
+
+        // Turtle
+        ComputerCraft.Blocks.turtle = BlockTurtle.createTurtleBlock();
+        registry.register( ComputerCraft.Blocks.turtle.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ) ) );
+
+        ComputerCraft.Blocks.turtleExpanded = BlockTurtle.createTurtleBlock();
+        registry.register( ComputerCraft.Blocks.turtleExpanded.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_expanded" ) ) );
+
+        // Advanced Turtle
+        ComputerCraft.Blocks.turtleAdvanced = BlockTurtle.createTurtleBlock();
+        registry.register( ComputerCraft.Blocks.turtleAdvanced.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ) ) );
+    }
+
+    @SubscribeEvent
+    public void registerItems( RegistryEvent.Register<Item> event )
+    {
+        IForgeRegistry<Item> registry = event.getRegistry();
+
+        registry.register( new ItemTurtleLegacy( ComputerCraft.Blocks.turtle).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ) ) );
+        registry.register( new ItemTurtleNormal( ComputerCraft.Blocks.turtleExpanded ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_expanded" ) ) );
+        registry.register( new ItemTurtleAdvanced( ComputerCraft.Blocks.turtleAdvanced ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "turtle_advanced" ) ) );
+    }
+
+    @SubscribeEvent
+    public void registerRecipes( RegistryEvent.Register<IRecipe> event )
+    {
+        IForgeRegistry<IRecipe> registry = event.getRegistry();
+        registry.register( new TurtleUpgradeRecipe().setRegistryName( new ResourceLocation( "computercraft:turtle" ) ) );
 
         // Add a bunch of impostor recipes
-        if( isUpgradeVanilla( upgrade )  )
+        // TODO: Figure out a way to do this in a "nice" way.
+        for( ITurtleUpgrade upgrade : m_turtleUpgrades.values() )
         {
+            if( !isUpgradeVanilla( upgrade ) ) continue;
+
             // Add fake recipes to fool NEI
-            List<IRecipe> recipeList = CraftingManager.getInstance().getRecipeList();
             ItemStack craftingItem = upgrade.getCraftingItem();
 
             // A turtle just containing this upgrade
@@ -285,22 +321,29 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
                 {
                     ItemStack craftedTurtle = TurtleItemFactory.create( -1, null, -1, family, upgrade, null, 0, null );
                     ItemStack craftedTurtleFlipped = TurtleItemFactory.create( -1, null, -1, family, null, upgrade, 0, null );
-                    recipeList.add( new ImpostorRecipe( 2, 1, new ItemStack[] { baseTurtle, craftingItem }, craftedTurtle ) );
-                    recipeList.add( new ImpostorRecipe( 2, 1, new ItemStack[] { craftingItem, baseTurtle }, craftedTurtleFlipped ) );
+                    registry.register(
+                        new ImpostorRecipe( "computercraft:" + family.toString() + "_turtle_upgrade", 2, 1, new ItemStack[] { baseTurtle, craftingItem }, craftedTurtle )
+                            .setRegistryName( new ResourceLocation( "computercraft:" + family + "_turtle_upgrade_" + upgrade.getUpgradeID().toString().replace( ':', '_' ) + "_1" ) )
+                    );
+                    registry.register(
+                        new ImpostorRecipe( "computercraft:" + family.toString() + "_turtle_upgrade", 2, 1, new ItemStack[] { craftingItem, baseTurtle }, craftedTurtleFlipped )
+                            .setRegistryName( new ResourceLocation( "computercraft:" + family + "_turtle_upgrade_" + upgrade.getUpgradeID().toString().replace( ':', '_' ) + "_2" ) )
+                    );
 
+                    /*
                     // A turtle containing this upgrade and another upgrade
                     for( ITurtleUpgrade otherUpgrade : m_turtleUpgrades.values() )
                     {
                         if( isUpgradeVanilla( otherUpgrade ) && isUpgradeSuitableForFamily( family, otherUpgrade ) )
                         {
                             ItemStack otherCraftingItem = otherUpgrade.getCraftingItem();
-
+    
                             ItemStack otherCraftedTurtle = TurtleItemFactory.create( -1, null, -1, family, null, otherUpgrade, 0, null );
                             ItemStack comboCraftedTurtle = TurtleItemFactory.create( -1, null, -1, family, upgrade, otherUpgrade, 0, null );
-
+    
                             ItemStack otherCraftedTurtleFlipped = TurtleItemFactory.create( -1, null, -1, family, otherUpgrade, null, 0, null );
                             ItemStack comboCraftedTurtleFlipped = TurtleItemFactory.create( -1, null, -1, family, otherUpgrade, upgrade, 0, null );
-
+    
                             recipeList.add( new ImpostorRecipe( 2, 1, new ItemStack[] { otherCraftingItem, craftedTurtle }, comboCraftedTurtle ) );
                             recipeList.add( new ImpostorRecipe( 2, 1, new ItemStack[] { otherCraftedTurtle, craftingItem }, comboCraftedTurtle ) );
                             recipeList.add( new ImpostorRecipe( 2, 1, new ItemStack[] { craftedTurtleFlipped, otherCraftingItem }, comboCraftedTurtleFlipped ) );
@@ -309,67 +352,14 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
                             recipeList.add( new ImpostorRecipe( 3, 1, new ItemStack[] { craftingItem, baseTurtle, otherCraftingItem }, comboCraftedTurtleFlipped ) );
                         }
                     }
+                    */
                 }
             }
         }
     }
-    
-    private void registerItems()
+
+    private void registerUpgrades()
     {
-        // Blocks
-        // Turtle
-        ComputerCraft.Blocks.turtle = BlockTurtle.createTurtleBlock();
-        registerBlock( ComputerCraft.Blocks.turtle, new ItemTurtleLegacy(ComputerCraft.Blocks.turtle), "turtle" );
-
-        ComputerCraft.Blocks.turtleExpanded = BlockTurtle.createTurtleBlock();
-        registerBlock( ComputerCraft.Blocks.turtleExpanded, new ItemTurtleNormal( ComputerCraft.Blocks.turtleExpanded ), "turtle_expanded" );
-
-        // Advanced Turtle
-        ComputerCraft.Blocks.turtleAdvanced = BlockTurtle.createTurtleBlock();
-        registerBlock( ComputerCraft.Blocks.turtleAdvanced, new ItemTurtleAdvanced( ComputerCraft.Blocks.turtleAdvanced ), "turtle_advanced" );
-
-        // Recipe types
-        RecipeSorter.register( "computercraft:turtle", TurtleRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shapeless" );
-        RecipeSorter.register( "computercraft:turtle_upgrade", TurtleUpgradeRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shapeless" );
-
-        // Recipes
-        // Turtle
-        GameRegistry.addRecipe( new TurtleRecipe( new Item[] {
-            Items.IRON_INGOT, Items.IRON_INGOT, Items.IRON_INGOT,
-            Items.IRON_INGOT, Item.getItemFromBlock( ComputerCraft.Blocks.computer ), Items.IRON_INGOT,
-            Items.IRON_INGOT, Item.getItemFromBlock( Blocks.CHEST ), Items.IRON_INGOT,
-        }, ComputerFamily.Normal ) );
-        GameRegistry.addRecipe( new TurtleUpgradeRecipe() );
-
-        // Impostor Turtle recipe (to fool NEI)
-        ItemStack iron = new ItemStack( Items.IRON_INGOT, 1 );
-        GameRegistry.addRecipe( new ImpostorRecipe( 3, 3,
-            new ItemStack[] {
-                iron, iron, iron,
-                iron, ComputerItemFactory.create( -1, null, ComputerFamily.Normal ), iron,
-                iron, new ItemStack( Blocks.CHEST, 1 ), iron,
-            },
-            TurtleItemFactory.create( -1, null, -1, ComputerFamily.Normal, null, null, 0, null )
-        ) );
-
-        // Advanced Turtle
-        GameRegistry.addRecipe( new TurtleRecipe( new Item[] {
-            Items.GOLD_INGOT, Items.GOLD_INGOT, Items.GOLD_INGOT,
-            Items.GOLD_INGOT, Item.getItemFromBlock( ComputerCraft.Blocks.computer ), Items.GOLD_INGOT,
-            Items.GOLD_INGOT, Item.getItemFromBlock( Blocks.CHEST ), Items.GOLD_INGOT,
-        }, ComputerFamily.Advanced ) );
-
-        // Impostor Advanced Turtle recipe (to fool NEI)
-        ItemStack gold = new ItemStack( Items.GOLD_INGOT, 1 );
-        GameRegistry.addRecipe( new ImpostorRecipe( 3, 3,
-            new ItemStack[] {
-                gold, gold, gold,
-                gold, ComputerItemFactory.create( -1, null, ComputerFamily.Advanced ), gold,
-                gold, new ItemStack( Blocks.CHEST, 1 ), gold,
-            },
-            TurtleItemFactory.create( -1, null, -1, ComputerFamily.Advanced, null, null, 0, null )
-        ) );
-
         // Upgrades
         ComputerCraft.Upgrades.wirelessModem =  new TurtleModem( false, new ResourceLocation( "computercraft", "wireless_modem" ), 1 );
         registerTurtleUpgradeInternal( ComputerCraft.Upgrades.wirelessModem );
@@ -397,63 +387,64 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
 
         ComputerCraft.Upgrades.turtleSpeaker = new TurtleSpeaker( new ResourceLocation( "computercraft", "speaker" ), 8 );
         registerTurtleUpgradeInternal( ComputerCraft.Upgrades.turtleSpeaker );
-
     }
 
-    @Override
-    public void remap( FMLMissingMappingsEvent mappings )
+    @SubscribeEvent
+    public void remapItems( RegistryEvent.MissingMappings<Item> mappings )
     {
-        // We have to use mappings.getAll() as the mod ID is upper case but the domain lower.
-        for( FMLMissingMappingsEvent.MissingMapping mapping : mappings.getAll() )
+        // 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.resourceLocation.getResourceDomain();
+            String domain = mapping.key.getResourceDomain();
             if( !domain.equalsIgnoreCase( ComputerCraft.MOD_ID ) ) continue;
 
-            String key = mapping.resourceLocation.getResourcePath();
+            String key = mapping.key.getResourcePath();
             if( key.equalsIgnoreCase( "CC-Turtle" ) )
             {
-                remap( mapping, ComputerCraft.Blocks.turtle );
+                mapping.remap( Item.getItemFromBlock( ComputerCraft.Blocks.turtle ) );
             }
             else if( key.equalsIgnoreCase( "CC-TurtleExpanded" ) )
             {
-                remap( mapping, ComputerCraft.Blocks.turtleExpanded );
+                mapping.remap( Item.getItemFromBlock( ComputerCraft.Blocks.turtleExpanded ) );
             }
             else if( key.equalsIgnoreCase( "CC-TurtleAdvanced" ) )
             {
-                remap( mapping, ComputerCraft.Blocks.turtleAdvanced );
+                mapping.remap( Item.getItemFromBlock( ComputerCraft.Blocks.turtleAdvanced ) );
             }
         }
     }
 
-    private static void remap( FMLMissingMappingsEvent.MissingMapping mapping, Block block )
+    @SubscribeEvent
+    public void remapBlocks( RegistryEvent.MissingMappings<Block> mappings )
     {
-        if( mapping.type == GameRegistry.Type.BLOCK )
+        // 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() )
         {
-            mapping.remap( block );
-        }
-        else
-        {
-            mapping.remap( Item.getItemFromBlock( block ) );
-        }
-    }
+            String domain = mapping.key.getResourceDomain();
+            if( !domain.equalsIgnoreCase( ComputerCraft.MOD_ID ) ) continue;
 
-    private void registerBlock( Block block, Item item, String name )
-    {
-        GameRegistry.register( block.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, name ) ) );
-        GameRegistry.register( item.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, name ) ) );
-    }
-
-    private void registerTileEntity( Class<? extends TileEntity> klass, String name )
-    {
-        GameRegistry.registerTileEntityWithAlternatives( klass, ComputerCraft.LOWER_ID + " : " + name, name );
+            String key = mapping.key.getResourcePath();
+            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 );
+            }
+        }
     }
 
     private void registerTileEntities()
     {
         // TileEntities
-        registerTileEntity( TileTurtle.class, "turtle" );
-        registerTileEntity( TileTurtleExpanded.class, "turtleex" );
-        registerTileEntity( TileTurtleAdvanced.class, "turtleadv" );
+        GameRegistry.registerTileEntity( TileTurtle.class, ComputerCraft.LOWER_ID + " : " + "turtle" );
+        GameRegistry.registerTileEntity( TileTurtleExpanded.class, ComputerCraft.LOWER_ID + " : " + "turtleex" );
+        GameRegistry.registerTileEntity( TileTurtleAdvanced.class, ComputerCraft.LOWER_ID + " : " + "turtleadv" );
     }
     
     private void registerForgeHandlers()
@@ -484,7 +475,7 @@ public abstract class CCTurtleProxyCommon implements ICCTurtleProxy
             // All checks have passed, lets dispatch the drops
             for(EntityItem entityItem : drops)
             {
-                consumer.consumeDrop( entity, entityItem.getEntityItem() );
+                consumer.consumeDrop( entity, entityItem.getItem() );
             }
             drops.clear();
         }

src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java

@@ -20,7 +20,6 @@ import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
-import dan200.computercraft.shared.computer.items.ComputerItemFactory;
 import dan200.computercraft.shared.computer.items.ItemCommandComputer;
 import dan200.computercraft.shared.computer.items.ItemComputer;
 import dan200.computercraft.shared.media.common.DefaultMediaProvider;
@@ -32,7 +31,6 @@ import dan200.computercraft.shared.media.items.ItemTreasureDisk;
 import dan200.computercraft.shared.media.recipes.DiskRecipe;
 import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
 import dan200.computercraft.shared.network.ComputerCraftPacket;
-import dan200.computercraft.shared.peripheral.PeripheralType;
 import dan200.computercraft.shared.peripheral.commandblock.CommandBlockPeripheralProvider;
 import dan200.computercraft.shared.peripheral.common.*;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
@@ -59,31 +57,28 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemRecord;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.IThreadListener;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
-import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.common.network.FMLNetworkEvent;
 import net.minecraftforge.fml.common.network.IGuiHandler;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.oredict.RecipeSorter;
+import net.minecraftforge.registries.IForgeRegistry;
 
 import javax.annotation.Nonnull;
 import java.io.File;
@@ -99,7 +94,18 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
     @Override
     public void preInit()
     {
-        registerItems();
+        MinecraftForge.EVENT_BUS.register( this );
+
+        // Creative tab
+        ComputerCraft.mainCreativeTab = new CreativeTabMain( CreativeTabs.getNextID() );
+
+        // Recipe types
+        // RecipeSorter.register( "computercraft:impostor", ImpostorRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shapeless" );
+        // RecipeSorter.register( "computercraft:impostor_shapeless", ImpostorShapelessRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
+        // RecipeSorter.register( "computercraft:disk", DiskRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
+        // RecipeSorter.register( "computercraft:colour", ColourableRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
+        // RecipeSorter.register( "computercraft:printout", PrintoutRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
+        // RecipeSorter.register( "computercraft:pocket_computer_upgrade", PocketComputerUpgradeRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
     }
 
     @Override
@@ -159,6 +165,7 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
     @Override
     public abstract Object getPocketComputerGUI( EntityPlayer player, EnumHand hand );
 
+    @Override
     public abstract File getWorldDir( World world );
 
     @Override
@@ -172,14 +179,7 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
                 processPacket( packet, player );
             } else
             {
-                listener.addScheduledTask( new Runnable()
-                {
-                    @Override
-                    public void run()
-                    {
-                        processPacket( packet, player );
-                    }
-                } );
+                listener.addScheduledTask( () -> processPacket( packet, player ) );
             }
         }
     }
@@ -228,224 +228,117 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
         }
     }
 
-    private void registerItems()
+    @SubscribeEvent
+    public void registerBlocks( RegistryEvent.Register<Block> event )
     {
-        // Creative tab
-        ComputerCraft.mainCreativeTab = new CreativeTabMain( CreativeTabs.getNextID() );
+        IForgeRegistry<Block> registry = event.getRegistry();
 
-        // Blocks
         // Computer
         ComputerCraft.Blocks.computer = new BlockComputer();
-        registerBlock( ComputerCraft.Blocks.computer, new ItemComputer( ComputerCraft.Blocks.computer ), "computer" );
+        registry.register( ComputerCraft.Blocks.computer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ) );
 
         // Peripheral
         ComputerCraft.Blocks.peripheral = new BlockPeripheral();
-        registerBlock( ComputerCraft.Blocks.peripheral, new ItemPeripheral( ComputerCraft.Blocks.peripheral ), "peripheral" );
+        registry.register( ComputerCraft.Blocks.peripheral.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "peripheral" ) ) );
 
         // Cable
         ComputerCraft.Blocks.cable = new BlockCable();
-        registerBlock( ComputerCraft.Blocks.cable, new ItemCable( ComputerCraft.Blocks.cable ), "cable" );
+        registry.register( ComputerCraft.Blocks.cable.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "cable" ) ) );
 
         // Command Computer
         ComputerCraft.Blocks.commandComputer = new BlockCommandComputer();
-        registerBlock( ComputerCraft.Blocks.commandComputer, new ItemCommandComputer( ComputerCraft.Blocks.commandComputer ), "command_computer" );
+        registry.register( ComputerCraft.Blocks.commandComputer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "command_computer" ) ) );
 
         // Command Computer
         ComputerCraft.Blocks.advancedModem = new BlockAdvancedModem();
-        registerBlock( ComputerCraft.Blocks.advancedModem, new ItemAdvancedModem( ComputerCraft.Blocks.advancedModem ), "advanced_modem" );
+        registry.register( ComputerCraft.Blocks.advancedModem.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "advanced_modem" ) ) );
+    }
+
+    @SubscribeEvent
+    public void registerItems( RegistryEvent.Register<Item> event )
+    {
+        IForgeRegistry<Item> registry = event.getRegistry();
+
+        // Computer
+        registry.register( new ItemComputer( ComputerCraft.Blocks.computer ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ) );
+
+        // Peripheral
+        registry.register( new ItemPeripheral( ComputerCraft.Blocks.peripheral ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "peripheral" ) ) );
+
+        // Cable
+        registry.register( new ItemCable( ComputerCraft.Blocks.cable ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "cable" ) ) );
+
+        // Command Computer
+        registry.register( new ItemCommandComputer( ComputerCraft.Blocks.commandComputer ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "command_computer" ) ) );
+
+        // Command Computer
+        registry.register( new ItemAdvancedModem( ComputerCraft.Blocks.advancedModem ).setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "advanced_modem" ) ) );
 
         // Items
         // Floppy Disk
         ComputerCraft.Items.disk = new ItemDiskLegacy();
-        GameRegistry.register( ComputerCraft.Items.disk.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk" ) ) );
+        registry.register( ComputerCraft.Items.disk.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk" ) ) );
 
         ComputerCraft.Items.diskExpanded = new ItemDiskExpanded();
-        GameRegistry.register( ComputerCraft.Items.diskExpanded.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk_expanded" ) ) );
+        registry.register( ComputerCraft.Items.diskExpanded.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "disk_expanded" ) ) );
 
         // Treasure Disk
         ComputerCraft.Items.treasureDisk = new ItemTreasureDisk();
-        GameRegistry.register( ComputerCraft.Items.treasureDisk.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "treasure_disk" ) ) );
+        registry.register( ComputerCraft.Items.treasureDisk.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "treasure_disk" ) ) );
 
         // Printout
         ComputerCraft.Items.printout = new ItemPrintout();
-        GameRegistry.register( ComputerCraft.Items.printout.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "printout" ) ) );
+        registry.register( ComputerCraft.Items.printout.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "printout" ) ) );
 
         // Pocket computer
         ComputerCraft.Items.pocketComputer = new ItemPocketComputer();
-        GameRegistry.register( ComputerCraft.Items.pocketComputer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "pocket_computer" ) ) );
+        registry.register( ComputerCraft.Items.pocketComputer.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, "pocket_computer" ) ) );
+    }
 
-        // Recipe types
-        RecipeSorter.register( "computercraft:impostor", ImpostorRecipe.class, RecipeSorter.Category.SHAPED, "after:minecraft:shapeless" );
-        RecipeSorter.register( "computercraft:impostor_shapeless", ImpostorShapelessRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
-        RecipeSorter.register( "computercraft:disk", DiskRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
-        RecipeSorter.register( "computercraft:colour", ColourableRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
-        RecipeSorter.register( "computercraft:printout", PrintoutRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
-        RecipeSorter.register( "computercraft:pocket_computer_upgrade", PocketComputerUpgradeRecipe.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless" );
-
-        // Recipes
-        // Computer
-        ItemStack computer = ComputerItemFactory.create( -1, null, ComputerFamily.Normal );
-        GameRegistry.addRecipe( computer,
-                "XXX", "XYX", "XZX",
-                'X', Blocks.STONE,
-                'Y', Items.REDSTONE,
-                'Z', Blocks.GLASS_PANE
-        );
-
-        // Advanced Computer
-        ItemStack advancedComputer = ComputerItemFactory.create( -1, null, ComputerFamily.Advanced );
-        GameRegistry.addRecipe( advancedComputer,
-                "XXX", "XYX", "XZX",
-                'X', Items.GOLD_INGOT,
-                'Y', Items.REDSTONE,
-                'Z', Blocks.GLASS_PANE
-        );
-
-        // Disk Drive
-        ItemStack diskDrive = PeripheralItemFactory.create( PeripheralType.DiskDrive, null, 1 );
-        GameRegistry.addRecipe( diskDrive,
-                "XXX", "XYX", "XYX",
-                'X', Blocks.STONE,
-                'Y', Items.REDSTONE
-        );
-
-        // Speaker
-        ItemStack speaker = PeripheralItemFactory.create( PeripheralType.Speaker, null, 1);
-        GameRegistry.addRecipe( speaker,
-                "XXX", "XYX", "XZX",
-                'X', Blocks.STONE,
-                'Y', Blocks.NOTEBLOCK,
-                'Z', Items.REDSTONE
-        );
-
-        // Wireless Modem
-        ItemStack wirelessModem = PeripheralItemFactory.create( PeripheralType.WirelessModem, null, 1 );
-        GameRegistry.addRecipe( wirelessModem,
-                "XXX", "XYX", "XXX",
-                'X', Blocks.STONE,
-                'Y', Items.ENDER_PEARL
-        );
-
-        // Monitor
-        ItemStack monitor = PeripheralItemFactory.create( PeripheralType.Monitor, null, 1 );
-        GameRegistry.addRecipe( monitor,
-                "XXX", "XYX", "XXX",
-                'X', Blocks.STONE,
-                'Y', Blocks.GLASS_PANE
-        );
-
-        // PrinterEmpty
-        ItemStack printer = PeripheralItemFactory.create( PeripheralType.Printer, null, 1 );
-        GameRegistry.addRecipe( printer,
-                "XXX", "XYX", "XZX",
-                'X', Blocks.STONE,
-                'Y', Items.REDSTONE,
-                'Z', new ItemStack( Items.DYE, 1, 0 ) // 0 = Black
-        );
-
-        // Advanced Monitor
-        ItemStack advancedMonitors = PeripheralItemFactory.create( PeripheralType.AdvancedMonitor, null, 4 );
-        GameRegistry.addRecipe( advancedMonitors,
-                "XXX", "XYX", "XXX",
-                'X', Items.GOLD_INGOT,
-                'Y', Blocks.GLASS_PANE
-        );
-
-        // Networking Cable
-        ItemStack cable = PeripheralItemFactory.create( PeripheralType.Cable, null, 6 );
-        GameRegistry.addRecipe( cable,
-                " X ", "XYX", " X ",
-                'X', Blocks.STONE,
-                'Y', Items.REDSTONE
-        );
-
-        // Wired Modem
-        ItemStack wiredModem = PeripheralItemFactory.create( PeripheralType.WiredModem, null, 1 );
-        GameRegistry.addRecipe( wiredModem,
-                "XXX", "XYX", "XXX",
-                'X', Blocks.STONE,
-                'Y', Items.REDSTONE
-        );
-
-        // Computer
-        ItemStack commandComputer = ComputerItemFactory.create( -1, null, ComputerFamily.Command );
-        GameRegistry.addRecipe( commandComputer,
-                "XXX", "XYX", "XZX",
-                'X', Blocks.STONE,
-                'Y', Blocks.COMMAND_BLOCK,
-                'Z', Blocks.GLASS_PANE
-        );
-
-        // Advanced Modem
-        ItemStack advancedModem = PeripheralItemFactory.create( PeripheralType.AdvancedModem, null, 1 );
-        GameRegistry.addRecipe( advancedModem,
-                "XXX", "XYX", "XXX",
-                'X', Items.GOLD_INGOT,
-                'Y', Items.ENDER_EYE
-        );
+    @SubscribeEvent
+    public void registerRecipes( RegistryEvent.Register<IRecipe> event )
+    {
+        IForgeRegistry<IRecipe> registry = event.getRegistry();
 
         // Disk
-        GameRegistry.addRecipe( new DiskRecipe() );
+        registry.register( new DiskRecipe().setRegistryName( new ResourceLocation( "computercraft:disk" ) ) );
 
         // Colourable items (turtles, disks)
-        GameRegistry.addRecipe( new ColourableRecipe() );
+        registry.register( new ColourableRecipe().setRegistryName( new ResourceLocation( "computercraft:colour" ) ) );
 
         // Impostor Disk recipes (to fool NEI)
         ItemStack paper = new ItemStack( Items.PAPER, 1 );
         ItemStack redstone = new ItemStack( Items.REDSTONE, 1 );
-        ItemStack basicDisk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.Blue.getHex() );
-        GameRegistry.addRecipe( new ImpostorShapelessRecipe( basicDisk, new ItemStack[]{redstone, paper} ) );
-
-        for (int colour = 0; colour < 16; ++colour)
+        for( int colour = 0; colour < 16; ++colour )
         {
-            ItemStack disk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[colour].getHex() );
+            ItemStack disk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[ colour ].getHex() );
             ItemStack dye = new ItemStack( Items.DYE, 1, colour );
-            for (int otherColour = 0; otherColour < 16; ++otherColour)
+
+            int diskIdx = 0;
+            ItemStack[] disks = new ItemStack[ 15 ];
+            for( int otherColour = 0; otherColour < 16; ++otherColour )
             {
-                if (colour != otherColour)
+                if( colour != otherColour )
                 {
-                    ItemStack otherDisk = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[colour].getHex() );
-                    GameRegistry.addRecipe( new ImpostorShapelessRecipe( disk, new ItemStack[]{
-                            otherDisk, dye
-                    } ) );
+                    disks[ diskIdx++ ] = ItemDiskLegacy.createFromIDAndColour( -1, null, Colour.values()[ otherColour ].getHex() );
                 }
             }
-            GameRegistry.addRecipe( new ImpostorShapelessRecipe( disk, new ItemStack[]{
-                    redstone, paper, dye
-            } ) );
+
+            // Normal recipe
+            registry.register(
+                new ImpostorShapelessRecipe( "computercraft:disk", disk, new ItemStack[] { redstone, paper, dye } )
+                    .setRegistryName( new ResourceLocation( "computercraft:disk_imposter_" + colour ) )
+            );
+
+            // Conversion recipe
+            registry.register(
+                new ImpostorShapelessRecipe( "computercraft:disk", disk, NonNullList.from( Ingredient.EMPTY, Ingredient.fromStacks( disks ), Ingredient.fromStacks( dye ) ) )
+                    .setRegistryName( new ResourceLocation( "computercraft:disk_imposter_convert_" + colour ) )
+            );
         }
 
         // Printout
-        GameRegistry.addRecipe( new PrintoutRecipe() );
-
-        ItemStack singlePrintout = ItemPrintout.createSingleFromTitleAndText( null, null, null );
-        ItemStack multiplePrintout = ItemPrintout.createMultipleFromTitleAndText( null, null, null );
-        ItemStack bookPrintout = ItemPrintout.createBookFromTitleAndText( null, null, null );
-
-        // Impostor Printout recipes (to fool NEI)
-        ItemStack string = new ItemStack( Items.STRING, 1, 0 );
-        GameRegistry.addRecipe( new ImpostorShapelessRecipe( multiplePrintout, new ItemStack[]{singlePrintout, singlePrintout, string} ) );
-
-        ItemStack leather = new ItemStack( Items.LEATHER, 1, 0 );
-        GameRegistry.addRecipe( new ImpostorShapelessRecipe( bookPrintout, new ItemStack[]{leather, singlePrintout, string} ) );
-
-        // Pocket Computer
-        ItemStack pocketComputer = PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Normal, null );
-        GameRegistry.addRecipe( pocketComputer,
-                "XXX", "XYX", "XZX",
-                'X', Blocks.STONE,
-                'Y', Items.GOLDEN_APPLE,
-                'Z', Blocks.GLASS_PANE
-        );
-
-        // Advanced Pocket Computer
-        ItemStack advancedPocketComputer = PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Advanced, null );
-        GameRegistry.addRecipe( advancedPocketComputer,
-                "XXX", "XYX", "XZX",
-                'X', Items.GOLD_INGOT,
-                'Y', Items.GOLDEN_APPLE,
-                'Z', Blocks.GLASS_PANE
-        );
+        registry.register( new PrintoutRecipe().setRegistryName( new ResourceLocation( "computercraft:printout" ) ) );
 
         // Register pocket upgrades
         ComputerCraft.PocketUpgrades.wirelessModem = new PocketModem( false );
@@ -457,61 +350,52 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
         ComputerCraftAPI.registerPocketUpgrade( ComputerCraft.PocketUpgrades.pocketSpeaker );
 
         // Wireless Pocket Computer
-        GameRegistry.addRecipe( new PocketComputerUpgradeRecipe() );
+        registry.register( new PocketComputerUpgradeRecipe().setRegistryName( new ResourceLocation( "computercraft:pocket_computer_upgrade" ) ) );
 
         // Impostor Pocket Computer recipes (to fool NEI)
-        for (IPocketUpgrade upgrade : ComputerCraft.getVanillaPocketUpgrades())
+        ItemStack pocketComputer = PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Normal, null );
+        ItemStack advancedPocketComputer = PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Advanced, null );
+        for( IPocketUpgrade upgrade : ComputerCraft.getVanillaPocketUpgrades() )
         {
-            GameRegistry.addRecipe( new ImpostorRecipe(
-                1, 2,
-                new ItemStack[]{ upgrade.getCraftingItem(), pocketComputer },
-                PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Normal, upgrade )
-            ) );
+            registry.register( new ImpostorRecipe(
+                    "computercraft:normal_pocket_upgrade",
+                    1, 2,
+                    new ItemStack[] { upgrade.getCraftingItem(), pocketComputer },
+                    PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Normal, upgrade )
+                ).setRegistryName( new ResourceLocation( "computercraft:normal_pocket_upgrade_" + upgrade.getUpgradeID().toString().replace( ':', '_' ) ) )
+            );
 
-            GameRegistry.addRecipe( new ImpostorRecipe(
-                1, 2,
-                new ItemStack[]{ upgrade.getCraftingItem(), advancedPocketComputer },
-                PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Advanced, upgrade )
-            ) );
+            registry.register(
+                new ImpostorRecipe( "computercraft:advanced_pocket_upgrade",
+                    1, 2,
+                    new ItemStack[] { upgrade.getCraftingItem(), advancedPocketComputer },
+                    PocketComputerItemFactory.create( -1, null, -1, ComputerFamily.Advanced, upgrade )
+                ).setRegistryName( new ResourceLocation( "computercraft:advanced_pocket_upgrade_" + upgrade.getUpgradeID().toString().replace( ':', '_' ) ) )
+            );
         }
-
-        // Skulls (Easter Egg)
-        // Dan
-        NBTTagCompound tag = new NBTTagCompound();
-        tag.setString( "SkullOwner", "dan200" );
-        ItemStack danHead = new ItemStack( Items.SKULL, 1, 3 );
-        danHead.setTagCompound( tag );
-        GameRegistry.addShapelessRecipe( danHead, computer, new ItemStack( Items.SKULL, 1, 1 ) );
-
-        // Cloudy
-        tag = new NBTTagCompound();
-        tag.setString( "SkullOwner", "Cloudhunter" );
-        ItemStack cloudyHead = new ItemStack( Items.SKULL, 1, 3 );
-        cloudyHead.setTagCompound( tag );
-        GameRegistry.addShapelessRecipe( cloudyHead, monitor, new ItemStack( Items.SKULL, 1, 1 ) );
     }
 
-    @Override
-    public void remap( FMLMissingMappingsEvent mappings )
+    @SubscribeEvent
+    public void remapItems( RegistryEvent.MissingMappings<Item> mappings )
     {
-        // We have to use mappings.getAll() as the mod ID is upper case but the domain lower.
-        for( FMLMissingMappingsEvent.MissingMapping mapping : mappings.getAll() )
+        // 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.resourceLocation.getResourceDomain();
+            String domain = mapping.key.getResourceDomain();
             if( !domain.equalsIgnoreCase( ComputerCraft.MOD_ID ) ) continue;
 
-            String key = mapping.resourceLocation.getResourcePath();
+            String key = mapping.key.getResourcePath();
             if( key.equalsIgnoreCase( "CC-Computer" ) )
             {
-                remap( mapping, ComputerCraft.Blocks.computer );
+                mapping.remap( Item.getItemFromBlock( ComputerCraft.Blocks.computer ) );
             }
             else if( key.equalsIgnoreCase( "CC-Peripheral" ) )
             {
-                remap( mapping, ComputerCraft.Blocks.peripheral );
+                mapping.remap( Item.getItemFromBlock( ComputerCraft.Blocks.peripheral ) );
             }
             else if( key.equalsIgnoreCase( "CC-Cable" ) )
             {
-                remap( mapping, ComputerCraft.Blocks.cable );
+                mapping.remap( Item.getItemFromBlock( ComputerCraft.Blocks.cable ) );
             }
             else if( key.equalsIgnoreCase( "diskExpanded" ) )
             {
@@ -528,41 +412,43 @@ public abstract class ComputerCraftProxyCommon implements IComputerCraftProxy
         }
     }
 
-    private static void remap( FMLMissingMappingsEvent.MissingMapping mapping, Block block )
+    @SubscribeEvent
+    public void remapBlocks( RegistryEvent.MissingMappings<Block> mappings )
     {
-        if( mapping.type == GameRegistry.Type.BLOCK )
+        // 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() )
         {
-            mapping.remap( block );
-        }
-        else
-        {
-            mapping.remap( Item.getItemFromBlock( block ) );
-        }
-    }
+            String domain = mapping.key.getResourceDomain();
+            if( !domain.equalsIgnoreCase( ComputerCraft.MOD_ID ) ) continue;
 
-    private void registerBlock( Block block, Item item, String name )
-    {
-        GameRegistry.register( block.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, name ) ) );
-        GameRegistry.register( item.setRegistryName( new ResourceLocation( ComputerCraft.MOD_ID, name ) ) );
-    }
-
-    private void registerTileEntity( Class<? extends TileEntity> klass, String name )
-    {
-        GameRegistry.registerTileEntityWithAlternatives( klass, ComputerCraft.LOWER_ID + " : " + name, name );
+            String key = mapping.key.getResourcePath();
+            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 );
+            }
+        }
     }
 
     private void registerTileEntities()
     {
         // Tile Entities
-        registerTileEntity( TileComputer.class, "computer" );
-        registerTileEntity( TileDiskDrive.class, "diskdrive" );
-        registerTileEntity( TileWirelessModem.class, "wirelessmodem" );
-        registerTileEntity( TileMonitor.class, "monitor" );
-        registerTileEntity( TilePrinter.class, "ccprinter" );
-        registerTileEntity( TileCable.class, "wiredmodem" );
-        registerTileEntity( TileCommandComputer.class, "command_computer" );
-        registerTileEntity( TileAdvancedModem.class, "advanced_modem" );
-        registerTileEntity( TileSpeaker.class, "speaker" );
+        GameRegistry.registerTileEntity( TileComputer.class, ComputerCraft.LOWER_ID + " : " + "computer" );
+        GameRegistry.registerTileEntity( TileDiskDrive.class, ComputerCraft.LOWER_ID + " : " + "diskdrive" );
+        GameRegistry.registerTileEntity( TileWirelessModem.class, ComputerCraft.LOWER_ID + " : " + "wirelessmodem" );
+        GameRegistry.registerTileEntity( TileMonitor.class, ComputerCraft.LOWER_ID + " : " + "monitor" );
+        GameRegistry.registerTileEntity( TilePrinter.class, ComputerCraft.LOWER_ID + " : " + "ccprinter" );
+        GameRegistry.registerTileEntity( TileCable.class, ComputerCraft.LOWER_ID + " : " + "wiredmodem" );
+        GameRegistry.registerTileEntity( TileCommandComputer.class, ComputerCraft.LOWER_ID + " : " + "command_computer" );
+        GameRegistry.registerTileEntity( TileAdvancedModem.class, ComputerCraft.LOWER_ID + " : " + "advanced_modem" );
+        GameRegistry.registerTileEntity( TileSpeaker.class, ComputerCraft.LOWER_ID + " : " + "speaker" );
 
         // Register peripheral providers
         ComputerCraftAPI.registerPeripheralProvider( new DefaultPeripheralProvider() );

src/main/java/dan200/computercraft/shared/proxy/ICCTurtleProxy.java

@@ -10,7 +10,6 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.shared.util.IEntityDropConsumer;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
 import net.minecraft.util.NonNullList;
 
 import javax.annotation.Nonnull;
@@ -19,7 +18,6 @@ public interface ICCTurtleProxy
 {
     void preInit();
     void init();
-    void remap( FMLMissingMappingsEvent mappings);
 
     void registerTurtleUpgrade( ITurtleUpgrade upgrade );
     ITurtleUpgrade getTurtleUpgrade( String id );

src/main/java/dan200/computercraft/shared/proxy/IComputerCraftProxy.java

@@ -18,7 +18,6 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.common.event.FMLMissingMappingsEvent;
 
 import javax.annotation.Nonnull;
 import java.io.File;
@@ -27,7 +26,6 @@ public interface IComputerCraftProxy
 {
     void preInit();
     void init();
-    void remap( FMLMissingMappingsEvent mappings);
     boolean isClient();
 
     boolean getGlobalCursorBlink();

src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java

@@ -6,7 +6,6 @@
 
 package dan200.computercraft.shared.turtle.apis;
 
-import com.google.common.base.Optional;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 import dan200.computercraft.api.turtle.ITurtleAccess;
@@ -21,6 +20,7 @@ import net.minecraft.item.ItemStack;
 import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 import static dan200.computercraft.core.apis.ArgumentHelper.*;
 
@@ -149,7 +149,7 @@ public class TurtleAPI implements ILuaAPI
         String side = optString( arguments, index, null );
         if( side == null )
         {
-            return Optional.absent();
+            return Optional.empty();
         }
         else if( side.equalsIgnoreCase( "left" ) )
         {
@@ -435,7 +435,7 @@ public class TurtleAPI implements ILuaAPI
                     int damage = stack.getItemDamage();
                     int count = stack.getCount();
 
-                    Map<Object, Object> table = new HashMap<Object, Object>();
+                    Map<Object, Object> table = new HashMap<>();
                     table.put( "name", name );
                     table.put( "damage", damage );
                     table.put( "count", count );

src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java

@@ -156,7 +156,7 @@ public class TileTurtle extends TileComputerBase
     }
 
     @Override
-    public void getDroppedItems( @Nonnull List<ItemStack> drops, boolean creative )
+    public void getDroppedItems( @Nonnull NonNullList<ItemStack> drops, boolean creative )
     {
         IComputer computer = getComputer();
         if( !creative || (computer != null && computer.getLabel() != null) )
@@ -258,8 +258,8 @@ public class TileTurtle extends TileComputerBase
     {
         Vec3d offset = getRenderOffset( 1.0f );
         return new AxisAlignedBB(
-            offset.xCoord + 0.125, offset.yCoord + 0.125, offset.zCoord + 0.125,
-            offset.xCoord + 0.875, offset.yCoord + 0.875, offset.zCoord + 0.875
+            offset.x + 0.125, offset.y + 0.125, offset.z + 0.125,
+            offset.x + 0.875, offset.y + 0.875, offset.z + 0.875
         );
     }
 

src/main/java/dan200/computercraft/shared/turtle/core/TurtleAttackCommand.java

@@ -6,10 +6,11 @@
 
 package dan200.computercraft.shared.turtle.core;
 
-import com.google.common.base.Optional;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
 
+import java.util.Optional;
+
 public class TurtleAttackCommand extends TurtleToolCommand
 {
     public TurtleAttackCommand( InteractDirection direction, Optional<TurtleSide> side )

src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java

@@ -41,7 +41,7 @@ import java.util.*;
 public class TurtleBrain implements ITurtleAccess
 {
     private static int s_nextInstanceID = 0;
-    private static Map<Integer, WeakReference<TurtleBrain>> s_allClientBrains = new HashMap<Integer, WeakReference<TurtleBrain>>();
+    private static Map<Integer, WeakReference<TurtleBrain>> s_allClientBrains = new HashMap<>();
 
     public static int assignInstanceID()
     {
@@ -75,7 +75,7 @@ public class TurtleBrain implements ITurtleAccess
         {
             if( getClientBrain( instanceID ) != brain )
             {
-                s_allClientBrains.put( instanceID, new WeakReference<TurtleBrain>( brain ) );
+                s_allClientBrains.put( instanceID, new WeakReference<>( brain ) );
             }
         }
     }
@@ -127,12 +127,12 @@ public class TurtleBrain implements ITurtleAccess
     {
         m_owner = turtle;
 
-        m_commandQueue = new LinkedList<TurtleCommandQueueEntry>();
+        m_commandQueue = new LinkedList<>();
         m_commandsIssued = 0;
 
-        m_upgrades = new HashMap<TurtleSide, ITurtleUpgrade>();
-        m_peripherals = new HashMap<TurtleSide, IPeripheral>();
-        m_upgradeNBTData = new HashMap<TurtleSide, NBTTagCompound>();
+        m_upgrades = new HashMap<>();
+        m_peripherals = new HashMap<>();
+        m_upgradeNBTData = new HashMap<>();
 
         m_selectedSlot = 0;
         m_fuelLevel = 0;
@@ -553,9 +553,9 @@ public class TurtleBrain implements ITurtleAccess
         Vec3d offset = getRenderOffset( f );
         BlockPos pos = m_owner.getPos();
         return new Vec3d(
-            pos.getX() + 0.5 + offset.xCoord,
-            pos.getY() + 0.5 + offset.yCoord,
-            pos.getZ() + 0.5 + offset.zCoord
+            pos.getX() + 0.5 + offset.x,
+            pos.getY() + 0.5 + offset.y,
+            pos.getZ() + 0.5 + offset.z
         );
     }
 
@@ -1177,9 +1177,9 @@ public class TurtleBrain implements ITurtleAccess
                     Vec3d position = getVisualPosition( 1.0f );
                     if( position != null )
                     {
-                        double x = position.xCoord + world.rand.nextGaussian() * 0.1;
-                        double y = position.yCoord + 0.5 + world.rand.nextGaussian() * 0.1;
-                        double z = position.zCoord + world.rand.nextGaussian() * 0.1;
+                        double x = position.x + world.rand.nextGaussian() * 0.1;
+                        double y = position.y + 0.5 + world.rand.nextGaussian() * 0.1;
+                        double z = position.z + world.rand.nextGaussian() * 0.1;
                         world.spawnParticle(
                                 EnumParticleTypes.HEART, x, y, z,
                                 world.rand.nextGaussian() * 0.02,

src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java

@@ -15,13 +15,13 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 
 import javax.annotation.Nonnull;
 import java.lang.reflect.Method;
-import java.util.List;
 
 public class TurtleCompareCommand implements ITurtleCommand
 {
@@ -77,8 +77,9 @@ public class TurtleCompareCommand implements ITurtleCommand
                     // (try 5 times to try and beat random number generators)
                     for( int i=0; (i<5) && lookAtStack.isEmpty(); ++i )
                     {
-                        List<ItemStack> drops = lookAtBlock.getDrops( world, newPosition, lookAtState, 0 );
-                        if( drops != null && drops.size() > 0 )
+                        NonNullList<ItemStack> drops = NonNullList.create();
+                        lookAtBlock.getDrops( drops, world, newPosition, lookAtState, 0 );
+                        if( drops.size() > 0 )
                         {
                             for( ItemStack drop : drops )
                             {

src/main/java/dan200/computercraft/shared/turtle/core/TurtleDigCommand.java

@@ -6,10 +6,11 @@
 
 package dan200.computercraft.shared.turtle.core;
 
-import com.google.common.base.Optional;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleVerb;
 
+import java.util.Optional;
+
 public class TurtleDigCommand extends TurtleToolCommand
 {
     public TurtleDigCommand( InteractDirection direction, Optional<TurtleSide> side )

src/main/java/dan200/computercraft/shared/turtle/core/TurtleInspectCommand.java

@@ -53,11 +53,11 @@ public class TurtleInspectCommand implements ITurtleCommand
                 String name = Block.REGISTRY.getNameForObject( block ).toString();
                 int metadata = block.getMetaFromState( state );
 
-                Map<Object, Object> table = new HashMap<Object, Object>();
+                Map<Object, Object> table = new HashMap<>();
                 table.put( "name", name );
                 table.put( "metadata", metadata );
 
-                Map<Object, Object> stateTable = new HashMap<Object, Object>();
+                Map<Object, Object> stateTable = new HashMap<>();
                 for( ImmutableMap.Entry<IProperty<?>, ?> entry : state.getActualState( world, newPosition ).getProperties().entrySet() )
                 {
                     String propertyName = entry.getKey().getName();
@@ -79,10 +79,10 @@ public class TurtleInspectCommand implements ITurtleCommand
 
         if( !FAIL_ON_AIR )
         {
-            Map<Object, Object> table = new HashMap<Object, Object>();
+            Map<Object, Object> table = new HashMap<>();
             table.put( "name", "minecraft:air" );
             table.put( "metadata", 0 );
-            table.put( "state", new HashMap<Object, Object>() );
+            table.put( "state", new HashMap<>() );
             return TurtleCommandResult.success( new Object[]{ table } );
         }
         return TurtleCommandResult.failure( "No block to inspect" );

src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java

@@ -12,7 +12,6 @@ import dan200.computercraft.api.turtle.ITurtleCommand;
 import dan200.computercraft.api.turtle.TurtleAnimation;
 import dan200.computercraft.api.turtle.TurtleCommandResult;
 import dan200.computercraft.shared.util.DirectionUtil;
-import dan200.computercraft.shared.util.IEntityDropConsumer;
 import dan200.computercraft.shared.util.InventoryUtil;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.Block;
@@ -225,22 +224,18 @@ public class TurtlePlaceCommand implements ITurtleCommand
         // Start claiming entity drops
         Entity hitEntity = hit.getKey();
         Vec3d hitPos = hit.getValue();
-        ComputerCraft.setEntityDropConsumer( hitEntity, new IEntityDropConsumer()
+        ComputerCraft.setEntityDropConsumer( hitEntity, ( entity, drop ) ->
         {
-            @Override
-            public void consumeDrop( Entity entity, @Nonnull ItemStack drop )
+            ItemStack remainder = InventoryUtil.storeItems( drop, turtle.getItemHandler(), turtle.getSelectedSlot() );
+            if( !remainder.isEmpty() )
             {
-                ItemStack remainder = InventoryUtil.storeItems( drop, turtle.getItemHandler(), turtle.getSelectedSlot() );
-                if( !remainder.isEmpty() )
-                {
-                    WorldUtil.dropItemStack( remainder, world, position, turtle.getDirection().getOpposite() );
-                }
+                WorldUtil.dropItemStack( remainder, world, position, turtle.getDirection().getOpposite() );
             }
         } );
 
         // Place on the entity
         boolean placed = false;
-        EnumActionResult cancelResult = ForgeHooks.onInteractEntityAtAction( turtlePlayer, hitEntity, hitPos, EnumHand.MAIN_HAND );
+        EnumActionResult cancelResult = ForgeHooks.onInteractEntityAt( turtlePlayer, hitEntity, hitPos, EnumHand.MAIN_HAND );
         if( cancelResult == null )
         {
             cancelResult = hitEntity.applyPlayerInteraction( turtlePlayer, hitPos, EnumHand.MAIN_HAND );
@@ -253,7 +248,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
         else
         {
             // See EntityPlayer.interactOn
-            cancelResult = ForgeHooks.onInteractEntityAction( turtlePlayer, hitEntity, EnumHand.MAIN_HAND );
+            cancelResult = ForgeHooks.onInteractEntity( turtlePlayer, hitEntity, EnumHand.MAIN_HAND );
             if( cancelResult == EnumActionResult.SUCCESS )
             {
                 placed = true;
@@ -391,7 +386,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
 
         if( !placed && (item instanceof ItemBucket || item instanceof ItemBoat || item instanceof ItemLilyPad || item instanceof ItemGlassBottle) )
         {
-            EnumActionResult actionResult = ForgeHooks.onItemRightClickAction( turtlePlayer, EnumHand.MAIN_HAND );
+            EnumActionResult actionResult = ForgeHooks.onItemRightClick( turtlePlayer, EnumHand.MAIN_HAND );
             if( actionResult == EnumActionResult.SUCCESS )
             {
                 placed = true;

src/main/java/dan200/computercraft/shared/turtle/core/TurtleSuckCommand.java

@@ -102,7 +102,7 @@ public class TurtleSuckCommand implements ITurtleCommand
                         // Suck up the item
                         foundItems = true;
                         EntityItem entityItem = (EntityItem) entity;
-                        ItemStack stack = entityItem.getEntityItem().copy();
+                        ItemStack stack = entityItem.getItem().copy();
                         ItemStack storeStack;
                         ItemStack leaveStack;
                         if( stack.getCount() > m_quantity )
@@ -125,16 +125,16 @@ public class TurtleSuckCommand implements ITurtleCommand
                             }
                             else if( remainder.isEmpty() )
                             {
-                                entityItem.setEntityItemStack( leaveStack );
+                                entityItem.setItem( leaveStack );
                             }
                             else if( leaveStack.isEmpty() )
                             {
-                                entityItem.setEntityItemStack( remainder );
+                                entityItem.setItem( remainder );
                             }
                             else
                             {
                                 leaveStack.grow( remainder.getCount() );
-                                entityItem.setEntityItemStack( leaveStack );
+                                entityItem.setItem( leaveStack );
                             }
                             break;
                         }

src/main/java/dan200/computercraft/shared/turtle/core/TurtleToolCommand.java

@@ -6,10 +6,10 @@
 
 package dan200.computercraft.shared.turtle.core;
 
-import com.google.common.base.Optional;
 import dan200.computercraft.api.turtle.*;
 
 import javax.annotation.Nonnull;
+import java.util.Optional;
 
 public class TurtleToolCommand implements ITurtleCommand
 {

src/main/java/dan200/computercraft/shared/turtle/entity/TurtleVisionCamera.java

@@ -28,7 +28,7 @@ public class TurtleVisionCamera extends EntityLivingBase
     {
         super( world );
         m_turtle = turtle;
-        m_armor = new ArrayList<ItemStack>();
+        m_armor = new ArrayList<>();
         applyPos();
     }
 
@@ -60,17 +60,17 @@ public class TurtleVisionCamera extends EntityLivingBase
     private void applyPos()
     {
         Vec3d prevPos = m_turtle.getVisualPosition( 0.0f );
-        this.lastTickPosX = this.prevPosX = prevPos.xCoord;
-        this.lastTickPosY = this.prevPosY = prevPos.yCoord;
-        this.lastTickPosZ = this.prevPosZ = prevPos.zCoord;
+        this.lastTickPosX = this.prevPosX = prevPos.x;
+        this.lastTickPosY = this.prevPosY = prevPos.y;
+        this.lastTickPosZ = this.prevPosZ = prevPos.z;
         this.prevRotationPitch = 0.0f;
         this.prevRotationYaw = m_turtle.getVisualYaw( 0.0f );
         this.prevCameraPitch = 0.0f;
 
         Vec3d pos = m_turtle.getVisualPosition( 1.0f );
-        this.posX = pos.xCoord;
-        this.posY = pos.yCoord;
-        this.posZ = pos.zCoord;
+        this.posX = pos.x;
+        this.posY = pos.y;
+        this.posZ = pos.z;
         this.rotationPitch = 0.0f;
         this.rotationYaw = m_turtle.getVisualYaw( 1.0f );
         this.cameraPitch = 0.0f;

src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java

@@ -92,7 +92,7 @@ public class ContainerTurtle extends Container
     private void sendStateToPlayer( IContainerListener icrafting )
     {
         int selectedSlot = m_turtle.getSelectedSlot();
-        icrafting.sendProgressBarUpdate( this, PROGRESS_ID_SELECTED_SLOT, selectedSlot );
+        icrafting.sendWindowProperty( this, PROGRESS_ID_SELECTED_SLOT, selectedSlot );
     }
                         
     @Override
@@ -112,7 +112,7 @@ public class ContainerTurtle extends Container
         {
             if( m_selectedSlot != selectedSlot )
             {
-                listener.sendProgressBarUpdate( this, PROGRESS_ID_SELECTED_SLOT, selectedSlot );
+                listener.sendWindowProperty( this, PROGRESS_ID_SELECTED_SLOT, selectedSlot );
             }
         }
         m_selectedSlot = selectedSlot;

src/main/java/dan200/computercraft/shared/turtle/items/ITurtleItem.java

@@ -20,5 +20,6 @@ public interface ITurtleItem extends IComputerItem, IColouredItem
     ITurtleUpgrade getUpgrade( ItemStack stack, TurtleSide side );
     int getFuelLevel( ItemStack stack );
     ResourceLocation getOverlay( ItemStack stack );
+    @Override
     int getColour( @Nonnull ItemStack stack );
 }

src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleBase.java

@@ -18,7 +18,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
@@ -42,8 +41,9 @@ public abstract class ItemTurtleBase extends ItemComputerBase implements ITurtle
     public abstract ItemStack create( int id, String label, int colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, int fuelLevel, ResourceLocation overlay );
 
     @Override
-    public void getSubItems( @Nonnull Item itemID, @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
+    public void getSubItems( @Nullable CreativeTabs tabs, @Nonnull NonNullList<ItemStack> list )
     {
+        if( !isInCreativeTab( tabs ) ) return;
         NonNullList<ItemStack> all = NonNullList.create();
         ComputerCraft.addAllUpgradedTurtles( all );
         for( ItemStack stack : all )

src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleRecipe.java

@@ -6,43 +6,38 @@
 
 package dan200.computercraft.shared.turtle.recipes;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.items.IComputerItem;
 import dan200.computercraft.shared.turtle.items.TurtleItemFactory;
+import dan200.computercraft.shared.util.RecipeUtil;
 import net.minecraft.inventory.InventoryCrafting;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.Ingredient;
+import net.minecraft.item.crafting.ShapedRecipes;
+import net.minecraft.util.JsonUtils;
 import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.common.crafting.CraftingHelper;
+import net.minecraftforge.common.crafting.IRecipeFactory;
+import net.minecraftforge.common.crafting.JsonContext;
 
 import javax.annotation.Nonnull;
 
-public class TurtleRecipe implements IRecipe
+public class TurtleRecipe extends ShapedRecipes
 {
-    private final Item[] m_recipe;
+    private final NonNullList<Ingredient> m_recipe;
     private final ComputerFamily m_family;
-    
-    public TurtleRecipe( Item[] recipe, ComputerFamily family )
+
+    public TurtleRecipe( String group, int width, int height, NonNullList<Ingredient> recipe, ComputerFamily family )
     {
+        super( group, width, height, recipe, TurtleItemFactory.create( -1, null, -1, family, null, null, 0, null ) );
         m_recipe = recipe;
         m_family = family;
     }
 
-    @Override
-    public int getRecipeSize()
-    {
-        return 9;
-    }
-    
-    @Nonnull
-    @Override
-    public ItemStack getRecipeOutput()
-    {
-        return TurtleItemFactory.create( -1, null, -1, m_family, null, null, 0, null );
-    }
-
     @Override
     public boolean matches( @Nonnull InventoryCrafting _inventory, @Nonnull World world )
     {
@@ -56,34 +51,28 @@ public class TurtleRecipe implements IRecipe
         // See if we match the recipe, and extract the input computercraft ID
         int computerID = -1;
         String label = null;
-        for( int y=0; y<3; ++y )
+        for( int y = 0; y < 3; ++y )
         {
-            for( int x=0; x<3; ++x )
+            for( int x = 0; x < 3; ++x )
             {
-                ItemStack item = inventory.getStackInRowAndColumn(x, y);
-                if( !item.isEmpty() && item.getItem() == m_recipe[ x + y*3 ] )
+                ItemStack item = inventory.getStackInRowAndColumn( x, y );
+                Ingredient target = m_recipe.get( x + y * 3 );
+
+                if( item.getItem() instanceof IComputerItem )
                 {
-                    if( item.getItem() instanceof IComputerItem )
-                    {
-                        IComputerItem itemComputer = (IComputerItem)item.getItem();
-                        if( m_family == ComputerFamily.Beginners || itemComputer.getFamily( item ) == m_family )
-                        {
-                            computerID = itemComputer.getComputerID( item );
-                            label = itemComputer.getLabel( item );
-                        }
-                        else
-                        {
-                            return ItemStack.EMPTY;
-                        }
-                    }
+                    IComputerItem itemComputer = (IComputerItem) item.getItem();
+                    if( itemComputer.getFamily( item ) != m_family ) return ItemStack.EMPTY;
+
+                    computerID = itemComputer.getComputerID( item );
+                    label = itemComputer.getLabel( item );
                 }
-                else
+                else if( !target.apply( item ) )
                 {
                     return ItemStack.EMPTY;
                 }
             }
         }
-        
+
         // Build a turtle with the same ID the computer had
         // Construct the new stack
         if( m_family != ComputerFamily.Beginners )
@@ -96,16 +85,26 @@ public class TurtleRecipe implements IRecipe
         }
     }
 
-    @Nonnull
-    @Override
-    public NonNullList<ItemStack> getRemainingItems( @Nonnull InventoryCrafting inventoryCrafting )
+    public static class Factory implements IRecipeFactory
     {
-        NonNullList<ItemStack> results = NonNullList.withSize( inventoryCrafting.getSizeInventory(), ItemStack.EMPTY );
-        for( int i = 0; i < results.size(); ++i )
+        @Override
+        public IRecipe parse( JsonContext context, JsonObject json )
         {
-            ItemStack stack = inventoryCrafting.getStackInSlot( i );
-            results.set( i, ForgeHooks.getContainerItem( stack ) );
+            String group = JsonUtils.getString( json, "group", "" );
+
+            String familyName = JsonUtils.getString( json, "family" );
+            ComputerFamily family;
+            try
+            {
+                family = ComputerFamily.valueOf( familyName );
+            }
+            catch( IllegalArgumentException e )
+            {
+                throw new JsonSyntaxException( "Unknown computer family '" + familyName + "'" );
+            }
+
+            CraftingHelper.ShapedPrimer primer = RecipeUtil.getPrimer( context, json );
+            return new TurtleRecipe( group, primer.width, primer.height, primer.input, family );
         }
-        return results;
     }
 }

src/main/java/dan200/computercraft/shared/turtle/recipes/TurtleUpgradeRecipe.java

@@ -13,7 +13,6 @@ import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.proxy.CCTurtleProxyCommon;
 import dan200.computercraft.shared.turtle.items.ITurtleItem;
 import dan200.computercraft.shared.turtle.items.TurtleItemFactory;
-import dan200.computercraft.shared.util.Colour;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
@@ -21,19 +20,26 @@ import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
+import net.minecraftforge.registries.IForgeRegistryEntry;
 
 import javax.annotation.Nonnull;
 
-public class TurtleUpgradeRecipe implements IRecipe
+public class TurtleUpgradeRecipe extends IForgeRegistryEntry.Impl<IRecipe> implements IRecipe
 {
     public TurtleUpgradeRecipe()
     {
     }
 
     @Override
-    public int getRecipeSize()
+    public boolean canFit( int x, int y )
     {
-        return 3;
+        return x >= 3 && y >= 1;
+    }
+
+    @Override
+    public boolean isHidden()
+    {
+        return true;
     }
     
     @Nonnull

src/main/java/dan200/computercraft/shared/turtle/upgrades/CraftingTablePeripheral.java

@@ -72,16 +72,6 @@ public class CraftingTablePeripheral
             }
         }
     }
-    
-    @Override
-    public void attach( @Nonnull IComputerAccess computer )
-    {
-    }
-    
-    @Override
-    public void detach( @Nonnull IComputerAccess computer )
-    {
-    }
 
     @Override
     public boolean equals( IPeripheral other )

src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java

@@ -118,9 +118,4 @@ public class TurtleCraftingTable implements ITurtleUpgrade
             return Pair.of( modelManager.getModel( m_rightModel ), transform );
         }
     }
-
-    @Override
-    public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
-    {
-    }
 }