From 65bebb6fbc654adff73ece37ea7f7dcde001fe8b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 19 Jun 2018 10:49:10 +0100 Subject: [PATCH] Should fix OML build part 2 --- src/main/java/net/fabricmc/loom/task/MapJarsTask.java | 4 ++-- src/main/java/net/fabricmc/loom/task/ProcessModsTask.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java index 49b83dbb..41d96602 100644 --- a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java +++ b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java @@ -55,7 +55,7 @@ public class MapJarsTask extends DefaultTask { } if(!extension.hasPomf()){ this.getLogger().lifecycle("POMF version not set, skipping mapping!"); - FileUtils.copyFile(Constants.MINECRAFT_MERGED_JAR.get(extension), Constants.MINECRAFT_MAPPED_JAR.get(extension)); + FileUtils.copyFile(Constants.MINECRAFT_MIXED_JAR.get(extension), Constants.MINECRAFT_MAPPED_JAR.get(extension)); return; } if (!Constants.MAPPINGS_DIR.get(extension).exists() || extension.localMappings) { @@ -65,7 +65,7 @@ public class MapJarsTask extends DefaultTask { } this.getLogger().lifecycle(":remapping jar"); - deobfuscator = new Deobfuscator(new JarFile(Constants.MINECRAFT_MERGED_JAR.get(extension))); + deobfuscator = new Deobfuscator(new JarFile(Constants.MINECRAFT_MIXED_JAR.get(extension))); this.deobfuscator.setMappings(new MappingsEnigmaReader().read(Constants.MAPPINGS_DIR.get(extension))); writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener(), deobfuscator); diff --git a/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java b/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java index 105b51c1..2dcf9794 100644 --- a/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java +++ b/src/main/java/net/fabricmc/loom/task/ProcessModsTask.java @@ -57,7 +57,7 @@ public class ProcessModsTask extends DefaultTask { Constants.MINECRAFT_FINAL_JAR.get(extension).delete(); } if (mods.size() == 0) { - FileUtils.copyFile(Constants.MINECRAFT_MERGED_JAR.get(extension), Constants.MINECRAFT_MAPPED_JAR.get(extension)); + FileUtils.copyFile(Constants.MINECRAFT_MERGED_JAR.get(extension), Constants.MINECRAFT_MIXED_JAR.get(extension)); } else { downloadRequiredDeps(extension); new PreBakeMixins().proccess(getProject(), extension, mods);