aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
diff options
context:
space:
mode:
authorev chang <wyvestbusiness@gmail.com>2024-05-16 16:09:51 -0400
committerev chang <wyvestbusiness@gmail.com>2024-05-16 16:09:51 -0400
commitf142b31324391ed02a90ff96b51ad44fd040d838 (patch)
treed0ad8032d49558f75aef6faef19c2db8c5ef5724 /src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
parent764eedd6ad31ed826b02e61611b690d65ec77fa3 (diff)
parent5134612493d43da328a2567e8425981094d67c50 (diff)
downloadRemap-f142b31324391ed02a90ff96b51ad44fd040d838.tar.gz
Remap-f142b31324391ed02a90ff96b51ad44fd040d838.tar.bz2
Remap-f142b31324391ed02a90ff96b51ad44fd040d838.zip
Merge branch 'master' of https://github.com/ReplayMod/remap into ReplayMod-master
Diffstat (limited to 'src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt')
-rw-r--r--src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt13
1 files changed, 5 insertions, 8 deletions
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)
}
}