From 14574cf6a0603774b39947a10f2bd9f102fcc977 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 17 Aug 2016 19:34:57 +0100 Subject: [PATCH] Handle new method of mappings --- src/main/java/net/fabricmc/loom/task/DownloadTask.java | 2 +- src/main/java/net/fabricmc/loom/task/MapJarsTask.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/DownloadTask.java b/src/main/java/net/fabricmc/loom/task/DownloadTask.java index 87dce28..1cf0dac 100644 --- a/src/main/java/net/fabricmc/loom/task/DownloadTask.java +++ b/src/main/java/net/fabricmc/loom/task/DownloadTask.java @@ -74,7 +74,7 @@ public class DownloadTask extends DefaultTask { } this.getLogger().lifecycle(":downloading mappings"); - FileUtils.copyURLToFile(new URL("https://github.com/FabricMC/pomf/archive/master.zip"), Constants.MAPPINGS_ZIP); + FileUtils.copyURLToFile(new URL("https://github.com/FabricMC/pomf/archive/" + extension.version + ".zip"), Constants.MAPPINGS_ZIP); DependencyHandler dependencyHandler = getProject().getDependencies(); diff --git a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java index ddb4fa1..5391136 100644 --- a/src/main/java/net/fabricmc/loom/task/MapJarsTask.java +++ b/src/main/java/net/fabricmc/loom/task/MapJarsTask.java @@ -53,7 +53,7 @@ public class MapJarsTask extends DefaultTask { this.getLogger().lifecycle(":remapping jar"); deobfuscator = new Deobfuscator(new JarFile(Constants.MINECRAFT_MERGED_JAR.get(extension))); - this.deobfuscator.setMappings(new MappingsEnigmaReader().read(new File(Constants.MAPPINGS_DIR, "pomf-master" + File.separator + "mappings"))); + this.deobfuscator.setMappings(new MappingsEnigmaReader().read(new File(Constants.MAPPINGS_DIR, "pomf-" + extension.version + File.separator + "mappings"))); this.deobfuscator.writeJar(Constants.MINECRAFT_MAPPED_JAR.get(extension), new ProgressListener()); File tempAssests = new File(Constants.CACHE_FILES, "tempAssets");