diff options
author | ev chang <wyvestbusiness@gmail.com> | 2024-05-16 16:12:49 -0400 |
---|---|---|
committer | ev chang <wyvestbusiness@gmail.com> | 2024-05-16 16:12:49 -0400 |
commit | 5fe990e0a93bfe74d276db3ece852502ae46aada (patch) | |
tree | d0ad8032d49558f75aef6faef19c2db8c5ef5724 /src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt | |
parent | 764eedd6ad31ed826b02e61611b690d65ec77fa3 (diff) | |
parent | f142b31324391ed02a90ff96b51ad44fd040d838 (diff) | |
download | Remap-5fe990e0a93bfe74d276db3ece852502ae46aada.tar.gz Remap-5fe990e0a93bfe74d276db3ece852502ae46aada.tar.bz2 Remap-5fe990e0a93bfe74d276db3ece852502ae46aada.zip |
Merge branch '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.kt | 13 |
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) } } |