aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
diff options
context:
space:
mode:
authorDeftu <deftudev@gmail.com>2024-05-16 22:15:52 +0200
committerGitHub <noreply@github.com>2024-05-16 22:15:52 +0200
commit3ad4de569f900ba9638ba6203424329e421646aa (patch)
treed0ad8032d49558f75aef6faef19c2db8c5ef5724 /src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt
parentacb66b1d652c61f8a49ff3d776758e6dcfeac488 (diff)
parent5fe990e0a93bfe74d276db3ece852502ae46aada (diff)
downloadRemap-3ad4de569f900ba9638ba6203424329e421646aa.tar.gz
Remap-3ad4de569f900ba9638ba6203424329e421646aa.tar.bz2
Remap-3ad4de569f900ba9638ba6203424329e421646aa.zip
Merge pull request #1 from Polyfrost/master
Update from upstream
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)
}
}