From 924378ebde4159376367f1bef955c2d1e2d8e654 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 2 Feb 2021 15:10:12 +0800 Subject: [PATCH 1/2] Fix remap forge source jar to srg --- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index 750fbdeb..993eb193 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -172,9 +172,10 @@ public class SourceRemapper { MappingSet mappings = extension.getOrCreateSrcMappingCache(toNamed ? 1 : 0, () -> { try { - TinyTree m = mappingsProvider.getMappings(); - project.getLogger().lifecycle(":loading " + (toNamed ? "intermediary -> named" : "named -> intermediary") + " source mappings"); - return new TinyMappingsReader(m, toNamed ? "intermediary" : "named", toNamed ? "named" : "intermediary").read(); + String destination = extension.isForge() ? "srg" : "intermediary"; + TinyTree m = extension.isForge() ? mappingsProvider.getMappingsWithSrg() : mappingsProvider.getMappings(); + project.getLogger().lifecycle(":loading " + (toNamed ? "intermediary -> named" : "named -> " + destination) + " source mappings"); + return new TinyMappingsReader(m, toNamed ? "intermediary" : "named", toNamed ? "named" : destination).read(); } catch (Exception e) { throw new RuntimeException(e); } From 157b902adc28bf576a153a5ab857c54cc5ade0fc Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 2 Feb 2021 15:19:03 +0800 Subject: [PATCH 2/2] Fix source remapping for dependencies as well. --- src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java index 993eb193..d2eea476 100644 --- a/src/main/java/net/fabricmc/loom/util/SourceRemapper.java +++ b/src/main/java/net/fabricmc/loom/util/SourceRemapper.java @@ -172,10 +172,10 @@ public class SourceRemapper { MappingSet mappings = extension.getOrCreateSrcMappingCache(toNamed ? 1 : 0, () -> { try { - String destination = extension.isForge() ? "srg" : "intermediary"; + String intermediary = extension.isForge() ? "srg" : "intermediary"; TinyTree m = extension.isForge() ? mappingsProvider.getMappingsWithSrg() : mappingsProvider.getMappings(); - project.getLogger().lifecycle(":loading " + (toNamed ? "intermediary -> named" : "named -> " + destination) + " source mappings"); - return new TinyMappingsReader(m, toNamed ? "intermediary" : "named", toNamed ? "named" : destination).read(); + project.getLogger().lifecycle(":loading " + (toNamed ? intermediary + " -> named" : "named -> " + intermediary) + " source mappings"); + return new TinyMappingsReader(m, toNamed ? intermediary : "named", toNamed ? "named" : intermediary).read(); } catch (Exception e) { throw new RuntimeException(e); }