Follow Fabric guidelines

1 files changed, 186 insertions, 189 deletions

diff --git a/src/main/java/cuchaz/enigma/CommandMain.java b/src/main/java/cuchaz/enigma/CommandMain.java
index b0a4107..f546eb1 100644
--- a/src/main/java/cuchaz/enigma/CommandMain.java
+++ b/src/main/java/cuchaz/enigma/CommandMain.java
@@ -8,201 +8,198 @@
  * Contributors:
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
-package cuchaz.enigma;
 
-import java.io.File;
-import java.util.jar.JarFile;
+package cuchaz.enigma;
 
 import cuchaz.enigma.Deobfuscator.ProgressListener;
 import cuchaz.enigma.mapping.Mappings;
 import cuchaz.enigma.mapping.MappingsEnigmaReader;
 
+import java.io.File;
+import java.util.jar.JarFile;
+
 public class CommandMain {
 
-    public static class ConsoleProgressListener implements ProgressListener {
-
-        private static final int ReportTime = 5000; // 5s
-
-        private int totalWork;
-        private long startTime;
-        private long lastReportTime;
-
-        @Override
-        public void init(int totalWork, String title) {
-            this.totalWork = totalWork;
-            this.startTime = System.currentTimeMillis();
-            this.lastReportTime = this.startTime;
-            System.out.println(title);
-        }
-
-        @Override
-        public void onProgress(int numDone, String message) {
-            long now = System.currentTimeMillis();
-            boolean isLastUpdate = numDone == this.totalWork;
-            boolean shouldReport = isLastUpdate || now - this.lastReportTime > ReportTime;
-
-            if (shouldReport) {
-                int percent = numDone * 100 / this.totalWork;
-                System.out.println(String.format("\tProgress: %3d%%", percent));
-                this.lastReportTime = now;
-            }
-            if (isLastUpdate) {
-                double elapsedSeconds = (now - this.startTime) / 1000.0;
-                System.out.println(String.format("Finished in %.1f seconds", elapsedSeconds));
-            }
-        }
-    }
-
-    public static void main(String[] args) throws Exception {
-        try {
-            // process the command
-            String command = getArg(args, 0, "command", true);
-            if (command.equalsIgnoreCase("deobfuscate")) {
-                deobfuscate(args);
-            } else if (command.equalsIgnoreCase("decompile")) {
-                decompile(args);
-            } else if (command.equalsIgnoreCase("protectify")) {
-                protectify(args);
-            } else if (command.equalsIgnoreCase("publify")) {
-                publify(args);
-            } else if (command.equalsIgnoreCase("convertmappings")) {
-                convertMappings(args);
-            }
-            else {
-                throw new IllegalArgumentException("Command not recognized: " + command);
-            }
-        } catch (IllegalArgumentException ex) {
-            System.out.println(ex.getMessage());
-            printHelp();
-        }
-    }
-
-    private static void printHelp() {
-        System.out.println(String.format("%s - %s", Constants.NAME, Constants.VERSION));
-        System.out.println("Usage:");
-        System.out.println("\tjava -cp enigma.jar cuchaz.enigma.CommandMain <command>");
-        System.out.println("\twhere <command> is one of:");
-        System.out.println("\t\tdeobfuscate <in jar> <out jar> [<mappings file>]");
-        System.out.println("\t\tdecompile <in jar> <out folder> [<mappings file>]");
-        System.out.println("\t\tprotectify <in jar> <out jar>");
-        System.out.println("\t\tpublify <in jar> <out jar>");
-        System.out.println("\t\tconvertmappings <enigma mappings> <converted mappings> <ENIGMA_FILE|ENIGMA_DIRECTORY|SRG_FILE>");
-    }
-
-    private static void decompile(String[] args) throws Exception {
-        File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
-        File fileJarOut = getWritableFolder(getArg(args, 2, "out folder", true));
-        File fileMappings = getReadableFile(getArg(args, 3, "mappings file", false));
-        Deobfuscator deobfuscator = getDeobfuscator(fileMappings, new JarFile(fileJarIn));
-        deobfuscator.writeSources(fileJarOut, new ConsoleProgressListener());
-    }
-
-    private static void deobfuscate(String[] args) throws Exception {
-        File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
-        File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
-        File fileMappings = getReadableFile(getArg(args, 3, "mappings file", false));
-        Deobfuscator deobfuscator = getDeobfuscator(fileMappings, new JarFile(fileJarIn));
-        deobfuscator.writeJar(fileJarOut, new ConsoleProgressListener());
-    }
-
-    private static void protectify(String[] args) throws Exception {
-        File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
-        File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
-        Deobfuscator deobfuscator = getDeobfuscator(null, new JarFile(fileJarIn));
-        deobfuscator.protectifyJar(fileJarOut, new ConsoleProgressListener());
-    }
-
-    private static void publify(String[] args) throws Exception {
-        File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
-        File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
-        Deobfuscator deobfuscator = getDeobfuscator(null, new JarFile(fileJarIn));
-        deobfuscator.publifyJar(fileJarOut, new ConsoleProgressListener());
-    }
-
-    private static Deobfuscator getDeobfuscator(File fileMappings, JarFile jar) throws Exception {
-        System.out.println("Reading jar...");
-        Deobfuscator deobfuscator = new Deobfuscator(jar);
-        if (fileMappings != null) {
-            System.out.println("Reading mappings...");
-            Mappings mappings = new MappingsEnigmaReader().read(fileMappings);
-            deobfuscator.setMappings(mappings);
-        }
-        return deobfuscator;
-    }
-
-    private static void convertMappings(String[] args) throws Exception {
-        File fileMappings = getReadableFile(getArg(args, 1, "enigma mapping", true));
-        File result = getWritableFile(getArg(args, 2, "enigma mapping", true));
-        String name = getArg(args, 3, "format type", true);
-        Mappings.FormatType formatType;
-        try
-        {
-            formatType = Mappings.FormatType.valueOf(name.toUpperCase());
-        } catch (IllegalArgumentException e)
-        {
-            throw new IllegalArgumentException(name + "is not a valid mapping format!");
-        }
-
-        System.out.println("Reading mappings...");
-        Mappings mappings = new MappingsEnigmaReader().read(fileMappings);
-        System.out.println("Saving new mappings...");
-        switch (formatType)
-        {
-            case SRG_FILE:
-                mappings.saveSRGMappings(result);
-                break;
-            default:
-                mappings.saveEnigmaMappings(result, Mappings.FormatType.ENIGMA_FILE != formatType);
-                break;
-        }
-    }
-
-    private static String getArg(String[] args, int i, String name, boolean required) {
-        if (i >= args.length) {
-            if (required) {
-                throw new IllegalArgumentException(name + " is required");
-            } else {
-                return null;
-            }
-        }
-        return args[i];
-    }
-
-    private static File getWritableFile(String path) {
-        if (path == null) {
-            return null;
-        }
-        File file = new File(path).getAbsoluteFile();
-        File dir = file.getParentFile();
-        if (dir == null) {
-            throw new IllegalArgumentException("Cannot write file: " + path);
-        }
-        // quick fix to avoid stupid stuff in Gradle code
-        if (!dir.isDirectory()) {
-            dir.mkdirs();
-        }
-        return file;
-    }
-
-    private static File getWritableFolder(String path) {
-        if (path == null) {
-            return null;
-        }
-        File dir = new File(path).getAbsoluteFile();
-        if (!dir.exists()) {
-            throw new IllegalArgumentException("Cannot write to folder: " + dir);
-        }
-        return dir;
-    }
-
-    private static File getReadableFile(String path) {
-        if (path == null) {
-            return null;
-        }
-        File file = new File(path).getAbsoluteFile();
-        if (!file.exists()) {
-            throw new IllegalArgumentException("Cannot find file: " + file.getAbsolutePath());
-        }
-        return file;
-    }
+        public static void main(String[] args) throws Exception {
+                try {
+                        // process the command
+                        String command = getArg(args, 0, "command", true);
+                        if (command.equalsIgnoreCase("deobfuscate")) {
+                                deobfuscate(args);
+                        } else if (command.equalsIgnoreCase("decompile")) {
+                                decompile(args);
+                        } else if (command.equalsIgnoreCase("protectify")) {
+                                protectify(args);
+                        } else if (command.equalsIgnoreCase("publify")) {
+                                publify(args);
+                        } else if (command.equalsIgnoreCase("convertmappings")) {
+                                convertMappings(args);
+                        } else {
+                                throw new IllegalArgumentException("Command not recognized: " + command);
+                        }
+                } catch (IllegalArgumentException ex) {
+                        System.out.println(ex.getMessage());
+                        printHelp();
+                }
+        }
+
+        private static void printHelp() {
+                System.out.println(String.format("%s - %s", Constants.NAME, Constants.VERSION));
+                System.out.println("Usage:");
+                System.out.println("\tjava -cp enigma.jar cuchaz.enigma.CommandMain <command>");
+                System.out.println("\twhere <command> is one of:");
+                System.out.println("\t\tdeobfuscate <in jar> <out jar> [<mappings file>]");
+                System.out.println("\t\tdecompile <in jar> <out folder> [<mappings file>]");
+                System.out.println("\t\tprotectify <in jar> <out jar>");
+                System.out.println("\t\tpublify <in jar> <out jar>");
+                System.out.println("\t\tconvertmappings <enigma mappings> <converted mappings> <ENIGMA_FILE|ENIGMA_DIRECTORY|SRG_FILE>");
+        }
+
+        private static void decompile(String[] args) throws Exception {
+                File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
+                File fileJarOut = getWritableFolder(getArg(args, 2, "out folder", true));
+                File fileMappings = getReadableFile(getArg(args, 3, "mappings file", false));
+                Deobfuscator deobfuscator = getDeobfuscator(fileMappings, new JarFile(fileJarIn));
+                deobfuscator.writeSources(fileJarOut, new ConsoleProgressListener());
+        }
+
+        private static void deobfuscate(String[] args) throws Exception {
+                File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
+                File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
+                File fileMappings = getReadableFile(getArg(args, 3, "mappings file", false));
+                Deobfuscator deobfuscator = getDeobfuscator(fileMappings, new JarFile(fileJarIn));
+                deobfuscator.writeJar(fileJarOut, new ConsoleProgressListener());
+        }
+
+        private static void protectify(String[] args) throws Exception {
+                File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
+                File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
+                Deobfuscator deobfuscator = getDeobfuscator(null, new JarFile(fileJarIn));
+                deobfuscator.protectifyJar(fileJarOut, new ConsoleProgressListener());
+        }
+
+        private static void publify(String[] args) throws Exception {
+                File fileJarIn = getReadableFile(getArg(args, 1, "in jar", true));
+                File fileJarOut = getWritableFile(getArg(args, 2, "out jar", true));
+                Deobfuscator deobfuscator = getDeobfuscator(null, new JarFile(fileJarIn));
+                deobfuscator.publifyJar(fileJarOut, new ConsoleProgressListener());
+        }
+
+        private static Deobfuscator getDeobfuscator(File fileMappings, JarFile jar) throws Exception {
+                System.out.println("Reading jar...");
+                Deobfuscator deobfuscator = new Deobfuscator(jar);
+                if (fileMappings != null) {
+                        System.out.println("Reading mappings...");
+                        Mappings mappings = new MappingsEnigmaReader().read(fileMappings);
+                        deobfuscator.setMappings(mappings);
+                }
+                return deobfuscator;
+        }
+
+        private static void convertMappings(String[] args) throws Exception {
+                File fileMappings = getReadableFile(getArg(args, 1, "enigma mapping", true));
+                File result = getWritableFile(getArg(args, 2, "enigma mapping", true));
+                String name = getArg(args, 3, "format type", true);
+                Mappings.FormatType formatType;
+                try {
+                        formatType = Mappings.FormatType.valueOf(name.toUpperCase());
+                } catch (IllegalArgumentException e) {
+                        throw new IllegalArgumentException(name + "is not a valid mapping format!");
+                }
+
+                System.out.println("Reading mappings...");
+                Mappings mappings = new MappingsEnigmaReader().read(fileMappings);
+                System.out.println("Saving new mappings...");
+                switch (formatType) {
+                        case SRG_FILE:
+                                mappings.saveSRGMappings(result);
+                                break;
+                        default:
+                                mappings.saveEnigmaMappings(result, Mappings.FormatType.ENIGMA_FILE != formatType);
+                                break;
+                }
+        }
+
+        private static String getArg(String[] args, int i, String name, boolean required) {
+                if (i >= args.length) {
+                        if (required) {
+                                throw new IllegalArgumentException(name + " is required");
+                        } else {
+                                return null;
+                        }
+                }
+                return args[i];
+        }
+
+        private static File getWritableFile(String path) {
+                if (path == null) {
+                        return null;
+                }
+                File file = new File(path).getAbsoluteFile();
+                File dir = file.getParentFile();
+                if (dir == null) {
+                        throw new IllegalArgumentException("Cannot write file: " + path);
+                }
+                // quick fix to avoid stupid stuff in Gradle code
+                if (!dir.isDirectory()) {
+                        dir.mkdirs();
+                }
+                return file;
+        }
+
+        private static File getWritableFolder(String path) {
+                if (path == null) {
+                        return null;
+                }
+                File dir = new File(path).getAbsoluteFile();
+                if (!dir.exists()) {
+                        throw new IllegalArgumentException("Cannot write to folder: " + dir);
+                }
+                return dir;
+        }
+
+        private static File getReadableFile(String path) {
+                if (path == null) {
+                        return null;
+                }
+                File file = new File(path).getAbsoluteFile();
+                if (!file.exists()) {
+                        throw new IllegalArgumentException("Cannot find file: " + file.getAbsolutePath());
+                }
+                return file;
+        }
+
+        public static class ConsoleProgressListener implements ProgressListener {
+
+                private static final int ReportTime = 5000; // 5s
+
+                private int totalWork;
+                private long startTime;
+                private long lastReportTime;
+
+                @Override
+                public void init(int totalWork, String title) {
+                        this.totalWork = totalWork;
+                        this.startTime = System.currentTimeMillis();
+                        this.lastReportTime = this.startTime;
+                        System.out.println(title);
+                }
+
+                @Override
+                public void onProgress(int numDone, String message) {
+                        long now = System.currentTimeMillis();
+                        boolean isLastUpdate = numDone == this.totalWork;
+                        boolean shouldReport = isLastUpdate || now - this.lastReportTime > ReportTime;
+
+                        if (shouldReport) {
+                                int percent = numDone * 100 / this.totalWork;
+                                System.out.println(String.format("\tProgress: %3d%%", percent));
+                                this.lastReportTime = now;
+                        }
+                        if (isLastUpdate) {
+                                double elapsedSeconds = (now - this.startTime) / 1000.0;
+                                System.out.println(String.format("Finished in %.1f seconds", elapsedSeconds));
+                        }
+                }
+        }
 }