From 78d264552f201c388ab833617d4d3ff7ed67eee8 Mon Sep 17 00:00:00 2001 From: Josiah Glosson Date: Thu, 25 Apr 2024 03:25:44 -0500 Subject: Fix remapMixinTarget not supporting NEW (#19) Fixes #18 --- src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt') diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt index 5dba364..f0b8b6b 100644 --- a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt +++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt @@ -531,14 +531,11 @@ internal class PsiMapper( } private fun remapMixinTarget(target: String): String { - return if (target.contains(':') || target.contains('(')) { - remapFullyQualifiedMethodOrField(target) - } else { - if (target[0] == 'L') { - remapInternalType(target) - } else { - remapInternalType("L$target;").drop(1).dropLast(1) - } + return when { + target.startsWith('(') -> remapMethodDesc(target) + target.contains(':') || target.contains('(') -> remapFullyQualifiedMethodOrField(target) + target[0] == 'L' -> remapInternalType(target) + else -> remapInternalType("L$target;").drop(1).dropLast(1) } } -- cgit