Exclude duplicate names from flat mappings

Author: Su5eD

gradle.properties

@@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 
 # Versions
-versionConnector=1.0.0-beta
+versionConnector=1.0.0-beta.2
 
 versionMc=1.20.1
 versionForge=47.1.3
 versionForgeAutoRenamingTool=1.0.8
 versionFabricLoader=2.2.1+0.14.21+1.20.1
 versionAccessWidener=2.1.0
-versionFabricApi=0.86.1+1.7.1+1.20.1
+versionFabricApi=0.86.1+1.8.0+1.20.1
 versionMixin=0.12.6+mixin.0.8.5
 versionYarn=1.19.4+build.2
 

src/main/java/dev/su5ed/sinytra/connector/transformer/JarTransformer.java

@@ -55,7 +55,6 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 
@@ -90,13 +89,25 @@ private static Map<String, String> getFlatMapping(String sourceNamespace) {
                 }
 
                 LOGGER.debug(TRANSFORM_MARKER, "Creating flat mapping for namespace {}", sourceNamespace);
+                // Intermediary sometimes contains duplicate names for different methods (why?). We exclude those.
+                Set<String> excludedNames = new HashSet<>();
                 Collection<String> prefixes = MAPPING_PREFIXES.get(sourceNamespace);
                 MappingResolverImpl resolver = FabricLoaderImpl.INSTANCE.getMappingResolver();
-                Map<String, String> resolved = resolver.getCurrentMap(sourceNamespace).getClasses().stream()
+                Map<String, String> resolved = new HashMap<>();
+                resolver.getCurrentMap(sourceNamespace).getClasses().stream()
                     .flatMap(cls -> Stream.concat(Stream.of(cls), Stream.concat(cls.getFields().stream(), cls.getMethods().stream()))
                         .filter(node -> prefixes.stream().anyMatch(node.getOriginal()::startsWith))
                         .map(node -> Pair.of(node.getOriginal(), node.getMapped())))
-                    .collect(Collectors.toMap(Pair::getFirst, Pair::getSecond, (a, b) -> a));
+                    .forEach(pair -> {
+                        String original = pair.getFirst();
+                        if (resolved.containsKey(original)) {
+                            excludedNames.add(original);
+                            resolved.remove(original);
+                        }
+                        if (!excludedNames.contains(original)) {
+                            resolved.put(original, pair.getSecond());
+                        }
+                    });
                 FLAT_MAPPINGS_CACHE.put(sourceNamespace, resolved);
                 return resolved;
             }

src/main/java/dev/su5ed/sinytra/connector/transformer/SrgRemappingReferenceMapper.java

@@ -14,7 +14,7 @@
 
 public class SrgRemappingReferenceMapper {
     private static final Pattern METHOD_REF_PATTERN = Pattern.compile("^(?<owner>L[a-zA-Z0-9/_$]+;)?(?<name>[a-zA-Z0-9_]+|<[a-z0-9_]+>)?(?<desc>\\((?:\\[?[VZCBSIFJD]|\\[?L[a-zA-Z0-9/_$]+;)*\\)(?:[VZCBSIFJD]|\\[?L[a-zA-Z0-9/_;$]+))$");
-    private static final Pattern FIELD_REF_PATTERN = Pattern.compile("^(?<owner>L[a-zA-Z0-9/_$]+;)?(?<name>[a-zA-Z0-9_]+):(?<desc>\\[?[VZCBSIFJD]|\\[?L[a-zA-Z0-9/_$]+;)$");
+    private static final Pattern FIELD_REF_PATTERN = Pattern.compile("^(?<owner>L[a-zA-Z0-9/_$]+;)?(?<name>[a-zA-Z0-9_]+):(?<desc>.+)$");
 
     private final IMappingFile mappingFile;
     private final Map<String, IMappingFile.IMethod> methods;