aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2021-02-02 15:10:12 +0800
committershedaniel <daniel@shedaniel.me>2021-02-02 15:10:34 +0800
commit924378ebde4159376367f1bef955c2d1e2d8e654 (patch)
tree86a58974a7687afd41fdb3376e04a4e1be36eb11 /src/main/java
parent056d46f4d46d75b3d1c366e734cc620738108708 (diff)
downloadarchitectury-loom-924378ebde4159376367f1bef955c2d1e2d8e654.tar.gz
architectury-loom-924378ebde4159376367f1bef955c2d1e2d8e654.tar.bz2
architectury-loom-924378ebde4159376367f1bef955c2d1e2d8e654.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.java7
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);
}