Fix HUD redirect rendering order, replaymod quick mode

Author: Su5eD

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.daemon=true
 # Versions
 versionConnector=1.0.0-beta.11
 versionAdapter=1.4.5-1.20.1-20230902.095059
-versionAdapterDefinition=1.4.6
+versionAdapterDefinition=1.4.7
 
 versionMc=1.20.1
 versionForge=47.1.3

src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java

@@ -13,6 +13,7 @@
 import dev.su5ed.sinytra.adapter.patch.Patch;
 import dev.su5ed.sinytra.adapter.patch.PatchEnvironment;
 import dev.su5ed.sinytra.adapter.patch.transformer.DynamicLVTPatch;
+import dev.su5ed.sinytra.adapter.patch.transformer.ModifyMethodAccess;
 import dev.su5ed.sinytra.adapter.patch.transformer.ModifyMethodParams;
 import dev.su5ed.sinytra.connector.ConnectorUtil;
 import dev.su5ed.sinytra.connector.transformer.patch.ClassResourcesTransformer;
@@ -103,14 +104,19 @@ public class MixinPatchTransformer implements Transformer {
                 "Lnet/minecraft/world/level/block/FireBlock;tryCatchFire(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/util/RandomSource;ILnet/minecraft/core/Direction;)V",
                 (insn, list) -> list.insertBefore(insn, new FieldInsnNode(Opcodes.GETSTATIC, "net/minecraft/core/Direction", "NORTH", "Lnet/minecraft/core/Direction;")))
             .build(),
-        // Redirect HUD rendering calls to Forge's replacement class
+        // Move HUD rendering calls at Options.renderDebug to a lambda in Forge's vanilla gui overlay enum class
         Patch.builder()
             .targetClass("net/minecraft/client/gui/Gui")
-            .targetMethod("m_280421_")
+            .targetMethod("m_280421_(Lnet/minecraft/client/gui/GuiGraphics;F)V")
             .targetInjectionPoint("Lnet/minecraft/client/Options;f_92063_:Z")
-            .modifyTarget("m_280421_(Lnet/minecraft/client/gui/GuiGraphics;F)V")
-            .modifyInjectionPoint("TAIL", "")
-            .modifyTargetClasses(classes -> classes.add(Type.getObjectType("net/minecraftforge/client/gui/overlay/ForgeGui")))
+            .modifyTarget("lambda$static$18(Lnet/minecraftforge/client/gui/overlay/ForgeGui;Lnet/minecraft/client/gui/GuiGraphics;FII)V")
+            .modifyInjectionPoint("HEAD", "")
+            .modifyMethodAccess(new ModifyMethodAccess.AccessChange(true, Opcodes.ACC_STATIC))
+            .modifyParams(builder -> builder
+                .replace(0, Type.getObjectType("net/minecraftforge/client/gui/overlay/ForgeGui"))
+                .insert(3, Type.INT_TYPE)
+                .insert(4, Type.INT_TYPE))
+            .modifyTargetClasses(classes -> classes.add(Type.getObjectType("net/minecraftforge/client/gui/overlay/VanillaGuiOverlay")))
             .build(),
         Patch.builder()
             .targetClass("net/minecraft/client/renderer/GameRenderer")

src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/network/NetworkFiltersMixin.java

@@ -0,0 +1,22 @@
+package dev.su5ed.sinytra.connector.mod.mixin.network;
+
+import io.netty.channel.ChannelPipeline;
+import net.minecraft.network.Connection;
+import net.minecraftforge.network.filters.NetworkFilters;
+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;
+
+import java.util.function.Function;
+
+@Mixin(NetworkFilters.class)
+public class NetworkFiltersMixin {
+
+    @Inject(method = "lambda$injectIfNecessary$1", at = @At(value = "INVOKE", target = "Lio/netty/channel/ChannelPipeline;addBefore(Ljava/lang/String;Ljava/lang/String;Lio/netty/channel/ChannelHandler;)Lio/netty/channel/ChannelPipeline;"), remap = false, cancellable = true)
+    private static void preventDuplicateHandler(Connection manager, ChannelPipeline pipeline, String key, Function filterFactory, CallbackInfo ci) {
+        if (pipeline.get(key) != null) {
+            ci.cancel();
+        }
+    }
+}

src/mod/resources/connectormod.mixins.json

@@ -12,6 +12,7 @@
     "CreativeModeInventoryScreenMixin",
     "network.ConnectionTypeMixin",
     "network.HandshakeHandlerMixin",
+    "network.NetworkFiltersMixin",
     "tags.TagEntryAccessor",
     "tags.TagLoaderMixin",
     "registries.ForgeRegistryMixin",