From e0f22f23da3080c3648f855f17078f6caa868ef7 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 10 Jan 2021 17:12:42 +0800 Subject: [PATCH] Refactor SrgNamedWriter --- .../java/net/fabricmc/loom/providers/MappingsProvider.java | 2 +- src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java index 9d64bc7b..6a1ca143 100644 --- a/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java +++ b/src/main/java/net/fabricmc/loom/providers/MappingsProvider.java @@ -183,7 +183,7 @@ public class MappingsProvider extends DependencyProvider { } if (!srgToNamedSrg.exists() || isRefreshDeps()) { - SrgNamedWriter.writeTo(getProject().getLogger(), srgToNamedSrg.toPath(), getMappingsWithSrg()); + SrgNamedWriter.writeTo(getProject().getLogger(), srgToNamedSrg.toPath(), getMappingsWithSrg(), "srg", "named"); } } diff --git a/src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java b/src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java index 98315615..06493ba7 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java +++ b/src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java @@ -10,10 +10,10 @@ import java.nio.file.Files; import java.nio.file.Path; public class SrgNamedWriter { - public static void writeTo(Logger logger, Path srgFile, TinyTree mappings) throws IOException { + public static void writeTo(Logger logger, Path srgFile, TinyTree mappings, String from, String to) throws IOException { Files.deleteIfExists(srgFile); try (SrgWriter writer = new SrgWriter(Files.newBufferedWriter(srgFile))) { - try (TinyMappingsReader reader = new TinyMappingsReader(mappings, "srg", "named")) { + try (TinyMappingsReader reader = new TinyMappingsReader(mappings, from, to)) { writer.write(reader.read()); } }