From eca0ab1bbddcb4b9797d75a8d3d0a05b02336276 Mon Sep 17 00:00:00 2001
From: modmuss
Date: Sat, 13 Sep 2025 09:18:47 +0100
Subject: Remove legacy mapping handling (#560)

* Remove legacy mapping handling

* Minor cleanup

* More cleanup---
 .../src/main/java/cuchaz/enigma/command/Command.java       |  7 -------
 .../java/cuchaz/enigma/command/MappingCommandsUtil.java    | 14 +-------------
 2 files changed, 1 insertion(+), 20 deletions(-)

(limited to 'enigma-cli')

diff --git a/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
index 7f42f3aa..30afb2c2 100644
--- a/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
@@ -7,7 +7,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import net.fabricmc.mappingio.MappingReader;
 import net.fabricmc.mappingio.tree.MemoryMappingTree;
@@ -17,7 +16,6 @@ import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProject;
 import cuchaz.enigma.ProgressListener;
 import cuchaz.enigma.translation.mapping.EntryMapping;
-import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.serde.MappingIoConverter;
 import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
@@ -57,11 +55,6 @@ public abstract class Command {
 	}
 
 	protected static EntryTree<EntryMapping> readMappings(Path path, ProgressListener progress, MappingSaveParameters saveParameters) throws IOException, MappingParseException {
-		// Legacy
-		if (path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(".zip")) {
-			return MappingFormat.ENIGMA_ZIP.read(path, progress, saveParameters, null);
-		}
-
 		net.fabricmc.mappingio.format.MappingFormat format = MappingReader.detectFormat(path);
 		if (format == null) throw new IllegalArgumentException("Unknown mapping format!");
 
diff --git a/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
index 7c6bf436..1bd72ac4 100644
--- a/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
@@ -15,8 +15,6 @@ import cuchaz.enigma.translation.mapping.serde.MappingFormat;
 import cuchaz.enigma.translation.mapping.serde.MappingIoConverter;
 import cuchaz.enigma.translation.mapping.serde.MappingParseException;
 import cuchaz.enigma.translation.mapping.serde.MappingSaveParameters;
-import cuchaz.enigma.translation.mapping.serde.tiny.TinyMappingsWriter;
-import cuchaz.enigma.translation.mapping.serde.tinyv2.TinyV2Writer;
 import cuchaz.enigma.translation.mapping.tree.EntryTree;
 
 public final class MappingCommandsUtil {
@@ -25,7 +23,7 @@ public final class MappingCommandsUtil {
 
 	public static EntryTree<EntryMapping> read(String type, Path path, MappingSaveParameters saveParameters) throws MappingParseException, IOException {
 		if (type.equals("enigma")) {
-			return (Files.isDirectory(path) ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_ZIP).read(path, ProgressListener.none(), saveParameters, null);
+			return (Files.isDirectory(path) ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_FILE).read(path, ProgressListener.none(), saveParameters, null);
 		}
 
 		if (type.equals("tiny")) {
@@ -62,11 +60,6 @@ public final class MappingCommandsUtil {
 				throw new IllegalArgumentException("specify column names as 'tinyv2:from_namespace:to_namespace'");
 			}
 
-			if (!System.getProperty("enigma.use_mappingio", "true").equals("true")) {
-				new TinyV2Writer(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
-				return;
-			}
-
 			try {
 				VisitableMappingTree tree = MappingIoConverter.toMappingIo(mappings, ProgressListener.none(), split[1], split[2]);
 				tree.accept(MappingWriter.create(path, net.fabricmc.mappingio.format.MappingFormat.TINY_2_FILE));
@@ -84,11 +77,6 @@ public final class MappingCommandsUtil {
 				throw new IllegalArgumentException("specify column names as 'tiny:from_column:to_column'");
 			}
 
-			if (!System.getProperty("enigma.use_mappingio", "true").equals("true")) {
-				new TinyMappingsWriter(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters);
-				return;
-			}
-
 			try {
 				VisitableMappingTree tree = MappingIoConverter.toMappingIo(mappings, ProgressListener.none(), split[1], split[2]);
 				tree.accept(MappingWriter.create(path, net.fabricmc.mappingio.format.MappingFormat.TINY_FILE));
-- 
cgit v1.2.3