It now compiles.

2025-10-24 10:27:38 +00:00 · 2020-08-31 19:09:22 -05:00
parent cb549d8f43
commit 76fe33760d
212 changed files with 3518 additions and 5783 deletions
--- a/src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java
@@ -5,28 +5,25 @@
 */
 package dan200.computercraft.client.render;

-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.shared.Registry;
+import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
 import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.util.WorldUtil;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.World;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.DrawHighlightEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;

-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Environment(EnvType.CLIENT)
 public final class CableHighlightRenderer
 {
    private CableHighlightRenderer()
@@ -35,29 +32,19 @@ public final class CableHighlightRenderer

    /**
     * Draw an outline for a specific part of a cable "Multipart".
-     *
-     * @param event The event to observe
-     * @see WorldRenderer#drawSelectionBox(MatrixStack, IVertexBuilder, Entity, double, double, double, BlockPos, BlockState)
     */
-    @SubscribeEvent
-    public static void drawHighlight( DrawHighlightEvent.HighlightBlock event )
+    public static boolean drawHighlight(MatrixStack stack, VertexConsumer consumer, Entity entity, double d, double e, double f, BlockPos pos, BlockState state)
    {
-        BlockHitResult hit = event.getTarget();
-        BlockPos pos = hit.getBlockPos();
-        World world = event.getInfo().getFocusedEntity().getEntityWorld();
-        Camera info = event.getInfo();
-
-        BlockState state = world.getBlockState( pos );
+        World world = entity.getEntityWorld();
+        Camera info = MinecraftClient.getInstance().gameRenderer.getCamera();

        // We only care about instances with both cable and modem.
-        if( state.getBlock() != Registry.ModBlocks.CABLE.get() || state.get( BlockCable.MODEM ).getFacing() == null || !state.get( BlockCable.CABLE ) )
+        if( state.getBlock() != ComputerCraftRegistry.ModBlocks.CABLE || state.get( BlockCable.MODEM ).getFacing() == null || !state.get( BlockCable.CABLE ) )
        {
-            return;
+            return false;
        }

-        event.setCanceled( true );
-
-        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ), hit.getPos().subtract( pos.getX(), pos.getY(), pos.getZ() ) )
+        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ), new Vec3d(d, e, f).subtract( pos.getX(), pos.getY(), pos.getZ() ) )
            ? CableShapes.getModemShape( state )
            : CableShapes.getCableShape( state );

@@ -65,14 +52,14 @@ public final class CableHighlightRenderer
        double xOffset = pos.getX() - cameraPos.getX();
        double yOffset = pos.getY() - cameraPos.getY();
        double zOffset = pos.getZ() - cameraPos.getZ();
-
-        VertexConsumer buffer = event.getBuffers().getBuffer( RenderLayer.getLines() );
-        Matrix4f matrix4f = event.getMatrix().peek().getModel();
+        Matrix4f matrix4f = stack.peek().getModel();
        shape.forEachEdge( ( x1, y1, z1, x2, y2, z2 ) -> {
-            buffer.vertex( matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset) )
+            consumer.vertex( matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset) )
                .color( 0, 0, 0, 0.4f ).next();
-            buffer.vertex( matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset) )
+            consumer.vertex( matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset) )
                .color( 0, 0, 0, 0.4f ).next();
        } );
+
+        return true;
    }
 }
--- a/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
@@ -5,6 +5,8 @@
 */
 package dan200.computercraft.client.render;

+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.HeldItemRenderer;
@@ -16,6 +18,7 @@ import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.MathHelper;

+@Environment(EnvType.CLIENT)
 public abstract class ItemMapLikeRenderer
 {
    /**
@@ -24,11 +27,10 @@ public abstract class ItemMapLikeRenderer
     * @param transform The matrix transformation stack
     * @param render    The buffer to render to
     * @param stack     The stack to render
-     * @see FirstPersonRenderer#renderItemInFirstPerson(AbstractClientPlayerEntity, float, float, Hand, float, ItemStack, float, MatrixStack, IRenderTypeBuffer, int)
     */
    protected abstract void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack );

