From 6b726fd5db0f0b14ffe5b8b7ff2065e3fee319d6 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Sat, 30 Jan 2021 12:32:15 +0100 Subject: [PATCH] Fix inner classes not being remapped in the refmap, closes #10 --- .../me/shedaniel/architect/plugin/transformers/FixForgeMixin.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/transformers/FixForgeMixin.kt b/src/main/kotlin/me/shedaniel/architect/plugin/transformers/FixForgeMixin.kt index 954d597..fd7c76a 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/transformers/FixForgeMixin.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/transformers/FixForgeMixin.kt @@ -102,6 +102,7 @@ object FixForgeMixin : Transformer { val methodMatch = methodPattern.matchEntire(originalRef) val fieldMatch = fieldPattern.matchEntire(originalRef) val methodMatchWithoutClass = methodPatternWithoutClass.matchEntire(originalRef) + val classMatch = srg.classes.firstOrNull { it.getName("intermediary") == originalRef } when { methodMatch != null -> { @@ -157,6 +158,7 @@ object FixForgeMixin : Transformer { }) ) } + classMatch != null -> obj.addProperty(key, classMatch.getName("srg")) else -> project.logger.warn("Failed to remap refmap value: $originalRef") } }