imports/architectury-loom
1
0
Fork 0
mirror of https://github.com/architectury/architectury-loom.git synced 2026-04-01 21:17:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/0.6-forge' into 0.6-merge

Browse Source 
# Conflicts:
#	src/main/java/net/fabricmc/loom/util/SourceRemapper.java
This commit is contained in:
shedaniel
2021-02-02 15:30:41 +08:00
parent 0adcbbe253 157b902adc
commit 3f0c51324f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/fabricmc/loom/util/SourceRemapper.java
View File

@@ -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);
}