Skip to content

Commit fe51ccc

Browse files
LexManosLexManos
committed
Bump gradleutils and cleanup Tools/Constants class
1 parent c795ba9 commit fe51ccc

File tree

5 files changed

+13
-97
lines changed

5 files changed

+13
-97
lines changed

‎settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gradle.beforeProject { Project project ->
2020

2121
//@formatter:off
2222
dependencyResolutionManagement.versionCatalogs.register('libs') {
23-
version 'gradleutils', '3.3.35'
23+
version 'gradleutils', '3.4.3'
2424

2525
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0'
2626
plugin 'gradleutils', 'net.minecraftforge.gradleutils' versionRef 'gradleutils'

‎src/main/groovy/net/minecraftforge/forgedev/Constants.java‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10,62 +10,4 @@ private Constants() { }
1010

1111
static final String FORGE_MAVEN = "https://maven.minecraftforge.net/";
1212
static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/";
13-
14-
static final String MAVENIZER_NAME = "mavenizer";
15-
static final String MAVENIZER_VERSION = "0.4.9";
16-
static final String MAVENIZER_DL_URL = FORGE_MAVEN + "net/minecraftforge/minecraft-mavenizer/" + MAVENIZER_VERSION + "/minecraft-mavenizer-" + MAVENIZER_VERSION + ".jar";
17-
static final String MAVENIZER_MAIN = "net.minecraftforge.mcmaven.cli.Main";
18-
static final int MAVENIZER_JAVA = 25;
19-
20-
static final String DIFFPATCH_NAME = "diffpatch";
21-
static final String DIFFPATCH_VERSION = "2.1.0.42";
22-
static final String DIFFPATCH_DL_URL = MAVEN_CENTRAL + "io/codechicken/DiffPatch/" + DIFFPATCH_VERSION + "/DiffPatch-" + DIFFPATCH_VERSION + "-all.jar";
23-
static final String DIFFPATCH_MAIN = "io.codechicken.diffpatch.cli.DiffPatchCli";
24-
static final int DIFFPATCH_JAVA = 8;
25-
26-
static final String BINPATCH_NAME = "binpatcher";
27-
static final String BINPATCH_VERSION = "1.2.2";
28-
static final String BINPATCH_DL_URL = FORGE_MAVEN + "net/minecraftforge/binarypatcher/" + BINPATCH_VERSION + "/binarypatcher-" + BINPATCH_VERSION + "-fatjar.jar";
29-
static final String BINPATCH_MAIN = "net.minecraftforge.binarypatcher.ConsoleTool";
30-
static final int BINPATCH_JAVA = 8;
31-
32-
static final String FART_NAME = "fart";
33-
static final String FART_VERSION = "1.1.1";
34-
static final String FART_DL_URL = FORGE_MAVEN + "net/minecraftforge/ForgeAutoRenamingTool/" + FART_VERSION + "/ForgeAutoRenamingTool-" + FART_VERSION + "-all.jar";
35-
static final String FART_MAIN = "net.minecraftforge.fart.Main";
36-
static final int FART_JAVA = 8;
37-
38-
static final String SRG2SRC_NAME = "srg2source";
39-
static final String SRG2SRC_VERSION = "8.1.1";
40-
static final String SRG2SRC_DL_URL = FORGE_MAVEN + "net/minecraftforge/Srg2Source/" + SRG2SRC_VERSION + "/Srg2Source-" + SRG2SRC_VERSION + "-fatjar.jar";
41-
static final String SRG2SRC_MAIN = "net.minecraftforge.srg2source.ConsoleTool";
42-
static final int SRG2SRC_JAVA = 17;
43-
44-
static final String INSTALLERTOOLS_NAME = "installertools";
45-
static final String INSTALLERTOOLS_VERSION = "1.4.4";
46-
static final String INSTALLERTOOLS_DL_URL = FORGE_MAVEN + "net/minecraftforge/installertools/" + INSTALLERTOOLS_VERSION + "/installertools-" + INSTALLERTOOLS_VERSION + "-fatjar.jar";
47-
static final String INSTALLERTOOLS_MAIN = "net.minecraftforge.installertools.ConsoleTool";
48-
static final int INSTALLERTOOLS_JAVA = 8;
49-
50-
static final String JARCOMPATIBILITYCHECKER_NAME = "jarcompatibilitychecker";
51-
static final String JARCOMPATIBILITYCHECKER_VERSION = "0.1.28";
52-
static final String JARCOMPATIBILITYCHECKER_DL_URL = FORGE_MAVEN + "net/minecraftforge/JarCompatibilityChecker/" + JARCOMPATIBILITYCHECKER_VERSION + "/JarCompatibilityChecker-" + JARCOMPATIBILITYCHECKER_VERSION + "-all.jar";
53-
static final String JARCOMPATIBILITYCHECKER_MAIN = "net.minecraftforge.jarcompatibilitychecker.ConsoleTool";
54-
static final int JARCOMPATIBILITYCHECKER_JAVA = 8;
55-
56-
static final String SRGUTILS_NAME = "srgutils";
57-
static final String SRGUTILS_VERSION = "0.5.14";
58-
static final String SRGUTILS_DL_URL = FORGE_MAVEN + "net/minecraftforge/srgutils/" + SRGUTILS_VERSION + "/srgutils-" + SRGUTILS_VERSION + ".jar";
59-
static final int SRGUTILS_JAVA = 8;
60-
61-
static final String FASTCSV_NAME = "fastcsv";
62-
static final String FASTCSV_VERSION = "3.7.0";
63-
static final String FASTCSV_DL_URL = MAVEN_CENTRAL + "de/siegmar/fastcsv/" + FASTCSV_VERSION + "/fastcsv-" + FASTCSV_VERSION + ".jar";
64-
static final int FASTCSV_JAVA = 11;
65-
66-
static final String SLIMELAUNCHER_NAME = "slimelauncher";
67-
static final String SLIMELAUNCHER_VERSION = "0.1.8";
68-
static final String SLIMELAUNCHER_DL_URL = "https://maven.minecraftforge.net/net/minecraftforge/slime-launcher/" + SLIMELAUNCHER_VERSION + "/slime-launcher-" + SLIMELAUNCHER_VERSION + ".jar";
69-
static final int SLIMELAUNCHER_JAVA_VERSION = 8;
70-
static final String SLIMELAUNCHER_MAIN = "net.minecraftforge.launcher.Main";
7113
}

‎src/main/groovy/net/minecraftforge/forgedev/Tools.java‎

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,21 @@
55
package net.minecraftforge.forgedev;
66

77
import net.minecraftforge.gradleutils.shared.Tool;
8-
import net.minecraftforge.util.download.DownloadUtils;
9-
import net.minecraftforge.util.hash.HashStore;
10-
import org.gradle.api.file.DirectoryProperty;
11-
import org.gradle.api.file.RegularFileProperty;
12-
import org.gradle.api.provider.Property;
13-
import org.gradle.api.provider.Provider;
14-
import org.gradle.api.provider.ProviderFactory;
15-
import org.gradle.api.provider.ValueSource;
16-
import org.gradle.api.provider.ValueSourceParameters;
17-
import org.gradle.api.tasks.Input;
18-
import org.gradle.api.tasks.InputFile;
19-
import org.jetbrains.annotations.Nullable;
20-
21-
import javax.inject.Inject;
22-
import java.io.File;
23-
import java.io.IOException;
24-
25-
import static net.minecraftforge.forgedev.ForgeDevPlugin.LOGGER;
268

279
public final class Tools {
2810
private Tools() { }
2911

3012
// EXECUTABLE
31-
public static final Tool MAVENIZER = tool(Constants.MAVENIZER_NAME, Constants.MAVENIZER_VERSION, Constants.MAVENIZER_DL_URL, Constants.MAVENIZER_JAVA, Constants.MAVENIZER_MAIN);
32-
public static final Tool DIFFPATCH = tool(Constants.DIFFPATCH_NAME, Constants.DIFFPATCH_VERSION, Constants.DIFFPATCH_DL_URL, Constants.DIFFPATCH_JAVA, Constants.DIFFPATCH_MAIN);
33-
public static final Tool BINPATCH = tool(Constants.BINPATCH_NAME, Constants.BINPATCH_VERSION, Constants.BINPATCH_DL_URL, Constants.BINPATCH_JAVA, Constants.BINPATCH_MAIN);
34-
public static final Tool INSTALLERTOOLS = tool(Constants.INSTALLERTOOLS_NAME, Constants.INSTALLERTOOLS_VERSION, Constants.INSTALLERTOOLS_DL_URL, Constants.INSTALLERTOOLS_JAVA, Constants.INSTALLERTOOLS_MAIN);
35-
public static final Tool JARCOMPATIBILITYCHECKER = tool(Constants.JARCOMPATIBILITYCHECKER_NAME, Constants.JARCOMPATIBILITYCHECKER_VERSION, Constants.JARCOMPATIBILITYCHECKER_DL_URL, Constants.JARCOMPATIBILITYCHECKER_JAVA, Constants.JARCOMPATIBILITYCHECKER_MAIN);
36-
public static final Tool FART = tool(Constants.FART_NAME, Constants.FART_VERSION, Constants.FART_DL_URL, Constants.FART_JAVA, Constants.FART_MAIN);
37-
public static final Tool SRG2SRC = tool(Constants.SRG2SRC_NAME, Constants.SRG2SRC_VERSION, Constants.SRG2SRC_DL_URL, Constants.SRG2SRC_JAVA, Constants.SRG2SRC_MAIN);
38-
public static final Tool SLIMELAUNCHER = tool(Constants.SLIMELAUNCHER_NAME, Constants.SLIMELAUNCHER_VERSION, Constants.SLIMELAUNCHER_DL_URL, Constants.SLIMELAUNCHER_JAVA_VERSION, Constants.SLIMELAUNCHER_MAIN);
13+
public static final Tool MAVENIZER = Tool.ofForge("mavenizer", "net.minecraftforge:minecraft-mavenizer:0.4.9", 25, "net.minecraftforge.mcmaven.cli.Main");
14+
public static final Tool DIFFPATCH = Tool.of("diffpatch", "io.codechicken:DiffPatch:2.1.0.42:all", Constants.MAVEN_CENTRAL, 8);
15+
public static final Tool BINPATCH = Tool.ofForge("binpatcher", "net.minecraftforge:binarypatcher:1.2.2:fatjar", 8);
16+
public static final Tool INSTALLERTOOLS = Tool.ofForge("installertools", "net.minecraftforge:installertools:1.4.4:fatjar", 8);
17+
public static final Tool JARCOMPATIBILITYCHECKER = Tool.ofForge("jarcompatibilitychecker", "net.minecraftforge:JarCompatibilityChecker:0.1.28:all", 8);
18+
public static final Tool RENAMER = Tool.ofForge("renamer", "net.minecraftforge:ForgeAutoRenamingTool:1.1.1:all", 8);
19+
public static final Tool SRG2SRC = Tool.ofForge("srg2source", "net.minecraftforge:Srg2Source:8.1.1:fatjar", 17);
20+
public static final Tool SLIMELAUNCHER = Tool.ofForge("slimelauncher", "net.minecraftforge:slime-launcher:0.1.8", 8, "net.minecraftforge.launcher.Main");
3921

4022
// LIBRARIES
41-
public static final Tool SRGUTILS = tool(Constants.SRGUTILS_NAME, Constants.SRGUTILS_VERSION, Constants.SRGUTILS_DL_URL, Constants.SRGUTILS_JAVA);
42-
public static final Tool FASTCSV = tool(Constants.FASTCSV_NAME, Constants.FASTCSV_VERSION, Constants.FASTCSV_DL_URL, Constants.FASTCSV_JAVA);
43-
44-
private static Tool tool(String name, String version, String downloadUrl, int javaVersion) {
45-
return Tool.of(name, version, downloadUrl, javaVersion);
46-
}
47-
48-
private static Tool tool(String name, String version, String downloadUrl, int javaVersion, String mainClass) {
49-
return Tool.of(name, version, downloadUrl, javaVersion, mainClass);
50-
}
23+
public static final Tool SRGUTILS = Tool.ofForge("srgutils", "net.minecraftforge:srgutils:0.5.14", 8);
24+
public static final Tool FASTCSV = Tool.of("fastcsv", "de.siegmar:fastcsv:3.7.0", Constants.MAVEN_CENTRAL, 11);
5125
}

‎src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyRenameJar.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ abstract class LegacyRenameJar extends ToolExec {
4949

5050
@Inject
5151
LegacyRenameJar() {
52-
super(Tools.FART)
52+
super(Tools.RENAMER)
5353

5454
this.preferToolchainJvm.set(true)
5555

‎src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyReobfuscateJar.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ abstract class LegacyReobfuscateJar extends ToolExec {
5353

5454
@Inject
5555
LegacyReobfuscateJar() {
56-
super(Tools.FART)
56+
super(Tools.RENAMER)
5757

5858
this.preferToolchainJvm.set(true)
5959

0 commit comments

Comments
 (0)