Split GUI code to separate module (#242)

* Split into modules

* Post merge compile fixes

Co-authored-by: modmuss50 <modmuss50@gmail.com>

17 files changed, 114 insertions, 22 deletions

diff --git a/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java
index 9d238e3a..e4deef8b 100644
--- a/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/CheckMappingsCommand.java
@@ -5,7 +5,7 @@ import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.analysis.index.JarIndex;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.representation.entry.ClassEntry;
diff --git a/src/main/java/cuchaz/enigma/command/Command.java b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
index 09dd3216..0640e3e7 100644
--- a/src/main/java/cuchaz/enigma/command/Command.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
@@ -4,7 +4,7 @@ import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
diff --git a/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
index f57f1fa6..e10fd47e 100644
--- a/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/ComposeMappingsCommand.java
@@ -1,9 +1,10 @@
 package cuchaz.enigma.command;
 
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.MappingOperations;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.utils.Utils;
 
@@ -32,7 +33,7 @@ public class ComposeMappingsCommand extends Command {
 
         EntryTree<EntryMapping> left = MappingCommandsUtil.read(args[0], Paths.get(args[1]), saveParameters);
         EntryTree<EntryMapping> right = MappingCommandsUtil.read(args[2], Paths.get(args[3]), saveParameters);
-        EntryTree<EntryMapping> result = MappingCommandsUtil.compose(left, right, args[6].equals("left") || args[6].equals("both"), args[6].equals("right") || args[6].equals("both"));
+        EntryTree<EntryMapping> result = MappingOperations.compose(left, right, args[6].equals("left") || args[6].equals("both"), args[6].equals("right") || args[6].equals("both"));
 
         Path output = Paths.get(args[5]);
         Utils.delete(output);
diff --git a/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
index 689df02d..144d89c5 100644
--- a/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/ConvertMappingsCommand.java
@@ -1,9 +1,9 @@
 package cuchaz.enigma.command;
 
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.utils.Utils;
 
diff --git a/src/main/java/cuchaz/enigma/command/DecompileCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/DecompileCommand.java
index 3d15dac6..3d15dac6 100644
--- a/src/main/java/cuchaz/enigma/command/DecompileCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/DecompileCommand.java
diff --git a/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java
index b0d2a7d0..b0d2a7d0 100644
--- a/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/DeobfuscateCommand.java
diff --git a/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java
index cd11e2e6..0780a965 100644
--- a/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/InvertMappingsCommand.java
@@ -1,9 +1,10 @@
 package cuchaz.enigma.command;
 
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.MappingOperations;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.MappingFileNameFormat;
-import cuchaz.enigma.translation.mapping.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.utils.Utils;
 
@@ -31,7 +32,7 @@ public class InvertMappingsCommand extends Command {
         MappingSaveParameters saveParameters = new MappingSaveParameters(MappingFileNameFormat.BY_DEOBF);
 
         EntryTree<EntryMapping> source = MappingCommandsUtil.read(args[0], Paths.get(args[1]), saveParameters);
-        EntryTree<EntryMapping> result = MappingCommandsUtil.invert(source);
+        EntryTree<EntryMapping> result = MappingOperations.invert(source);
 
         Path output = Paths.get(args[3]);
         Utils.delete(output);
diff --git a/src/main/java/cuchaz/enigma/CommandMain.java b/enigma-cli/src/main/java/cuchaz/enigma/command/Main.java
index 93b013d5..0a4c1b9b 100644
--- a/src/main/java/cuchaz/enigma/CommandMain.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/Main.java
@@ -9,15 +9,15 @@
  * Jeff Martin - initial API and implementation
  ******************************************************************************/
 
-package cuchaz.enigma;
+package cuchaz.enigma.command;
 
-import cuchaz.enigma.command.*;
+import cuchaz.enigma.Enigma;
 
 import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 
-public class CommandMain {
+public class Main {
 
         private static final Map<String, Command> COMMANDS = new LinkedHashMap<>();
 
@@ -46,7 +46,7 @@ public class CommandMain {
                         }
                 } catch (CommandHelpException ex) {
                         System.err.println(ex.getMessage());
-                        System.out.println(String.format("%s - %s", Constants.NAME, Constants.VERSION));
+                        System.out.println(String.format("%s - %s", Enigma.NAME, Enigma.VERSION));
                         System.out.println("Command " + ex.command.name + " has encountered an error! Usage:");
                         printHelp(ex.command);
                         System.exit(1);
@@ -58,9 +58,9 @@ public class CommandMain {
         }
 
         private static void printHelp() {
-                System.out.println(String.format("%s - %s", Constants.NAME, Constants.VERSION));
+                System.out.println(String.format("%s - %s", Enigma.NAME, Enigma.VERSION));
                 System.out.println("Usage:");
-                System.out.println("\tjava -cp enigma.jar cuchaz.enigma.CommandMain <command>");
+                System.out.println("\tjava -cp enigma.jar cuchaz.enigma.command.CommandMain <command>");
                 System.out.println("\twhere <command> is one of:");
 
                 for (Command command : COMMANDS.values()) {
diff --git a/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java b/enigma-cli/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
index eb8d5dcc..292de192 100644
--- a/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/MapSpecializedMethodsCommand.java
@@ -4,10 +4,12 @@ import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.analysis.ClassCache;
 import cuchaz.enigma.analysis.index.BridgeMethodIndex;
 import cuchaz.enigma.analysis.index.JarIndex;
-import cuchaz.enigma.throwables.MappingParseException;
+import cuchaz.enigma.translation.mapping.serde.MappingFileNameFormat;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.MappingTranslator;
 import cuchaz.enigma.translation.Translator;
 import cuchaz.enigma.translation.mapping.*;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 import cuchaz.enigma.translation.mapping.tree.EntryTreeNode;
 import cuchaz.enigma.translation.mapping.tree.HashEntryTree;
diff --git a/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
new file mode 100644
index 00000000..d365129b
--- /dev/null
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
@@ -0,0 +1,87 @@
+package cuchaz.enigma.command;
+
+import cuchaz.enigma.ProgressListener;
+import cuchaz.enigma.translation.mapping.serde.MappingParseException;
+import cuchaz.enigma.translation.mapping.EntryMapping;
+import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
+import cuchaz.enigma.translation.mapping.serde.*;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.enigma.EnigmaMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsReader;
+import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsWriter;
+import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
+import cuchaz.enigma.translation.mapping.tree.EntryTree;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public final class MappingCommandsUtil {
+    private MappingCommandsUtil() {}
+
+    public static EntryTree<EntryMapping> read(String type, Path path, MappingSaveParameters saveParameters) throws MappingParseException, IOException {
+        if (type.equals("enigma")) {
+            return (Files.isDirectory(path) ? EnigmaMappingsReader.DIRECTORY : EnigmaMappingsReader.ZIP).read(path, ProgressListener.none(), saveParameters);
+        }
+
+        if (type.equals("tiny")) {
+            return TinyMappingsReader.INSTANCE.read(path, ProgressListener.none(), saveParameters);
+        }
+
+        MappingFormat format = null;
+        try {
+            format = MappingFormat.valueOf(type.toUpperCase());
+        } catch (IllegalArgumentException ignored) {
+            if (type.equals("tinyv2")) {
+                format = MappingFormat.TINY_V2;
+            }
+        }
+
+        if (format != null) {
+            return format.getReader().read(path, ProgressListener.none(), saveParameters);
+        }
+
+        throw new IllegalArgumentException("no reader for " + type);
+    }
+
+    public static void write(EntryTree<EntryMapping> mappings, String type, Path path, MappingSaveParameters saveParameters) {
+        if (type.equals("enigma")) {
+            EnigmaMappingsWriter.DIRECTORY.write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        if (type.startsWith("tinyv2:") || type.startsWith("tiny_v2:")) {
+            String[] split = type.split(":");
+
+            if (split.length != 3) {
+                throw new IllegalArgumentException("specify column names as 'tinyv2:from_namespace:to_namespace'");
+            }
+
+            new TinyV2Writer(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        if (type.startsWith("tiny:")) {
+            String[] split = type.split(":");
+
+            if (split.length != 3) {
+                throw new IllegalArgumentException("specify column names as 'tiny:from_column:to_column'");
+            }
+
+            new TinyMappingsWriter(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        MappingFormat format = null;
+        try {
+            format = MappingFormat.valueOf(type.toUpperCase());
+        } catch (IllegalArgumentException ignored) {}
+
+        if (format != null) {
+            format.getWriter().write(mappings, path, ProgressListener.none(), saveParameters);
+            return;
+        }
+
+        throw new IllegalArgumentException("no writer for " + type);
+    }
+}
diff --git a/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java b/enigma-cli/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
index f3b9f85e..a29bba40 100644
--- a/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
+++ b/enigma-cli/src/test/java/cuchaz/enigma/command/CheckMappingsCommandTest.java
@@ -5,16 +5,17 @@ import org.junit.Test;
 import java.io.File;
 
 public class CheckMappingsCommandTest {
+        private static final String PACKAGE_ACCESS = "../enigma/build/test-obf/packageAccess.jar";
 
         @Test(expected = IllegalStateException.class)
         public void testWrong() throws Exception {
-                new CheckMappingsCommand().run(new File("build/test-obf/packageAccess.jar").getAbsolutePath(), new File("src/test/resources" +
+                new CheckMappingsCommand().run(new File(PACKAGE_ACCESS).getAbsolutePath(), new File("src/test/resources" +
                                 "/packageAccess/wrongMappings").getAbsolutePath());
         }
 
         @Test
         public void testRight() throws Exception {
-                new CheckMappingsCommand().run(new File("build/test-obf/packageAccess.jar").getAbsolutePath(), new File("src/test/resources" +
+                new CheckMappingsCommand().run(new File(PACKAGE_ACCESS).getAbsolutePath(), new File("src/test/resources" +
                                 "/packageAccess/correctMappings").getAbsolutePath());
         }
 }
diff --git a/src/test/resources/packageAccess/correctMappings/base/Base.mapping b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/Base.mapping
index 0a86def0..0a86def0 100644
--- a/src/test/resources/packageAccess/correctMappings/base/Base.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/Base.mapping
diff --git a/src/test/resources/packageAccess/correctMappings/base/One.mapping b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/One.mapping
index dd4c2083..dd4c2083 100644
--- a/src/test/resources/packageAccess/correctMappings/base/One.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/correctMappings/base/One.mapping
diff --git a/src/test/resources/packageAccess/correctMappings/two/Two.mapping b/enigma-cli/src/test/resources/packageAccess/correctMappings/two/Two.mapping
index a179349c..a179349c 100644
--- a/src/test/resources/packageAccess/correctMappings/two/Two.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/correctMappings/two/Two.mapping
diff --git a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping b/enigma-cli/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
index 0a86def0..0a86def0 100644
--- a/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/base/Base.mapping
diff --git a/src/test/resources/packageAccess/wrongMappings/one/One.mapping b/enigma-cli/src/test/resources/packageAccess/wrongMappings/one/One.mapping
index 15b42cf5..15b42cf5 100644
--- a/src/test/resources/packageAccess/wrongMappings/one/One.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/one/One.mapping
diff --git a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping b/enigma-cli/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
index a179349c..a179349c 100644
--- a/src/test/resources/packageAccess/wrongMappings/two/Two.mapping
+++ b/enigma-cli/src/test/resources/packageAccess/wrongMappings/two/Two.mapping