Add a fallback check for weird jar paths in dep deobfuscation

GTNewHorizons · Apr 27, 2023 · 99b2b2e · 99b2b2e
1 parent 5280738
commit 99b2b2e
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...n/java/com/gtnewhorizons/retrofuturagradle/modutils/DependencyDeobfuscationTransform.java b/...n/java/com/gtnewhorizons/retrofuturagradle/modutils/DependencyDeobfuscationTransform.java
@@ -8,6 +8,7 @@
 import java.io.OutputStream;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +18,7 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
+import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -92,7 +94,18 @@ private static boolean mustRunDeobf(File inputFile, Set<File> filesToDeobf, Set<
         if (!mustRunDeobf) {
             final Path inputPath = inputFile.toPath();
             final String moduleSpec = Utilities.getModuleSpecFromCachePath(inputPath);
-            mustRunDeobf = modulesToDeobf.contains(moduleSpec);
+            if (moduleSpec == null) {
+                for (final String foundSpec : modulesToDeobf) {
+                    final List<String> parts = Arrays.stream(foundSpec.split(":")).filter(StringUtils::isNotBlank)
+                            .collect(Collectors.toList());
+                    final String foundJar = StringUtils.join(parts, "-") + ".jar";
+                    if (inputPath.endsWith(foundJar)) {
+                        mustRunDeobf = true;
+                    }
+                }
+            } else {
+                mustRunDeobf = modulesToDeobf.contains(moduleSpec);
+            }
         }
 
         return mustRunDeobf;