Fix remapping of Archloom JIJ dependencies (#10)

neoforged · Dec 3, 2024 · b060e38 · b060e38
1 parent cc8a7cd
commit b060e38
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/net/neoforged/installertools/SrgMcpRenamer.java b/src/main/java/net/neoforged/installertools/SrgMcpRenamer.java
@@ -129,7 +129,9 @@ public String mapMethodName(final String owner, final String name, final String
                 Utils.copy(zin, zout);
             };
 
-            processors.add(new ZipEntryProcessor(ein -> ein.getName().startsWith("META-INF/jarjar/") && ein.getName().endsWith(".jar"),
+            // While FG put jij jars into META-INF/jarjar, archloom did put them into META-INF/jars
+            // So to catch more cases, we just remap all jars in META-INF/ or subdirectories thereof
+            processors.add(new ZipEntryProcessor(ein -> ein.getName().startsWith("META-INF/") && ein.getName().endsWith(".jar"),
                     (ein, zin, zout) -> this.processNestedJar(processors, defaultProcessor, ein, zin, zout)));
 
             ByteArrayOutputStream memory = input.equals(output) ? new ByteArrayOutputStream() : null;