From e1b780ae6d60bd6a9635f6f1197dc26d2b31e3a8 Mon Sep 17 00:00:00 2001 From: gegy1000 Date: Fri, 28 Jun 2019 23:13:43 +0200 Subject: Profile option for mappings to be saved by-obf instead of by-deobf --- .../java/cuchaz/enigma/command/MappingCommandsUtil.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java') diff --git a/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java b/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java index 03d9ab7..8384e4e 100644 --- a/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java +++ b/src/main/java/cuchaz/enigma/command/MappingCommandsUtil.java @@ -5,6 +5,7 @@ import cuchaz.enigma.throwables.MappingParseException; import cuchaz.enigma.translation.MappingTranslator; import cuchaz.enigma.translation.Translator; import cuchaz.enigma.translation.mapping.EntryMapping; +import cuchaz.enigma.translation.mapping.MappingSaveParameters; import cuchaz.enigma.translation.mapping.VoidEntryResolver; import cuchaz.enigma.translation.mapping.serde.*; import cuchaz.enigma.translation.mapping.tree.EntryTree; @@ -91,13 +92,13 @@ public final class MappingCommandsUtil { return result; } - public static EntryTree read(String type, Path path) throws MappingParseException, IOException { + public static EntryTree read(String type, Path path, MappingSaveParameters saveParameters) throws MappingParseException, IOException { if (type.equals("enigma")) { - return EnigmaMappingsReader.DIRECTORY.read(path, ProgressListener.none()); + return EnigmaMappingsReader.DIRECTORY.read(path, ProgressListener.none(), saveParameters); } if (type.equals("tiny")) { - return TinyMappingsReader.INSTANCE.read(path, ProgressListener.none()); + return TinyMappingsReader.INSTANCE.read(path, ProgressListener.none(), saveParameters); } MappingFormat format = null; @@ -106,15 +107,15 @@ public final class MappingCommandsUtil { } catch (IllegalArgumentException ignored) {} if (format != null) { - return format.getReader().read(path, ProgressListener.none()); + return format.getReader().read(path, ProgressListener.none(), saveParameters); } throw new IllegalArgumentException("no reader for " + type); } - public static void write(EntryTree mappings, String type, Path path) { + public static void write(EntryTree mappings, String type, Path path, MappingSaveParameters saveParameters) { if (type.equals("enigma")) { - EnigmaMappingsWriter.DIRECTORY.write(mappings, path, ProgressListener.none()); + EnigmaMappingsWriter.DIRECTORY.write(mappings, path, ProgressListener.none(), saveParameters); return; } @@ -125,7 +126,7 @@ public final class MappingCommandsUtil { throw new IllegalArgumentException("specify column names as 'tiny:from_column:to_column'"); } - new TinyMappingsWriter(split[1], split[2]).write(mappings, path, ProgressListener.none()); + new TinyMappingsWriter(split[1], split[2]).write(mappings, path, ProgressListener.none(), saveParameters); return; } @@ -135,7 +136,7 @@ public final class MappingCommandsUtil { } catch (IllegalArgumentException ignored) {} if (format != null) { - format.getWriter().write(mappings, path, ProgressListener.none()); + format.getWriter().write(mappings, path, ProgressListener.none(), saveParameters); return; } -- cgit v1.2.3