Merge pull request #463 from NebelNidas/mapping-io

Initial Mapping-IO support

2 files changed, 71 insertions, 34 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index 91037b0..c579901 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -29,6 +29,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import com.google.common.collect.Lists;
+import org.jetbrains.annotations.ApiStatus;
 
 import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProfile;
@@ -139,6 +140,12 @@ public class GuiController implements ClientPacketHandler {
                 this.gui.onCloseJar();
         }
 
+        @ApiStatus.Internal
+        public CompletableFuture<Void> openMappings(MappingFormat format, Path path, boolean useMappingIo) {
+                System.getProperties().setProperty("enigma.use_mappingio", useMappingIo ? "true" : "false");
+                return openMappings(format, path);
+        }
+
         public CompletableFuture<Void> openMappings(MappingFormat format, Path path) {
                 if (project == null) {
                         return CompletableFuture.completedFuture(null);
@@ -149,9 +156,7 @@ public class GuiController implements ClientPacketHandler {
                 return ProgressDialog.runOffThread(gui.getFrame(), progress -> {
                         try {
                                 MappingSaveParameters saveParameters = enigma.getProfile().getMappingSaveParameters();
-
-                                EntryTree<EntryMapping> mappings = format.read(path, progress, saveParameters);
-                                project.setMappings(mappings);
+                                project.setMappings(format.read(path, progress, saveParameters, project.getJarIndex()));
 
                                 loadedMappingFormat = format;
                                 loadedMappingPath = path;
@@ -179,6 +184,12 @@ public class GuiController implements ClientPacketHandler {
                 return saveMappings(path, loadedMappingFormat);
         }
 
+        @ApiStatus.Internal
+        public CompletableFuture<Void> saveMappings(Path path, MappingFormat format, boolean useMappingIo) {
+                System.getProperties().setProperty("enigma.use_mappingio", useMappingIo ? "true" : "false");
+                return saveMappings(path, format);
+        }
+
         /**
          * Saves the mappings, with a dialog popping up, showing the progress.
          *
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 1cfad50..30e3586 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -45,7 +45,7 @@ public class MenuBar {
         private final JMenu fileMenu = new JMenu();
         private final JMenuItem jarOpenItem = new JMenuItem();
         private final JMenuItem jarCloseItem = new JMenuItem();
-        private final JMenu openMenu = new JMenu();
+        private final JMenu openMappingsMenu = new JMenu();
         private final JMenuItem saveMappingsItem = new JMenuItem();
         private final JMenu saveMappingsAsMenu = new JMenu();
         private final JMenuItem closeMappingsItem = new JMenuItem();
@@ -88,7 +88,7 @@ public class MenuBar {
 
                 this.retranslateUi();
 
-                prepareOpenMenu(this.openMenu, gui);
+                prepareOpenMappingsMenu(this.openMappingsMenu, gui);
                 prepareSaveMappingsAsMenu(this.saveMappingsAsMenu, this.saveMappingsItem, gui);
                 prepareDecompilerMenu(this.decompilerMenu, gui);
                 prepareThemesMenu(this.themesMenu, gui);
@@ -98,7 +98,7 @@ public class MenuBar {
                 this.fileMenu.add(this.jarOpenItem);
                 this.fileMenu.add(this.jarCloseItem);
                 this.fileMenu.addSeparator();
-                this.fileMenu.add(this.openMenu);
+                this.fileMenu.add(this.openMappingsMenu);
                 this.fileMenu.add(this.saveMappingsItem);
                 this.fileMenu.add(this.saveMappingsAsMenu);
                 this.fileMenu.add(this.closeMappingsItem);
@@ -174,7 +174,7 @@ public class MenuBar {
                 this.startServerItem.setText(I18n.translate(connectionState != ConnectionState.HOSTING ? "menu.collab.server.start" : "menu.collab.server.stop"));
 
                 this.jarCloseItem.setEnabled(jarOpen);
-                this.openMenu.setEnabled(jarOpen);
+                this.openMappingsMenu.setEnabled(jarOpen);
                 this.saveMappingsItem.setEnabled(jarOpen && this.gui.enigmaMappingsFileChooser.getSelectedFile() != null && connectionState != ConnectionState.CONNECTED);
                 this.saveMappingsAsMenu.setEnabled(jarOpen);
                 this.closeMappingsItem.setEnabled(jarOpen);
@@ -189,7 +189,7 @@ public class MenuBar {
                 this.fileMenu.setText(I18n.translate("menu.file"));
                 this.jarOpenItem.setText(I18n.translate("menu.file.jar.open"));
                 this.jarCloseItem.setText(I18n.translate("menu.file.jar.close"));
-                this.openMenu.setText(I18n.translate("menu.file.mappings.open"));
+                this.openMappingsMenu.setText(I18n.translate("menu.file.mappings.open"));
                 this.saveMappingsItem.setText(I18n.translate("menu.file.mappings.save"));
                 this.saveMappingsAsMenu.setText(I18n.translate("menu.file.mappings.save_as"));
                 this.closeMappingsItem.setText(I18n.translate("menu.file.mappings.close"));
@@ -402,45 +402,71 @@ public class MenuBar {
                 GuiUtil.openUrl("https://github.com/FabricMC/Enigma");
         }
 
-        private static void prepareOpenMenu(JMenu openMenu, Gui gui) {
+        private static void prepareOpenMappingsMenu(JMenu openMappingsMenu, Gui gui) {
+                // Mapping-IO readers
+                MappingFormat.getReadableFormats().stream()
+                                .filter(format -> format.getMappingIoCounterpart() != null)
+                                .forEach(format -> addOpenMappingsMenuEntry(I18n.translate(format.getMappingIoCounterpart().name),
+                                        format, true, openMappingsMenu, gui));
+                openMappingsMenu.addSeparator();
+
+                // Enigma's own readers
                 for (MappingFormat format : MappingFormat.values()) {
                         if (format.getReader() != null) {
-                                JMenuItem item = new JMenuItem(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)));
-                                item.addActionListener(event -> {
-                                        gui.enigmaMappingsFileChooser.setCurrentDirectory(new File(UiConfig.getLastSelectedDir()));
-
-                                        if (gui.enigmaMappingsFileChooser.showOpenDialog(gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
-                                                File selectedFile = gui.enigmaMappingsFileChooser.getSelectedFile();
-                                                gui.getController().openMappings(format, selectedFile.toPath());
-                                                UiConfig.setLastSelectedDir(gui.enigmaMappingsFileChooser.getCurrentDirectory().toString());
-                                        }
-                                });
-                                openMenu.add(item);
+                                addOpenMappingsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)) + " (legacy)",
+                                                format, false, openMappingsMenu, gui);
                         }
                 }
         }
 
+        private static void addOpenMappingsMenuEntry(String text, MappingFormat format, boolean mappingIo, JMenu openMappingsMenu, Gui gui) {
+                JMenuItem item = new JMenuItem(text);
+                item.addActionListener(event -> {
+                        gui.enigmaMappingsFileChooser.setCurrentDirectory(new File(UiConfig.getLastSelectedDir()));
+
+                        if (gui.enigmaMappingsFileChooser.showOpenDialog(gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                                File selectedFile = gui.enigmaMappingsFileChooser.getSelectedFile();
+                                gui.getController().openMappings(format, selectedFile.toPath(), mappingIo);
+                                UiConfig.setLastSelectedDir(gui.enigmaMappingsFileChooser.getCurrentDirectory().toString());
+                        }
+                });
+                openMappingsMenu.add(item);
+        }
+
         private static void prepareSaveMappingsAsMenu(JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) {
+                // Mapping-IO writers
+                MappingFormat.getWritableFormats().stream()
+                                .filter(format -> format.hasMappingIoWriter())
+                                .forEach(format -> addSaveMappingsAsMenuEntry(format.getMappingIoCounterpart().name,
+                                                        format, true, saveMappingsAsMenu, saveMappingsItem, gui));
+                saveMappingsAsMenu.addSeparator();
+
+                // Enigma's own writers
                 for (MappingFormat format : MappingFormat.values()) {
                         if (format.getWriter() != null) {
-                                JMenuItem item = new JMenuItem(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)));
-                                item.addActionListener(event -> {
-                                        // TODO: Use a specific file chooser for it
-                                        if (gui.enigmaMappingsFileChooser.getCurrentDirectory() == null) {
-                                                gui.enigmaMappingsFileChooser.setCurrentDirectory(new File(UiConfig.getLastSelectedDir()));
-                                        }
-
-                                        if (gui.enigmaMappingsFileChooser.showSaveDialog(gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
-                                                gui.getController().saveMappings(gui.enigmaMappingsFileChooser.getSelectedFile().toPath(), format);
-                                                saveMappingsItem.setEnabled(true);
-                                                UiConfig.setLastSelectedDir(gui.enigmaMappingsFileChooser.getCurrentDirectory().toString());
-                                        }
-                                });
-                                saveMappingsAsMenu.add(item);
+                                addSaveMappingsAsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)) + " (legacy)",
+                                                format, false, saveMappingsAsMenu, saveMappingsItem, gui);
                         }
                 }
         }
 
+        private static void addSaveMappingsAsMenuEntry(String text, MappingFormat format, boolean mappingIo, JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) {
+                JMenuItem item = new JMenuItem(text);
+                item.addActionListener(event -> {
+                        // TODO: Use a specific file chooser for it
+                        if (gui.enigmaMappingsFileChooser.getCurrentDirectory() == null) {
+                                gui.enigmaMappingsFileChooser.setCurrentDirectory(new File(UiConfig.getLastSelectedDir()));
+                        }
+
+                        if (gui.enigmaMappingsFileChooser.showSaveDialog(gui.getFrame()) == JFileChooser.APPROVE_OPTION) {
+                                gui.getController().saveMappings(gui.enigmaMappingsFileChooser.getSelectedFile().toPath(), format, mappingIo);
+                                saveMappingsItem.setEnabled(true);
+                                UiConfig.setLastSelectedDir(gui.enigmaMappingsFileChooser.getCurrentDirectory().toString());
+                        }
+                });
+                saveMappingsAsMenu.add(item);
+        }
+
         private static void prepareDecompilerMenu(JMenu decompilerMenu, Gui gui) {
                 ButtonGroup decompilerGroup = new ButtonGroup();