Close #211 : Add --skip-when-absent as the temporary solution

Author: XiaoPangxie732

modules/api/src/main/java/cn/maxpixel/mcdecompiler/api/MinecraftDecompiler.java

@@ -75,6 +75,10 @@ public MinecraftDecompiler(Options options) {
     }
 
     public void deobfuscate() {
+        if (options.skipWhenAbsent() && deobfuscator == null) {
+            LOGGER.info("Skipping deobfuscation as mappings are absent");
+            return;
+        }
         try {
             deobfuscator.deobfuscate(options.inputJar(), options.outputJar());
         } catch (IOException e) {
@@ -92,13 +96,15 @@ public void decompile(String decompilerName) {
     public void decompile(String decompilerName, @Nullable Path incrementalJar) {
         var decompiler = Decompilers.get(decompilerName);
         if (decompiler == null) throw new IllegalArgumentException("Decompiler \"" + decompilerName + "\" does not exist");
-        if (Files.notExists(options.outputJar())) deobfuscate();
-        if (deobfuscator.toDecompile.isEmpty()) {
-            LOGGER.info("Nothing to decompile, skipping decompilation");
-            return;
+        if (deobfuscator != null) {
+            if (Files.notExists(options.outputJar())) deobfuscate();
+            if (deobfuscator.toDecompile.isEmpty()) {
+                LOGGER.info("Nothing to decompile, skipping decompilation");
+                return;
+            }
         }
         LOGGER.info("Decompiling using \"{}\"", decompiler.name());
-        var inputJar = options.outputJar();
+        var inputJar = deobfuscator == null ? options.inputJar() : options.outputJar();
         var outputDir = options.outputDecompDir();
         try (FileSystem jarFs = JarUtil.createZipFs(inputJar)) {
             if (incrementalJar == null) FileUtil.deleteIfExists(outputDir);
@@ -110,6 +116,7 @@ public void decompile(String decompilerName, @Nullable Path incrementalJar) {
                 ObjectOpenHashSet<Path> libs = options.bundledLibs().map(ObjectOpenHashSet::new).orElseGet(() ->
                         DownloadingUtil.downloadLibraries(options.version(), libDownloadPath));
                 if (incrementalJar != null && decompiler.getSourceType() == IDecompiler.SourceType.DIRECTORY) {
+                    if (deobfuscator == null) throw new UnsupportedOperationException();// FIXME: I guess no one use this, so just throw uoe before refactoring
                     try (FileSystem incrementalFs = JarUtil.createZipFs(incrementalJar);
                         Stream<Path> paths = FileUtil.iterateFiles(incrementalFs.getPath(""))) {
                         var toDecompile = deobfuscator.toDecompile;
@@ -153,9 +160,12 @@ public void decompile(String decompilerName, @Nullable Path incrementalJar) {
                 if (!libs.isEmpty()) lrd.receiveLibs(libs);
             }
             switch (decompiler.getSourceType()) {
-                case DIRECTORY -> {
+                case DIRECTORY -> {// FIXME: temporary solution; needs refactoring
                     Path decompileClasses = Directories.TEMP_DIR.resolve("decompileClasses").toAbsolutePath().normalize();
-                    deobfuscator.toDecompile.parallelStream().forEach(path -> FileUtil.copyFile(jarFs.getPath(path), decompileClasses.resolve(path)));
+                    if (deobfuscator != null) deobfuscator.toDecompile.parallelStream().forEach(path -> FileUtil.copyFile(jarFs.getPath(path), decompileClasses.resolve(path)));
+                    else try (Stream<Path> s = FileUtil.iterateFiles(jarFs.getPath(""))) {
+                        s.forEach(p -> FileUtil.copyFile(p, decompileClasses.resolve(p.toString())));
+                    }
                     decompiler.decompile(decompileClasses, outputDir);
                 }
                 case FILE -> decompiler.decompile(inputJar, outputDir);
@@ -185,6 +195,8 @@ public static final class OptionBuilder {
 
         private String namespaceTarget;
 
+        private boolean skipWhenAbsent;
+
         public OptionBuilder(String version, SideType type) {
             this.version = Objects.requireNonNull(version, "version cannot be null!");
             this.type = Objects.requireNonNull(type, "type cannot be null!");
@@ -349,6 +361,11 @@ public OptionBuilder addExtraClasses(ObjectList<String> classes) {
             return this;
         }
 
+        public OptionBuilder skipRemappingWhenMappingsAreAbsent() {
+            this.skipWhenAbsent = true;
+            return this;
+        }
+
         public Options build() {
             if(this.outputJar.getParent().equals(this.outputDecompDir))
                 throw new IllegalArgumentException("The parent directory of outputJar cannot be the same as outputDecomp");
@@ -405,6 +422,11 @@ public String namespaceTarget() {
                 public Optional<ObjectSet<Path>> bundledLibs() {
                     return bundledLibs;
                 }
+
+                @Override
+                public boolean skipWhenAbsent() {
+                    return skipWhenAbsent;
+                }
             };
         }
     }
@@ -423,9 +445,15 @@ private ClassifiedDeobfuscator buildDeobfuscator() {
                     } else return new ClassifiedDeobfuscator((ClassifiedMapping<PairedMapping>) mappings, deobfuscation());
                 } else throw new UnsupportedOperationException("Unsupported yet"); // TODO
             }
+            if (skipWhenAbsent() && !containsMappings(version(), type())) return null;
             return new ClassifiedDeobfuscator(version(), type(), deobfuscation());
         }
 
+        private static boolean containsMappings(String version, SideType type) {
+            return VersionManifest.getSync(version).getAsJsonObject("downloads")
+                    .has(type + "_mappings");
+        }
+
         DataMap dataMap();
 
         DeobfuscationOptions deobfuscation();
@@ -441,5 +469,7 @@ private ClassifiedDeobfuscator buildDeobfuscator() {
         String namespaceTarget();
 
         Optional<ObjectSet<Path>> bundledLibs();
+
+        boolean skipWhenAbsent();
     }
 }

modules/cli/src/main/java/cn/maxpixel/mcdecompiler/MinecraftDecompilerCommandLine.java

@@ -91,6 +91,8 @@ public static void main(String[] args) throws Throwable {
         ArgumentAcceptingOptionSpec<Path> incrementalDecompilationO = parser.accepts("incremental-decompilation","Try to decompile " +
                 "incrementally. Specify a jar to compare the difference. Only works with decompilers of source type \"DIRECTORY\"")
                 .withRequiredArg().withValuesConvertedBy(new PathConverter(PathProperties.FILE_EXISTING));
+        OptionSpecBuilder skipWhenAbsentO = parser.accepts("skip-when-absent",
+                "Skip remapping when mappings are absent");
         AbstractOptionSpec<Void> help = parser.acceptsAll(of("h", "?", "help"), "For help").forHelp();
 
         for (Option option : ExtensionManager.OPTION_REGISTRY.getOptions()) {
@@ -166,6 +168,8 @@ public String valuePattern() {
         builder.addExtraJars(options.valuesOf(extraJarsO));
         builder.addExtraClasses(options.valuesOf(extraClassesO));
 
+        if (options.has(skipWhenAbsentO)) builder.skipRemappingWhenMappingsAreAbsent();
+
         MinecraftDecompiler md = new MinecraftDecompiler(builder.build());
         md.deobfuscate();