-    protected void renderItemFirstPerson( MatrixStack transform, VertexConsumerProvider render, int lightTexture, Hand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack )
+    public void renderItemFirstPerson(MatrixStack transform, VertexConsumerProvider render, int lightTexture, Hand hand, float pitch, float equipProgress, float swingProgress, ItemStack stack)
    {
        PlayerEntity player = MinecraftClient.getInstance().player;

@@ -58,7 +60,6 @@ public abstract class ItemMapLikeRenderer
     * @param equipProgress The equip progress of this item
     * @param swingProgress The swing progress of this item
     * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPersonSide(MatrixStack, IRenderTypeBuffer, int, float, HandSide, float, ItemStack)
     */
    private void renderItemFirstPersonSide( MatrixStack transform, VertexConsumerProvider render, int combinedLight, Arm side, float equipProgress, float swingProgress, ItemStack stack )
    {
@@ -103,7 +104,6 @@ public abstract class ItemMapLikeRenderer
     * @param equipProgress The equip progress of this item
     * @param swingProgress The swing progress of this item
     * @param stack         The stack to render
-     * @see FirstPersonRenderer#renderMapFirstPerson(MatrixStack, IRenderTypeBuffer, int, float, float, float)
     */
    private void renderItemFirstPersonCenter( MatrixStack transform, VertexConsumerProvider render, int combinedLight, float pitch, float equipProgress, float swingProgress, ItemStack stack )
    {
--- a/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
@@ -22,10 +22,6 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.Matrix4f;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderHandEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
 import org.lwjgl.opengl.GL11;

 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
@@ -36,30 +32,16 @@ import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
 /**
 * Emulates map rendering for pocket computers.
 */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class ItemPocketRenderer extends ItemMapLikeRenderer
 {
    private static final int LIGHT_HEIGHT = 8;

-    private static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
+    public static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();

    private ItemPocketRenderer()
    {
    }

-    @SubscribeEvent
-    public static void onRenderInHand( RenderHandEvent event )
-    {
-        ItemStack stack = event.getItemStack();
-        if( !(stack.getItem() instanceof ItemPocketComputer) ) return;
-
-        event.setCanceled( true );
-        INSTANCE.renderItemFirstPerson(
-            event.getMatrixStack(), event.getBuffers(), event.getLight(),
-            event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack()
-        );
-    }
-
    @Override
    protected void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
    {
@@ -69,8 +51,8 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer
        int termWidth, termHeight;
        if( terminal == null )
        {
-            termWidth = ComputerCraft.pocketTermWidth;
-            termHeight = ComputerCraft.pocketTermHeight;
+            termWidth = ComputerCraft.terminalWidth_pocketComputer;
+            termHeight = ComputerCraft.terminalHeight_pocketComputer;
        }
        else
        {
--- a/src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java
@@ -7,16 +7,12 @@ package dan200.computercraft.client.render;

 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.media.items.ItemPrintout;
+import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.Matrix4f;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderHandEvent;
-import net.minecraftforge.client.event.RenderItemInFrameEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;

 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
@@ -27,28 +23,14 @@ import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENG
 /**
 * Emulates map and item-frame rendering for printouts.
 */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
 public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
 {
-    private static final ItemPrintoutRenderer INSTANCE = new ItemPrintoutRenderer();
+    public static final ItemPrintoutRenderer INSTANCE = new ItemPrintoutRenderer();

    private ItemPrintoutRenderer()
    {
    }

-    @SubscribeEvent
-    public static void onRenderInHand( RenderHandEvent event )
-    {
-        ItemStack stack = event.getItemStack();
-        if( !(stack.getItem() instanceof ItemPrintout) ) return;
-
-        event.setCanceled( true );
-        INSTANCE.renderItemFirstPerson(
-            event.getMatrixStack(), event.getBuffers(), event.getLight(),
-            event.getHand(), event.getInterpolatedPitch(), event.getEquipProgress(), event.getSwingProgress(), event.getItemStack()
-        );
-    }
-
    @Override
    protected void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
    {
@@ -59,22 +41,19 @@ public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
        drawPrintout( transform, render, stack );
    }

-    @SubscribeEvent
-    public static void onRenderInFrame( RenderItemInFrameEvent event )
+    public boolean renderInFrame(MatrixStack matrixStack, VertexConsumerProvider consumerProvider, ItemStack stack )
    {
-        ItemStack stack = event.getItem();
-        if( !(stack.getItem() instanceof ItemPrintout) ) return;
-        event.setCanceled( true );
-
-        MatrixStack transform = event.getMatrix();
+        if( !(stack.getItem() instanceof ItemPrintout) ) return false;

        // Move a little bit forward to ensure we're not clipping with the frame
-        transform.translate( 0.0f, 0.0f, -0.001f );
-        transform.multiply( Vector3f.POSITIVE_Z.getDegreesQuaternion( 180f ) );
-        transform.scale( 0.95f, 0.95f, -0.95f );
-        transform.translate( -0.5f, -0.5f, 0.0f );
+        matrixStack.translate( 0.0f, 0.0f, -0.001f );
+        matrixStack.multiply( Vector3f.POSITIVE_Z.getDegreesQuaternion( 180f ) );
+        matrixStack.scale( 0.95f, 0.95f, -0.95f );
+        matrixStack.translate( -0.5f, -0.5f, 0.0f );

-        drawPrintout( transform, event.getBuffers(), stack );
+        drawPrintout( matrixStack, consumerProvider, stack );
+
+        return true;
    }

    private static void drawPrintout( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
--- a/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
@@ -5,21 +5,20 @@
 */
 package dan200.computercraft.client.render;

-import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.DrawHighlightEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;

 import java.util.EnumSet;

@@ -29,27 +28,24 @@ import static net.minecraft.util.math.Direction.*;
 * Overrides monitor highlighting to only render the outline of the <em>whole</em> monitor, rather than the current
 * block. This means you do not get an intrusive outline on top of the screen.
 */
-@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Dist.CLIENT )
+@Environment(EnvType.CLIENT)
 public final class MonitorHighlightRenderer
 {
    private MonitorHighlightRenderer()
    {
    }

-    @SubscribeEvent
-    public static void drawHighlight( DrawHighlightEvent.HighlightBlock event )
+    public static boolean drawHighlight(MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos pos, BlockState blockState)
    {
        // Preserve normal behaviour when crouching.
-        if( event.getInfo().getFocusedEntity().isInSneakingPose() ) return;
+        if( entity.isInSneakingPose() ) return false;

-        World world = event.getInfo().getFocusedEntity().getEntityWorld();
-        BlockPos pos = event.getTarget().getBlockPos();
+        World world = entity.getEntityWorld();

        BlockEntity tile = world.getBlockEntity( pos );
-        if( !(tile instanceof TileMonitor) ) return;
+        if( !(tile instanceof TileMonitor) ) return false;

        TileMonitor monitor = (TileMonitor) tile;
-        event.setCanceled( true );

        // Determine which sides are part of the external faces of the monitor, and so which need to be rendered.
        EnumSet<Direction> faces = EnumSet.allOf( Direction.class );
@@ -60,28 +56,28 @@ public final class MonitorHighlightRenderer
        if( monitor.getYIndex() != 0 ) faces.remove( monitor.getDown().getOpposite() );
        if( monitor.getYIndex() != monitor.getHeight() - 1 ) faces.remove( monitor.getDown() );

-        MatrixStack transformStack = event.getMatrix();
-        Vec3d cameraPos = event.getInfo().getPos();
-        transformStack.push();
-        transformStack.translate( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );
+        Vec3d cameraPos = MinecraftClient.getInstance().gameRenderer.getCamera().getPos();
+        matrixStack.push();
+        matrixStack.translate( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );

        // I wish I could think of a better way to do this
-        VertexConsumer buffer = event.getBuffers().getBuffer( RenderLayer.getLines() );
-        Matrix4f transform = transformStack.peek().getModel();
-        if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( buffer, transform, 0, 0, 0, UP );
-        if( faces.contains( SOUTH ) || faces.contains( WEST ) ) line( buffer, transform, 0, 0, 1, UP );
-        if( faces.contains( NORTH ) || faces.contains( EAST ) ) line( buffer, transform, 1, 0, 0, UP );
-        if( faces.contains( SOUTH ) || faces.contains( EAST ) ) line( buffer, transform, 1, 0, 1, UP );
-        if( faces.contains( NORTH ) || faces.contains( DOWN ) ) line( buffer, transform, 0, 0, 0, EAST );
-        if( faces.contains( SOUTH ) || faces.contains( DOWN ) ) line( buffer, transform, 0, 0, 1, EAST );
-        if( faces.contains( NORTH ) || faces.contains( UP ) ) line( buffer, transform, 0, 1, 0, EAST );
-        if( faces.contains( SOUTH ) || faces.contains( UP ) ) line( buffer, transform, 0, 1, 1, EAST );
-        if( faces.contains( WEST ) || faces.contains( DOWN ) ) line( buffer, transform, 0, 0, 0, SOUTH );
-        if( faces.contains( EAST ) || faces.contains( DOWN ) ) line( buffer, transform, 1, 0, 0, SOUTH );
-        if( faces.contains( WEST ) || faces.contains( UP ) ) line( buffer, transform, 0, 1, 0, SOUTH );
-        if( faces.contains( EAST ) || faces.contains( UP ) ) line( buffer, transform, 1, 1, 0, SOUTH );
+        Matrix4f transform = matrixStack.peek().getModel();
+        if( faces.contains( NORTH ) || faces.contains( WEST ) ) line( vertexConsumer, transform, 0, 0, 0, UP );
+        if( faces.contains( SOUTH ) || faces.contains( WEST ) ) line( vertexConsumer, transform, 0, 0, 1, UP );
+        if( faces.contains( NORTH ) || faces.contains( EAST ) ) line( vertexConsumer, transform, 1, 0, 0, UP );
+        if( faces.contains( SOUTH ) || faces.contains( EAST ) ) line( vertexConsumer, transform, 1, 0, 1, UP );
+        if( faces.contains( NORTH ) || faces.contains( DOWN ) ) line( vertexConsumer, transform, 0, 0, 0, EAST );
+        if( faces.contains( SOUTH ) || faces.contains( DOWN ) ) line( vertexConsumer, transform, 0, 0, 1, EAST );
+        if( faces.contains( NORTH ) || faces.contains( UP ) ) line( vertexConsumer, transform, 0, 1, 0, EAST );
+        if( faces.contains( SOUTH ) || faces.contains( UP ) ) line( vertexConsumer, transform, 0, 1, 1, EAST );
+        if( faces.contains( WEST ) || faces.contains( DOWN ) ) line( vertexConsumer, transform, 0, 0, 0, SOUTH );
+        if( faces.contains( EAST ) || faces.contains( DOWN ) ) line( vertexConsumer, transform, 1, 0, 0, SOUTH );
+        if( faces.contains( WEST ) || faces.contains( UP ) ) line( vertexConsumer, transform, 0, 1, 0, SOUTH );
+        if( faces.contains( EAST ) || faces.contains( UP ) ) line( vertexConsumer, transform, 1, 1, 0, SOUTH );

-        transformStack.pop();
+        matrixStack.pop();
+
+        return true;
    }

    private static void line( VertexConsumer buffer, Matrix4f transform, float x, float y, float z, Direction direction )
--- a/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
@@ -32,7 +32,6 @@ import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.client.model.data.EmptyModelData;

 import javax.annotation.Nonnull;
 import java.util.List;
@@ -80,7 +79,7 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
        if( label != null && hit.getType() == HitResult.Type.BLOCK && turtle.getPos().equals( ((BlockHitResult) hit).getBlockPos() ) )
        {
            MinecraftClient mc = MinecraftClient.getInstance();
-            TextRenderer font = dispatcher.textRenderer;
+            TextRenderer font = mc.textRenderer;

            transform.push();
            transform.translate( 0.5, 1.2, 0.5 );
@@ -146,7 +145,7 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
        transform.translate( 0.0f, -0.5f, -0.5f );

        TransformedModel model = upgrade.getModel( turtle.getAccess(), side );
-        model.getMatrix().push( transform );
+        // model.getMatrix().multiply(transform);
        renderModel( transform, renderer, lightmapCoord, overlayLight, model.getModel(), null );
        transform.pop();

@@ -162,10 +161,10 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
    private void renderModel( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, BakedModel model, int[] tints )
    {
        random.setSeed( 0 );
-        renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, null, random, EmptyModelData.INSTANCE ), tints );
+        renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, null, random ), tints );
        for( Direction facing : DirectionUtil.FACINGS )
        {
-            renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, facing, random, EmptyModelData.INSTANCE ), tints );
+            renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, facing, random ), tints );
        }
    }

@@ -185,7 +184,7 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
            float f = (float) (tint >> 16 & 255) / 255.0F;
            float f1 = (float) (tint >> 8 & 255) / 255.0F;
            float f2 = (float) (tint & 255) / 255.0F;
-            buffer.addVertexData( matrix, bakedquad, f, f1, f2, lightmapCoord, overlayLight, true );
+            buffer.quad( matrix, bakedquad, new float[]{1.0F, 1.0F, 1.0F, 1.0F}, f, f1, f2, new int[] {lightmapCoord, lightmapCoord, lightmapCoord, lightmapCoord}, overlayLight, true );
        }
    }
 }
