Fix rendering on top with iris (FAPI event injects into wrong place)

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/command/WaypointCommand.java

@@ -10,10 +10,10 @@
 import com.mojang.logging.LogUtils;
 import com.mojang.serialization.Dynamic;
 import net.earthcomputer.clientcommands.ClientCommands;
+import net.earthcomputer.clientcommands.event.MoreWorldRenderEvents;
 import net.earthcomputer.clientcommands.render.RenderQueue;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 import net.minecraft.ChatFormatting;
 import net.minecraft.SharedConstants;
@@ -283,7 +283,7 @@ private static Component formatCoordinates(BlockPos waypoint) {
 
     public static void registerEvents() {
         HudElementRegistry.addLast(HUD_LAYER_ID, WaypointCommand::renderWaypointLabels);
-        WorldRenderEvents.AFTER_ENTITIES.register(WaypointCommand::renderWaypointBoxes);
+        MoreWorldRenderEvents.END_MAIN_PASS.register(WaypointCommand::renderWaypointBoxes);
     }
 
     private static void renderWaypointLabels(GuiGraphics guiGraphics, DeltaTracker deltaTracker) {
@@ -413,7 +413,7 @@ private static void renderWaypointBoxes(WorldRenderContext context) {
             Font font = Minecraft.getInstance().font;
             int width = font.width(waypointName) / 2;
             int backgroundColour = (int) (Minecraft.getInstance().options.getBackgroundOpacity(0.25f) * 255.0f) << 24;
-            font.drawInBatch(waypointName, -width, 0, 0xFFFFFF, false, stack.last().pose(), context.consumers(), Font.DisplayMode.SEE_THROUGH, backgroundColour, LightTexture.FULL_SKY);
+            font.drawInBatch(waypointName, -width, 0, 0xFFFFFFFF, false, stack.last().pose(), context.consumers(), Font.DisplayMode.SEE_THROUGH, backgroundColour, LightTexture.FULL_SKY);
 
             stack.popPose();
         });

src/main/java/net/earthcomputer/clientcommands/event/MoreWorldRenderEvents.java

@@ -0,0 +1,21 @@
+package net.earthcomputer.clientcommands.event;
+
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
+
+public final class MoreWorldRenderEvents {
+    private MoreWorldRenderEvents() {
+    }
+
+    public static final Event<EndMainPass> END_MAIN_PASS = EventFactory.createArrayBacked(EndMainPass.class, callbacks -> context -> {
+        for (EndMainPass callback : callbacks) {
+            callback.endMainPass(context);
+        }
+    });
+
+    @FunctionalInterface
+    public interface EndMainPass {
+        void endMainPass(WorldRenderContext context);
+    }
+}

src/main/java/net/earthcomputer/clientcommands/mixin/events/LevelRendererMixin.java

@@ -0,0 +1,17 @@
+package net.earthcomputer.clientcommands.mixin.events;
+
+import net.earthcomputer.clientcommands.event.MoreWorldRenderEvents;
+import net.earthcomputer.clientcommands.render.RenderQueue;
+import net.minecraft.client.renderer.LevelRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LevelRenderer.class)
+public class LevelRendererMixin {
+    @Inject(method = "lambda$addMainPass$2", at = @At(value = "INVOKE:LAST", target = "Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;endBatch()V"))
+    private void onEndMainPass(CallbackInfo ci) {
+        MoreWorldRenderEvents.END_MAIN_PASS.invoker().endMainPass(RenderQueue.getWorldRenderContext((LevelRenderer) (Object) this));
+    }
+}

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

@@ -3,17 +3,21 @@
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.platform.DepthTestFunction;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.earthcomputer.clientcommands.event.MoreWorldRenderEvents;
 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.LevelRenderer;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.EnumMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -39,9 +43,11 @@ public class RenderQueue {
         .setLineState(new RenderType.LineStateShard(OptionalDouble.of(Line.THICKNESS)))
         .createCompositeState(false));
 
+    private static final MethodHandle WORLD_RENDER_CONTEXT_HANDLE = findWorldRenderContextHandle();
+
     static {
         ClientTickEvents.START_CLIENT_TICK.register(RenderQueue::tick);
-        WorldRenderEvents.AFTER_TRANSLUCENT.register(context -> {
+        MoreWorldRenderEvents.END_MAIN_PASS.register(context -> {
             RenderQueue.render(RenderQueue.Layer.ON_TOP, Objects.requireNonNull(context.consumers()).getBuffer(RenderQueue.LINES_NO_DEPTH_LAYER), context);
         });
     }
@@ -50,6 +56,30 @@ public static void register() {
         // load class
     }
 
+    // TODO: remove this reflection by PRing to FAPI
+    private static MethodHandle findWorldRenderContextHandle() {
+        return Arrays.stream(LevelRenderer.class.getDeclaredFields())
+            .filter(field -> WorldRenderContext.class.isAssignableFrom(field.getType()))
+            .findFirst()
+            .map(field -> {
+                field.setAccessible(true);
+                try {
+                    return MethodHandles.lookup().unreflectGetter(field);
+                } catch (IllegalAccessException e) {
+                    throw new IllegalStateException("Unable to access WorldRenderContext field in LevelRenderer", e);
+                }
+            })
+            .orElseThrow(() -> new IllegalStateException("Unable to find WorldRenderContext field in LevelRenderer"));
+    }
+
+    public static WorldRenderContext getWorldRenderContext(LevelRenderer renderer) {
+        try {
+            return (WorldRenderContext) WORLD_RENDER_CONTEXT_HANDLE.invoke(renderer);
+        } catch (Throwable e) {
+            throw new IllegalStateException("Exception calling WorldRenderContext getter", e);
+        }
+    }
+
     public static void add(Layer layer, Object key, Shape shape, int life) {
         addQueue.add(new AddQueueEntry(layer, key, shape, life));
     }

src/main/resources/mixins.clientcommands.json

@@ -76,6 +76,7 @@
     "commands.snap.MinecraftMixin",
     "dataqueryhandler.ClientPacketListenerMixin",
     "events.ClientPacketListenerMixin",
+    "events.LevelRendererMixin",
     "lengthextender.ChatScreenMixin",
     "rngevents.ClientLevelMixin",
     "scrambletitle.MinecraftMixin",