diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-09-18 14:00:14 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-09-18 14:00:14 +0800 |
| commit | 7f54808315df20baae2b9b737f34a08bd85f6f1e (patch) | |
| tree | c50b93b170743009d622372ac7237c3a11020814 /src/main/java/net/fabricmc/loom/configuration/mods | |
| parent | 3aa0e5f731f6c8fb5b4afa0c73aaada464f270a5 (diff) | |
| download | architectury-loom-7f54808315df20baae2b9b737f34a08bd85f6f1e.tar.gz architectury-loom-7f54808315df20baae2b9b737f34a08bd85f6f1e.tar.bz2 architectury-loom-7f54808315df20baae2b9b737f34a08bd85f6f1e.zip | |
Fix merge conflicts
Signed-off-by: shedaniel <daniel@shedaniel.me>
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/mods')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java index 54a7903f..bb3f839e 100644 --- a/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java +++ b/src/main/java/net/fabricmc/loom/configuration/mods/ModProcessor.java @@ -67,7 +67,7 @@ import net.fabricmc.loom.util.LoggerFilter; import net.fabricmc.loom.util.TinyRemapperHelper; import net.fabricmc.loom.util.srg.AtRemapper; import net.fabricmc.loom.util.srg.CoreModClassRemapper; -import net.fabricmc.mapping.tree.TinyTree; +import net.fabricmc.mappingio.tree.MemoryMappingTree; public class ModProcessor { public static void processMods(Project project, List<ModDependencyInfo> processList) throws IOException { @@ -148,7 +148,7 @@ public class ModProcessor { Stopwatch stopwatch = Stopwatch.createStarted(); project.getLogger().lifecycle(":remapping " + remapList.size() + " mods (TinyRemapper, " + fromM + " -> " + toM + ")"); - TinyTree mappings = extension.isForge() ? mappingsProvider.getMappingsWithSrg() : mappingsProvider.getMappings(); + MemoryMappingTree mappings = extension.isForge() ? mappingsProvider.getMappingsWithSrg() : mappingsProvider.getMappings(); LoggerFilter.replaceSystemOut(); TinyRemapper remapper = TinyRemapper.newRemapper() .logger(project.getLogger()::lifecycle) |