Update to latest Mapping IO commit

4 files changed, 16 insertions, 11 deletions

diff --git a/build.gradle b/build.gradle
index e2d5edd7..e9fd4a25 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ subprojects {
                 implementation 'com.google.guava:guava:30.1.1-jre'
                 implementation 'com.google.code.gson:gson:2.8.7'
 
-                implementation 'net.fabricmc:mapping-io:0.3.0'
+                implementation 'net.fabricmc:mapping-io:0.5.0-SNAPSHOT'
 
                 testImplementation 'junit:junit:4.13.2'
                 testImplementation 'org.hamcrest:hamcrest:2.2'
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 5b04f3cf..e6d4096c 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -32,6 +32,7 @@ import com.google.common.collect.Lists;
 import net.fabricmc.mappingio.MappingReader;
 import net.fabricmc.mappingio.MappingWriter;
 import net.fabricmc.mappingio.tree.MemoryMappingTree;
+import net.fabricmc.mappingio.tree.VisitOrder;
 
 import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProfile;
@@ -232,7 +233,7 @@ public class GuiController implements ClientPacketHandler {
 
                                 progress.init(1, I18n.translate("progress.mappings.writing"));
                                 MappingWriter writer = MappingWriter.create(path, format.getMappingIoCounterpart());
-                                mappingTree.accept(writer);
+                                mappingTree.accept(writer, VisitOrder.createByName());
                                 writer.close();
                                 progress.step(1, I18n.translate("progress.done"));
                         } else if (saveAll) {
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 3692eb3b..ca3067c8 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
@@ -406,6 +406,7 @@ public class MenuBar {
         private static void prepareOpenMappingsMenu(JMenu openMappingsMenu, Gui gui) {
                 List<MappingFormat> readableMappingIoFormats = Arrays.asList(
                                 MappingFormat.ENIGMA_DIRECTORY,
+                                MappingFormat.ENIGMA_FILE,
                                 MappingFormat.TINY_FILE,
                                 MappingFormat.TINY_V2,
                                 MappingFormat.SRG_FILE,
@@ -448,7 +449,10 @@ public class MenuBar {
         private static void prepareSaveMappingsAsMenu(JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) {
                 List<MappingFormat> writableMappingIoFormats = Arrays.asList(
                                 MappingFormat.ENIGMA_DIRECTORY,
-                                MappingFormat.TINY_V2);
+                                MappingFormat.ENIGMA_FILE,
+                                MappingFormat.TINY_FILE,
+                                MappingFormat.TINY_V2,
+                                MappingFormat.PROGUARD);
 
                 // Enigma's own writers
                 for (MappingFormat format : MappingFormat.values()) {
diff --git a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
index 5bad9298..f402c193 100644
--- a/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
+++ b/enigma/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
@@ -21,15 +21,15 @@ import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
 public enum MappingFormat {
-        ENIGMA_FILE(EnigmaMappingsWriter.FILE, EnigmaMappingsReader.FILE, null),
-        ENIGMA_DIRECTORY(EnigmaMappingsWriter.DIRECTORY, EnigmaMappingsReader.DIRECTORY, net.fabricmc.mappingio.format.MappingFormat.ENIGMA),
+        ENIGMA_FILE(EnigmaMappingsWriter.FILE, EnigmaMappingsReader.FILE, net.fabricmc.mappingio.format.MappingFormat.ENIGMA_FILE),
+        ENIGMA_DIRECTORY(EnigmaMappingsWriter.DIRECTORY, EnigmaMappingsReader.DIRECTORY, net.fabricmc.mappingio.format.MappingFormat.ENIGMA_DIR),
         ENIGMA_ZIP(EnigmaMappingsWriter.ZIP, EnigmaMappingsReader.ZIP, null),
-        TINY_V2(new TinyV2Writer("intermediary", "named"), new TinyV2Reader(), net.fabricmc.mappingio.format.MappingFormat.TINY_2),
-        TINY_FILE(TinyMappingsWriter.INSTANCE, TinyMappingsReader.INSTANCE, net.fabricmc.mappingio.format.MappingFormat.TINY),
-        SRG_FILE(SrgMappingsWriter.INSTANCE, null, net.fabricmc.mappingio.format.MappingFormat.SRG),
-        TSRG_FILE(null, null, net.fabricmc.mappingio.format.MappingFormat.TSRG),
-        TSRG_2_FILE(null, null, net.fabricmc.mappingio.format.MappingFormat.TSRG2),
-        PROGUARD(null, ProguardMappingsReader.INSTANCE, net.fabricmc.mappingio.format.MappingFormat.PROGUARD),
+        TINY_V2(new TinyV2Writer("intermediary", "named"), new TinyV2Reader(), net.fabricmc.mappingio.format.MappingFormat.TINY_2_FILE),
+        TINY_FILE(TinyMappingsWriter.INSTANCE, TinyMappingsReader.INSTANCE, net.fabricmc.mappingio.format.MappingFormat.TINY_FILE),
+        SRG_FILE(SrgMappingsWriter.INSTANCE, null, net.fabricmc.mappingio.format.MappingFormat.SRG_FILE),
+        TSRG_FILE(null, null, net.fabricmc.mappingio.format.MappingFormat.TSRG_FILE),
+        TSRG_2_FILE(null, null, net.fabricmc.mappingio.format.MappingFormat.TSRG_2_FILE),
+        PROGUARD(null, ProguardMappingsReader.INSTANCE, net.fabricmc.mappingio.format.MappingFormat.PROGUARD_FILE),
         RECAF(RecafMappingsWriter.INSTANCE, RecafMappingsReader.INSTANCE, null);
 
         private final MappingsWriter writer;