From 08e548b6c62815bf4b75593cb9a499951a4f564e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 13 Sep 2021 17:58:52 +0100 Subject: Expose layered mappings as an API (#490) * Expose layered mappings as an API * Add FileSpec * Cleanup and support DependencyFileSpec --- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/net/fabricmc/loom/util/SourceRemapper.java') diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index 66c74dc3..8f7bf89e 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -40,6 +40,7 @@ import org.gradle.api.Project; import org.zeroturnaround.zip.ZipUtil; import net.fabricmc.loom.LoomGradleExtension; +import net.fabricmc.loom.api.mappings.layered.MappingsNamespace; import net.fabricmc.loom.configuration.RemappedConfigurationEntry; import net.fabricmc.loom.configuration.providers.mappings.MappingsProviderImpl; import net.fabricmc.loom.util.gradle.ProgressLogger; @@ -166,7 +167,7 @@ public class SourceRemapper { try { TinyTree m = mappingsProvider.getMappings(); project.getLogger().info(":loading " + (toNamed ? "intermediary -> named" : "named -> intermediary") + " source mappings"); - return new TinyMappingsReader(m, toNamed ? "intermediary" : "named", toNamed ? "named" : "intermediary").read(); + return new TinyMappingsReader(m, toNamed ? MappingsNamespace.INTERMEDIARY.toString() : MappingsNamespace.NAMED.toString(), toNamed ? MappingsNamespace.NAMED.toString() : MappingsNamespace.INTERMEDIARY.toString()).read(); } catch (Exception e) { throw new RuntimeException(e); } -- cgit