From cbdb516d5bf513e64b4fddad3489714a2c69b943 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 30 Oct 2018 11:45:27 +0000 Subject: [PATCH] Download pomf directly from maven, can be refactored to use maven correctly in the future --- src/main/java/net/fabricmc/loom/task/DownloadTask.java | 5 ++--- src/main/java/net/fabricmc/loom/util/Constants.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/DownloadTask.java b/src/main/java/net/fabricmc/loom/task/DownloadTask.java index a8658d8..a2192d4 100644 --- a/src/main/java/net/fabricmc/loom/task/DownloadTask.java +++ b/src/main/java/net/fabricmc/loom/task/DownloadTask.java @@ -40,7 +40,6 @@ import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.dsl.DependencyHandler; import org.gradle.api.logging.Logger; import org.gradle.api.tasks.TaskAction; -import org.spongepowered.asm.mixin.injection.Constant; import java.io.*; import java.net.URL; @@ -78,7 +77,7 @@ public class DownloadTask extends DefaultTask { this.getLogger().lifecycle(":downloading enigma mappings"); try { FileUtils.copyURLToFile( - new URL(Constants.POMF_JENKINS_SERVER + "/job/FabricMC/job/pomf/job/" + extension.version + "/" + extension.pomfVersion + "/artifact/build/libs/pomf-enigma-" + extension.version + "." + extension.pomfVersion + ".zip"), + new URL(String.format("%1$s%2$s.%3$s/pomf-%2$s.%3$s-engima.zip", Constants.POMF_MAVEN_SERVER, extension.version, extension.pomfVersion)), Constants.MAPPINGS_ENIGMA_ZIP.get(extension) ); } catch (Exception e) { @@ -109,7 +108,7 @@ public class DownloadTask extends DefaultTask { if (!Constants.MAPPINGS_TINY_GZ.get(extension).exists() && !extension.localMappings) { getLogger().lifecycle(":downloading tiny mappings"); try { - FileUtils.copyURLToFile(new URL(Constants.POMF_JENKINS_SERVER + "/job/FabricMC/job/pomf/job/" + extension.version + "/" + extension.pomfVersion + "/artifact/build/libs/pomf-tiny-" + extension.version + "." + extension.pomfVersion + ".gz"), Constants.MAPPINGS_TINY_GZ.get(extension)); + FileUtils.copyURLToFile(new URL(String.format("%1$s%2$s.%3$s/pomf-%2$s.%3$s-tiny.gz", Constants.POMF_MAVEN_SERVER, extension.version, extension.pomfVersion)), Constants.MAPPINGS_TINY_GZ.get(extension)); } catch (Exception e) { throw new RuntimeException("Failed to download mappings", e); } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index 5555a29..120b40b 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -69,7 +69,7 @@ public class Constants { public static final String FABRIC_CLIENT_TWEAKER = "net.fabricmc.loader.launch.FabricClientTweaker"; public static final String FABRIC_SERVER_TWEAKER = "net.fabricmc.loader.launch.FabricServerTweaker"; - public static final String POMF_JENKINS_SERVER = "http://modmuss50.me:8080"; + public static final String POMF_MAVEN_SERVER = "https://maven.modmuss50.me/net/fabricmc/pomf/"; public static final String LIBRARIES_BASE = "https://libraries.minecraft.net/"; public static final String RESOURCES_BASE = "http://resources.download.minecraft.net/";