Bump to 1.93.0

Don't propagate adjacent redstone signals for computers (#549 )
Minecraft propagates "strong" redstone signals (such as those directly from comparators or repeaters) through solid blocks. This includes computers, which is a little annoying as it means one cannot feed redstone wire from one side and a repeater from another. This changes computers to not propagate strong redstone signals, in the same way transparent blocks like glass do. Closes #548.
2025-10-17 06:57:38 +00:00 · 2020-10-04 11:19:43 +01:00 · 2020-10-04 11:14:22 +01:00 · 2020-10-02 21:21:53 +01:00 · 2020-09-30 08:25:57 +00:00 · 2020-09-24 17:47:30 +01:00
124 changed files with 817 additions and 663 deletions
--- a/README.md
+++ b/README.md
@@ -50,12 +50,12 @@ I'd generally recommend you don't contact me directly (email, DM, etc...) unless
 report exploits). You'll get a far quicker response if you ask the whole community!

 ## Using
-If you want to depend on CC: Tweaked, we have a maven repo. However, you should be wary that some functionality is only
-exposed by CC:T's API and not vanilla ComputerCraft. If you wish to support all variations of ComputerCraft, I recommend
-using [cc.crzd.me's maven](https://cc.crzd.me/maven/) instead.
+CC: Tweaked is hosted on my maven repo, and so is relatively simple to depend on. You may wish to add a soft (or hard)
+dependency in your `mods.toml` file, with the appropriate version bounds, to ensure that API functionality you depend
+on is present.

 ```groovy
-dependencies {
+repositories {
  maven { url 'https://squiddev.cc/maven/' }
 }

--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
    }
    dependencies {
        classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.181'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.179'
        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
    }
@@ -109,7 +109,7 @@ dependencies {
    compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3:api")
    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.2:6.0.0.9")

-    // runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")

    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
@@ -409,7 +409,7 @@ curseforge {
    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
    project {
        id = '282001'
-        releaseType = 'alpha'
+        releaseType = 'release'
        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."

        relations {
@@ -487,7 +487,7 @@ githubRelease {
            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
            .join("\n").trim()
    }
-    prerelease true
+    prerelease false
 }

 def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 # Mod properties
-mod_version=1.91.1
+mod_version=1.93.0

 # Minecraft properties (update mods.toml when changing)
-mc_version=1.16.2
-forge_version=33.0.37
-mappings_version=20200723-1.16.1
+mc_version=1.15.2
+forge_version=31.1.41
+mappings_version=20200429-1.15.1
--- a/src/generated/resources/data/minecraft/tags/items/piglin_loved.json
+++ b/src/generated/resources/data/minecraft/tags/items/piglin_loved.json
@@ -1,10 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "computercraft:computer_advanced",
-    "computercraft:turtle_advanced",
-    "computercraft:wireless_modem_advanced",
-    "computercraft:pocket_computer_advanced",
-    "computercraft:monitor_advanced"
-  ]
-}
--- a/src/main/java/dan200/computercraft/ComputerCraft.java
+++ b/src/main/java/dan200/computercraft/ComputerCraft.java
@@ -39,6 +39,7 @@ public final class ComputerCraft
    public static final String[] DEFAULT_HTTP_ALLOW = new String[] { "*" };
    public static final String[] DEFAULT_HTTP_DENY = new String[] {
        "127.0.0.0/8",
+        "0.0.0.0/8",
        "10.0.0.0/8",
        "172.16.0.0/12",
        "192.168.0.0/16",
@@ -62,10 +63,10 @@ public final class ComputerCraft
    public static boolean httpWebsocketEnabled = true;
    public static List<AddressRule> httpRules = Collections.unmodifiableList( Stream.concat(
        Stream.of( DEFAULT_HTTP_DENY )
-            .map( x -> AddressRule.parse( x, Action.DENY.toPartial() ) )
+            .map( x -> AddressRule.parse( x, null, Action.DENY.toPartial() ) )
            .filter( Objects::nonNull ),
        Stream.of( DEFAULT_HTTP_ALLOW )
-            .map( x -> AddressRule.parse( x, Action.ALLOW.toPartial() ) )
+            .map( x -> AddressRule.parse( x, null, Action.ALLOW.toPartial() ) )
            .filter( Objects::nonNull )
    ).collect( Collectors.toList() ) );

--- a/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java
+++ b/src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java
@@ -54,7 +54,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI

    public static InputStream getResourceFile( String domain, String subPath )
    {
-        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
+        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
        try
        {
            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
@@ -97,7 +97,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
    @Override
    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
    {
-        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
+        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResourceManager();
        ResourceMount mount = ResourceMount.get( domain, subPath, manager );
        return mount.exists( "" ) ? mount : null;
    }
--- a/src/main/java/dan200/computercraft/api/client/TransformedModel.java
+++ b/src/main/java/dan200/computercraft/api/client/TransformedModel.java
@@ -6,11 +6,11 @@
 package dan200.computercraft.api.client;

 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelManager;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.TransformationMatrix;

 import javax.annotation.Nonnull;
 import java.util.Objects;
--- a/src/main/java/dan200/computercraft/api/network/IPacketReceiver.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketReceiver.java
@@ -5,7 +5,7 @@
 */
 package dan200.computercraft.api.network;

-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 import javax.annotation.Nonnull;
@@ -29,7 +29,7 @@ public interface IPacketReceiver
     * @return The receiver's position.
     */
    @Nonnull
-    Vector3d getPosition();
+    Vec3d getPosition();

    /**
     * Get the maximum distance this receiver can send and receive messages.
--- a/src/main/java/dan200/computercraft/api/network/IPacketSender.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketSender.java
@@ -5,7 +5,7 @@
 */
 package dan200.computercraft.api.network;

-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 import javax.annotation.Nonnull;
@@ -29,7 +29,7 @@ public interface IPacketSender
     * @return The sender's position.
     */
    @Nonnull
-    Vector3d getPosition();
+    Vec3d getPosition();

    /**
     * Get some sort of identification string for this sender. This does not strictly need to be unique, but you
--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
@@ -13,7 +13,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandlerModifiable;

@@ -67,7 +67,7 @@ public interface ITurtleAccess
     * @see #getVisualYaw(float)
     */
    @Nonnull
-    Vector3d getVisualPosition( float f );
+    Vec3d getVisualPosition( float f );

    /**
     * Returns the yaw the turtle is facing when it is rendered.
--- a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
+++ b/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
@@ -12,12 +12,14 @@ import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.NewChatGui;
+import net.minecraft.client.gui.RenderComponentsUtil;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextFormatting;
 import org.apache.commons.lang3.StringUtils;

 import javax.annotation.Nullable;
+import java.util.List;

 public class ClientTableFormatter implements TableFormatter
 {
@@ -55,7 +57,7 @@ public class ClientTableFormatter implements TableFormatter
    @Override
    public int getWidth( ITextComponent component )
    {
-        return renderer().func_238414_a_( component );
+        return renderer().getStringWidth( component.getFormattedText() );
    }

    @Override
@@ -64,11 +66,10 @@ public class ClientTableFormatter implements TableFormatter
        Minecraft mc = Minecraft.getInstance();
        NewChatGui chat = mc.ingameGUI.getChatGUI();

-        // TODO: Trim the text if it goes over the allowed length
-        // int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
-        // List<ITextProperties> list = RenderComponentsUtil.func_238505_a_( component, maxWidth, mc.fontRenderer );
-        // if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
-        chat.printChatMessageWithOptionalDeletion( component, id );
+        // Trim the text if it goes over the allowed length
+        int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
+        List<ITextComponent> list = RenderComponentsUtil.splitText( component, maxWidth, mc.fontRenderer, false, false );
+        if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
    }

    @Override
--- a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
+++ b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java
@@ -13,14 +13,10 @@ import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.RenderState;
-import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.*;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.TransformationMatrix;
 import org.lwjgl.opengl.GL11;

 import javax.annotation.Nonnull;
--- a/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiComputer.java
@@ -5,7 +5,6 @@
 */
 package dan200.computercraft.client.gui;

-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
@@ -22,8 +21,6 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.text.ITextComponent;
 import org.lwjgl.glfw.GLFW;

-import javax.annotation.Nonnull;
-
 import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
 import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;

@@ -91,13 +88,13 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Containe
        terminalWrapper = new WidgetWrapper( terminal, MARGIN + BORDER + guiLeft, MARGIN + BORDER + guiTop, termPxWidth, termPxHeight );

        children.add( terminalWrapper );
-        setListener( terminalWrapper );
+        setFocused( terminalWrapper );
    }

    @Override
-    public void onClose()
+    public void removed()
    {
-        super.onClose();
+        super.removed();
        children.remove( terminal );
        terminal = null;
        minecraft.keyboardListener.enableRepeatEvents( false );
@@ -114,16 +111,16 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Containe
    public boolean keyPressed( int key, int scancode, int modifiers )
    {
        // Forward the tab key to the terminal, rather than moving between controls.
-        if( key == GLFW.GLFW_KEY_TAB && getListener() != null && getListener() == terminalWrapper )
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
        {
-            return getListener().keyPressed( key, scancode, modifiers );
+            return getFocused().keyPressed( key, scancode, modifiers );
        }

        return super.keyPressed( key, scancode, modifiers );
    }

    @Override
-    public void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY )
+    public void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
    {
        // Draw terminal
        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
@@ -138,22 +135,17 @@ public final class GuiComputer<T extends ContainerComputerBase> extends Containe
    }

    @Override
-    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public void render( int mouseX, int mouseY, float partialTicks )
    {
-        super.render( stack, mouseX, mouseY, partialTicks );
-        func_230459_a_( stack, mouseX, mouseY );
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        renderHoveredToolTip( mouseX, mouseY );
    }

    @Override
    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
    {
-        return (getListener() != null && getListener().mouseDragged( x, y, button, deltaX, deltaY ))
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
            || super.mouseDragged( x, y, button, deltaX, deltaY );
    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer( @Nonnull MatrixStack transform, int mouseX, int mouseY )
-    {
-        // Skip rendering labels.
-    }
 }
--- a/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java
@@ -5,7 +5,6 @@
 */
 package dan200.computercraft.client.gui;

-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
@@ -13,8 +12,6 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;

-import javax.annotation.Nonnull;
-
 public class GuiDiskDrive extends ContainerScreen<ContainerDiskDrive>
 {
    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/disk_drive.png" );
@@ -25,18 +22,26 @@ public class GuiDiskDrive extends ContainerScreen<ContainerDiskDrive>
    }

    @Override
-    protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
    {
-        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bindTexture( BACKGROUND );
-        blit( transform, guiLeft, guiTop, 0, 0, xSize, ySize );
+        String title = this.title.getFormattedText();
+        font.drawString( title, (xSize - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
+        font.drawString( title, 8, ySize - 96 + 2, 0x404040 );
    }

    @Override
-    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
+    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
    {
-        renderBackground( transform );
-        super.render( transform, mouseX, mouseY, partialTicks );
-        func_230459_a_( transform, mouseX, mouseY );
+        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+        minecraft.getTextureManager().bindTexture( BACKGROUND );
+        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
+    }
+
+    @Override
+    public void render( int mouseX, int mouseY, float partialTicks )
+    {
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        renderHoveredToolTip( mouseX, mouseY );
    }
 }
--- a/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPrinter.java
@@ -5,16 +5,14 @@
 */
 package dan200.computercraft.client.gui;

-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;

-import javax.annotation.Nonnull;
-
 public class GuiPrinter extends ContainerScreen<ContainerPrinter>
 {
    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/printer.png" );
@@ -24,29 +22,29 @@ public class GuiPrinter extends ContainerScreen<ContainerPrinter>
        super( container, player, title );
    }

-    /*@Override
+    @Override
    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
    {
        String title = getTitle().getFormattedText();
        font.drawString( title, (xSize - font.getStringWidth( title )) / 2.0f, 6, 0x404040 );
        font.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
-    }*/
+    }

    @Override
-    protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
    {
        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
        minecraft.getTextureManager().bindTexture( BACKGROUND );
-        blit( transform, guiLeft, guiTop, 0, 0, xSize, ySize );
+        blit( guiLeft, guiTop, 0, 0, xSize, ySize );

-        if( getContainer().isPrinting() ) blit( transform, guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
+        if( getContainer().isPrinting() ) blit( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
    }

    @Override
-    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public void render( int mouseX, int mouseY, float partialTicks )
    {
-        renderBackground( stack );
-        super.render( stack, mouseX, mouseY, partialTicks );
-        func_230459_a_( stack, mouseX, mouseY );
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        renderHoveredToolTip( mouseX, mouseY );
    }
 }
--- a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
@@ -5,7 +5,6 @@
 */
 package dan200.computercraft.client.gui;

-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.ContainerHeldItem;
@@ -13,17 +12,18 @@ import dan200.computercraft.shared.media.items.ItemPrintout;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.inventory.ContainerScreen;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Matrix4f;
+import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.math.vector.Matrix4f;
 import net.minecraft.util.text.ITextComponent;
 import org.lwjgl.glfw.GLFW;

-import javax.annotation.Nonnull;
-
 import static dan200.computercraft.client.render.PrintoutRenderer.*;

 public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
 {
+    private static final Matrix4f IDENTITY = TransformationMatrix.identity().getMatrix();
+
    private final boolean m_book;
    private final int m_pages;
    private final TextBuffer[] m_text;
@@ -91,33 +91,27 @@ public class GuiPrintout extends ContainerScreen<ContainerHeldItem>
    }

    @Override
-    protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    public void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
    {
        // Draw the printout
        RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
        RenderSystem.enableDepthTest();

        IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
-        Matrix4f matrix = transform.getLast().getMatrix();
-        drawBorder( matrix, renderer, guiLeft, guiTop, getBlitOffset(), m_page, m_pages, m_book );
-        drawText( matrix, renderer, guiLeft + X_TEXT_MARGIN, guiTop + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
+        drawBorder( IDENTITY, renderer, guiLeft, guiTop, getBlitOffset(), m_page, m_pages, m_book );
+        drawText( IDENTITY, renderer, guiLeft + X_TEXT_MARGIN, guiTop + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
        renderer.finish();
    }

    @Override
-    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    public void render( int mouseX, int mouseY, float partialTicks )
    {
        // We must take the background further back in order to not overlap with our printed pages.
        setBlitOffset( getBlitOffset() - 1 );
-        renderBackground( stack );
+        renderBackground();
        setBlitOffset( getBlitOffset() + 1 );

-        super.render( stack, mouseX, mouseY, partialTicks );
-    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer( @Nonnull MatrixStack transform, int mouseX, int mouseY )
-    {
-        // Skip rendering labels.
+        super.render( mouseX, mouseY, partialTicks );
+        renderHoveredToolTip( mouseX, mouseY );
    }
 }
--- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
@@ -5,7 +5,6 @@
 */
 package dan200.computercraft.client.gui;

-import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
@@ -19,8 +18,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import org.lwjgl.glfw.GLFW;

-import javax.annotation.Nonnull;
-
 public class GuiTurtle extends ContainerScreen<ContainerTurtle>
 {
    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/turtle_normal.png" );
@@ -64,13 +61,13 @@ public class GuiTurtle extends ContainerScreen<ContainerTurtle>
        terminalWrapper = new WidgetWrapper( terminal, 2 + 8 + guiLeft, 2 + 8 + guiTop, termPxWidth, termPxHeight );

        children.add( terminalWrapper );
-        setListener( terminalWrapper );
+        setFocused( terminalWrapper );
    }

    @Override
-    public void onClose()
+    public void removed()
    {
-        super.onClose();
+        super.removed();
        children.remove( terminal );
        terminal = null;
        minecraft.keyboardListener.enableRepeatEvents( false );
@@ -87,58 +84,55 @@ public class GuiTurtle extends ContainerScreen<ContainerTurtle>
    public boolean keyPressed( int key, int scancode, int modifiers )
    {
        // Forward the tab key to the terminal, rather than moving between controls.
-        if( key == GLFW.GLFW_KEY_TAB && getListener() != null && getListener() == terminalWrapper )
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
        {
-            return getListener().keyPressed( key, scancode, modifiers );
+            return getFocused().keyPressed( key, scancode, modifiers );
        }

        return super.keyPressed( key, scancode, modifiers );
    }

-    @Override
-    protected void drawGuiContainerBackgroundLayer( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    private void drawSelectionSlot( boolean advanced )
    {
-        // Draw term
-        ResourceLocation texture = m_family == ComputerFamily.ADVANCED ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
-        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
-
-        // Draw border/inventory
-        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        minecraft.getTextureManager().bindTexture( texture );
-        blit( transform, guiLeft, guiTop, 0, 0, xSize, ySize );
-
        // Draw selection slot
        int slot = m_container.getSelectedSlot();
        if( slot >= 0 )
        {
+            RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
            int slotX = slot % 4;
            int slotY = slot / 4;
-            blit( transform,
-                guiLeft + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18,
-                guiTop + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18,
-                0, 217, 24, 24
-            );
+            minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+            blit( guiLeft + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, guiTop + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18, 0, 217, 24, 24 );
        }
    }

    @Override
-    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
    {
-        renderBackground( stack );
-        super.render( stack, mouseX, mouseY, partialTicks );
-        func_230459_a_( stack, mouseX, mouseY );
+        // Draw term
+        boolean advanced = m_family == ComputerFamily.ADVANCED;
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
+
+        // Draw border/inventory
+        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
+        minecraft.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
+        blit( guiLeft, guiTop, 0, 0, xSize, ySize );
+
+        drawSelectionSlot( advanced );
+    }
+
+    @Override
+    public void render( int mouseX, int mouseY, float partialTicks )
+    {
+        renderBackground();
+        super.render( mouseX, mouseY, partialTicks );
+        renderHoveredToolTip( mouseX, mouseY );
    }

    @Override
    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
    {
-        return (getListener() != null && getListener().mouseDragged( x, y, button, deltaX, deltaY ))
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
            || super.mouseDragged( x, y, button, deltaX, deltaY );
    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer( @Nonnull MatrixStack transform, int mouseX, int mouseY )
-    {
-        // Skip rendering labels.
-    }
 }
--- a/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
+++ b/src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java
@@ -11,19 +11,13 @@ import dan200.computercraft.client.render.TileEntityMonitorRenderer;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.client.render.TurtlePlayerRenderer;
 import dan200.computercraft.shared.Registry;
-import dan200.computercraft.shared.common.IColouredItem;
 import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
-import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import net.minecraft.client.gui.ScreenManager;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.RenderTypeLookup;
-import net.minecraft.item.IItemPropertyGetter;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemModelsProperties;
-import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -32,8 +26,6 @@ import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;

-import java.util.function.Supplier;
-
@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD )
 public final class ComputerCraftProxyClient
 {
@@ -58,25 +50,6 @@ public final class ComputerCraftProxyClient
        // TODO: ClientRegistry.bindTileEntityRenderer( TileCable.FACTORY, x -> new TileEntityCableRenderer() );

        RenderingRegistry.registerEntityRenderingHandler( Registry.ModEntities.TURTLE_PLAYER.get(), TurtlePlayerRenderer::new );
-
-        registerItemProperty( "state",
-            ( stack, world, player ) -> ItemPocketComputer.getState( stack ).ordinal(),
-            Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
-        );
-        registerItemProperty( "state",
-            ( stack, world, player ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
-            Registry.ModItems.POCKET_COMPUTER_NORMAL, Registry.ModItems.POCKET_COMPUTER_ADVANCED
-        );
-    }
-
-    @SafeVarargs
-    private static void registerItemProperty( String name, IItemPropertyGetter getter, Supplier<? extends Item>... items )
-    {
-        ResourceLocation id = new ResourceLocation( ComputerCraft.MOD_ID, name );
-        for( Supplier<? extends Item> item : items )
-        {
-            ItemModelsProperties.func_239418_a_( item.get(), id, getter );
-        }
    }

    private static void registerContainers()
--- a/src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java
@@ -14,14 +14,14 @@ import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.renderer.ActiveRenderInfo;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawHighlightEvent;
@@ -63,7 +63,7 @@ public final class CableHighlightRenderer
            ? CableShapes.getModemShape( state )
            : CableShapes.getCableShape( state );

-        Vector3d cameraPos = info.getProjectedView();
+        Vec3d cameraPos = info.getProjectedView();
        double xOffset = pos.getX() - cameraPos.getX();
        double yOffset = pos.getY() - cameraPos.getY();
        double zOffset = pos.getZ() - cameraPos.getZ();
--- a/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
@@ -11,10 +11,10 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Matrix4f;
 import org.lwjgl.opengl.GL11;

 import javax.annotation.Nonnull;
--- a/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
@@ -10,12 +10,12 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
 import net.minecraft.client.renderer.FirstPersonRenderer;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Hand;
 import net.minecraft.util.HandSide;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.vector.Vector3f;

 public abstract class ItemMapLikeRenderer
 {
--- a/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
@@ -15,13 +15,9 @@ import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.*;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3f;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
--- a/src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java
@@ -9,9 +9,9 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Matrix4f;
+import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3f;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderItemInFrameEvent;
--- a/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
@@ -9,12 +9,12 @@ import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.DrawHighlightEvent;
@@ -61,7 +61,7 @@ public final class MonitorHighlightRenderer
        if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );

        MatrixStack transformStack = event.getMatrix();
-        Vector3d cameraPos = event.getInfo().getProjectedView();
+        Vec3d cameraPos = event.getInfo().getProjectedView();
        transformStack.push();
        transformStack.translate( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );

--- a/src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java
+++ b/src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java
@@ -12,8 +12,8 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.shared.util.Palette;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.texture.TextureUtil;
-import net.minecraft.util.math.vector.Matrix4f;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
--- a/src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java
@@ -10,11 +10,11 @@ import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.RenderState;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Matrix4f;
 import org.lwjgl.opengl.GL11;

 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
--- a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
@@ -17,19 +17,13 @@ import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.DirectionUtil;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.*;
 import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
 import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexBuffer;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.TransformationMatrix;
-import net.minecraft.util.math.vector.Vector3f;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
--- a/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
@@ -19,6 +19,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.Atlases;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Matrix4f;
+import net.minecraft.client.renderer.Vector3f;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelManager;
@@ -29,9 +31,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.math.vector.Vector3f;
+import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.client.model.data.EmptyModelData;

 import javax.annotation.Nonnull;
@@ -99,7 +99,7 @@ public class TileEntityTurtleRenderer extends TileEntityRenderer<TileTurtle>
        transform.push();

        // Setup the transform.
-        Vector3d offset = turtle.getRenderOffset( partialTicks );
+        Vec3d offset = turtle.getRenderOffset( partialTicks );
        float yaw = turtle.getRenderYaw( partialTicks );
        transform.translate( offset.x, offset.y, offset.z );

--- a/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
@@ -57,16 +57,16 @@ public final class TurtleModelLoader implements IModelLoader<TurtleModelLoader.T
        }

        @Override
-        public Collection<RenderMaterial> getTextures( IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
+        public Collection<Material> getTextures( IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
        {
-            Set<RenderMaterial> materials = new HashSet<>();
+            Set<Material> materials = new HashSet<>();
            materials.addAll( modelGetter.apply( family ).getTextures( modelGetter, missingTextureErrors ) );
            materials.addAll( modelGetter.apply( COLOUR_TURTLE_MODEL ).getTextures( modelGetter, missingTextureErrors ) );
            return materials;
        }

        @Override
-        public IBakedModel bake( IModelConfiguration owner, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation modelLocation )
+        public IBakedModel bake( IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation modelLocation )
        {
            return new TurtleSmartItemModel(
                bakery.getBakedModel( family, transform, spriteGetter ),
--- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
@@ -7,12 +7,12 @@ package dan200.computercraft.client.render;

 import dan200.computercraft.api.client.TransformedModel;
 import net.minecraft.block.BlockState;
+import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.Direction;
-import net.minecraft.util.math.vector.TransformationMatrix;
 import net.minecraftforge.client.model.data.EmptyModelData;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
--- a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
@@ -15,14 +15,14 @@ import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.client.renderer.model.*;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.TransformationMatrix;
+import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.IModelData;

 import javax.annotation.Nonnull;
@@ -109,7 +109,7 @@ public class TurtleSmartItemModel implements IBakedModel
        {
            @Nonnull
            @Override
-            public IBakedModel func_239290_a_( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable ClientWorld world, @Nullable LivingEntity entity )
+            public IBakedModel getModelWithOverrides( @Nonnull IBakedModel originalModel, @Nonnull ItemStack stack, @Nullable World world, @Nullable LivingEntity entity )
            {
                ItemTurtle turtle = (ItemTurtle) stack.getItem();
                int colour = turtle.getColour( stack );
--- a/src/main/java/dan200/computercraft/core/apis/FSAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/FSAPI.java
@@ -385,8 +385,8 @@ public class FSAPI implements ILuaAPI
     *
     * @param path The path to check the free space for.
     * @return The amount of free space available, in bytes.
-     * @throws LuaException If the path doesn't exist.
     * @cc.treturn number|"unlimited" The amount of free space available, in bytes, or "unlimited".
+     * @throws LuaException If the path doesn't exist.
     */
    @LuaFunction
    public final Object getFreeSpace( String path ) throws LuaException
--- a/src/main/java/dan200/computercraft/core/apis/OSAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/OSAPI.java
@@ -303,10 +303,10 @@ public class OSAPI implements ILuaAPI
     * always be in the range [0.0, 24.0).
     *
     * * If called with {@code ingame}, the current world time will be returned.
-     * This is the default if nothing is passed.
+     *   This is the default if nothing is passed.
     * * If called with {@code utc}, returns the hour of the day in UTC time.
     * * If called with {@code local}, returns the hour of the day in the
-     * timezone the server is located in.
+     *   timezone the server is located in.
     *
     * This function can also be called with a table returned from {@link #date},
     * which will convert the date fields into a UNIX timestamp (number of
@@ -314,9 +314,9 @@ public class OSAPI implements ILuaAPI
     *
     * @param args The locale of the time, or a table filled by {@code os.date("*t")} to decode. Defaults to {@code ingame} locale if not specified.
     * @return The hour of the selected locale, or a UNIX timestamp from the table, depending on the argument passed in.
-     * @throws LuaException If an invalid locale is passed.
     * @cc.tparam [opt] string|table locale The locale of the time, or a table filled by {@code os.date("*t")} to decode. Defaults to {@code ingame} locale if not specified.
     * @see #date To get a date table that can be converted with this function.
+     * @throws LuaException If an invalid locale is passed.
     */
    @LuaFunction
    public final Object time( IArguments args ) throws LuaException
@@ -342,11 +342,11 @@ public class OSAPI implements ILuaAPI
     * Returns the day depending on the locale specified.
     *
     * * If called with {@code ingame}, returns the number of days since the
-     * world was created. This is the default.
+     *   world was created. This is the default.
     * * If called with {@code utc}, returns the number of days since 1 January
-     * 1970 in the UTC timezone.
+     *   1970 in the UTC timezone.
     * * If called with {@code local}, returns the number of days since 1
-     * January 1970 in the server's local timezone.
+     *   January 1970 in the server's local timezone.
     *
     * @param args The locale to get the day for. Defaults to {@code ingame} if not set.
     * @return The day depending on the selected locale.
@@ -372,11 +372,11 @@ public class OSAPI implements ILuaAPI
     * Returns the number of seconds since an epoch depending on the locale.
     *
     * * If called with {@code ingame}, returns the number of seconds since the
-     * world was created. This is the default.
+     *   world was created. This is the default.
     * * If called with {@code utc}, returns the number of seconds since 1
-     * January 1970 in the UTC timezone.
+     *   January 1970 in the UTC timezone.
     * * If called with {@code local}, returns the number of seconds since 1
-     * January 1970 in the server's local timezone.
+     *   January 1970 in the server's local timezone.
     *
     * @param args The locale to get the seconds for. Defaults to {@code ingame} if not set.
     * @return The seconds since the epoch depending on the selected locale.
@@ -426,7 +426,7 @@ public class OSAPI implements ILuaAPI
     * timestamp (days since 1 January 1970) with {@link #date}.
     *
     * @param formatA The format of the string to return. This defaults to {@code %c}, which expands to a string similar to "Sat Dec 24 16:58:00 2011".
-     * @param timeA   The time to convert to a string. This defaults to the current time.
+     * @param timeA The time to convert to a string. This defaults to the current time.
     * @return The resulting format string.
     * @throws LuaException If an invalid format is passed.
     */
--- a/src/main/java/dan200/computercraft/core/apis/http/CheckUrl.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/CheckUrl.java
@@ -24,14 +24,14 @@ public class CheckUrl extends Resource<CheckUrl>

    private final IAPIEnvironment environment;
    private final String address;
-    private final String host;
+    private final URI uri;

    public CheckUrl( ResourceGroup<CheckUrl> limiter, IAPIEnvironment environment, String address, URI uri )
    {
        super( limiter );
        this.environment = environment;
        this.address = address;
-        host = uri.getHost();
+        this.uri = uri;
    }

    public void run()
@@ -47,8 +47,9 @@ public class CheckUrl extends Resource<CheckUrl>

        try
        {
-            InetSocketAddress netAddress = NetworkUtils.getAddress( host, 80, false );
-            NetworkUtils.getOptions( host, netAddress );
+            boolean ssl = uri.getScheme().equalsIgnoreCase( "https" );
+            InetSocketAddress netAddress = NetworkUtils.getAddress( uri, ssl );
+            NetworkUtils.getOptions( uri.getHost(), netAddress );

            if( tryClose() ) environment.queueEvent( EVENT, address, true );
        }
--- a/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
@@ -19,6 +19,7 @@ import io.netty.handler.ssl.SslContextBuilder;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManagerFactory;
 import java.net.InetSocketAddress;
+import java.net.URI;
 import java.security.KeyStore;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.SynchronousQueue;
@@ -99,6 +100,21 @@ public final class NetworkUtils
        }
    }

+    /**
+     * Create a {@link InetSocketAddress} from a {@link java.net.URI}.
+     *
+     * Note, this may require a DNS lookup, and so should not be executed on the main CC thread.
+     *
+     * @param uri The URI to fetch.
+     * @param ssl Whether to connect with SSL. This is used to find the default port if not otherwise specified.
+     * @return The resolved address.
+     * @throws HTTPRequestException If the host is not malformed.
+     */
+    public static InetSocketAddress getAddress( URI uri, boolean ssl ) throws HTTPRequestException
+    {
+        return getAddress( uri.getHost(), uri.getPort(), ssl );
+    }
+
    /**
     * Create a {@link InetSocketAddress} from the resolved {@code host} and port.
     *
@@ -128,7 +144,7 @@ public final class NetworkUtils
     */
    public static Options getOptions( String host, InetSocketAddress address ) throws HTTPRequestException
    {
-        Options options = AddressRule.apply( ComputerCraft.httpRules, host, address.getAddress() );
+        Options options = AddressRule.apply( ComputerCraft.httpRules, host, address );
        if( options.action == Action.DENY ) throw new HTTPRequestException( "Domain not permitted" );
        return options;
    }
--- a/src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java
@@ -12,6 +12,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.net.Inet6Address;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
 import java.util.regex.Pattern;

 /**
@@ -52,17 +53,23 @@ public final class AddressRule

    private final HostRange ip;
    private final Pattern domainPattern;
+    private final Integer port;
    private final PartialOptions partial;

-    private AddressRule( @Nullable HostRange ip, @Nullable Pattern domainPattern, @Nonnull PartialOptions partial )
+    private AddressRule(
+        @Nullable HostRange ip,
+        @Nullable Pattern domainPattern,
+        @Nullable Integer port,
+        @Nonnull PartialOptions partial )
    {
        this.ip = ip;
        this.domainPattern = domainPattern;
        this.partial = partial;
+        this.port = port;
    }

    @Nullable
-    public static AddressRule parse( String filter, @Nonnull PartialOptions partial )
+    public static AddressRule parse( String filter, @Nullable Integer port, @Nonnull PartialOptions partial )
    {
        int cidr = filter.indexOf( '/' );
        if( cidr >= 0 )
@@ -117,24 +124,27 @@ public final class AddressRule
                size -= 8;
            }

-            return new AddressRule( new HostRange( minBytes, maxBytes ), null, partial );
+            return new AddressRule( new HostRange( minBytes, maxBytes ), null, port, partial );
        }
        else
        {
            Pattern pattern = Pattern.compile( "^\\Q" + filter.replaceAll( "\\*", "\\\\E.*\\\\Q" ) + "\\E$" );
-            return new AddressRule( null, pattern, partial );
+            return new AddressRule( null, pattern, port, partial );
        }
    }

    /**
     * Determine whether the given address matches a series of patterns.
     *
-     * @param domain  The domain to match
-     * @param address The address to check.
+     * @param domain        The domain to match
+     * @param socketAddress The address to check.
     * @return Whether it matches any of these patterns.
     */
-    private boolean matches( String domain, InetAddress address )
+    private boolean matches( String domain, InetSocketAddress socketAddress )
    {
+        InetAddress address = socketAddress.getAddress();
+        if( port != null && port != socketAddress.getPort() ) return false;
+
        if( domainPattern != null )
        {
            if( domainPattern.matcher( domain ).matches() ) return true;
@@ -155,7 +165,7 @@ public final class AddressRule
        return ip != null && ip.contains( address );
    }

-    public static Options apply( Iterable<? extends AddressRule> rules, String domain, InetAddress address )
+    public static Options apply( Iterable<? extends AddressRule> rules, String domain, InetSocketAddress address )
    {
        PartialOptions options = null;
        boolean hasMany = false;
--- a/src/main/java/dan200/computercraft/core/apis/http/options/AddressRuleConfig.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/options/AddressRuleConfig.java
@@ -49,12 +49,14 @@ public class AddressRuleConfig
    public static boolean checkRule( UnmodifiableConfig builder )
    {
        String hostObj = get( builder, "host", String.class ).orElse( null );
+        Integer port = get( builder, "port", Number.class ).map( Number::intValue ).orElse( null );
        return hostObj != null && checkEnum( builder, "action", Action.class )
+            && check( builder, "port", Number.class )
            && check( builder, "timeout", Number.class )
            && check( builder, "max_upload", Number.class )
            && check( builder, "max_download", Number.class )
            && check( builder, "websocket_message", Number.class )
-            && AddressRule.parse( hostObj, PartialOptions.DEFAULT ) != null;
+            && AddressRule.parse( hostObj, port, PartialOptions.DEFAULT ) != null;
    }

    @Nullable
@@ -64,6 +66,7 @@ public class AddressRuleConfig
        if( hostObj == null ) return null;

        Action action = getEnum( builder, "action", Action.class ).orElse( null );
+        Integer port = get( builder, "port", Number.class ).map( Number::intValue ).orElse( null );
        Integer timeout = get( builder, "timeout", Number.class ).map( Number::intValue ).orElse( null );
        Long maxUpload = get( builder, "max_upload", Number.class ).map( Number::longValue ).orElse( null );
        Long maxDownload = get( builder, "max_download", Number.class ).map( Number::longValue ).orElse( null );
@@ -77,7 +80,7 @@ public class AddressRuleConfig
            websocketMessage
        );

-        return AddressRule.parse( hostObj, options );
+        return AddressRule.parse( hostObj, port, options );
    }

    private static <T> boolean check( UnmodifiableConfig config, String field, Class<T> klass )
--- a/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequest.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/request/HttpRequest.java
@@ -136,7 +136,7 @@ public class HttpRequest extends Resource<HttpRequest>
        try
        {
            boolean ssl = uri.getScheme().equalsIgnoreCase( "https" );
-            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri.getHost(), uri.getPort(), ssl );
+            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri, ssl );
            Options options = NetworkUtils.getOptions( uri.getHost(), socketAddress );
            SslContext sslContext = ssl ? NetworkUtils.getSslContext() : null;

--- a/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
@@ -129,8 +129,7 @@ public class Websocket extends Resource<Websocket>
        try
        {
            boolean ssl = uri.getScheme().equalsIgnoreCase( "wss" );
-
-            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri.getHost(), uri.getPort(), ssl );
+            InetSocketAddress socketAddress = NetworkUtils.getAddress( uri, ssl );
            Options options = NetworkUtils.getOptions( uri.getHost(), socketAddress );
            SslContext sslContext = ssl ? NetworkUtils.getSslContext() : null;

--- a/src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java
+++ b/src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java
@@ -124,7 +124,7 @@ public class FileSystemWrapperMount implements IFileSystem
    {
        try
        {
-            return m_filesystem.exists( path );
+            return m_filesystem.isDir( path );
        }
        catch( FileSystemException e )
        {
--- a/src/main/java/dan200/computercraft/data/Generators.java
+++ b/src/main/java/dan200/computercraft/data/Generators.java
@@ -7,7 +7,6 @@
 package dan200.computercraft.data;

 import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
-import net.minecraft.data.BlockTagsProvider;
 import net.minecraft.data.DataGenerator;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -24,6 +23,6 @@ public class Generators
        DataGenerator generator = event.getGenerator();
        generator.addProvider( new Recipes( generator ) );
        generator.addProvider( new LootTables( generator ) );
-        generator.addProvider( new Tags( generator, new BlockTagsProvider( generator ) ) );
+        generator.addProvider( new Tags( generator ) );
    }
 }
--- a/src/main/java/dan200/computercraft/data/LootTableProvider.java
+++ b/src/main/java/dan200/computercraft/data/LootTableProvider.java
@@ -13,11 +13,11 @@ import dan200.computercraft.ComputerCraft;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.DirectoryCache;
 import net.minecraft.data.IDataProvider;
-import net.minecraft.loot.LootParameterSets;
-import net.minecraft.loot.LootTable;
-import net.minecraft.loot.LootTableManager;
-import net.minecraft.loot.ValidationTracker;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.loot.LootParameterSets;
+import net.minecraft.world.storage.loot.LootTable;
+import net.minecraft.world.storage.loot.LootTableManager;
+import net.minecraft.world.storage.loot.ValidationTracker;

 import javax.annotation.Nonnull;
 import java.io.IOException;
--- a/src/main/java/dan200/computercraft/data/LootTables.java
+++ b/src/main/java/dan200/computercraft/data/LootTables.java
@@ -14,10 +14,10 @@ import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
 import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import net.minecraft.block.Block;
 import net.minecraft.data.DataGenerator;
-import net.minecraft.loot.*;
-import net.minecraft.loot.conditions.Alternative;
-import net.minecraft.loot.conditions.SurvivesExplosion;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.loot.*;
+import net.minecraft.world.storage.loot.conditions.Alternative;
+import net.minecraft.world.storage.loot.conditions.SurvivesExplosion;
 import net.minecraftforge.fml.RegistryObject;

 import java.util.function.BiConsumer;
@@ -77,9 +77,9 @@ public class LootTables extends LootTableProvider
                .rolls( ConstantRange.of( 1 ) )
                .addEntry( DynamicLootEntry.func_216162_a( new ResourceLocation( ComputerCraft.MOD_ID, "computer" ) ) )
                .acceptCondition( Alternative.builder(
-                    BlockNamedEntityLootCondition.BUILDER,
-                    HasComputerIdLootCondition.BUILDER,
-                    PlayerCreativeLootCondition.BUILDER.inverted()
+                    BlockNamedEntityLootCondition.builder(),
+                    HasComputerIdLootCondition.builder(),
+                    PlayerCreativeLootCondition.builder().inverted()
                ) )
            ).build() );
    }
--- a/src/main/java/dan200/computercraft/data/Recipes.java
+++ b/src/main/java/dan200/computercraft/data/Recipes.java
@@ -21,7 +21,7 @@ import net.minecraft.advancements.criterion.ItemPredicate;
 import net.minecraft.block.Blocks;
 import net.minecraft.data.*;
 import net.minecraft.item.*;
-import net.minecraft.tags.ITag;
+import net.minecraft.tags.Tag;
 import net.minecraft.util.IItemProvider;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.Tags;
@@ -309,7 +309,7 @@ public class Recipes extends RecipeProvider
        return DyeColor.byId( 15 - colour.ordinal() );
    }

-    private static InventoryChangeTrigger.Instance inventoryChange( ITag<Item> stack )
+    private static InventoryChangeTrigger.Instance inventoryChange( Tag<Item> stack )
    {
        return InventoryChangeTrigger.Instance.forItems( ItemPredicate.Builder.create().tag( stack ).build() );
    }
--- a/src/main/java/dan200/computercraft/data/Tags.java
+++ b/src/main/java/dan200/computercraft/data/Tags.java
@@ -8,54 +8,46 @@ package dan200.computercraft.data;

 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.Registry;
-import net.minecraft.data.BlockTagsProvider;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.ItemTagsProvider;
 import net.minecraft.item.Item;
-import net.minecraft.tags.ITag;
 import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.Tag;
 import net.minecraft.util.ResourceLocation;

 import static dan200.computercraft.data.Tags.CCTags.*;

 public class Tags extends ItemTagsProvider
 {
-    private static final ITag.INamedTag<Item> PIGLIN_LOVED = ItemTags.field_232903_N_;
-
    public static class CCTags
    {
-        public static final ITag.INamedTag<Item> COMPUTER = item( "computer" );
-        public static final ITag.INamedTag<Item> TURTLE = item( "turtle" );
-        public static final ITag.INamedTag<Item> WIRED_MODEM = item( "wired_modem" );
-        public static final ITag.INamedTag<Item> MONITOR = item( "monitor" );
+        public static final Tag<Item> COMPUTER = item( "computer" );
+        public static final Tag<Item> TURTLE = item( "turtle" );
+        public static final Tag<Item> WIRED_MODEM = item( "wired_modem" );
+        public static final Tag<Item> MONITOR = item( "monitor" );
    }

-    public Tags( DataGenerator generator, BlockTagsProvider tags )
+    public Tags( DataGenerator generator )
    {
-        super( generator, tags );
+        super( generator );
    }

    @Override
    protected void registerTags()
    {
-        getOrCreateBuilder( COMPUTER ).add(
-            Registry.ModItems.COMPUTER_NORMAL.get(),
-            Registry.ModItems.COMPUTER_ADVANCED.get(),
-            Registry.ModItems.COMPUTER_COMMAND.get()
-        );
-        getOrCreateBuilder( TURTLE ).add( Registry.ModItems.TURTLE_NORMAL.get(), Registry.ModItems.TURTLE_ADVANCED.get() );
-        getOrCreateBuilder( WIRED_MODEM ).add( Registry.ModItems.WIRED_MODEM.get(), Registry.ModItems.WIRED_MODEM_FULL.get() );
-        getOrCreateBuilder( MONITOR ).add( Registry.ModItems.MONITOR_NORMAL.get(), Registry.ModItems.MONITOR_ADVANCED.get() );
-
-        getOrCreateBuilder( PIGLIN_LOVED ).add(
-            Registry.ModItems.COMPUTER_ADVANCED.get(), Registry.ModItems.TURTLE_ADVANCED.get(),
-            Registry.ModItems.WIRELESS_MODEM_ADVANCED.get(), Registry.ModItems.POCKET_COMPUTER_ADVANCED.get(),
-            Registry.ModItems.MONITOR_ADVANCED.get()
-        );
+        getBuilder( COMPUTER )
+            .add( Registry.ModItems.COMPUTER_NORMAL.get() )
+            .add( Registry.ModItems.COMPUTER_ADVANCED.get() )
+            .add( Registry.ModItems.COMPUTER_COMMAND.get() );
+        getBuilder( TURTLE ).add( Registry.ModItems.TURTLE_NORMAL.get(), Registry.ModItems.TURTLE_ADVANCED.get() );
+        getBuilder( WIRED_MODEM ).add( Registry.ModItems.WIRED_MODEM.get(), Registry.ModItems.WIRED_MODEM_FULL.get() );
+        getBuilder( MONITOR )
+            .add( Registry.ModItems.MONITOR_NORMAL.get() )
+            .add( Registry.ModItems.MONITOR_ADVANCED.get() );
    }

-    private static ITag.INamedTag<Item> item( String name )
+    private static Tag<Item> item( String name )
    {
-        return ItemTags.makeWrapperTag( new ResourceLocation( ComputerCraft.MOD_ID, name ).toString() );
+        return new ItemTags.Wrapper( new ResourceLocation( ComputerCraft.MOD_ID, name ) );
    }
 }
--- a/src/main/java/dan200/computercraft/shared/Registry.java
+++ b/src/main/java/dan200/computercraft/shared/Registry.java
@@ -92,7 +92,7 @@ public final class Registry

    public static final class ModBlocks
    {
-        static final DeferredRegister<Block> BLOCKS = DeferredRegister.create( ForgeRegistries.BLOCKS, ComputerCraft.MOD_ID );
+        static final DeferredRegister<Block> BLOCKS = new DeferredRegister<>( ForgeRegistries.BLOCKS, ComputerCraft.MOD_ID );

        private static Block.Properties properties()
        {
@@ -145,7 +145,7 @@ public final class Registry

    public static class ModTiles
    {
-        static final DeferredRegister<TileEntityType<?>> TILES = DeferredRegister.create( ForgeRegistries.TILE_ENTITIES, ComputerCraft.MOD_ID );
+        static final DeferredRegister<TileEntityType<?>> TILES = new DeferredRegister<>( ForgeRegistries.TILE_ENTITIES, ComputerCraft.MOD_ID );

        private static <T extends TileEntity> RegistryObject<TileEntityType<T>> ofBlock( RegistryObject<? extends Block> block, Function<TileEntityType<T>, T> factory )
        {
@@ -183,7 +183,7 @@ public final class Registry

    public static final class ModItems
    {
-        static final DeferredRegister<Item> ITEMS = DeferredRegister.create( ForgeRegistries.ITEMS, ComputerCraft.MOD_ID );
+        static final DeferredRegister<Item> ITEMS = new DeferredRegister<>( ForgeRegistries.ITEMS, ComputerCraft.MOD_ID );

        private static Item.Properties properties()
        {
@@ -281,7 +281,7 @@ public final class Registry

    public static class ModEntities
    {
-        static final DeferredRegister<EntityType<?>> ENTITIES = DeferredRegister.create( ForgeRegistries.ENTITIES, ComputerCraft.MOD_ID );
+        static final DeferredRegister<EntityType<?>> ENTITIES = new DeferredRegister<>( ForgeRegistries.ENTITIES, ComputerCraft.MOD_ID );

        public static final RegistryObject<EntityType<TurtlePlayer>> TURTLE_PLAYER = ENTITIES.register( "turtle_player", () ->
            EntityType.Builder.<TurtlePlayer>create( EntityClassification.MISC )
@@ -293,7 +293,7 @@ public final class Registry

    public static class ModContainers
    {
-        static final DeferredRegister<ContainerType<?>> CONTAINERS = DeferredRegister.create( ForgeRegistries.CONTAINERS, ComputerCraft.MOD_ID );
+        static final DeferredRegister<ContainerType<?>> CONTAINERS = new DeferredRegister<>( ForgeRegistries.CONTAINERS, ComputerCraft.MOD_ID );

        public static final RegistryObject<ContainerType<ContainerComputer>> COMPUTER = CONTAINERS.register( "computer",
            () -> ContainerData.toType( ComputerContainerData::new, ContainerComputer::new ) );
--- a/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
+++ b/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
@@ -11,7 +11,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;

@@ -21,12 +20,13 @@ public final class TurtlePermissions
    public static boolean isBlockEnterable( World world, BlockPos pos, PlayerEntity player )
    {
        MinecraftServer server = world.getServer();
-        return server == null || world.isRemote || (world instanceof ServerWorld && !server.isBlockProtected( (ServerWorld) world, pos, player ));
+        return server == null || world.isRemote || !server.isBlockProtected( world, pos, player );
    }

    public static boolean isBlockEditable( World world, BlockPos pos, PlayerEntity player )
    {
-        return isBlockEnterable( world, pos, player );
+        MinecraftServer server = world.getServer();
+        return server == null || world.isRemote || !server.isBlockProtected( world, pos, player );
    }

    @SubscribeEvent
--- a/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java
+++ b/src/main/java/dan200/computercraft/shared/command/CommandComputerCraft.java
@@ -30,7 +30,6 @@ import net.minecraft.inventory.container.Container;
 import net.minecraft.inventory.container.INamedContainerProvider;
 import net.minecraft.network.play.server.SPlayerPositionLookPacket;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.IFormattableTextComponent;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
@@ -284,16 +283,16 @@ public final class CommandComputerCraft

    private static ITextComponent linkComputer( CommandSource source, ServerComputer serverComputer, int computerId )
    {
-        IFormattableTextComponent out = new StringTextComponent( "" );
+        ITextComponent out = new StringTextComponent( "" );

        // Append the computer instance
        if( serverComputer == null )
        {
-            out.append( text( "?" ) );
+            out.appendSibling( text( "?" ) );
        }
        else
        {
-            out.append( link(
+            out.appendSibling( link(
                text( Integer.toString( serverComputer.getInstanceID() ) ),
                "/computercraft dump " + serverComputer.getInstanceID(),
                translate( "commands.computercraft.dump.action" )
@@ -301,20 +300,20 @@ public final class CommandComputerCraft
        }

        // And ID
-        out.appendString( " (id " + computerId + ")" );
+        out.appendText( " (id " + computerId + ")" );

        // And, if we're a player, some useful links
        if( serverComputer != null && UserLevel.OP.test( source ) && isPlayer( source ) )
        {
            out
-                .appendString( " " )
-                .append( link(
+                .appendText( " " )
+                .appendSibling( link(
                    text( "\u261b" ),
                    "/computercraft tp " + serverComputer.getInstanceID(),
                    translate( "commands.computercraft.tp.action" )
                ) )
-                .appendString( " " )
-                .append( link(
+                .appendText( " " )
+                .appendSibling( link(
                    text( "\u20e2" ),
                    "/computercraft view " + serverComputer.getInstanceID(),
                    translate( "commands.computercraft.view.action" )
--- a/src/main/java/dan200/computercraft/shared/command/CommandCopy.java
+++ b/src/main/java/dan200/computercraft/shared/command/CommandCopy.java
@@ -12,7 +12,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandSource;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.util.text.event.ClickEvent;
 import net.minecraft.util.text.event.HoverEvent;
@@ -58,8 +57,10 @@ public final class CommandCopy

    public static ITextComponent createCopyText( String text )
    {
-        return new StringTextComponent( text ).mergeStyle( Style.EMPTY
+        StringTextComponent name = new StringTextComponent( text );
+        name.getStyle()
            .setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, PREFIX + text ) )
-            .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TranslationTextComponent( "gui.computercraft.tooltip.copy" ) ) ) );
+            .setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new TranslationTextComponent( "gui.computercraft.tooltip.copy" ) ) );
+        return name;
    }
 }
--- a/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java
+++ b/src/main/java/dan200/computercraft/shared/command/builder/HelpingArgumentBuilder.java
@@ -13,7 +13,6 @@ import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import net.minecraft.command.CommandSource;
-import net.minecraft.util.text.IFormattableTextComponent;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
@@ -174,12 +173,12 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<Command
        temp.addChild( node );
        String usage = dispatcher.getSmartUsage( temp, context.getSource() ).get( node ).substring( node.getName().length() );

-        IFormattableTextComponent output = new StringTextComponent( "" )
-            .append( coloured( "/" + command + usage, HEADER ) )
-            .appendString( " " )
-            .append( coloured( translate( "commands." + id + ".synopsis" ), SYNOPSIS ) )
-            .appendString( "\n" )
-            .append( translate( "commands." + id + ".desc" ) );
+        ITextComponent output = new StringTextComponent( "" )
+            .appendSibling( coloured( "/" + command + usage, HEADER ) )
+            .appendText( " " )
+            .appendSibling( coloured( translate( "commands." + id + ".synopsis" ), SYNOPSIS ) )
+            .appendText( "\n" )
+            .appendSibling( translate( "commands." + id + ".desc" ) );

        for( CommandNode<CommandSource> child : node.getChildren() )
        {
@@ -188,16 +187,16 @@ public final class HelpingArgumentBuilder extends LiteralArgumentBuilder<Command
                continue;
            }

-            output.appendString( "\n" );
+            output.appendText( "\n" );

-            IFormattableTextComponent component = coloured( child.getName(), NAME );
+            ITextComponent component = coloured( child.getName(), NAME );
            component.getStyle().setClickEvent( new ClickEvent(
                ClickEvent.Action.SUGGEST_COMMAND,
                "/" + command + " " + child.getName()
            ) );
-            output.append( component );
+            output.appendSibling( component );

-            output.appendString( " - " ).append( translate( "commands." + id + "." + child.getName() + ".synopsis" ) );
+            output.appendText( " - " ).appendSibling( translate( "commands." + id + "." + child.getName() + ".synopsis" ) );
        }

        return output;
--- a/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java
+++ b/src/main/java/dan200/computercraft/shared/command/text/ChatHelpers.java
@@ -19,67 +19,69 @@ public final class ChatHelpers

    private ChatHelpers() {}

-    public static IFormattableTextComponent coloured( String text, TextFormatting colour )
+    public static ITextComponent coloured( String text, TextFormatting colour )
    {
-        return new StringTextComponent( text == null ? "" : text ).mergeStyle( colour );
-    }
-
-    public static <T extends IFormattableTextComponent> T coloured( T component, TextFormatting colour )
-    {
-        component.mergeStyle( colour );
+        ITextComponent component = new StringTextComponent( text == null ? "" : text );
+        component.getStyle().setColor( colour );
        return component;
    }

-    public static IFormattableTextComponent text( String text )
+    public static <T extends ITextComponent> T coloured( T component, TextFormatting colour )
+    {
+        component.getStyle().setColor( colour );
+        return component;
+    }
+
+    public static ITextComponent text( String text )
    {
        return new StringTextComponent( text == null ? "" : text );
    }

-    public static IFormattableTextComponent translate( String text )
+    public static ITextComponent translate( String text )
    {
        return new TranslationTextComponent( text == null ? "" : text );
    }

-    public static IFormattableTextComponent translate( String text, Object... args )
+    public static ITextComponent translate( String text, Object... args )
    {
        return new TranslationTextComponent( text == null ? "" : text, args );
    }

-    public static IFormattableTextComponent list( ITextComponent... children )
+    public static ITextComponent list( ITextComponent... children )
    {
-        IFormattableTextComponent component = new StringTextComponent( "" );
+        ITextComponent component = new StringTextComponent( "" );
        for( ITextComponent child : children )
        {
-            component.append( child );
+            component.appendSibling( child );
        }
        return component;
    }

-    public static IFormattableTextComponent position( BlockPos pos )
+    public static ITextComponent position( BlockPos pos )
    {
        if( pos == null ) return translate( "commands.computercraft.generic.no_position" );
        return translate( "commands.computercraft.generic.position", pos.getX(), pos.getY(), pos.getZ() );
    }

-    public static IFormattableTextComponent bool( boolean value )
+    public static ITextComponent bool( boolean value )
    {
        return value
            ? coloured( translate( "commands.computercraft.generic.yes" ), TextFormatting.GREEN )
            : coloured( translate( "commands.computercraft.generic.no" ), TextFormatting.RED );
    }

-    public static IFormattableTextComponent link( IFormattableTextComponent component, String command, ITextComponent toolTip )
+    public static ITextComponent link( ITextComponent component, String command, ITextComponent toolTip )
    {
        Style style = component.getStyle();

-        if( style.getColor() == null ) style = style.setFormatting( TextFormatting.YELLOW );
-        style = style.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, command ) );
-        style = style.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, toolTip ) );
+        if( style.getColor() == null ) style.setColor( TextFormatting.YELLOW );
+        style.setClickEvent( new ClickEvent( ClickEvent.Action.RUN_COMMAND, command ) );
+        style.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, toolTip ) );

-        return component.setStyle( style );
+        return component;
    }

-    public static IFormattableTextComponent header( String text )
+    public static ITextComponent header( String text )
    {
        return coloured( text, HEADER );
    }
--- a/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java
+++ b/src/main/java/dan200/computercraft/shared/command/text/TableFormatter.java
@@ -79,12 +79,12 @@ public interface TableFormatter
            StringTextComponent line = new StringTextComponent( "" );
            for( int i = 0; i < columns - 1; i++ )
            {
-                line.append( headers[i] );
+                line.appendSibling( headers[i] );
                ITextComponent padding = getPadding( headers[i], maxWidths[i] );
-                if( padding != null ) line.append( padding );
-                line.append( SEPARATOR );
+                if( padding != null ) line.appendSibling( padding );
+                line.appendSibling( SEPARATOR );
            }
-            line.append( headers[columns - 1] );
+            line.appendSibling( headers[columns - 1] );

            writeLine( rowId++, line );

@@ -100,12 +100,12 @@ public interface TableFormatter
            StringTextComponent line = new StringTextComponent( "" );
            for( int i = 0; i < columns - 1; i++ )
            {
-                line.append( row[i] );
+                line.appendSibling( row[i] );
                ITextComponent padding = getPadding( row[i], maxWidths[i] );
-                if( padding != null ) line.append( padding );
-                line.append( SEPARATOR );
+                if( padding != null ) line.appendSibling( padding );
+                line.appendSibling( SEPARATOR );
            }
-            line.append( row[columns - 1] );
+            line.appendSibling( row[columns - 1] );
            writeLine( rowId++, line );
        }

--- a/src/main/java/dan200/computercraft/shared/common/TileGeneric.java
+++ b/src/main/java/dan200/computercraft/shared/common/TileGeneric.java
@@ -105,9 +105,9 @@ public abstract class TileGeneric extends TileEntity
    }

    @Override
-    public void handleUpdateTag( @Nonnull BlockState state, @Nonnull CompoundNBT tag )
+    public void handleUpdateTag( @Nonnull CompoundNBT tag )
    {
-        super.handleUpdateTag( state, tag );
+        super.handleUpdateTag( tag );
        readDescription( tag );
    }
 }
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java
@@ -16,8 +16,6 @@ import net.minecraft.block.BlockState;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.loot.LootContext;
-import net.minecraft.loot.LootParameters;
 import net.minecraft.stats.Stats;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityType;
@@ -25,10 +23,12 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.IBlockReader;
+import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameters;
 import net.minecraftforge.fml.RegistryObject;

 import javax.annotation.Nonnull;
@@ -139,7 +139,6 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
    public void onBlockHarvested( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull PlayerEntity player )
    {
        if( !(world instanceof ServerWorld) ) return;
-        ServerWorld serverWorld = (ServerWorld) world;

        // We drop the item here instead of doing it in the harvest method, as we should
        // drop computers for creative players too.
@@ -148,19 +147,19 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
        if( tile instanceof TileComputerBase )
        {
            TileComputerBase computer = (TileComputerBase) tile;
-            LootContext.Builder context = new LootContext.Builder( serverWorld )
+            LootContext.Builder context = new LootContext.Builder( (ServerWorld) world )
                .withRandom( world.rand )
-                .withParameter( LootParameters.field_237457_g_, Vector3d.copyCentered( pos ) )
+                .withParameter( LootParameters.POSITION, pos )
                .withParameter( LootParameters.TOOL, player.getHeldItemMainhand() )
                .withParameter( LootParameters.THIS_ENTITY, player )
-                .withParameter( LootParameters.BLOCK_ENTITY, tile )
+                .withNullableParameter( LootParameters.BLOCK_ENTITY, tile )
                .withDynamicDrop( DROP, ( ctx, out ) -> out.accept( getItem( computer ) ) );
            for( ItemStack item : state.getDrops( context ) )
            {
                spawnAsEntity( world, pos, item );
            }

-            state.spawnAdditionalDrops( serverWorld, pos, player.getHeldItemMainhand() );
+            state.spawnAdditionalDrops( world, pos, player.getHeldItemMainhand() );
        }
    }

@@ -182,4 +181,10 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc
            if( label != null ) computer.setLabel( label );
        }
    }
+
+    @Override
+    public boolean shouldCheckWeakPower( BlockState state, IWorldReader world, BlockPos pos, Direction side )
+    {
+        return false;
+    }
 }
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileCommandComputer.java
@@ -14,8 +14,8 @@ import net.minecraft.command.ICommandSource;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntityType;
-import net.minecraft.util.math.vector.Vector2f;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec2f;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
@@ -25,7 +25,6 @@ import net.minecraft.world.server.ServerWorld;
 import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;

 public class TileCommandComputer extends TileComputer
 {
@@ -49,7 +48,7 @@ public class TileCommandComputer extends TileComputer
        }

        @Override
-        public void sendMessage( @Nonnull ITextComponent textComponent, @Nonnull UUID id )
+        public void sendMessage( @Nonnull ITextComponent textComponent )
        {
            output.put( output.size() + 1, textComponent.getString() );
        }
@@ -97,7 +96,7 @@ public class TileCommandComputer extends TileComputer
        }

        return new CommandSource( receiver,
-            new Vector3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ), Vector2f.ZERO,
+            new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ), Vec2f.ZERO,
            (ServerWorld) getWorld(), 2,
            name, new StringTextComponent( name ),
            getWorld().getServer(), null
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
@@ -189,9 +189,9 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT nbt )
    {
-        super.read( state, nbt );
+        super.read( nbt );

        // Load ID, label and power state
        m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1;
--- a/src/main/java/dan200/computercraft/shared/computer/core/ComputerState.java
+++ b/src/main/java/dan200/computercraft/shared/computer/core/ComputerState.java
@@ -24,7 +24,7 @@ public enum ComputerState implements IStringSerializable

    @Nonnull
    @Override
-    public String getString()
+    public String getName()
    {
        return name;
    }
--- a/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java
@@ -43,7 +43,7 @@ public abstract class ItemComputerBase extends BlockItem implements IComputerIte
            if( id >= 0 )
            {
                list.add( new TranslationTextComponent( "gui.computercraft.tooltip.computer_id", id )
-                    .mergeStyle( TextFormatting.GRAY ) );
+                    .applyTextStyle( TextFormatting.GRAY ) );
            }
        }
    }
--- a/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java
+++ b/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java
@@ -5,13 +5,12 @@
 */
 package dan200.computercraft.shared.data;

-import net.minecraft.loot.LootConditionType;
-import net.minecraft.loot.LootContext;
-import net.minecraft.loot.LootParameter;
-import net.minecraft.loot.LootParameters;
-import net.minecraft.loot.conditions.ILootCondition;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.INameable;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameter;
+import net.minecraft.world.storage.loot.LootParameters;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;

 import javax.annotation.Nonnull;
 import java.util.Collections;
@@ -23,8 +22,6 @@ import java.util.Set;
 public final class BlockNamedEntityLootCondition implements ILootCondition
 {
    public static final BlockNamedEntityLootCondition INSTANCE = new BlockNamedEntityLootCondition();
-    public static final LootConditionType TYPE = ConstantLootConditionSerializer.type( INSTANCE );
-    public static final IBuilder BUILDER = () -> INSTANCE;

    private BlockNamedEntityLootCondition()
    {
@@ -44,10 +41,8 @@ public final class BlockNamedEntityLootCondition implements ILootCondition
        return Collections.singleton( LootParameters.BLOCK_ENTITY );
    }

-    @Override
-    @Nonnull
-    public LootConditionType func_230419_b_()
+    public static IBuilder builder()
    {
-        return TYPE;
+        return () -> INSTANCE;
    }
 }
--- a/src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java
+++ b/src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java
@@ -8,34 +8,34 @@ package dan200.computercraft.shared.data;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
-import net.minecraft.loot.ILootSerializer;
-import net.minecraft.loot.LootConditionType;
-import net.minecraft.loot.conditions.ILootCondition;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;

 import javax.annotation.Nonnull;

-public final class ConstantLootConditionSerializer<T extends ILootCondition> implements ILootSerializer<T>
+public final class ConstantLootConditionSerializer<T extends ILootCondition> extends ILootCondition.AbstractSerializer<T>
 {
    private final T instance;

-    public ConstantLootConditionSerializer( T instance )
+    private ConstantLootConditionSerializer( ResourceLocation id, Class<T> klass, T instance )
    {
+        super( id, klass );
        this.instance = instance;
    }

-    public static <T extends ILootCondition> LootConditionType type( T condition )
+    public static <T extends ILootCondition> ILootCondition.AbstractSerializer<T> of( ResourceLocation id, Class<T> klass, T instance )
    {
-        return new LootConditionType( new ConstantLootConditionSerializer<>( condition ) );
+        return new ConstantLootConditionSerializer<>( id, klass, instance );
    }

    @Override
-    public void func_230424_a_( @Nonnull JsonObject json, @Nonnull T object, @Nonnull JsonSerializationContext context )
+    public void serialize( @Nonnull JsonObject json, @Nonnull T object, @Nonnull JsonSerializationContext context )
    {
    }

    @Nonnull
    @Override
-    public T func_230423_a_( @Nonnull JsonObject json, @Nonnull JsonDeserializationContext context )
+    public T deserialize( @Nonnull JsonObject json, @Nonnull JsonDeserializationContext context )
    {
        return instance;
    }
--- a/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
+++ b/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
@@ -6,12 +6,11 @@
 package dan200.computercraft.shared.data;

 import dan200.computercraft.shared.computer.blocks.IComputerTile;
-import net.minecraft.loot.LootConditionType;
-import net.minecraft.loot.LootContext;
-import net.minecraft.loot.LootParameter;
-import net.minecraft.loot.LootParameters;
-import net.minecraft.loot.conditions.ILootCondition;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameter;
+import net.minecraft.world.storage.loot.LootParameters;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;

 import javax.annotation.Nonnull;
 import java.util.Collections;
@@ -23,8 +22,6 @@ import java.util.Set;
 public final class HasComputerIdLootCondition implements ILootCondition
 {
    public static final HasComputerIdLootCondition INSTANCE = new HasComputerIdLootCondition();
-    public static final LootConditionType TYPE = ConstantLootConditionSerializer.type( INSTANCE );
-    public static final IBuilder BUILDER = () -> INSTANCE;

    private HasComputerIdLootCondition()
    {
@@ -44,10 +41,8 @@ public final class HasComputerIdLootCondition implements ILootCondition
        return Collections.singleton( LootParameters.BLOCK_ENTITY );
    }

-    @Override
-    @Nonnull
-    public LootConditionType func_230419_b_()
+    public static IBuilder builder()
    {
-        return TYPE;
+        return () -> INSTANCE;
    }
 }
--- a/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java
+++ b/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java
@@ -7,11 +7,10 @@ package dan200.computercraft.shared.data;

 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.loot.LootConditionType;
-import net.minecraft.loot.LootContext;
-import net.minecraft.loot.LootParameter;
-import net.minecraft.loot.LootParameters;
-import net.minecraft.loot.conditions.ILootCondition;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameter;
+import net.minecraft.world.storage.loot.LootParameters;
+import net.minecraft.world.storage.loot.conditions.ILootCondition;

 import javax.annotation.Nonnull;
 import java.util.Collections;
@@ -23,8 +22,6 @@ import java.util.Set;
 public final class PlayerCreativeLootCondition implements ILootCondition
 {
    public static final PlayerCreativeLootCondition INSTANCE = new PlayerCreativeLootCondition();
-    public static final LootConditionType TYPE = ConstantLootConditionSerializer.type( INSTANCE );
-    public static final IBuilder BUILDER = () -> INSTANCE;

    private PlayerCreativeLootCondition()
    {
@@ -44,10 +41,8 @@ public final class PlayerCreativeLootCondition implements ILootCondition
        return Collections.singleton( LootParameters.THIS_ENTITY );
    }

-    @Override
-    @Nonnull
-    public LootConditionType func_230419_b_()
+    public static IBuilder builder()
    {
-        return TYPE;
+        return () -> INSTANCE;
    }
 }
--- a/src/main/java/dan200/computercraft/shared/media/items/ItemDisk.java
+++ b/src/main/java/dan200/computercraft/shared/media/items/ItemDisk.java
@@ -69,7 +69,7 @@ public class ItemDisk extends Item implements IMedia, IColouredItem
            if( id >= 0 )
            {
                list.add( new TranslationTextComponent( "gui.computercraft.tooltip.disk_id", id )
-                    .mergeStyle( TextFormatting.GRAY ) );
+                    .applyTextStyle( TextFormatting.GRAY ) );
            }
        }
    }
--- a/src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java
+++ b/src/main/java/dan200/computercraft/shared/media/recipes/DiskRecipe.java
@@ -19,14 +19,14 @@ import net.minecraft.item.crafting.SpecialRecipe;
 import net.minecraft.item.crafting.SpecialRecipeSerializer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+import net.minecraftforge.common.Tags;

 import javax.annotation.Nonnull;

 public class DiskRecipe extends SpecialRecipe
 {
    private final Ingredient paper = Ingredient.fromItems( Items.PAPER );
-    private final Ingredient redstone = Ingredient.fromItems( Items.REDSTONE );
-    // TODO: Ingredient.fromTag( Tags.Items.DUSTS_REDSTONE );
+    private final Ingredient redstone = Ingredient.fromTag( Tags.Items.DUSTS_REDSTONE );

    public DiskRecipe( ResourceLocation id )
    {
--- a/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
+++ b/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
@@ -13,7 +13,7 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.fml.network.NetworkDirection;
@@ -76,9 +76,9 @@ public final class NetworkHandler
        network.sendToServer( packet );
    }

-    public static void sendToAllAround( NetworkMessage packet, World world, Vector3d pos, double range )
+    public static void sendToAllAround( NetworkMessage packet, World world, Vec3d pos, double range )
    {
-        PacketDistributor.TargetPoint target = new PacketDistributor.TargetPoint( pos.x, pos.y, pos.z, range, world.func_234923_W_() );
+        PacketDistributor.TargetPoint target = new PacketDistributor.TargetPoint( pos.x, pos.y, pos.z, range, world.getDimension().getType() );
        network.send( PacketDistributor.NEAR.with( () -> target ), packet );
    }

--- a/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/PlayRecordClientMessage.java
@@ -10,7 +10,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkEvent;
@@ -80,7 +79,7 @@ public class PlayRecordClientMessage implements NetworkMessage
    public void handle( NetworkEvent.Context context )
    {
        Minecraft mc = Minecraft.getInstance();
-        mc.worldRenderer.playRecord( soundEvent, pos, null );
-        if( name != null ) mc.ingameGUI.func_238451_a_( new StringTextComponent( name ) );
+        mc.worldRenderer.playRecord( soundEvent, pos );
+        if( name != null ) mc.ingameGUI.setRecordPlayingMessage( name );
    }
 }
--- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDriveState.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDriveState.java
@@ -24,7 +24,7 @@ public enum DiskDriveState implements IStringSerializable

    @Override
    @Nonnull
-    public String getString()
+    public String getName()
    {
        return name;
    }
--- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java
@@ -122,10 +122,10 @@ public final class TileDiskDrive extends TileGeneric implements DefaultInventory
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT nbt )
    {
-        super.read( state, nbt );
-        customName = nbt.contains( NBT_NAME ) ? ITextComponent.Serializer.func_240643_a_( nbt.getString( NBT_NAME ) ) : null;
+        super.read( nbt );
+        customName = nbt.contains( NBT_NAME ) ? ITextComponent.Serializer.fromJson( nbt.getString( NBT_NAME ) ) : null;
        if( nbt.contains( NBT_ITEM ) )
        {
            CompoundNBT item = nbt.getCompound( NBT_ITEM );
--- a/src/main/java/dan200/computercraft/shared/peripheral/generic/data/BlockData.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/data/BlockData.java
@@ -8,7 +8,7 @@ package dan200.computercraft.shared.peripheral.generic.data;

 import com.google.common.collect.ImmutableMap;
 import net.minecraft.block.BlockState;
-import net.minecraft.state.Property;
+import net.minecraft.state.IProperty;

 import javax.annotation.Nonnull;
 import java.util.HashMap;
@@ -22,9 +22,9 @@ public class BlockData
        data.put( "name", DataHelpers.getId( state.getBlock() ) );

        Map<Object, Object> stateTable = new HashMap<>();
-        for( ImmutableMap.Entry<Property<?>, ? extends Comparable<?>> entry : state.getValues().entrySet() )
+        for( ImmutableMap.Entry<IProperty<?>, ? extends Comparable<?>> entry : state.getValues().entrySet() )
        {
-            Property<?> property = entry.getKey();
+            IProperty<?> property = entry.getKey();
            stateTable.put( property.getName(), getPropertyValue( property, entry.getValue() ) );
        }
        data.put( "state", stateTable );
@@ -34,7 +34,7 @@ public class BlockData
    }

    @SuppressWarnings( { "unchecked", "rawtypes" } )
-    private static Object getPropertyValue( Property property, Comparable value )
+    private static Object getPropertyValue( IProperty property, Comparable value )
    {
        if( value instanceof String || value instanceof Number || value instanceof Boolean ) return value;
        return property.getName( value );
--- a/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/data/ItemData.java
@@ -113,7 +113,7 @@ public class ItemData
    {
        try
        {
-            return ITextComponent.Serializer.func_240643_a_( x.getString() );
+            return ITextComponent.Serializer.fromJson( x.getString() );
        }
        catch( JsonParseException e )
        {
@@ -164,7 +164,7 @@ public class ItemData

        enchants.ensureCapacity( enchants.size() + rawEnchants.size() );

-        for( Map.Entry<Enchantment, Integer> entry : EnchantmentHelper.deserializeEnchantments( rawEnchants ).entrySet() )
+        for( Map.Entry<Enchantment, Integer> entry : EnchantmentHelper.func_226652_a_( rawEnchants ).entrySet() )
        {
            Enchantment enchantment = entry.getKey();
            Integer level = entry.getValue();
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
@@ -13,7 +13,7 @@ import dan200.computercraft.api.network.IPacketSender;
 import dan200.computercraft.api.network.Packet;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 import javax.annotation.Nonnull;
@@ -171,7 +171,7 @@ public abstract class ModemPeripheral implements IPeripheral, IPacketSender, IPa
        parseChannel( replyChannel );

        World world = getWorld();
-        Vector3d position = getPosition();
+        Vec3d position = getPosition();
        IPacketNetwork network = m_network;

        if( world == null || position == null || network == null ) return;
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java
@@ -15,7 +15,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.block.IWaterLoggable;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.IFluidState;
 import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.state.BooleanProperty;
@@ -100,7 +100,7 @@ public class BlockCable extends BlockGeneric implements IWaterLoggable
    }

    @Override
-    public boolean removedByPlayer( BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, FluidState fluid )
+    public boolean removedByPlayer( BlockState state, World world, BlockPos pos, PlayerEntity player, boolean willHarvest, IFluidState fluid )
    {
        if( state.get( CABLE ) && state.get( MODEM ).getFacing() != null )
        {
@@ -180,7 +180,7 @@ public class BlockCable extends BlockGeneric implements IWaterLoggable
    @Nonnull
    @Override
    @Deprecated
-    public FluidState getFluidState( @Nonnull BlockState state )
+    public IFluidState getFluidState( @Nonnull BlockState state )
    {
        return getWaterloggedFluidState( state );
    }
@@ -207,7 +207,9 @@ public class BlockCable extends BlockGeneric implements IWaterLoggable
        Direction facing = state.get( MODEM ).getFacing();
        if( facing == null ) return true;

-        return hasEnoughSolidSide( world, pos.offset( facing ), facing.getOpposite() );
+        BlockPos offsetPos = pos.offset( facing );
+        BlockState offsetState = world.getBlockState( offsetPos );
+        return hasSolidSide( offsetState, world, offsetPos, facing.getOpposite() );
    }

    @Nullable
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java
@@ -65,7 +65,7 @@ public enum CableModemVariant implements IStringSerializable

    @Nonnull
    @Override
-    public String getString()
+    public String getName()
    {
        return name;
    }
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
@@ -28,7 +28,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -58,10 +58,10 @@ public class TileCable extends TileGeneric

        @Nonnull
        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos pos = getPos();
-            return new Vector3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
+            return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
        }

        @Override
@@ -103,10 +103,10 @@ public class TileCable extends TileGeneric

        @Nonnull
        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos pos = getPos().offset( modemDirection );
-            return new Vector3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
+            return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
        }

        @Nonnull
@@ -281,9 +281,9 @@ public class TileCable extends TileGeneric
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT nbt )
    {
-        super.read( state, nbt );
+        super.read( nbt );
        m_peripheralAccessAllowed = nbt.getBoolean( NBT_PERIPHERAL_ENABLED );
        m_peripheral.read( nbt, "" );
    }
@@ -422,6 +422,12 @@ public class TileCable extends TileGeneric
        m_node.updatePeripherals( peripherals );
    }

+    @Override
+    public boolean canRenderBreaking()
+    {
+        return true;
+    }
+
    @Nonnull
    @Override
    public <T> LazyOptional<T> getCapability( @Nonnull Capability<T> capability, @Nullable Direction side )
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java
@@ -26,7 +26,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
@@ -85,10 +85,10 @@ public class TileWiredModemFull extends TileGeneric

        @Nonnull
        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos pos = m_entity.getPos();
-            return new Vector3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
+            return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
        }
    }

@@ -217,17 +217,17 @@ public class TileWiredModemFull extends TileGeneric
        StringTextComponent base = new StringTextComponent( "" );
        for( int i = 0; i < names.size(); i++ )
        {
-            if( i > 0 ) base.appendString( ", " );
-            base.append( CommandCopy.createCopyText( names.get( i ) ) );
+            if( i > 0 ) base.appendText( ", " );
+            base.appendSibling( CommandCopy.createCopyText( names.get( i ) ) );
        }

        player.sendStatusMessage( new TranslationTextComponent( kind, base ), false );
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT nbt )
    {
-        super.read( state, nbt );
+        super.read( nbt );
        m_peripheralAccessAllowed = nbt.getBoolean( NBT_PERIPHERAL_ENABLED );
        for( int i = 0; i < m_peripherals.length; i++ ) m_peripherals[i].read( nbt, Integer.toString( i ) );
    }
@@ -399,10 +399,10 @@ public class TileWiredModemFull extends TileGeneric

            @Nonnull
            @Override
-            public Vector3d getPosition()
+            public Vec3d getPosition()
            {
                BlockPos pos = getPos().offset( side );
-                return new Vector3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
+                return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
            }

            @Nonnull
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockWirelessModem.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockWirelessModem.java
@@ -10,7 +10,7 @@ import dan200.computercraft.shared.peripheral.modem.ModemShapes;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.IWaterLoggable;
-import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.IFluidState;
 import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.state.BooleanProperty;
 import net.minecraft.state.DirectionProperty;
@@ -62,7 +62,7 @@ public class BlockWirelessModem extends BlockGeneric implements IWaterLoggable
    @Nonnull
    @Override
    @Deprecated
-    public FluidState getFluidState( @Nonnull BlockState state )
+    public IFluidState getFluidState( @Nonnull BlockState state )
    {
        return getWaterloggedFluidState( state );
    }
@@ -80,10 +80,12 @@ public class BlockWirelessModem extends BlockGeneric implements IWaterLoggable

    @Override
    @Deprecated
-    public boolean isValidPosition( BlockState state, @Nonnull IWorldReader world, BlockPos pos )
+    public boolean isValidPosition( BlockState state, IWorldReader world, BlockPos pos )
    {
        Direction facing = state.get( FACING );
-        return hasEnoughSolidSide( world, pos.offset( facing ), facing.getOpposite() );
+        BlockPos offsetPos = pos.offset( facing );
+        BlockState offsetState = world.getBlockState( offsetPos );
+        return hasSolidSide( offsetState, world, offsetPos, facing.getOpposite() );
    }

    @Nullable
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
@@ -15,7 +15,7 @@ import net.minecraft.block.BlockState;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
@@ -46,10 +46,10 @@ public class TileWirelessModem extends TileGeneric

        @Nonnull
        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos pos = entity.getPos().offset( entity.modemDirection );
-            return new Vector3d( pos.getX(), pos.getY(), pos.getZ() );
+            return new Vec3d( pos.getX(), pos.getY(), pos.getZ() );
        }

        @Override
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java
@@ -9,7 +9,7 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.network.IPacketNetwork;
 import dan200.computercraft.shared.peripheral.modem.ModemPeripheral;
 import dan200.computercraft.shared.peripheral.modem.ModemState;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 public abstract class WirelessModemPeripheral extends ModemPeripheral
@@ -40,7 +40,7 @@ public abstract class WirelessModemPeripheral extends ModemPeripheral
            World world = getWorld();
            if( world != null )
            {
-                Vector3d position = getPosition();
+                Vec3d position = getPosition();
                double minRange = ComputerCraft.modemRange;
                double maxRange = ComputerCraft.modemHighAltitudeRange;
                if( world.isRaining() && world.isThundering() )
--- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorEdgeState.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorEdgeState.java
@@ -59,7 +59,7 @@ public enum MonitorEdgeState implements IStringSerializable

    @Nonnull
    @Override
-    public String getString()
+    public String getName()
    {
        return name;
    }
--- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
@@ -14,7 +14,6 @@ import dan200.computercraft.shared.common.TileGeneric;
 import dan200.computercraft.shared.network.client.TerminalState;
 import dan200.computercraft.shared.util.CapabilityUtil;
 import dan200.computercraft.shared.util.TickScheduler;
-import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
@@ -135,14 +134,13 @@ public class TileMonitor extends TileGeneric
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT tag )
    {
-        super.read( state, nbt );
-
-        m_xIndex = nbt.getInt( NBT_X );
-        m_yIndex = nbt.getInt( NBT_Y );
-        m_width = nbt.getInt( NBT_WIDTH );
-        m_height = nbt.getInt( NBT_HEIGHT );
+        super.read( tag );
+        m_xIndex = tag.getInt( NBT_X );
+        m_yIndex = tag.getInt( NBT_Y );
+        m_width = tag.getInt( NBT_WIDTH );
+        m_height = tag.getInt( NBT_HEIGHT );
    }

    @Override
--- a/src/main/java/dan200/computercraft/shared/peripheral/printer/ContainerPrinter.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/ContainerPrinter.java
@@ -13,7 +13,6 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.inventory.container.Container;
 import net.minecraft.inventory.container.Slot;
-import net.minecraft.item.DyeItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIntArray;
 import net.minecraft.util.IntArray;
@@ -95,7 +94,7 @@ public class ContainerPrinter extends Container
        else
        {
            // Transfer from inventory to printer
-            if( stack.getItem() instanceof DyeItem )
+            if( TilePrinter.isInk( stack ) )
            {
                if( !mergeItemStack( stack, 0, 1, false ) ) return ItemStack.EMPTY;
            }
--- a/src/main/java/dan200/computercraft/shared/peripheral/printer/PrinterPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/PrinterPeripheral.java
@@ -46,8 +46,8 @@ public class PrinterPeripheral implements IPeripheral
     * Writes text to the current page.
     *
     * @param arguments The values to write to the page.
-     * @throws LuaException If any values couldn't be converted to a string, or if no page is started.
     * @cc.tparam string|number ... The values to write to the page.
+     * @throws LuaException If any values couldn't be converted to a string, or if no page is started.
     */
    @LuaFunction
    public final void write( IArguments arguments ) throws LuaException
@@ -62,9 +62,9 @@ public class PrinterPeripheral implements IPeripheral
     * Returns the current position of the cursor on the page.
     *
     * @return The position of the cursor.
-     * @throws LuaException If a page isn't being printed.
     * @cc.treturn number The X position of the cursor.
     * @cc.treturn number The Y position of the cursor.
+     * @throws LuaException If a page isn't being printed.
     */
    @LuaFunction
    public final Object[] getCursorPos() throws LuaException
@@ -93,9 +93,9 @@ public class PrinterPeripheral implements IPeripheral
     * Returns the size of the current page.
     *
     * @return The size of the page.
-     * @throws LuaException If a page isn't being printed.
     * @cc.treturn number The width of the page.
     * @cc.treturn number The height of the page.
+     * @throws LuaException If a page isn't being printed.
     */
    @LuaFunction
    public final Object[] getPageSize() throws LuaException
--- a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java
@@ -22,7 +22,7 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraftforge.common.capabilities.Capability;
@@ -91,11 +91,11 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT nbt )
    {
-        super.read( state, nbt );
+        super.read( nbt );

-        customName = nbt.contains( NBT_NAME ) ? ITextComponent.Serializer.func_240643_a_( nbt.getString( NBT_NAME ) ) : null;
+        customName = nbt.contains( NBT_NAME ) ? ITextComponent.Serializer.fromJson( nbt.getString( NBT_NAME ) ) : null;

        // Read page
        synchronized( m_page )
@@ -300,9 +300,9 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
        }
    }

-    private static boolean isInk( @Nonnull ItemStack stack )
+    static boolean isInk( @Nonnull ItemStack stack )
    {
-        return stack.getItem() instanceof DyeItem;
+        return ColourUtils.getStackColour( stack ) != null;
    }

    private static boolean isPaper( @Nonnull ItemStack stack )
@@ -321,7 +321,8 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
    private boolean inputPage()
    {
        ItemStack inkStack = m_inventory.get( 0 );
-        if( !isInk( inkStack ) ) return false;
+        DyeColor dye = ColourUtils.getStackColour( inkStack );
+        if( dye == null ) return false;

        for( int i = 1; i < 7; i++ )
        {
@@ -329,8 +330,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
            if( paperStack.isEmpty() || !isPaper( paperStack ) ) continue;

            // Setup the new page
-            DyeColor dye = ColourUtils.getStackColour( inkStack );
-            m_page.setTextColour( dye != null ? dye.getId() : 15 );
+            m_page.setTextColour( dye.getId() );

            m_page.clear();
            if( paperStack.getItem() instanceof ItemPrintout )
@@ -403,7 +403,7 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent
                setInventorySlotContents( i, ItemStack.EMPTY );

                // Spawn the item in the world
-                WorldUtil.dropItemStack( stack, getWorld(), Vector3d.copy( getPos() ).add( 0.5, 0.75, 0.5 ) );
+                WorldUtil.dropItemStack( stack, getWorld(), new Vec3d( getPos() ).add( 0.5, 0.75, 0.5 ) );
            }
        }
    }
--- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
@@ -16,7 +16,7 @@ import net.minecraft.state.properties.NoteBlockInstrument;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.ResourceLocationException;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 import javax.annotation.Nonnull;
@@ -44,7 +44,7 @@ public abstract class SpeakerPeripheral implements IPeripheral

    public abstract World getWorld();

-    public abstract Vector3d getPosition();
+    public abstract Vec3d getPosition();

    public boolean madeSound( long ticks )
    {
@@ -66,9 +66,9 @@ public abstract class SpeakerPeripheral implements IPeripheral
     * with an optional volume and speed multiplier, and plays it through the speaker.
     *
     * @param context The Lua context
-     * @param name    The name of the sound to play.
+     * @param name The name of the sound to play.
     * @param volumeA The volume to play the sound at, from 0.0 to 3.0. Defaults to 1.0.
-     * @param pitchA  The speed to play the sound at, from 0.5 to 2.0. Defaults to 1.0.
+     * @param pitchA The speed to play the sound at, from 0.5 to 2.0. Defaults to 1.0.
     * @return Whether the sound could be played.
     * @throws LuaException If the sound name couldn't be decoded.
     */
@@ -102,9 +102,9 @@ public abstract class SpeakerPeripheral implements IPeripheral
     * and 6 and 18 map to C.
     *
     * @param context The Lua context
-     * @param name    The name of the note to play.
+     * @param name The name of the note to play.
     * @param volumeA The volume to play the note at, from 0.0 to 3.0. Defaults to 1.0.
-     * @param pitchA  The pitch to play the note at in semitones, from 0 to 24. Defaults to 12.
+     * @param pitchA The pitch to play the note at in semitones, from 0 to 24. Defaults to 12.
     * @return Whether the note could be played.
     * @throws LuaException If the instrument doesn't exist.
     */
@@ -117,7 +117,7 @@ public abstract class SpeakerPeripheral implements IPeripheral
        NoteBlockInstrument instrument = null;
        for( NoteBlockInstrument testInstrument : NoteBlockInstrument.values() )
        {
-            if( testInstrument.getString().equalsIgnoreCase( name ) )
+            if( testInstrument.getName().equalsIgnoreCase( name ) )
            {
                instrument = testInstrument;
                break;
@@ -144,7 +144,7 @@ public abstract class SpeakerPeripheral implements IPeripheral
        }

        World world = getWorld();
-        Vector3d pos = getPosition();
+        Vec3d pos = getPosition();

        context.issueMainThreadTask( () -> {
            MinecraftServer server = world.getServer();
@@ -152,7 +152,7 @@ public abstract class SpeakerPeripheral implements IPeripheral

            float adjVolume = Math.min( volume, 3.0f );
            server.getPlayerList().sendToAllNearExcept(
-                null, pos.x, pos.y, pos.z, adjVolume > 1.0f ? 16 * adjVolume : 16.0, world.func_234923_W_(),
+                null, pos.x, pos.y, pos.z, adjVolume > 1.0f ? 16 * adjVolume : 16.0, world.dimension.getType(),
                new SPlaySoundPacket( name, SoundCategory.RECORDS, pos, adjVolume, pitch )
            );
            return null;
--- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java
@@ -12,7 +12,7 @@ import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
@@ -77,10 +77,10 @@ public class TileSpeaker extends TileGeneric implements ITickableTileEntity
        }

        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos pos = speaker.getPos();
-            return new Vector3d( pos.getX(), pos.getY(), pos.getZ() );
+            return new Vec3d( pos.getX(), pos.getY(), pos.getZ() );
        }

        @Override
--- a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
@@ -27,14 +27,12 @@ import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.item.IItemPropertyGetter;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Hand;
-import net.minecraft.util.NonNullList;
+import net.minecraft.util.*;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
@@ -62,6 +60,8 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
    {
        super( settings );
        this.family = family;
+        addPropertyOverride( new ResourceLocation( ComputerCraft.MOD_ID, "state" ), COMPUTER_STATE );
+        addPropertyOverride( new ResourceLocation( ComputerCraft.MOD_ID, "coloured" ), COMPUTER_COLOURED );
    }

    public ItemStack create( int id, String label, int colour, IPocketUpgrade upgrade )
@@ -190,7 +190,7 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
            if( id >= 0 )
            {
                list.add( new TranslationTextComponent( "gui.computercraft.tooltip.computer_id", id )
-                    .mergeStyle( TextFormatting.GRAY ) );
+                    .applyTextStyle( TextFormatting.GRAY ) );
            }
        }
    }
@@ -408,4 +408,7 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I
    {
        return stack.getOrCreateChildTag( NBT_UPGRADE_INFO );
    }
+
+    private static final IItemPropertyGetter COMPUTER_STATE = ( stack, world, player ) -> getState( stack ).ordinal();
+    private static final IItemPropertyGetter COMPUTER_COLOURED = ( stack, world, player ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0;
 }
--- a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java
@@ -8,7 +8,7 @@ package dan200.computercraft.shared.pocket.peripherals;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.shared.peripheral.modem.ModemState;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessModemPeripheral;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 import javax.annotation.Nonnull;
@@ -16,14 +16,14 @@ import javax.annotation.Nonnull;
 public class PocketModemPeripheral extends WirelessModemPeripheral
 {
    private World world = null;
-    private Vector3d position = Vector3d.ZERO;
+    private Vec3d position = Vec3d.ZERO;

    public PocketModemPeripheral( boolean advanced )
    {
        super( new ModemState(), advanced );
    }

-    void setLocation( World world, Vector3d position )
+    void setLocation( World world, Vec3d position )
    {
        this.position = position;
        this.world = world;
@@ -38,7 +38,7 @@ public class PocketModemPeripheral extends WirelessModemPeripheral

    @Nonnull
    @Override
-    public Vector3d getPosition()
+    public Vec3d getPosition()
    {
        return position;
    }
--- a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java
@@ -7,15 +7,15 @@ package dan200.computercraft.shared.pocket.peripherals;

 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.shared.peripheral.speaker.SpeakerPeripheral;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;

 public class PocketSpeakerPeripheral extends SpeakerPeripheral
 {
    private World world = null;
-    private Vector3d position = Vector3d.ZERO;
+    private Vec3d position = Vec3d.ZERO;

-    void setLocation( World world, Vector3d position )
+    void setLocation( World world, Vec3d position )
    {
        this.position = position;
        this.world = world;
@@ -28,7 +28,7 @@ public class PocketSpeakerPeripheral extends SpeakerPeripheral
    }

    @Override
-    public Vector3d getPosition()
+    public Vec3d getPosition()
    {
        return world != null ? position : null;
    }
--- a/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java
+++ b/src/main/java/dan200/computercraft/shared/proxy/ComputerCraftProxyCommon.java
@@ -19,6 +19,7 @@ import dan200.computercraft.shared.computer.core.IComputer;
 import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
+import dan200.computercraft.shared.data.ConstantLootConditionSerializer;
 import dan200.computercraft.shared.data.HasComputerIdLootCondition;
 import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
 import dan200.computercraft.shared.media.items.RecordMedia;
@@ -28,18 +29,21 @@ import dan200.computercraft.shared.util.NullStorage;
 import net.minecraft.inventory.container.Container;
 import net.minecraft.item.Item;
 import net.minecraft.item.MusicDiscItem;
-import net.minecraft.loot.*;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.world.storage.loot.ConstantRange;
+import net.minecraft.world.storage.loot.LootPool;
+import net.minecraft.world.storage.loot.LootTables;
+import net.minecraft.world.storage.loot.TableLootEntry;
+import net.minecraft.world.storage.loot.conditions.LootConditionManager;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.event.LootTableLoadEvent;
-import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.PlayerContainerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
+import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;

 import java.util.Arrays;
@@ -64,14 +68,23 @@ public final class ComputerCraftProxyCommon

    public static void registerLoot()
    {
-        registerCondition( "block_named", BlockNamedEntityLootCondition.TYPE );
-        registerCondition( "player_creative", PlayerCreativeLootCondition.TYPE );
-        registerCondition( "has_id", HasComputerIdLootCondition.TYPE );
-    }
+        LootConditionManager.registerCondition( ConstantLootConditionSerializer.of(
+            new ResourceLocation( ComputerCraft.MOD_ID, "block_named" ),
+            BlockNamedEntityLootCondition.class,
+            BlockNamedEntityLootCondition.INSTANCE
+        ) );

-    private static void registerCondition( String name, LootConditionType serializer )
-    {
-        Registry.register( Registry.LOOT_CONDITION_TYPE, new ResourceLocation( ComputerCraft.MOD_ID, name ), serializer );
+        LootConditionManager.registerCondition( ConstantLootConditionSerializer.of(
+            new ResourceLocation( ComputerCraft.MOD_ID, "player_creative" ),
+            PlayerCreativeLootCondition.class,
+            PlayerCreativeLootCondition.INSTANCE
+        ) );
+
+        LootConditionManager.registerCondition( ConstantLootConditionSerializer.of(
+            new ResourceLocation( ComputerCraft.MOD_ID, "has_id" ),
+            HasComputerIdLootCondition.class,
+            HasComputerIdLootCondition.INSTANCE
+        ) );
    }

    private static void registerProviders()
@@ -139,9 +152,9 @@ public final class ComputerCraftProxyCommon
        }

        @SubscribeEvent
-        public static void onRegisterCommand( RegisterCommandsEvent event )
+        public static void onServerStarting( FMLServerStartingEvent event )
        {
-            CommandComputerCraft.register( event.getDispatcher() );
+            CommandComputerCraft.register( event.getCommandDispatcher() );
        }

        @SubscribeEvent
--- a/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java
@@ -20,7 +20,7 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.projectile.DamagingProjectileEntity;
-import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.IFluidState;
 import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.ItemStack;
 import net.minecraft.state.DirectionProperty;
@@ -31,14 +31,11 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.shapes.ISelectionContext;
 import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.util.math.shapes.VoxelShapes;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.IBlockReader;
-import net.minecraft.world.IWorld;
-import net.minecraft.world.World;
+import net.minecraft.world.*;
 import net.minecraftforge.fml.RegistryObject;

 import javax.annotation.Nonnull;
@@ -85,8 +82,8 @@ public class BlockTurtle extends BlockComputerBase<TileTurtle> implements IWater
    public VoxelShape getShape( @Nonnull BlockState state, IBlockReader world, @Nonnull BlockPos pos, @Nonnull ISelectionContext context )
    {
        TileEntity tile = world.getTileEntity( pos );
-        Vector3d offset = tile instanceof TileTurtle ? ((TileTurtle) tile).getRenderOffset( 1.0f ) : Vector3d.ZERO;
-        return offset.equals( Vector3d.ZERO ) ? DEFAULT_SHAPE : DEFAULT_SHAPE.withOffset( offset.x, offset.y, offset.z );
+        Vec3d offset = tile instanceof TileTurtle ? ((TileTurtle) tile).getRenderOffset( 1.0f ) : Vec3d.ZERO;
+        return offset.equals( Vec3d.ZERO ) ? DEFAULT_SHAPE : DEFAULT_SHAPE.withOffset( offset.x, offset.y, offset.z );
    }

    @Nullable
@@ -101,7 +98,7 @@ public class BlockTurtle extends BlockComputerBase<TileTurtle> implements IWater
    @Nonnull
    @Override
    @Deprecated
-    public FluidState getFluidState( @Nonnull BlockState state )
+    public IFluidState getFluidState( @Nonnull BlockState state )
    {
        return getWaterloggedFluidState( state );
    }
@@ -154,15 +151,14 @@ public class BlockTurtle extends BlockComputerBase<TileTurtle> implements IWater
    }

    @Override
-    public float getExplosionResistance( BlockState state, IBlockReader world, BlockPos pos, Explosion explosion )
+    public float getExplosionResistance( BlockState state, IWorldReader world, BlockPos pos, @Nullable Entity exploder, Explosion explosion )
    {
-        Entity exploder = explosion.getExploder();
        if( getFamily() == ComputerFamily.ADVANCED || exploder instanceof LivingEntity || exploder instanceof DamagingProjectileEntity )
        {
            return 2000;
        }

-        return super.getExplosionResistance( state, world, pos, explosion );
+        return super.getExplosionResistance( state, world, pos, exploder, explosion );
    }

    @Nonnull
--- a/src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java
@@ -10,7 +10,7 @@ import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.computer.blocks.IComputerTile;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;

 public interface ITurtleTile extends IComputerTile
 {
@@ -22,7 +22,7 @@ public interface ITurtleTile extends IComputerTile

    ITurtleAccess getAccess();

-    Vector3d getRenderOffset( float f );
+    Vec3d getRenderOffset( float f );

    float getRenderYaw( float f );

--- a/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
@@ -23,7 +23,6 @@ import dan200.computercraft.shared.turtle.apis.TurtleAPI;
 import dan200.computercraft.shared.turtle.core.TurtleBrain;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
 import dan200.computercraft.shared.util.*;
-import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.Container;
@@ -37,7 +36,7 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.*;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.LazyOptional;
@@ -257,9 +256,9 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
    }

    @Override
-    public void read( @Nonnull BlockState state, @Nonnull CompoundNBT nbt )
+    public void read( @Nonnull CompoundNBT nbt )
    {
-        super.read( state, nbt );
+        super.read( nbt );

        // Read inventory
        ListNBT nbttaglist = nbt.getList( "Items", Constants.NBT.TAG_COMPOUND );
@@ -354,7 +353,7 @@ public class TileTurtle extends TileComputerBase implements ITurtleTile, Default
    }

    @Override
-    public Vector3d getRenderOffset( float f )
+    public Vec3d getRenderOffset( float f )
    {
        return m_brain.getRenderOffset( f );
    }
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
@@ -26,7 +26,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.MoverType;
-import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.IFluidState;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.DyeColor;
 import net.minecraft.nbt.CompoundNBT;
@@ -38,7 +38,7 @@ import net.minecraft.util.EntityPredicates;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.items.IItemHandlerModifiable;
@@ -304,7 +304,7 @@ public class TurtleBrain implements ITurtleAccess
        // Ensure we're inside the world border
        if( !world.getWorldBorder().contains( pos ) ) return false;

-        FluidState existingFluid = world.getBlockState( pos ).getFluidState();
+        IFluidState existingFluid = world.getBlockState( pos ).getFluidState();
        BlockState newState = oldBlock
            // We only mark this as waterlogged when travelling into a source block. This prevents us from spreading
            // fluid by creating a new source when moving into a block, causing the next block to be almost full and
@@ -357,11 +357,11 @@ public class TurtleBrain implements ITurtleAccess

    @Nonnull
    @Override
-    public Vector3d getVisualPosition( float f )
+    public Vec3d getVisualPosition( float f )
    {
-        Vector3d offset = getRenderOffset( f );
+        Vec3d offset = getRenderOffset( f );
        BlockPos pos = m_owner.getPos();
-        return new Vector3d(
+        return new Vec3d(
            pos.getX() + 0.5 + offset.x,
            pos.getY() + 0.5 + offset.y,
            pos.getZ() + 0.5 + offset.z
@@ -659,7 +659,7 @@ public class TurtleBrain implements ITurtleAccess
        m_owner.updateBlock();
    }

-    public Vector3d getRenderOffset( float f )
+    public Vec3d getRenderOffset( float f )
    {
        switch( m_animation )
        {
@@ -688,7 +688,7 @@ public class TurtleBrain implements ITurtleAccess
                }

                double distance = -1.0 + getAnimationFraction( f );
-                return new Vector3d(
+                return new Vec3d(
                    distance * dir.getXOffset(),
                    distance * dir.getYOffset(),
                    distance * dir.getZOffset()
@@ -696,7 +696,7 @@ public class TurtleBrain implements ITurtleAccess
            }
            default:
            {
-                return Vector3d.ZERO;
+                return Vec3d.ZERO;
            }
        }
    }
@@ -880,7 +880,7 @@ public class TurtleBrain implements ITurtleAccess
                        double pushStepZ = moveDir.getZOffset() * pushStep;
                        for( Entity entity : list )
                        {
-                            entity.move( MoverType.PISTON, new Vector3d( pushStepX, pushStepY, pushStepZ ) );
+                            entity.move( MoverType.PISTON, new Vec3d( pushStepX, pushStepY, pushStepZ ) );
                        }
                    }
                }
@@ -893,7 +893,7 @@ public class TurtleBrain implements ITurtleAccess
                Holiday currentHoliday = HolidayUtil.getCurrentHoliday();
                if( currentHoliday == Holiday.VALENTINES )
                {
-                    Vector3d position = getVisualPosition( 1.0f );
+                    Vec3d position = getVisualPosition( 1.0f );
                    if( position != null )
                    {
                        double x = position.x + world.rand.nextGaussian() * 0.1;
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
@@ -28,7 +28,7 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
@@ -210,9 +210,9 @@ public class TurtlePlaceCommand implements ITurtleCommand
        // See if there is an entity present
        final World world = turtle.getWorld();
        final BlockPos position = turtle.getPosition();
-        Vector3d turtlePos = turtlePlayer.getPositionVec();
-        Vector3d rayDir = turtlePlayer.getLook( 1.0f );
-        Pair<Entity, Vector3d> hit = WorldUtil.rayTraceEntities( world, turtlePos, rayDir, 1.5 );
+        Vec3d turtlePos = turtlePlayer.getPositionVec();
+        Vec3d rayDir = turtlePlayer.getLook( 1.0f );
+        Pair<Entity, Vec3d> hit = WorldUtil.rayTraceEntities( world, turtlePos, rayDir, 1.5 );
        if( hit == null )
        {
            return stack;
@@ -224,7 +224,7 @@ public class TurtlePlaceCommand implements ITurtleCommand

        // Start claiming entity drops
        Entity hitEntity = hit.getKey();
-        Vector3d hitPos = hit.getValue();
+        Vec3d hitPos = hit.getValue();
        DropConsumer.set(
            hitEntity,
            drop -> InventoryUtil.storeItems( drop, turtle.getItemHandler(), turtle.getSelectedSlot() )
@@ -238,7 +238,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
            cancelResult = hitEntity.applyPlayerInteraction( turtlePlayer, hitPos, Hand.MAIN_HAND );
        }

-        if( cancelResult.isSuccessOrConsume() )
+        if( cancelResult == ActionResultType.SUCCESS )
        {
            placed = true;
        }
@@ -246,19 +246,19 @@ public class TurtlePlaceCommand implements ITurtleCommand
        {
            // See EntityPlayer.interactOn
            cancelResult = ForgeHooks.onInteractEntity( turtlePlayer, hitEntity, Hand.MAIN_HAND );
-            if( cancelResult != null && cancelResult.isSuccessOrConsume() )
+            if( cancelResult == ActionResultType.SUCCESS )
            {
                placed = true;
            }
            else if( cancelResult == null )
            {
-                if( hitEntity.processInitialInteract( turtlePlayer, Hand.MAIN_HAND ) == ActionResultType.CONSUME )
+                if( hitEntity.processInitialInteract( turtlePlayer, Hand.MAIN_HAND ) )
                {
                    placed = true;
                }
                else if( hitEntity instanceof LivingEntity )
                {
-                    placed = stackCopy.interactWithEntity( turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND ).isSuccessOrConsume();
+                    placed = stackCopy.interactWithEntity( turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND );
                    if( placed ) turtlePlayer.loadInventory( stackCopy );
                }
            }
@@ -338,7 +338,7 @@ public class TurtlePlaceCommand implements ITurtleCommand
        }

        // Check if there's something suitable to place onto
-        BlockRayTraceResult hit = new BlockRayTraceResult( new Vector3d( hitX, hitY, hitZ ), side, position, false );
+        BlockRayTraceResult hit = new BlockRayTraceResult( new Vec3d( hitX, hitY, hitZ ), side, position, false );
        ItemUseContext context = new ItemUseContext( turtlePlayer, Hand.MAIN_HAND, hit );
        if( !canDeployOnBlock( new BlockItemUseContext( context ), turtle, turtlePlayer, position, side, allowReplace, outErrorMessage ) )
        {
@@ -353,15 +353,17 @@ public class TurtlePlaceCommand implements ITurtleCommand
        TileEntity existingTile = turtle.getWorld().getTileEntity( position );

        // See PlayerInteractionManager.processRightClickBlock
+        // TODO: ^ Check we're still consistent.
        PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock( turtlePlayer, Hand.MAIN_HAND, position, side );
        if( !event.isCanceled() )
        {
-            if( item.onItemUseFirst( stack, context ).isSuccessOrConsume() )
+            if( item.onItemUseFirst( stack, context ) == ActionResultType.SUCCESS )
            {
                placed = true;
                turtlePlayer.loadInventory( stackCopy );
            }
-            else if( event.getUseItem() != Event.Result.DENY && stackCopy.onItemUse( context ).isSuccessOrConsume() )
+            else if( event.getUseItem() != Event.Result.DENY &&
+                stackCopy.onItemUse( context ) == ActionResultType.SUCCESS )
            {
                placed = true;
                turtlePlayer.loadInventory( stackCopy );
@@ -371,14 +373,14 @@ public class TurtlePlaceCommand implements ITurtleCommand
        if( !placed && (item instanceof BucketItem || item instanceof BoatItem || item instanceof LilyPadItem || item instanceof GlassBottleItem) )
        {
            ActionResultType actionResult = ForgeHooks.onItemRightClick( turtlePlayer, Hand.MAIN_HAND );
-            if( actionResult != null && actionResult.isSuccessOrConsume() )
+            if( actionResult == ActionResultType.SUCCESS )
            {
                placed = true;
            }
            else if( actionResult == null )
            {
                ActionResult<ItemStack> result = stackCopy.useItemRightClick( turtle.getWorld(), turtlePlayer, Hand.MAIN_HAND );
-                if( result.getType().isSuccessOrConsume() && !ItemStack.areItemStacksEqual( stack, result.getResult() ) )
+                if( result.getType() == ActionResultType.SUCCESS && !ItemStack.areItemStacksEqual( stack, result.getResult() ) )
                {
                    placed = true;
                    turtlePlayer.loadInventory( result.getResult() );
@@ -403,22 +405,22 @@ public class TurtlePlaceCommand implements ITurtleCommand
                    String s = (String) extraArguments[0];
                    String[] split = s.split( "\n" );
                    int firstLine = split.length <= 2 ? 1 : 0;
-                    for( int i = 0; i < 4; i++ )
+                    for( int i = 0; i < signTile.signText.length; i++ )
                    {
                        if( i >= firstLine && i < firstLine + split.length )
                        {
                            if( split[i - firstLine].length() > 15 )
                            {
-                                signTile.setText( i, new StringTextComponent( split[i - firstLine].substring( 0, 15 ) ) );
+                                signTile.signText[i] = new StringTextComponent( split[i - firstLine].substring( 0, 15 ) );
                            }
                            else
                            {
-                                signTile.setText( i, new StringTextComponent( split[i - firstLine] ) );
+                                signTile.signText[i] = new StringTextComponent( split[i - firstLine] );
                            }
                        }
                        else
                        {
-                            signTile.setText( i, new StringTextComponent( "" ) );
+                            signTile.signText[i] = new StringTextComponent( "" );
                        }
                    }
                    signTile.markDirty();
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
@@ -25,7 +25,7 @@ import net.minecraft.tileentity.SignTileEntity;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.util.FakePlayer;

@@ -55,11 +55,10 @@ public final class TurtlePlayer extends FakePlayer

    private void setState( ITurtleAccess turtle )
    {
-        if( openContainer != null )
+        if( openContainer != container )
        {
            ComputerCraft.log.warn( "Turtle has open container ({})", openContainer );
-            openContainer.onContainerClosed( this );
-            openContainer = null;
+            closeContainer();
        }

        BlockPos position = turtle.getPosition();
@@ -131,9 +130,9 @@ public final class TurtlePlayer extends FakePlayer
    }

    @Override
-    public Vector3d getPositionVec()
+    public Vec3d getPositionVector()
    {
-        return new Vector3d( getPosX(), getPosY(), getPosZ() );
+        return getPositionVec();
    }

    @Override
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java
@@ -16,7 +16,7 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -44,10 +44,10 @@ public class TurtleModem extends AbstractTurtleUpgrade

        @Nonnull
        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos turtlePos = turtle.getPosition();
-            return new Vector3d(
+            return new Vec3d(
                turtlePos.getX(),
                turtlePos.getY(),
                turtlePos.getZ()
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java
@@ -17,7 +17,7 @@ import dan200.computercraft.shared.peripheral.speaker.SpeakerPeripheral;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -42,10 +42,10 @@ public class TurtleSpeaker extends AbstractTurtleUpgrade
        }

        @Override
-        public Vector3d getPosition()
+        public Vec3d getPosition()
        {
            BlockPos pos = turtle.getPosition();
-            return new Vector3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
+            return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 );
        }

        @Override
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
@@ -19,10 +19,12 @@ import dan200.computercraft.shared.util.WorldUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.client.renderer.Matrix4f;
+import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.ai.attributes.Attributes;
+import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.item.ArmorStandEntity;
-import net.minecraft.fluid.FluidState;
+import net.minecraft.fluid.IFluidState;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -30,9 +32,7 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.Direction;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Matrix4f;
-import net.minecraft.util.math.vector.TransformationMatrix;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -119,9 +119,9 @@ public class TurtleTool extends AbstractTurtleUpgrade
        final TurtlePlayer turtlePlayer = TurtlePlaceCommand.createPlayer( turtle, position, direction );

        // See if there is an entity present
-        Vector3d turtlePos = turtlePlayer.getPositionVec();
-        Vector3d rayDir = turtlePlayer.getLook( 1.0f );
-        Pair<Entity, Vector3d> hit = WorldUtil.rayTraceEntities( world, turtlePos, rayDir, 1.5 );
+        Vec3d turtlePos = turtlePlayer.getPositionVec();
+        Vec3d rayDir = turtlePlayer.getLook( 1.0f );
+        Pair<Entity, Vec3d> hit = WorldUtil.rayTraceEntities( world, turtlePos, rayDir, 1.5 );
        if( hit != null )
        {
            // Load up the turtle's inventory
@@ -149,7 +149,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
            boolean attacked = false;
            if( !hitEntity.hitByEntity( turtlePlayer ) )
            {
-                float damage = (float) turtlePlayer.getAttributeValue( Attributes.ATTACK_DAMAGE );
+                float damage = (float) turtlePlayer.getAttribute( SharedMonsterAttributes.ATTACK_DAMAGE ).getValue();
                damage *= getDamageMultiplier();
                if( damage > 0.0f )
                {
@@ -201,7 +201,7 @@ public class TurtleTool extends AbstractTurtleUpgrade
        }

        BlockState state = world.getBlockState( blockPosition );
-        FluidState fluidState = world.getFluidState( blockPosition );
+        IFluidState fluidState = world.getFluidState( blockPosition );

        TurtlePlayer turtlePlayer = TurtlePlaceCommand.createPlayer( turtle, turtlePosition, direction );
        turtlePlayer.loadInventory( item.copy() );
--- a/src/main/java/dan200/computercraft/shared/util/ColourUtils.java
+++ b/src/main/java/dan200/computercraft/shared/util/ColourUtils.java
@@ -8,7 +8,7 @@ package dan200.computercraft.shared.util;
 import net.minecraft.item.DyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tags.ITag;
+import net.minecraft.tags.Tag;
 import net.minecraftforge.common.Tags;

 import javax.annotation.Nullable;
@@ -16,7 +16,7 @@ import javax.annotation.Nullable;
 public final class ColourUtils
 {
    @SuppressWarnings( { "unchecked", "rawtypes" } )
-    private static final ITag<Item>[] DYES = new ITag[] {
+    private static final Tag<Item>[] DYES = new Tag[] {
        Tags.Items.DYES_WHITE,
        Tags.Items.DYES_ORANGE,
        Tags.Items.DYES_MAGENTA,
@@ -40,9 +40,11 @@ public final class ColourUtils

    public static DyeColor getStackColour( ItemStack stack )
    {
+        if( stack.isEmpty() ) return null;
+
        for( int i = 0; i < DYES.length; i++ )
        {
-            ITag<Item> dye = DYES[i];
+            Tag<Item> dye = DYES[i];
            if( dye.contains( stack.getItem() ) ) return DyeColor.byId( i );
        }

--- a/src/main/java/dan200/computercraft/shared/util/DropConsumer.java
+++ b/src/main/java/dan200/computercraft/shared/util/DropConsumer.java
@@ -42,8 +42,6 @@ public final class DropConsumer
        dropEntity = entity;
        dropWorld = entity.world;
        dropBounds = new AxisAlignedBB( entity.getPosition() ).grow( 2, 2, 2 );
-
-        entity.captureDrops( new ArrayList<>() );
    }

    public static void set( World world, BlockPos pos, Function<ItemStack, ItemStack> consumer )
@@ -79,14 +77,14 @@ public final class DropConsumer
    {
        // Capture any nearby item spawns
        if( dropWorld == event.getWorld() && event.getEntity() instanceof ItemEntity
-            && dropBounds.contains( event.getEntity().getPositionVec() ) )
+            && dropBounds.contains( event.getEntity().getPositionVector() ) )
        {
            handleDrops( ((ItemEntity) event.getEntity()).getItem() );
            event.setCanceled( true );
        }
    }

-    @SubscribeEvent
+    @SubscribeEvent( priority = EventPriority.LOW )
    public static void onLivingDrops( LivingDropsEvent drops )
    {
        if( dropEntity == null || drops.getEntity() != dropEntity ) return;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
SquidDev	334ca65482	Bump to 1.93.0	2020-10-04 11:19:43 +01:00
Jonathan Coates	8472112fc1	Don't propagate adjacent redstone signals for computers (#549 ) Minecraft propagates "strong" redstone signals (such as those directly from comparators or repeaters) through solid blocks. This includes computers, which is a little annoying as it means one cannot feed redstone wire from one side and a repeater from another. This changes computers to not propagate strong redstone signals, in the same way transparent blocks like glass do. Closes #548.	2020-10-04 11:14:22 +01:00
SquidDev	84036d97d9	Fix io.open documentation Well, that was silly.	2020-10-02 21:21:53 +01:00
Weblate	0832974725	Translations for Swedish Co-authored-by: David Isaksson <davidisaksson93@gmail.com>	2020-09-30 08:25:57 +00:00
SquidDev	6cee4efcd3	Fix incorrect open container check Was this always broken, or did it happen in a Minecraft update? Don't know, but it's a very silly mistake either way. Fixes #544	2020-09-24 17:47:30 +01:00
SquidDev	6f868849ab	Use tags to check if something is a dye We half did this already, just needed to change a couple of checks. Closes #541.	2020-09-16 21:27:59 +01:00
SquidDev	275ca58a82	HTTP rules now allow filtering by port The HTTP filtering system becomes even more complex! Though in this case, it's pretty minimal, and definitely worth doing. For instance, the following rule will allow connecting to localhost on port :8080. [[http.rules]] host = "127.0.0.1" port = 8080 action = "allow" # Other rules as before. Closes #540	2020-09-15 22:05:27 +01:00
SquidDev	87393e8aef	Fix additional `-` in docs Why isn't this automatically stripped! Bad squid.	2020-09-13 17:56:12 +01:00
SquidDev	86bf57e3cd	My inability to spell will be immortalsied in the changelog	2020-09-12 11:03:18 +01:00
SquidDev	748ebbe66b	Bump to 1.92.0 A tiny release, but there's new features so it's technically a minor bump.	2020-09-12 09:27:47 +01:00
SquidDev	59de21eae2	Handle tabs when parsing JSON Fixes #539	2020-09-11 18:02:23 +01:00
SquidDev	50473afea8	Fix Gradle example for depending on CC:T See #405	2020-09-09 08:39:28 +01:00
SquidDev	37f925de0a	Remove references to cc.crzd.me's maven As CC only exists on 1.12.2, it's a bit meaningless to talk about it on 1.15+!	2020-09-08 18:37:40 +01:00
SquidDev	cefde3f003	Also block 0.0.0.0/8 See MightyPirates/OpenComputers#3356	2020-09-08 18:12:20 +01:00
Weblate	ae6124d1f4	Translations for Vietnamese Co-authored-by: Boom <boom@flyingpackets.net>	2020-09-08 03:57:52 +00:00
Weblate	7e121ff72f	Translations for Vietnamese Co-authored-by: Boom <boom@flyingpackets.net>	2020-09-07 06:37:58 +00:00
Weblate	5155e18de2	Added translation for Vietnamese Co-authored-by: Boom <boom@flyingpackets.net>	2020-09-07 03:33:36 +00:00
SquidDev	7365741088	Don't use entity.captureDrops at all. This really should have been removed in `9e2232d240`. Otherwise we don't drop these items into the world at all. Fixes #537.	2020-09-05 11:02:24 +01:00
JackMacWindows	d5368d0719	Add date-specific MOTDs (like Minecraft) (#533 )	2020-09-04 17:35:46 +01:00
Jonathan Coates	04509cefec	Merge pull request #529 from Bluenaxela/mc-1.15.x Pretty sure FileSystemWrapperMount.isDirectory() should call Filesystem.isDir(), not Filesystem.exists()	2020-08-25 08:11:13 +01:00
Bluenaxela	74b9f5dcb0	Fix FileSystemWrapperMount.isDirectory() Pretty sure FileSystemWrapperMount.isDirectory() should call Filesystem.isDir(), not Filesystem.exists()	2020-08-24 23:55:24 -07:00