--- a/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java
@@ -1,82 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft.client.render;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonObject;
-import com.mojang.datafixers.util.Pair;
-import dan200.computercraft.ComputerCraft;
-import net.minecraft.client.render.model.BakedModel;
-import net.minecraft.client.render.model.ModelBakeSettings;
-import net.minecraft.client.render.model.ModelLoader;
-import net.minecraft.client.render.model.UnbakedModel;
-import net.minecraft.client.render.model.json.ModelOverrideList;
-import net.minecraft.client.renderer.model.*;
-import net.minecraft.client.texture.Sprite;
-import net.minecraft.client.util.SpriteIdentifier;
-import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.JsonHelper;
-import net.minecraftforge.client.model.IModelConfiguration;
-import net.minecraftforge.client.model.IModelLoader;
-import net.minecraftforge.client.model.geometry.IModelGeometry;
-
-import javax.annotation.Nonnull;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.function.Function;
-
-public final class TurtleModelLoader implements IModelLoader<TurtleModelLoader.TurtleModel>
-{
-    private static final Identifier COLOUR_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_colour" );
-
-    public static final TurtleModelLoader INSTANCE = new TurtleModelLoader();
-
-    private TurtleModelLoader() {
-    }
-
-    @Override
-    public void apply( @Nonnull ResourceManager manager )
-    {
-    }
-
-    @Nonnull
-    @Override
-    public TurtleModel read( @Nonnull JsonDeserializationContext deserializationContext, @Nonnull JsonObject modelContents )
-    {
-        Identifier model = new Identifier( JsonHelper.getString( modelContents, "model" ) );
-        return new TurtleModel( model );
-    }
-
-    public static final class TurtleModel implements IModelGeometry<TurtleModel>
-    {
-        private final Identifier family;
-
-        private TurtleModel( Identifier family )
-        {
-            this.family = family;
-        }
-
-        @Override
-        public Collection<SpriteIdentifier> getTextures( IModelConfiguration owner, Function<Identifier, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
-        {
-            Set<SpriteIdentifier> materials = new HashSet<>();
-            materials.addAll( modelGetter.apply( family ).getTextureDependencies( modelGetter, missingTextureErrors ) );
-            materials.addAll( modelGetter.apply( COLOUR_TURTLE_MODEL ).getTextureDependencies( modelGetter, missingTextureErrors ) );
-            return materials;
-        }
-
-        @Override
-        public BakedModel bake( IModelConfiguration owner, ModelLoader bakery, Function<SpriteIdentifier, Sprite> spriteGetter, ModelBakeSettings transform, ModelOverrideList overrides, Identifier modelLocation )
-        {
-            return new TurtleSmartItemModel(
-                bakery.getBakedModel( family, transform, spriteGetter ),
-                bakery.getBakedModel( COLOUR_TURTLE_MODEL, transform, spriteGetter )
-            );
-        }
-    }
-}
--- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
@@ -6,6 +6,8 @@
 package dan200.computercraft.client.render;

 import dan200.computercraft.api.client.TransformedModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;
@@ -13,14 +15,11 @@ import net.minecraft.client.render.model.json.ModelOverrideList;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.math.AffineTransformation;
 import net.minecraft.util.math.Direction;
-import net.minecraftforge.client.model.data.EmptyModelData;
-import net.minecraftforge.client.model.data.IModelData;
-import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
-import net.minecraftforge.client.model.pipeline.TRSRTransformer;

 import javax.annotation.Nonnull;
 import java.util.*;

+@Environment(EnvType.CLIENT)
 public class TurtleMultiModel implements BakedModel
 {
    private final BakedModel m_baseModel;
@@ -43,15 +42,7 @@ public class TurtleMultiModel implements BakedModel

    @Nonnull
    @Override
-    @Deprecated
    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
-    {
-        return getQuads( state, side, rand, EmptyModelData.INSTANCE );
-    }
-
-    @Nonnull
-    @Override
-    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand, @Nonnull IModelData data )
    {
        if( side != null )
        {
@@ -70,20 +61,20 @@ public class TurtleMultiModel implements BakedModel
        ArrayList<BakedQuad> quads = new ArrayList<>();


-        transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
+        transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand ), m_generalTransform );
        if( m_overlayModel != null )
        {
-            transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
+            transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand ), m_generalTransform );
        }
        if( m_leftUpgradeModel != null )
        {
-            AffineTransformation upgradeTransform = m_generalTransform.compose( m_leftUpgradeModel.getMatrix() );
-            transformQuadsTo( quads, m_leftUpgradeModel.getModel().getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
+            AffineTransformation upgradeTransform = m_generalTransform.multiply( m_leftUpgradeModel.getMatrix() );
+            transformQuadsTo( quads, m_leftUpgradeModel.getModel().getQuads( state, side, rand ), upgradeTransform );
        }
        if( m_rightUpgradeModel != null )
        {
-            AffineTransformation upgradeTransform = m_generalTransform.compose( m_rightUpgradeModel.getMatrix() );
-            transformQuadsTo( quads, m_rightUpgradeModel.getModel().getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
+            AffineTransformation upgradeTransform = m_generalTransform.multiply( m_rightUpgradeModel.getMatrix() );
+            transformQuadsTo( quads, m_rightUpgradeModel.getModel().getQuads( state, side, rand ), upgradeTransform );
        }
        quads.trimToSize();
        return quads;
@@ -140,10 +131,11 @@ public class TurtleMultiModel implements BakedModel
    {
        for( BakedQuad quad : quads )
        {
-            BakedQuadBuilder builder = new BakedQuadBuilder();
-            TRSRTransformer transformer = new TRSRTransformer( builder, transform );
-            quad.pipe( transformer );
-            output.add( builder.build() );
+            // TODO Figure out what the fuck to do here
+//            BakedQuadBuilder builder = new BakedQuadBuilder();
+//            TRSRTransformer transformer = new TRSRTransformer( builder, transform );
+//            quad.pipe( transformer );
+//            output.add( builder.build() );
        }
    }
 }
--- a/src/main/java/dan200/computercraft/client/render/TurtlePlayerRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtlePlayerRenderer.java
@@ -8,6 +8,8 @@ package dan200.computercraft.client.render;

 import dan200.computercraft.shared.turtle.core.TurtlePlayer;
 import javax.annotation.Nonnull;
+
+import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;
@@ -21,9 +23,13 @@ public class TurtlePlayerRenderer extends EntityRenderer<TurtlePlayer>
        super( renderManager );
    }

