From e32dfa11e892e12577a9fef50675d52e16c6d73d Mon Sep 17 00:00:00 2001
From: NebelNidas
Date: Sun, 18 Jun 2023 19:54:02 +0200
Subject: Make Mapping-IO the default

---
 .../main/java/cuchaz/enigma/gui/GuiController.java |  2 +-
 .../java/cuchaz/enigma/gui/elements/MenuBar.java   | 36 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 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 e6d4096c..0eecc7ba 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -104,7 +104,7 @@ public class GuiController implements ClientPacketHandler {
 
 	private Path loadedMappingPath;
 	private MappingFormat loadedMappingFormat;
-	public boolean useMappingIo;
+	public boolean useMappingIo = true;
 
 	private ClassHandleProvider chp;
 
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 ca3067c8..59362e52 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
@@ -414,21 +414,21 @@ public class MenuBar {
 				MappingFormat.TSRG_2_FILE,
 				MappingFormat.PROGUARD);
 
+		// Mapping-IO readers
+		for (MappingFormat format : readableMappingIoFormats) {
+			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) {
-				addOpenMappingsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)),
+				addOpenMappingsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)) + " (legacy)",
 						format, false, openMappingsMenu, gui);
 			}
 		}
-
-		openMappingsMenu.addSeparator();
-
-		// Mapping-IO readers
-		for (MappingFormat format : readableMappingIoFormats) {
-			addOpenMappingsMenuEntry(I18n.translate(format.getMappingIoCounterpart().name + " (via Mapping-IO, experimental)"),
-					format, true, openMappingsMenu, gui);
-		}
 	}
 
 	private static void addOpenMappingsMenuEntry(String text, MappingFormat format, boolean mappingIo, JMenu openMappingsMenu, Gui gui) {
@@ -454,21 +454,21 @@ public class MenuBar {
 				MappingFormat.TINY_V2,
 				MappingFormat.PROGUARD);
 
+		// Mapping-IO writers
+		for (MappingFormat format : writableMappingIoFormats) {
+			addSaveMappingsAsMenuEntry(format.getMappingIoCounterpart().name,
+					format, true, saveMappingsAsMenu, saveMappingsItem, gui);
+		}
+
+		saveMappingsAsMenu.addSeparator();
+
 		// Enigma's own writers
 		for (MappingFormat format : MappingFormat.values()) {
 			if (format.getWriter() != null) {
-				addSaveMappingsAsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)),
+				addSaveMappingsAsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)) + " (legacy)",
 						format, false, saveMappingsAsMenu, saveMappingsItem, gui);
 			}
 		}
-
-		saveMappingsAsMenu.addSeparator();
-
-		// Mapping-IO writers
-		for (MappingFormat format : writableMappingIoFormats) {
-			addSaveMappingsAsMenuEntry(format.getMappingIoCounterpart().name + " (via Mapping-IO, experimental)",
-					format, true, saveMappingsAsMenu, saveMappingsItem, gui);
-		}
 	}
 
 	private static void addSaveMappingsAsMenuEntry(String text, MappingFormat format, boolean mappingIo, JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) {
-- 
cgit v1.2.3