From 423f5cf98c6d419942301cca0c7c8169db8d4b30 Mon Sep 17 00:00:00 2001
From: NebelNidas
Date: Thu, 16 Nov 2023 13:51:03 +0100
Subject: Fix importing mappings without field source descriptors

---
 enigma-cli/src/main/java/cuchaz/enigma/command/Command.java         | 4 ++--
 .../src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'enigma-cli/src/main/java')

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 ef7cfaa5..de06fa6e 100644
--- a/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/Command.java
@@ -58,7 +58,7 @@ public abstract class Command {
 	protected static EntryTree<EntryMapping> readMappings(Path path, ProgressListener progress, MappingSaveParameters saveParameters) throws IOException, MappingParseException {
 		// Legacy
 		if ("zip".equalsIgnoreCase(MoreFiles.getFileExtension(path))) {
-			return MappingFormat.ENIGMA_ZIP.read(path, progress, saveParameters);
+			return MappingFormat.ENIGMA_ZIP.read(path, progress, saveParameters, null);
 		}
 
 		net.fabricmc.mappingio.format.MappingFormat format = MappingReader.detectFormat(path);
@@ -66,7 +66,7 @@ public abstract class Command {
 
 		VisitableMappingTree tree = new MemoryMappingTree();
 		MappingReader.read(path, format, tree);
-		return MappingIoConverter.fromMappingIo(tree, progress);
+		return MappingIoConverter.fromMappingIo(tree, progress, null);
 	}
 
 	protected static File getWritableFile(String path) {
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 c452d8ca..2c6c9fdb 100644
--- a/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
+++ b/enigma-cli/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java
@@ -23,11 +23,11 @@ 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);
+			return (Files.isDirectory(path) ? MappingFormat.ENIGMA_DIRECTORY : MappingFormat.ENIGMA_ZIP).read(path, ProgressListener.none(), saveParameters, null);
 		}
 
 		if (type.equals("tiny")) {
-			return MappingFormat.TINY_FILE.read(path, ProgressListener.none(), saveParameters);
+			return MappingFormat.TINY_FILE.read(path, ProgressListener.none(), saveParameters, null);
 		}
 
 		MappingFormat format = null;
@@ -41,7 +41,7 @@ public final class MappingCommandsUtil {
 		}
 
 		if (format != null) {
-			return format.read(path, ProgressListener.none(), saveParameters);
+			return format.read(path, ProgressListener.none(), saveParameters, null);
 		}
 
 		throw new IllegalArgumentException("no reader for " + type);
-- 
cgit v1.2.3