Fix LWtransformer borken

CleanroomMC · Mar 14, 2024 · 31c0fe4 · 31c0fe4
1 parent 4e6b48c
commit 31c0fe4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ mappings_version=39-1.12
 mod_id=fugue
 mod_name=Fugue
 mod_main_class=Fugue
-mod_version=0.9.5
+mod_version=0.9.6
 mod_base_package=com.cleanroommc.fugue
 mod_authors=kappa_maintainer
 mod_description=A mod that patch dead mods for Cleanroom
diff --git a/src/main/java/com/cleanroommc/config/FugueConfig.java b/src/main/java/com/cleanroommc/config/FugueConfig.java
@@ -163,8 +163,8 @@ public class FugueConfig {
             //EntityDistance
             {"net.minecraft.client.gui.GuiOptions", "field_146441_g|field_146443_h"}, //lastScreen|settings
             {"net.minecraft.entity.EntityTracker", "field_72793_b|field_72794_c|field_72795_a"}, //entries|trackedEntityHashTable|world
-            {"net.minecraft.entity.EntityTrackerEntry", "field_73130_b|field_73132_a|field_187262_f|field_73131_c|field_73143_t"}, //range|trackedEntity|maxRange|updateFrequency|sendVelocityUpdates|loadedEntityList
-            {"net.minecraft.world.World", "field_72996_f",}, //
+            {"net.minecraft.entity.EntityTrackerEntry", "field_73130_b|field_73132_a|field_187262_f|field_73131_c|field_73143_t"}, //range|trackedEntity|maxRange|updateFrequency|sendVelocityUpdates
+            {"net.minecraft.world.World", "field_72996_f",}, //loadedEntityList
     }).collect(Collectors.toMap(data -> data[0], data -> data[1]));
 
 }
diff --git a/src/main/java/com/cleanroommc/transformer/universal/RemapLegacyLWTransformer.java b/src/main/java/com/cleanroommc/transformer/universal/RemapLegacyLWTransformer.java
@@ -23,7 +23,7 @@ public byte[] transform(byte[] bytes) {
                 if (methodInsnNode.owner.equals("net/minecraft/launchwrapper/LaunchClassLoader")) {
                     if (methodInsnNode.name.equals("getTransformers")) {
                         methodNode.instructions.insert(abstractInsnNode, new MethodInsnNode(Opcodes.INVOKESTATIC, "top/outlands/foundation/TransformerDelegate", "getTransformers", "()Ljava/util/List;"));
-                        methodNode.instructions.insert(new InsnNode(Opcodes.POP));
+                        methodNode.instructions.insert(abstractInsnNode, new InsnNode(Opcodes.POP));
                         methodNode.instructions.remove(abstractInsnNode);
                     } else {
                         methodNode.instructions.insert(abstractInsnNode, new MethodInsnNode(methodInsnNode.getOpcode(), "top/outlands/foundation/boot/ActualClassLoader", methodInsnNode.name, methodInsnNode.desc));