+    public TurtlePlayerRenderer(EntityRenderDispatcher entityRenderDispatcher, EntityRendererRegistry.Context context) {
+        super(entityRenderDispatcher);
+    }
+
    @Nonnull
    @Override
-    public Identifier getEntityTexture( @Nonnull TurtlePlayer entity )
+    public Identifier getTexture( @Nonnull TurtlePlayer entity )
    {
        return ComputerBorderRenderer.BACKGROUND_NORMAL;
    }
--- a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
@@ -5,13 +5,6 @@
 */
 package dan200.computercraft.client.render;

-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.base.Objects;
 import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
@@ -19,8 +12,8 @@ import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.turtle.items.ItemTurtle;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-import net.minecraftforge.client.model.data.IModelData;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.model.BakedModel;
@@ -28,7 +21,6 @@ import net.minecraft.client.render.model.BakedModelManager;
 import net.minecraft.client.render.model.BakedQuad;
 import net.minecraft.client.render.model.json.ModelOverrideList;
 import net.minecraft.client.render.model.json.ModelTransformation;
-import net.minecraft.client.renderer.model.*;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.ModelIdentifier;
 import net.minecraft.client.util.math.AffineTransformation;
@@ -39,11 +31,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;

-@SuppressWarnings ({
-    "MethodCallSideOnly",
-    "LocalVariableDeclarationSideOnly",
-    "NewExpressionSideOnly"
-})
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
+
+@Environment(EnvType.CLIENT)
 public class TurtleSmartItemModel implements BakedModel
 {
    private static final AffineTransformation identity, flip;
@@ -170,14 +164,6 @@ public class TurtleSmartItemModel implements BakedModel
        return familyModel.getQuads( state, facing, rand );
    }

-    @Nonnull
-    @Override
-    @Deprecated
-    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand, @Nonnull IModelData data )
-    {
-        return familyModel.getQuads( state, facing, rand, data );
-    }
-
    @Override
    public boolean useAmbientOcclusion()
    {