Add --decompile-memory argument, partially addresses #21

Author: LexManos

src/main/java/net/minecraftforge/mcmaven/cli/MCPTask.java

@@ -98,6 +98,15 @@ static OptionParser run(String[] args, boolean getParser) throws Exception {
         var parchmentO = parser.accepts("parchment",
             "Version of parchment mappings to use, snapshots are not supported")
             .availableIf(mappingsO).withRequiredArg();
+
+        // ignore caches, currently only invalidates HashStore entries
+        var ignoreCacheO = parser.accepts("ignore-cache",
+            "Forces all cache checks to fail, which results in all tasks re-running");
+
+        // Add extra memory to the java decompile and recompile tasks
+        var decompileMemoryO = parser.accepts("decompile-memory",
+            "Overrides the -Xmx argument passed into the decompile sub-processes")
+            .withRequiredArg();
         //@formatter:on
 
         if (getParser)
@@ -110,6 +119,11 @@ static OptionParser run(String[] args, boolean getParser) throws Exception {
             return parser;
         }
 
+        if (options.has(ignoreCacheO))
+            Mavenizer.setIgnoreCache();
+        if (options.has(decompileMemoryO))
+            Mavenizer.setDecompileMemory(options.valueOf(decompileMemoryO));
+
         var output = options.valueOf(outputO);
         var outputFiles = options.valueOf(outputFilesO);
         var cacheRoot = options.valueOf(cacheO);

src/main/java/net/minecraftforge/mcmaven/cli/MavenTask.java

@@ -78,6 +78,11 @@ static OptionParser run(String[] args, boolean getParser) throws Exception {
             .availableUnless(cacheOnlyO);
         cacheOnlyO.availableUnless(ignoreCacheO);
 
+        // Add extra memory to the java decompile and recompile tasks
+        var decompileMemoryO = parser.accepts("decompile-memory",
+            "Overrides the -Xmx argument passed into the decompile sub-processes")
+            .withRequiredArg();
+
         var mappingsO = parser.accepts("mappings",
             "Mappings to use for this artifact. Formatted as channel:version")
             .withRequiredArg().ofType(String.class).defaultsTo("official");
@@ -154,6 +159,8 @@ static OptionParser run(String[] args, boolean getParser) throws Exception {
             Mavenizer.setCacheOnly();
         if (options.has(ignoreCacheO))
             Mavenizer.setIgnoreCache();
+        if (options.has(decompileMemoryO))
+            Mavenizer.setDecompileMemory(options.valueOf(decompileMemoryO));
 
         var output = options.valueOf(outputO);
         var cache = options.valueOf(cacheO);

src/main/java/net/minecraftforge/mcmaven/impl/Mavenizer.java

@@ -5,6 +5,10 @@
 package net.minecraftforge.mcmaven.impl;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jetbrains.annotations.Nullable;
 
 import net.minecraftforge.util.hash.HashStore;
 import net.minecraftforge.util.logging.Logger;
@@ -65,4 +69,24 @@ public static boolean checkCache(File output, HashStore cache) {
         Mavenizer.assertNotCacheOnly();
         return false;
     }
+
+    private static @Nullable String decompileMemory = null;
+    public static void setDecompileMemory(String value) {
+        decompileMemory = value;
+    }
+    public static List<String> fillDecompileJvmArgs(List<String> args) {
+        return fillJvmArgs(decompileMemory, args);
+    }
+    private static List<String> fillJvmArgs(@Nullable String mx, List<String> args) {
+        if (mx == null)
+            return args;
+        var ret = new ArrayList<String>();
+        ret.add("-Xmx" + mx);
+        for (var arg : args) {
+            if (arg.startsWith("-Xmx"))
+                continue;
+            ret.add(arg);
+        }
+        return ret;
+    }
 }

src/main/java/net/minecraftforge/mcmaven/impl/repo/mcpconfig/MCPTaskFactory.java

@@ -899,6 +899,9 @@ private File execute(String name, List<TaskOrArg> jvmArgs, List<TaskOrArg> runAr
             throw new IllegalStateException("Failed to find JDK for version " + java_version, e);
         }
 
+        if (isDecompile)
+            jvm = Mavenizer.fillDecompileJvmArgs(jvm);
+
         var ret = ProcessUtils.runJar(jdk, log.getParentFile(), log, tool, jvm, run, isDecompile ? MCPTaskFactory::parseDecompileLog : null);
         if (ret.exitCode != 0)
             throw new IllegalStateException("Failed to run MCP Step (exit code " + ret.exitCode + "), See log: " + log.getAbsolutePath());

src/main/java/net/minecraftforge/mcmaven/impl/util/ProcessUtils.java

@@ -413,7 +413,6 @@ private static Result runJavac(File javaHome, File workDir, File logFile, List<S
             };
 
             int ret = runCommand(workDir, lines, command.toArray(String[]::new));
-            System.currentTimeMillis();
 
             log.flush();
             return new Result(consoleLog, ret);