From b4462eb6030f8e5a072ad4b6508d7a93d574522f Mon Sep 17 00:00:00 2001
From: Jonas Herzig <jonas@spark-squared.com>
Date: Thu, 11 Nov 2021 15:06:54 +0100
Subject: Fix mixin @At target not considering mappings from parent classes

When remapping the @At `target` argument, we used to only look at the mappings
for the target class but we also need to consider mappings for its super classes
and interfaces.
This commit now searches for the target Psi method and then uses the regular
remap method for PsiMethod to get its properly mapped name.
---
 .../kotlin/com/replaymod/gradle/remap/PsiMapper.kt | 16 ++++++++-
 src/test/java/a/pkg/A.java                         |  1 +
 src/test/java/b/pkg/B.java                         |  1 +
 .../gradle/remap/mapper/TestMixinInjections.kt     | 42 ++++++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
index 3adc4f1..07d7d1d 100644
--- a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
+++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
@@ -399,10 +399,24 @@ internal class PsiMapper(
         val name = signature.substring(ownerEnd + 1, argsBegin)
         val returnType = signature.substring(argsEnd + 1)
 
+        val ownerPsi = JavaPsiFacade.getInstance(file.project).findClass(
+            owner.drop(1).dropLast(1).replace('/', '.').replace('$', '.'),
+            GlobalSearchScope.allScope(file.project),
+        )
+        val methodPsi = if (method) {
+            val desc = signature.substring(argsBegin)
+            ownerPsi?.findMethodsByName(name, true)?.find { ClassUtil.getAsmMethodSignature(it) == desc }
+        } else {
+            null
+        }
+
         val builder = StringBuilder(signature.length + 32)
         val mapping = remapInternalType(owner, builder)
         var mapped: String? = null
-        if (mapping != null) {
+        if (methodPsi != null) {
+            mapped = findMapping(methodPsi)?.deobfuscatedName
+        }
+        if (mapped == null && mapping != null) {
             mapped = (if (method) {
                 mapping.findMethodMapping(MethodSignature.of(signature.substring(ownerEnd + 1)))
             } else {
diff --git a/src/test/java/a/pkg/A.java b/src/test/java/a/pkg/A.java
index 3e20f3e..ff779b2 100644
--- a/src/test/java/a/pkg/A.java
+++ b/src/test/java/a/pkg/A.java
@@ -10,6 +10,7 @@ public class A extends AParent implements AInterface {
     }
 
     public void aMethod() {
+        aInterfaceMethod();
     }
 
     public void aOverloaded() {
diff --git a/src/test/java/b/pkg/B.java b/src/test/java/b/pkg/B.java
index 3c71aae..6ed26c1 100644
--- a/src/test/java/b/pkg/B.java
+++ b/src/test/java/b/pkg/B.java
@@ -10,6 +10,7 @@ public class B extends BParent implements BInterface {
     }
 
     public void bMethod() {
+        bInterfaceMethod();
     }
 
     public void bOverloaded() {
diff --git a/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt b/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt
index 3f8d55f..f01a832 100644
--- a/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt
+++ b/src/test/kotlin/com/replaymod/gradle/remap/mapper/TestMixinInjections.kt
@@ -137,4 +137,46 @@ class TestMixinInjections {
             }
         """.trimIndent()
     }
+
+    @Test
+    fun `remaps @At target`() {
+        TestData.remap("""
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(a.pkg.A.class)
+            class MixinA {
+                @Inject(method = "aMethod", at = @At(target = "La/pkg/A;aInterfaceMethod()V"))
+                private void test() {}
+            }
+        """.trimIndent()) shouldBe """
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(b.pkg.B.class)
+            class MixinA {
+                @Inject(method = "bMethod", at = @At(target = "Lb/pkg/B;bInterfaceMethod()V"))
+                private void test() {}
+            }
+        """.trimIndent()
+    }
+
+    @Test
+    fun `remaps @At target without mappings for target`() {
+        TestData.remap("""
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(a.pkg.A.class)
+            class MixinA {
+                @Inject(method = "aMethod", at = @At(target = "La/pkg/A;unmappedOverloaded(La/pkg/A;)V"))
+                private void test() {}
+            }
+        """.trimIndent()) shouldBe """
+            import org.spongepowered.asm.mixin.injection.At;
+            import org.spongepowered.asm.mixin.injection.Inject;
+            @org.spongepowered.asm.mixin.Mixin(b.pkg.B.class)
+            class MixinA {
+                @Inject(method = "bMethod", at = @At(target = "Lb/pkg/B;unmappedOverloaded(Lb/pkg/B;)V"))
+                private void test() {}
+            }
+        """.trimIndent()
+    }
 }
\ No newline at end of file
-- 
cgit