Support renaming refmapless accessor methods

Sinytra · Apr 4, 2024 · d37c8f3 · d37c8f3
1 parent 614a666
commit d37c8f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ versionForge=47.1.3
 versionForgeAutoRenamingTool=1.0.11
 versionFabricLoader=2.7.2+0.15.3+1.20.1
 versionAccessWidener=2.1.0
-versionFabricApi=0.92.0+1.11.2+1.20.1
+versionFabricApi=0.92.0+1.11.3+1.20.1
 versionMixin=0.12.9+mixin.0.8.5
 versionMixinTransmog=0.4.4+1.20.1
 

diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/OptimizedRenamingTransformer.java b/src/main/java/dev/su5ed/sinytra/connector/transformer/OptimizedRenamingTransformer.java
@@ -26,6 +26,7 @@
 import org.objectweb.asm.tree.MethodNode;
 import org.sinytra.adapter.patch.selector.AnnotationHandle;
 import org.sinytra.adapter.patch.util.MethodQualifier;
+import org.spongepowered.asm.mixin.gen.AccessorInfo;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -45,6 +46,7 @@ public final class OptimizedRenamingTransformer extends RenamingTransformer {
     private static final String FQN_CLASS_NAME_PATTERN = "^(?:[a-zA-Z0-9$_]+\\.)*[a-zA-Z0-9$_]+$";
     private static final String INTERNAL_CLASS_NAME_PATTERN = "^(?:[a-zA-Z0-9$_]+/)*[a-zA-Z0-9$_]+$";
     private static final Pattern FIELD_QUALIFIER_PATTERN = Pattern.compile("^(?<owner>L[\\\\\\w/$]+;)?(?<name>\\w+)(?::(?<desc>\\[*[ZCBSIFJD]|\\[*L[a-zA-Z0-9/_$]+;))?$");
+    private static final String ACCESSOR_METHOD_PATTERN = "^.*(Method_|Field_|Comp_).*$";
 
     private final boolean remapRefs;
 
@@ -273,6 +275,15 @@ public String mapMethodName(String owner, String name, String descriptor) {
                             String mapped = fastMappedLambda != null ? fastMappedLambda : mapMethodName(owner, actualName, descriptor);
                             return name.substring(0, interfacePrefix + 1) + mapped;
                         }
+                        if (name.matches(ACCESSOR_METHOD_PATTERN)) {
+                            AccessorInfo.AccessorName accessorName = AccessorInfo.AccessorName.of(name);
+                            if (accessorName != null) {
+                                String mapped = this.flatMappings.mapMethod(accessorName.name, descriptor);
+                                if (mapped != null) {
+                                    return accessorName.prefix + mapped.substring(0, 1).toUpperCase() + mapped.substring(1);
+                                }
+                            }
+                        }
                     }
                     return null;
                 })