diff options
author | shedaniel <daniel@shedaniel.me> | 2021-02-02 15:10:12 +0800 |
---|---|---|
committer | shedaniel <daniel@shedaniel.me> | 2021-02-02 15:10:12 +0800 |
commit | 0adcbbe25336ca77d55010f779bc3c6f26115e06 (patch) | |
tree | 7423f8736339b7349cd9558201750dcdc4b546cd /src/main/java | |
parent | 32e5297de48e47644963a348ff61b5c54c669d95 (diff) | |
download | architectury-loom-0adcbbe25336ca77d55010f779bc3c6f26115e06.tar.gz architectury-loom-0adcbbe25336ca77d55010f779bc3c6f26115e06.tar.bz2 architectury-loom-0adcbbe25336ca77d55010f779bc3c6f26115e06.zip |
Fix remap forge source jar to srg
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 7 |
1 files 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); } |