From 54233da14c9ae556d596c3df41a97f367b8d6e5d Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:11:20 -0500
Subject: [PATCH] Generate SRG named redirects for TransformationMatrix methods
 in userdev (#9883)

---
 build.gradle                                  |  4 +-
 .../resources/coremods/add_bouncer_method.js  | 51 ++++++++++++++-----
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index b2948c6734..713e854d52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -960,7 +960,7 @@ project(':forge') {
     }
     
     task downloadInstaller(type: DownloadMavenArtifact) {
-        artifact = 'net.minecraftforge:installer:2.1.+:shrunk'
+        artifact = 'net.minecraftforge:installer:2.2.+:fatjar'
         changing = true
     }
     
@@ -1246,4 +1246,4 @@ task setup() {
 
 changelog {
     fromTag MIN_TAG_FOR_CHANGELOG
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/coremods/add_bouncer_method.js b/src/main/resources/coremods/add_bouncer_method.js
index d28ee2dd8c..1ad86013ce 100644
--- a/src/main/resources/coremods/add_bouncer_method.js
+++ b/src/main/resources/coremods/add_bouncer_method.js
@@ -45,7 +45,9 @@ function addBouncer(className, conflictedName, expectedName, descriptor, signatu
    }
 }
 
-// Generate a method with name oldName that redirects to expectedName. oldName is remapped, expectedName isn't.
+// Generate a method with name oldName that redirects to expectedName. expectedName is not remapped.
+// A redirect will be generated for oldName and whatever deobfuscated name it maps to,
+// provided these methods do not exist already.
 function addRedirect(className, oldName, expectedName, descriptor, numArgs) {
     return {
        'target': {
@@ -55,21 +57,42 @@ function addRedirect(className, oldName, expectedName, descriptor, numArgs) {
        'transformer': function(node) {
             var mappedName = ASMAPI.mapMethod(oldName);
 
-            var method = new MethodNode(
-                /* access = */ Opcodes.ACC_PUBLIC,
-                /* name = */ mappedName,
-                /* descriptor = */ descriptor,
-                /* signature = */ descriptor,
-                /* exceptions = */ null
-            );
+            var names = [oldName, mappedName];
 
-            for(var i = 0; i < numArgs; i++) {
-                 method.instructions.add(new VarInsnNode(Opcodes.ALOAD, i));
+            for(var i = 0; i < names.length; i++) {
+                var name = names[i];
+
+                // Skip generating stub if method name exists in this class
+                var exists = false;
+                for(var j = 0; j < node.methods.length; j++) {
+                    if(node.methods[i].name == name) {
+                        exists = true;
+                        break;
+                    }
+                }
+
+                if(exists) {
+                    continue;
+                }
+
+                // Generate stub
+
+                var method = new MethodNode(
+                    /* access = */ Opcodes.ACC_PUBLIC,
+                    /* name = */ name,
+                    /* descriptor = */ descriptor,
+                    /* signature = */ descriptor,
+                    /* exceptions = */ null
+                );
+
+                for(var i = 0; i < numArgs; i++) {
+                     method.instructions.add(new VarInsnNode(Opcodes.ALOAD, i));
+                }
+                method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, className.replaceAll("\\.","/"), expectedName, descriptor));
+                method.instructions.add(new InsnNode(Opcodes.ARETURN));
+
+                node.methods.add(method);
             }
-            method.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, className.replaceAll("\\.","/"), expectedName, descriptor));
-            method.instructions.add(new InsnNode(Opcodes.ARETURN));
-
-            node.methods.add(method);
 
             return node;
        }