diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java | 2 | ||||
| -rw-r--r-- | src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java index 1d5ebb69..51cc4ef4 100644 --- a/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java +++ b/src/main/java/net/fabricmc/loom/configuration/providers/mappings/MappingsProviderImpl.java @@ -202,7 +202,7 @@ public class MappingsProviderImpl extends DependencyProvider implements Mappings } if (Files.notExists(srgToNamedSrg) || isRefreshDeps()) { - SrgNamedWriter.writeTo(getProject().getLogger(), srgToNamedSrg, getMappingsWithSrg(), "srg", "named"); + SrgNamedWriter.writeTo(srgToNamedSrg, getMappingsWithSrg(), "srg", "named", getExtension().isLegacyForge()); } } 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 f999f936..d7653297 100644 --- a/src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java +++ b/src/main/java/net/fabricmc/loom/util/srg/SrgNamedWriter.java @@ -36,18 +36,20 @@ import org.cadixdev.lorenz.io.srg.SrgWriter; import org.cadixdev.lorenz.model.ClassMapping; import org.cadixdev.lorenz.model.InnerClassMapping; import org.cadixdev.lorenz.model.TopLevelClassMapping; -import org.gradle.api.logging.Logger; import net.fabricmc.lorenztiny.TinyMappingsReader; import net.fabricmc.mappingio.tree.MappingTree; public class SrgNamedWriter { - public static void writeTo(Logger logger, Path srgFile, MappingTree mappings, String from, String to) throws IOException { + public static void writeTo(Path srgFile, MappingTree mappings, String from, String to, boolean includeIdentityMappings) throws IOException { Files.deleteIfExists(srgFile); try (SrgWriter writer = new SrgWriter(Files.newBufferedWriter(srgFile))) { try (TinyMappingsReader reader = new TinyMappingsReader(mappings, from, to)) { - writer.write(reader.read(MappingSet.create(new ClassesAlwaysHaveDeobfNameFactory()))); + MappingSet mappingSet = includeIdentityMappings + ? MappingSet.create(new ClassesAlwaysHaveDeobfNameFactory()) + : MappingSet.create(); + writer.write(reader.read(mappingSet)); } } } |