From 27b732f835b82545b6bc179df4875eaa20a06847 Mon Sep 17 00:00:00 2001
From: Jonathan Coates <git@squiddev.cc>
Date: Thu, 15 Dec 2022 22:25:14 +0000
Subject: [PATCH] Make the turtle label move with the turtle

We now perform movement translations before rendering the label, rather
than afterwards. This means the label moves smoothly(ish), rather than
jumping from block to block.
---
 .../client/render/TurtleBlockEntityRenderer.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java b/projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java
index 726e6737c..14930f0d9 100644
--- a/projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java
+++ b/projects/common/src/client/java/dan200/computercraft/client/render/TurtleBlockEntityRenderer.java
@@ -67,6 +67,12 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
 
     @Override
     public void render(TurtleBlockEntity turtle, float partialTicks, PoseStack transform, MultiBufferSource buffers, int lightmapCoord, int overlayLight) {
+        transform.pushPose();
+
+        // Translate the turtle first, so the label moves with it.
+        var offset = turtle.getRenderOffset(partialTicks);
+        transform.translate(offset.x, offset.y, offset.z);
+
         // Render the label
         var label = turtle.getLabel();
         var hit = renderer.cameraHitResult;
@@ -88,17 +94,11 @@ public class TurtleBlockEntityRenderer implements BlockEntityRenderer<TurtleBloc
             transform.popPose();
         }
 
-        transform.pushPose();
-
-        // Setup the transform.
-        var offset = turtle.getRenderOffset(partialTicks);
-        var yaw = turtle.getRenderYaw(partialTicks);
-        transform.translate(offset.x, offset.y, offset.z);
-
+        // Then apply rotation and flip if needed.
         transform.translate(0.5f, 0.5f, 0.5f);
+        var yaw = turtle.getRenderYaw(partialTicks);
         transform.mulPose(Axis.YP.rotationDegrees(180.0f - yaw));
         if (label != null && (label.equals("Dinnerbone") || label.equals("Grumm"))) {
-            // Flip the model
             transform.scale(1.0f, -1.0f, 1.0f);
         }
         transform.translate(-0.5f, -0.5f, -0.5f);