Add MCP Patching step

Add more controls over reformatting

Author: LexManos

src/main/java/net/minecraftforge/mcpcleanup/ConsoleTool.java

@@ -6,10 +6,13 @@
 
 import java.io.File;
 import java.io.IOException;
-import joptsimple.OptionException;
+import java.util.HashSet;
+import java.util.Set;
+
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
+import net.minecraftforge.mcpcleanup.MCPCleanup.Mode;
 
 public class ConsoleTool {
     private static boolean get(OptionSet options, boolean _default, OptionSpec<Boolean> spec) {
@@ -31,48 +34,70 @@ public static void main(String[] args) throws IOException {
         OptionSpec<Boolean> basicCleanupO = parser.accepts("basic", "Rus the BasicCleanups set").withOptionalArg().ofType(Boolean.class);
         OptionSpec<Boolean> glCleanupO = parser.accepts("gl", "Runs the GLConstantFixer set").withOptionalArg().ofType(Boolean.class);
         OptionSpec<Boolean> fmlCleanupO = parser.accepts("fml", "Runs the FMLCleanup set").withOptionalArg().ofType(Boolean.class);
+        OptionSpec<Boolean> fmlCasesCleanupO = parser.accepts("fml-cases", "Fixed blank lines around case statements when doing FMLCleanup").withOptionalArg().ofType(Boolean.class);
         OptionSpec<Boolean> astyleO = parser.accepts("astyle", "Runs AStyle formatter").withOptionalArg().ofType(Boolean.class);
 
-        try {
-            OptionSet options = parser.parse(args);
+        OptionSpec<Mode> modeO = parser.accepts("mode", "What set of fixes we should be running").withRequiredArg().withValuesConvertedBy(Mode.MODERN);
+        OptionSpec<String> ignorePatchesO = parser.accepts("ignore-patches", "Patch files to ingore").withRequiredArg();
+
+
+        OptionSpec<File> patchesO = parser.accepts("patches", "Archive containing patch files to apply after doing the FernFlower cleanup").withRequiredArg().ofType(File.class);
+        OptionSpec<String> patchesPrefixO = parser.accepts("patches-prefix", "Prefix of patch files in the specified archive").withRequiredArg();
 
-            File input = options.valueOf(inputO);
-            File output  = options.valueOf(outputO);
-            boolean filterFML    = get(options, false, filterFMLO);
-            boolean fixParams    = get(options, false, fixGeneric);
-            boolean ffCleanup    = get(options, false, ffCleanupO);
-            boolean basicCleanup = get(options, true,  basicCleanupO);
-            boolean glCleanup    = get(options, true,  glCleanupO);
-            boolean fmlCleanup   = get(options, false, fmlCleanupO);
-            boolean astyle       = get(options, true,  astyleO);
+        OptionSet options = parser.parse(args);
 
-            log("MCPCleanup: ");
-            log("  Input:     " + input);
-            log("  Output:    " + output);
-            log("  FilterFML: " + filterFML);
-            log("  Abstract:  " + fixParams);
-            log("  FF:        " + ffCleanup);
-            log("  Basic:     " + basicCleanup);
-            log("  GL:        " + glCleanup);
-            log("  FML:       " + fmlCleanup);
-            log("  Astyle:    " + astyle);
+        File input = options.valueOf(inputO);
+        File output  = options.valueOf(outputO);
+        Mode mode = options.valueOf(modeO);
+        boolean filterFML       = get(options, false, filterFMLO);
+        boolean fixParams       = get(options, false, fixGeneric);
+        boolean ffCleanup       = get(options, false, ffCleanupO);
+        boolean basicCleanup    = get(options, true,  basicCleanupO);
+        boolean glCleanup       = get(options, true,  glCleanupO);
+        boolean fmlCleanup      = get(options, false, fmlCleanupO);
+        boolean fmlCasesCleanup = get(options, true,  fmlCasesCleanupO);
+        boolean astyle          = get(options, true,  astyleO);
+        File patches = options.has(patchesO) ? options.valueOf(patchesO) : null;
+        String prefix = options.has(patchesPrefixO) ? options.valueOf(patchesPrefixO) : null;
+        Set<String> ignores = new HashSet<String>();
 
-            MCPCleanup cleanup = MCPCleanup.create(input, output)
-                .filterFML(filterFML)
-                .fixParams(fixParams)
-                .fernflower(ffCleanup)
-                .basic(basicCleanup)
-                .gl(glCleanup)
-                .fml(fmlCleanup)
-                .astyle(astyle)
-                ;
-            cleanup.process();
-        } catch (OptionException e) {
-            parser.printHelpOn(System.out);
-            e.printStackTrace();
+        log("MCPCleanup: ");
+        log("  Input:     " + input);
+        log("  Output:    " + output);
+        log("  FilterFML: " + filterFML);
+        log("  Abstract:  " + fixParams);
+        log("  FF:        " + ffCleanup);
+        log("  Mode:      " + mode);
+        log("  Basic:     " + basicCleanup);
+        log("  GL:        " + glCleanup);
+        log("  FML:       " + fmlCleanup);
+        log("  FML Case:  " + fmlCasesCleanup);
+        log("  Astyle:    " + astyle);
+        if (patches != null) {
+            log("  Patches:   " + patches.getAbsolutePath());
+            if (prefix != null)
+                log("  Prefix:    " + prefix);
+            for (String value : options.valuesOf(ignorePatchesO)) {
+                log("  Ignore:    " + value);
+                ignores.add(value.replace('/', '.'));
+            }
         }
-    }
 
+        MCPCleanup cleanup = MCPCleanup.create(input, output)
+            .filterFML(filterFML)
+            .fixParams(fixParams)
+            .fernflower(ffCleanup)
+            .mode(mode)
+            .basic(basicCleanup)
+            .gl(glCleanup)
+            .fml(fmlCleanup)
+            .fmlCases(fmlCasesCleanup)
+            .astyle(astyle)
+            ;
+        if (patches != null)
+            cleanup.patches(patches, prefix, ignores);
+        cleanup.process();
+    }
 
     public static void log(String message) {
         System.out.println(message);