Drop the mixin usage

Author: me4502

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ format = { version = "1.1" }
 indra = "3.1.3"
 minecraft = "1.21.10"
 fabricLoader = "0.17.3"
-fabricApi = "0.135.0+1.21.10"
+fabricApi = "0.138.0+1.21.10"
 modmenu = "16.0.0-rc.1"
 viafabricplus = "3.3.0"
 vineflower = "1.10.1"

worldeditcui-fabric/build.gradle.kts

@@ -32,10 +32,6 @@ loom {
         }
     }
 
-    mixin {
-        defaultRefmapName.set("worldeditcui-refmap.json")
-    }
-
     accessWidenerPath.set(project.file("src/main/resources/worldeditcui.accesswidener"))
 }
 

worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/callback/BlockOutlineRenderCallback.java

@@ -15,6 +15,8 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderContext;
+import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
 import net.fabricmc.fabric.api.networking.v1.PacketSender;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
@@ -23,7 +25,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.Level;
 import org.enginehub.worldeditcui.WorldEditCUI;
-import org.enginehub.worldeditcui.callback.WorldRenderCallback;
 import org.enginehub.worldeditcui.config.CUIConfiguration;
 import org.enginehub.worldeditcui.event.listeners.CUIListenerChannel;
 import org.enginehub.worldeditcui.event.listeners.CUIListenerWorldRender;
@@ -32,7 +33,6 @@
 import org.enginehub.worldeditcui.render.OptifinePipelineProvider;
 import org.enginehub.worldeditcui.render.PipelineProvider;
 import org.enginehub.worldeditcui.render.VanillaPipelineProvider;
-import org.enginehub.worldeditcui.render.WecuiRenderContext;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.MixinEnvironment;
 
@@ -71,6 +71,8 @@ public final class FabricModWorldEditCUI implements ModInitializer {
     private boolean visible = true;
     private int delayedHelo = 0;
 
+    private float lastPartialTicks = 0.0f;
+
     /**
      * Register a key binding
      *
@@ -96,31 +98,20 @@ public void onInitialize() {
         ClientLifecycleEvents.CLIENT_STARTED.register(this::onGameInitDone);
         CUINetworking.subscribeToCuiPacket(this::onPluginMessage);
         ClientPlayConnectionEvents.JOIN.register(this::onJoinGame);
-        WorldRenderCallback.AFTER_TRANSLUCENT.register(ctx -> {
-            if (ctx.advancedTranslucency()) {
-                try {
-                    RenderSystem.getModelViewStack().pushMatrix();
-                    RenderSystem.getModelViewStack().mul(ctx.poseStack().last().pose());
-                    // RenderSystem.applyModelViewMatrix();
-                    //ctx.worldRenderer().getTranslucentTarget().bindWrite(false);
-                    this.onPostRenderEntities(ctx);
-                } finally {
-                    //Minecraft.getInstance().getMainRenderTarget().bindWrite(false);
-                    RenderSystem.getModelViewStack().popMatrix();
-                }
-            }
+        WorldRenderEvents.END_EXTRACTION.register(ctx -> {
+            // MC now handles this separately to the actual render, due to it occurring across threads.
+            // We need to store this for later use during actual render.
+            lastPartialTicks = ctx.tickCounter().getRealtimeDeltaTicks();
         });
-        WorldRenderCallback.LAST.register(ctx -> {
-            if (!ctx.advancedTranslucency()) {
-                try {
-                    RenderSystem.getModelViewStack().pushMatrix();
-                    RenderSystem.getModelViewStack().mul(ctx.poseStack().last().pose());
-                    // RenderSystem.applyModelViewMatrix();
-                    this.onPostRenderEntities(ctx);
-                } finally {
-                    RenderSystem.getModelViewStack().popMatrix();
-                    // RenderSystem.applyModelViewMatrix();
-                }
+        WorldRenderEvents.END_MAIN.register(ctx -> {
+            try {
+                RenderSystem.getModelViewStack().pushMatrix();
+                RenderSystem.getModelViewStack().mul(ctx.matrices().last().pose());
+                // RenderSystem.applyModelViewMatrix();
+                this.onPostRenderEntities(ctx);
+            } finally {
+                RenderSystem.getModelViewStack().popMatrix();
+                // RenderSystem.applyModelViewMatrix();
             }
         });
     }
@@ -194,9 +185,9 @@ public void onJoinGame(final ClientPacketListener handler, final PacketSender se
         this.helo(handler);
     }
 
-    public void onPostRenderEntities(final WecuiRenderContext ctx) {
+    public void onPostRenderEntities(final WorldRenderContext ctx) {
         if (this.visible) {
-            this.worldRenderListener.onRender(ctx.delta().getRealtimeDeltaTicks());
+            this.worldRenderListener.onRender(lastPartialTicks);
         }
     }
 

worldeditcui-fabric/src/main/java/org/enginehub/worldeditcui/callback/WorldRenderCallback.java

@@ -33,9 +33,6 @@
       "org.enginehub.worldeditcui.fabric.ConfigPanelFactory"
     ]
   },
-  "mixins": [
-    "worldeditcui.mixins.json"
-  ],
   "depends": {
     "worldeditcui_protocol": "*",
     "fabric-api-base": "*",