From cae67f598e2a66f4cb263b14e76b95f3a3818bfd Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 25 Aug 2024 22:03:23 -0700 Subject: [PATCH] Pin default tools. --- .../gradle/common/util/Utils.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/common/java/net/minecraftforge/gradle/common/util/Utils.java b/src/common/java/net/minecraftforge/gradle/common/util/Utils.java index 82e265888..9517e7dc5 100644 --- a/src/common/java/net/minecraftforge/gradle/common/util/Utils.java +++ b/src/common/java/net/minecraftforge/gradle/common/util/Utils.java @@ -85,19 +85,24 @@ public class Utils { .setPrettyPrinting().create(); static final int CACHE_TIMEOUT = 1000 * 60 * 60; //1 hour, Timeout used for version_manifest.json so we dont ping their server every request. //manifest doesn't include sha1's so we use this for the per-version json as well. - public static final String FORGE_MAVEN = "https://maven.minecraftforge.net/"; - public static final String MOJANG_MAVEN = "https://libraries.minecraft.net/"; - public static final String BINPATCHER = "net.minecraftforge:binarypatcher:1.+:fatjar"; - public static final String ACCESSTRANSFORMER = "net.minecraftforge:accesstransformers:8.2.0:fatjar"; - public static final String SPECIALSOURCE = "net.md-5:SpecialSource:1.11.2:shaded"; - public static final String FART = "net.minecraftforge:ForgeAutoRenamingTool:1.+:all"; - public static final String SRG2SOURCE = "net.minecraftforge:Srg2Source:8.+:fatjar"; - public static final String SIDESTRIPPER = "net.minecraftforge:mergetool:1.1.7:fatjar"; - public static final String INSTALLERTOOLS = "net.minecraftforge:installertools:1.3.2:fatjar"; - public static final String JARCOMPATIBILITYCHECKER = "net.minecraftforge:JarCompatibilityChecker:0.1.+:all"; + public static final String FORGE_MAVEN = "https://maven.minecraftforge.net/"; + public static final String MOJANG_MAVEN = "https://libraries.minecraft.net/"; + public static final String SPECIALSOURCE = "net.md-5:SpecialSource:1.11.2:shaded"; + public static final String BINPATCHER = art("binarypatcher", "1.2.0", "fatjar"); + public static final String ACCESSTRANSFORMER = art("accesstransformers", "8.2.0", "fatjar"); + public static final String FART = art("ForgeAutoRenamingTool", "1.0.6", "all" ); + public static final String SRG2SOURCE = art("Srg2Source", "8.0.9", "fatjar"); + public static final String SIDESTRIPPER = art("mergetool", "1.1.7", "fatjar"); + public static final String INSTALLERTOOLS = art("installertools", "1.3.2", "fatjar"); + public static final String JARCOMPATIBILITYCHECKER = art("JarCompatibilityChecker", "0.1.28", "all" ); + public static final long ZIPTIME = 628041600000L; public static final TimeZone GMT = TimeZone.getTimeZone("GMT"); + private static final String art(String name, String ver, String classifier) { + return "net.minecraftforge:" + name + ':' + ver + ':' + classifier; + } + public static void extractFile(ZipFile zip, String name, File output) throws IOException { extractFile(zip, zip.getEntry(name), output); }