Fix LWJGL transformer for real

CleanroomMC · Dec 18, 2024 · 119c4e9 · 119c4e9
1 parent ec71313
commit 119c4e9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/LWJGLTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/LWJGLTransformer.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.Launch;
+import net.minecraftforge.fml.common.FMLLog;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.ClassWriter;
@@ -53,15 +54,15 @@ public byte[] transform(String s, String s1, byte[] bytes) {
         lwjglxReader = new ClassReader(lwjglxBytes);
         ClassNode lwjglxNode = new ClassNode();
         lwjglxReader.accept(lwjglxNode, 0);
-        Set<String> methods = lwjglNode.methods.stream().map(m -> m.desc).collect(Collectors.toSet());
+        Set<String> methods = lwjglNode.methods.stream().map(m -> m.name + m.desc).collect(Collectors.toSet());
         lwjglxNode.methods.forEach(m -> {
-            if (!methods.contains(m.desc)) {
+            if (!methods.contains(m.name + m.desc)) {
                 lwjglNode.methods.add(m);
             }
         });
-        Set<String> fields = lwjglNode.fields.stream().map(f -> f.desc).collect(Collectors.toSet());
+        Set<String> fields = lwjglNode.fields.stream().map(f -> f.name + f.desc).collect(Collectors.toSet());
         lwjglxNode.fields.forEach(f -> {
-            if (!fields.contains(f.desc)) {
+            if (!fields.contains(f.name + f.desc)) {
                 lwjglNode.fields.add(f);
             }
         });