diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-02-02 15:30:41 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-02-02 15:30:41 +0800 |
| commit | 3f0c51324fb12d8b4dcd705a5bac14e406fa9f02 (patch) | |
| tree | d500e13a06fe3a79f567bfb88d00329572e49b46 /src/main/java | |
| parent | 0adcbbe25336ca77d55010f779bc3c6f26115e06 (diff) | |
| parent | 157b902adc28bf576a153a5ab857c54cc5ade0fc (diff) | |
| download | architectury-loom-3f0c51324fb12d8b4dcd705a5bac14e406fa9f02.tar.gz architectury-loom-3f0c51324fb12d8b4dcd705a5bac14e406fa9f02.tar.bz2 architectury-loom-3f0c51324fb12d8b4dcd705a5bac14e406fa9f02.zip | |
Merge branch 'dev/0.6-forge' into 0.6-merge
# Conflicts:
# src/main/java/net/fabricmc/loom/util/SourceRemapper.java
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/util/SourceRemapper.java | 6 |
1 files 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); } |