Fix rendering of shapes near the world border. Closes #694

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/render/Cuboid.java

@@ -3,6 +3,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
@@ -34,9 +35,9 @@ public Cuboid(Vec3 start, Vec3 end, int color) {
     }
 
     @Override
-    public void render(PoseStack poseStack, VertexConsumer vertexConsumer, float delta) {
+    public void render(VertexConsumer vertexConsumer, WorldRenderContext context) {
         for (Line edge : this.edges) {
-            edge.renderLine(poseStack, vertexConsumer, delta, prevPos.subtract(getPos()));
+            edge.renderLine(vertexConsumer, context, prevPos.subtract(getPos()));
         }
     }
 

src/main/java/net/earthcomputer/clientcommands/render/Line.java

@@ -2,6 +2,7 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.minecraft.world.phys.Vec3;
 
 public class Line extends Shape {
@@ -17,14 +18,18 @@ public Line(Vec3 start, Vec3 end, int color) {
     }
 
     @Override
-    public void render(PoseStack poseStack, VertexConsumer vertexConsumer, float delta) {
-        renderLine(poseStack, vertexConsumer, delta, prevPos.subtract(getPos()));
+    public void render(VertexConsumer vertexConsumer, WorldRenderContext context) {
+        renderLine(vertexConsumer, context, prevPos.subtract(getPos()));
     }
 
-    public void renderLine(PoseStack poseStack, VertexConsumer vertexConsumer, float delta, Vec3 prevPosOffset) {
+    public void renderLine(VertexConsumer vertexConsumer, WorldRenderContext context, Vec3 prevPosOffset) {
+        PoseStack poseStack = context.matrixStack();
+        float delta = context.tickCounter().getRealtimeDeltaTicks();
+        Vec3 cameraPos = context.camera().getPosition();
+        assert poseStack != null;
         Vec3 normal = this.end.subtract(this.start).normalize();
-        putVertex(poseStack, vertexConsumer, this.start.add(prevPosOffset.scale(1 - delta)), normal);
-        putVertex(poseStack, vertexConsumer, this.end.add(prevPosOffset.scale(1 - delta)), normal);
+        putVertex(poseStack, vertexConsumer, this.start.add(prevPosOffset.scale(1 - delta)).subtract(cameraPos), normal);
+        putVertex(poseStack, vertexConsumer, this.end.add(prevPosOffset.scale(1 - delta)).subtract(cameraPos), normal);
     }
 
     private void putVertex(PoseStack poseStack, VertexConsumer vertexConsumer, Vec3 pos, Vec3 normal) {

src/main/java/net/earthcomputer/clientcommands/render/RenderQueue.java

@@ -2,11 +2,9 @@
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.blaze3d.vertex.VertexFormat;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderPipelines;
@@ -44,13 +42,7 @@ public class RenderQueue {
     static {
         ClientTickEvents.START_CLIENT_TICK.register(RenderQueue::tick);
         WorldRenderEvents.AFTER_ENTITIES.register(context -> {
-            context.matrixStack().pushPose();
-
-            Vec3 cameraPos = context.camera().getPosition();
-            context.matrixStack().translate(-cameraPos.x, -cameraPos.y, -cameraPos.z);
-            RenderQueue.render(RenderQueue.Layer.ON_TOP, Objects.requireNonNull(context.consumers()).getBuffer(RenderQueue.LINES_NO_DEPTH_LAYER), context.matrixStack(), context.tickCounter().getRealtimeDeltaTicks());
-
-            context.matrixStack().popPose();
+            RenderQueue.render(RenderQueue.Layer.ON_TOP, Objects.requireNonNull(context.consumers()).getBuffer(RenderQueue.LINES_NO_DEPTH_LAYER), context);
         });
     }
 
@@ -117,11 +109,11 @@ private static void tick(Minecraft mc) {
         }
     }
 
-    public static void render(Layer layer, VertexConsumer vertexConsumer, PoseStack poseStack, float delta) {
+    public static void render(Layer layer, VertexConsumer vertexConsumer, WorldRenderContext context) {
         if (!queue.containsKey(layer)) {
             return;
         }
-        queue.get(layer).values().forEach(shape -> shape.render(poseStack, vertexConsumer, delta));
+        queue.get(layer).values().forEach(shape -> shape.render(vertexConsumer, context));
     }
 
     public enum Layer {

src/main/java/net/earthcomputer/clientcommands/render/Shape.java

@@ -1,7 +1,7 @@
 package net.earthcomputer.clientcommands.render;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
 import net.minecraft.world.phys.Vec3;
 
 public abstract class Shape {
@@ -11,7 +11,7 @@ public abstract class Shape {
     public void tick() {
     }
 
-    public abstract void render(PoseStack poseStack, VertexConsumer vertexConsumer, float delta);
+    public abstract void render(VertexConsumer vertexConsumer, WorldRenderContext context);
 
     public abstract Vec3 getPos();