diff options
| -rw-r--r-- | src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt | 1 | ||||
| -rw-r--r-- | src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinAccessors.kt | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt index 1c5ac67..5dba364 100644 --- a/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt +++ b/src/main/kotlin/com/replaymod/gradle/remap/PsiMapper.kt @@ -444,6 +444,7 @@ internal class PsiMapper( val methodName = method.name val targetByName = when { methodName.startsWith("invoke") -> methodName.substring(6) + methodName.startsWith("call") -> methodName.substring(4) methodName.startsWith("is") -> methodName.substring(2) methodName.startsWith("get") || methodName.startsWith("set") -> methodName.substring(3) else -> null diff --git a/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinAccessors.kt b/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinAccessors.kt index 6d9fb38..0492569 100644 --- a/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinAccessors.kt +++ b/src/test/kotlin/com/replaymod/gradle/remap/mapper/mixin/TestMixinAccessors.kt @@ -14,6 +14,10 @@ class TestMixinAccessors { void invokeAMethod(); @org.spongepowered.asm.mixin.gen.Invoker("aMethod") void invokeBMethod(); + @org.spongepowered.asm.mixin.gen.Invoker + void callAMethod(); + @org.spongepowered.asm.mixin.gen.Invoker("aMethod") + void callBMethod(); } """.trimIndent()) shouldBe """ @org.spongepowered.asm.mixin.Mixin(b.pkg.B.class) @@ -22,6 +26,10 @@ class TestMixinAccessors { void invokeAMethod(); @org.spongepowered.asm.mixin.gen.Invoker void invokeBMethod(); + @org.spongepowered.asm.mixin.gen.Invoker("bMethod") + void callAMethod(); + @org.spongepowered.asm.mixin.gen.Invoker + void callBMethod(); } """.trimIndent() } |