Remap mixin injector target arguments even when method is not mapped

E.g. there are no mapping entries for constructors cause their name is always
`<init>` but we nevertheless want to remap their argument types.
We cannot determine whether the name is ambiguous in the mapped
environment (because that check is based on the mappings), so we always keep the
arguments when it previously had ones.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
index a2be57a..3adc4f1 100644
--- a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
+++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
@@ -339,14 +339,15 @@ internal class PsiMapper(
                             }}")
                         }
                         targetMethods.firstOrNull()
-                    } ?: continue
-                    val mappedName = findMapping(targetMethod)?.deobfuscatedName ?: continue
+                    }
+                    val mappedName = targetMethod?.let(::findMapping)?.deobfuscatedName ?: targetName
 
                     val ambiguousName = mapping.methodMappings.count { it.deobfuscatedName == mappedName } > 1
-                    val mapped = mappedName + if (ambiguousName) {
-                        remapMethodDesc(ClassUtil.getAsmMethodSignature(targetMethod))
-                    } else {
-                        ""
+                    val mapped = mappedName + when {
+                        ambiguousName && targetMethod != null ->
+                            remapMethodDesc(ClassUtil.getAsmMethodSignature(targetMethod))
+                        targetDesc != null -> remapMethodDesc(targetDesc)
+                        else -> ""
                     }
 
                     if (mapped != literalValue) {