From a3e6214482a16cedeed64c55e719d102b1544df8 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Sun, 3 Aug 2025 18:27:16 -0400 Subject: [PATCH 01/12] Upgrade Gson to 2.9.1, commons-io to 2.20.0, and unimined to 1.3.5. --- buildSrc/build.gradle | 6 ++-- .../baritone/gradle/task/ProguardTask.java | 35 +++---------------- gradle.properties | 4 +-- .../baritone/api/utils/BetterBlockPos.java | 4 +-- .../baritone/api/utils/BlockOptionalMeta.java | 12 +++---- .../BlockStateInterfaceAccessWrapper.java | 2 +- .../format/defaults/LitematicaSchematic.java | 7 ++-- tweaker/build.gradle | 12 ++++--- 8 files changed, 29 insertions(+), 53 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index d894aeec2..d79599d75 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -37,8 +37,8 @@ repositories { } dependencies { - implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.0' - implementation group: 'commons-io', name: 'commons-io', version: '2.7' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1' + implementation group: 'commons-io', name: 'commons-io', version: '2.20.0' - implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.0.5' + implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.3.5' } \ No newline at end of file diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index d5e05a19c..9d46b069a 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -19,13 +19,10 @@ import baritone.gradle.util.Determinizer; import org.gradle.api.plugins.JavaPluginConvention; +import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; -import org.gradle.api.tasks.TaskCollection; -import org.gradle.api.tasks.compile.ForkOptions; -import org.gradle.api.tasks.compile.JavaCompile; -import org.gradle.internal.jvm.Jvm; import org.gradle.jvm.toolchain.JavaLanguageVersion; import org.gradle.jvm.toolchain.JavaLauncher; import org.gradle.jvm.toolchain.JavaToolchainService; @@ -112,10 +109,8 @@ private void extractProguard() throws Exception { } private JavaLauncher getJavaLauncherForProguard() { - var toolchains = getProject().getExtensions().getByType(JavaToolchainService.class); - var toolchain = toolchains.launcherFor((spec) -> { - spec.getLanguageVersion().set(JavaLanguageVersion.of(getProject().findProperty("java_version").toString())); - }).getOrNull(); + JavaToolchainService toolchains = getProject().getExtensions().getByType(JavaToolchainService.class); + JavaLauncher toolchain = toolchains.launcherFor((spec) -> spec.getLanguageVersion().set(JavaLanguageVersion.of(getProject().findProperty("java_version").toString()))).getOrNull(); if (toolchain == null) { throw new IllegalStateException("Java toolchain not found"); @@ -127,7 +122,7 @@ private JavaLauncher getJavaLauncherForProguard() { private void generateConfigs() throws Exception { Files.copy(getRootRelativeFile(PROGUARD_CONFIG_TEMPLATE), getTemporaryFile(PROGUARD_CONFIG_DEST), StandardCopyOption.REPLACE_EXISTING); - // Setup the template that will be used to derive the API and Standalone configs + // Set up the template that will be used to derive the API and Standalone configs List template = Files.readAllLines(getTemporaryFile(PROGUARD_CONFIG_DEST)); template.add(0, "-injars '" + this.artifactPath.toString() + "'"); template.add(1, "-outjars '" + this.getTemporaryFile(PROGUARD_EXPORT_PATH) + "'"); @@ -146,7 +141,7 @@ private void generateConfigs() throws Exception { } { - // Discover all of the libraries that we will need to acquire from gradle + // Discover all the libraries that we will need to acquire from gradle final Stream dependencies = acquireDependencies() // remove MCP mapped jar, and nashorn .filter(f -> !f.toString().endsWith("-recomp.jar") && !f.getName().startsWith("nashorn") && !f.getName().startsWith("coremods")); @@ -190,25 +185,6 @@ private void proguardStandalone() throws Exception { Determinizer.determinize(this.proguardOut.toString(), this.artifactStandalonePath.toString(), List.of(), false); } - private static final class Pair { - public final A a; - public final B b; - - private Pair(final A a, final B b) { - this.a = a; - this.b = b; - } - - @Override - public String toString() { - return "Pair{" + - "a=" + this.a + - ", " + - "b=" + this.b + - '}'; - } - } - private void cleanup() { try { Files.delete(this.proguardOut); @@ -235,5 +211,4 @@ private void runProguard(Path config) throws Exception { spec.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile()); }).assertNormalExitValue().rethrowFailure(); } - } diff --git a/gradle.properties b/gradle.properties index bd275b61a..926a40ced 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ fabric_version=0.14.11 nether_pathfinder_version=1.4.1 -// These dependencies are used for common and tweaker -// while mod loaders usually ship their own version +# These dependencies are used for common and tweaker +# while mod loaders usually ship their own version mixin_version=0.8.5 asm_version=9.3 diff --git a/src/api/java/baritone/api/utils/BetterBlockPos.java b/src/api/java/baritone/api/utils/BetterBlockPos.java index 5add76555..a56754aa5 100644 --- a/src/api/java/baritone/api/utils/BetterBlockPos.java +++ b/src/api/java/baritone/api/utils/BetterBlockPos.java @@ -17,11 +17,11 @@ package baritone.api.utils; -import javax.annotation.Nonnull; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; import net.minecraft.util.Mth; +import org.jetbrains.annotations.NotNull; /** * A better BlockPos that has fewer hash collisions (and slightly more performant offsets) @@ -225,7 +225,7 @@ public double distanceTo(final BetterBlockPos to) { } @Override - @Nonnull + @NotNull public String toString() { return String.format( "BetterBlockPos{x=%s,y=%s,z=%s}", diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index b10aa294f..796494549 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -52,9 +52,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.NotNull; import sun.misc.Unsafe; -import javax.annotation.Nonnull; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; @@ -84,7 +84,7 @@ public final class BlockOptionalMeta { private static PredicateManager predicate = new PredicateManager(); private static Map> drops = new HashMap<>(); - public BlockOptionalMeta(@Nonnull Block block) { + public BlockOptionalMeta(@NotNull Block block) { this.block = block; this.propertiesDescription = "{}"; this.blockstates = getStates(block, Collections.emptyMap()); @@ -92,7 +92,7 @@ public BlockOptionalMeta(@Nonnull Block block) { this.stackHashes = getStackHashes(blockstates); } - public BlockOptionalMeta(@Nonnull String selector) { + public BlockOptionalMeta(@NotNull String selector) { Matcher matcher = PATTERN.matcher(selector); if (!matcher.find()) { @@ -135,7 +135,7 @@ private static , P extends Property> P castToIPropert return builder.build(); } - private static Set getStates(@Nonnull Block block, @Nonnull Map, ?> properties) { + private static Set getStates(@NotNull Block block, @NotNull Map, ?> properties) { return block.getStateDefinition().getPossibleStates().stream() .filter(blockstate -> properties.entrySet().stream().allMatch(entry -> blockstate.getValue(entry.getKey()) == entry.getValue() @@ -168,11 +168,11 @@ public Block getBlock() { return block; } - public boolean matches(@Nonnull Block block) { + public boolean matches(@NotNull Block block) { return block == this.block; } - public boolean matches(@Nonnull BlockState blockstate) { + public boolean matches(@NotNull BlockState blockstate) { Block block = blockstate.getBlock(); return block == this.block && stateHashes.contains(blockstate.hashCode()); } diff --git a/src/main/java/baritone/utils/BlockStateInterfaceAccessWrapper.java b/src/main/java/baritone/utils/BlockStateInterfaceAccessWrapper.java index 9f4bddf12..9d6e261b1 100644 --- a/src/main/java/baritone/utils/BlockStateInterfaceAccessWrapper.java +++ b/src/main/java/baritone/utils/BlockStateInterfaceAccessWrapper.java @@ -17,12 +17,12 @@ package baritone.utils; -import javax.annotation.Nullable; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.FluidState; +import org.jetbrains.annotations.Nullable; /** * @author Brady diff --git a/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java b/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java index 89684981e..0cc9847b9 100644 --- a/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java +++ b/src/main/java/baritone/utils/schematic/format/defaults/LitematicaSchematic.java @@ -29,8 +29,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Property; import org.apache.commons.lang3.Validate; +import org.jetbrains.annotations.Nullable; -import javax.annotation.Nullable; import java.util.Collections; import java.util.Optional; @@ -44,8 +44,7 @@ public final class LitematicaSchematic extends CompositeSchematic implements IStaticSchematic { /** - * @param nbtTagCompound a decompressed file stream aka nbt data. - * @param rotated if the schematic is rotated by 90°. + * @param nbt a decompressed file stream aka nbt data. */ public LitematicaSchematic(CompoundTag nbt) { super(0, 0, 0); @@ -225,7 +224,7 @@ private static class LitematicaBitArray { */ private final long arraySize; - public LitematicaBitArray(int bitsPerEntryIn, long arraySizeIn, @Nullable long[] longArrayIn) { + public LitematicaBitArray(int bitsPerEntryIn, long arraySizeIn, long @Nullable [] longArrayIn) { Validate.inclusiveBetween(1L, 32L, bitsPerEntryIn); this.arraySize = arraySizeIn; this.bitsPerEntry = bitsPerEntryIn; diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 3e4758c87..8fd09fc15 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -24,9 +24,11 @@ plugins { } unimined.minecraft { - runs.client = { - mainClass = "net.minecraft.launchwrapper.Launch" - args.addAll(["--tweakClass", "baritone.launch.tweaker.BaritoneTweaker"]) + runs { + config("client") { + mainClass = "net.minecraft.launchwrapper.Launch" + args.addAll(["--tweakClass", "baritone.launch.tweaker.BaritoneTweaker"]) + } } } @@ -94,11 +96,11 @@ jar { } } -task proguard(type: ProguardTask) { +tasks.register('proguard', ProguardTask) { proguardVersion "7.2.1" } -task createDist(type: CreateDistTask, dependsOn: proguard) +tasks.register('createDist', CreateDistTask) { dependsOn proguard } build.finalizedBy(createDist) From e6e9878423ba0ffe03c7dd86df3db2907c467711 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Sun, 3 Aug 2025 18:27:43 -0400 Subject: [PATCH 02/12] Push back to working 1.3.4. --- buildSrc/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index d79599d75..b704ea88f 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -40,5 +40,5 @@ dependencies { implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1' implementation group: 'commons-io', name: 'commons-io', version: '2.20.0' - implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.3.5' + implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.3.4' } \ No newline at end of file From 359e229165b7cbcb1313c9257208be13cad056c7 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 00:18:22 -0400 Subject: [PATCH 03/12] Update gradle. --- build.gradle | 2 -- .../baritone/gradle/task/ProguardTask.java | 25 +++++++++++-------- fabric/build.gradle | 7 +++--- forge/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- src/api/java/baritone/api/BaritoneAPI.java | 2 +- tweaker/build.gradle | 3 +-- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 5f3776219..a39cb97d3 100755 --- a/build.gradle +++ b/build.gradle @@ -36,8 +36,6 @@ allprojects { println "Detected version " + version } group = rootProject.maven_group - - sourceCompatibility = targetCompatibility = JavaVersion.toVersion(project.java_version) java { toolchain { diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index 9d46b069a..c0728d4ef 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -18,9 +18,9 @@ package baritone.gradle.task; import baritone.gradle.util.Determinizer; -import org.gradle.api.plugins.JavaPluginConvention; -import org.gradle.api.provider.Provider; +import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.JavaExec; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; import org.gradle.jvm.toolchain.JavaLanguageVersion; @@ -36,6 +36,7 @@ import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Stream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -170,7 +171,13 @@ private void generateConfigs() throws Exception { } private Stream acquireDependencies() { - return getProject().getConvention().getPlugin(JavaPluginConvention.class).getSourceSets().findByName("main").getCompileClasspath().getFiles() + return getProject() + .getExtensions() + .getByType(JavaPluginExtension.class) + .getSourceSets() + .getByName("main") + .getCompileClasspath() + .getFiles() .stream() .filter(File::isFile); } @@ -203,12 +210,10 @@ private void runProguard(Path config) throws Exception { Path workingDirectory = getTemporaryFile(""); - getProject().javaexec(spec -> { - spec.workingDir(workingDirectory.toFile()); - spec.args("@" + workingDirectory.relativize(config)); - spec.classpath(getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion))); - - spec.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile()); - }).assertNormalExitValue().rethrowFailure(); + JavaExec javaExecTask = getProject().getObjects().newInstance(JavaExec.class); + javaExecTask.workingDir(workingDirectory.toFile()); + javaExecTask.args("@" + workingDirectory.relativize(config)); + javaExecTask.classpath(getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion))); + javaExecTask.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile()); } } diff --git a/fabric/build.gradle b/fabric/build.gradle index caeb009aa..b1cce8d68 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -19,7 +19,7 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask plugins { - id "com.github.johnrengelman.shadow" version "8.0.0" + id "com.gradleup.shadow" version "9.0.0-rc3" } archivesBaseName = archivesBaseName + "-fabric" @@ -77,12 +77,13 @@ components.java { } } -task proguard(type: ProguardTask) { +tasks.register('proguard', ProguardTask) { proguardVersion "7.2.1" compType "fabric" } -task createDist(type: CreateDistTask, dependsOn: proguard) { +tasks.register('createDist', CreateDistTask) { + dependsOn proguard compType "fabric" } diff --git a/forge/build.gradle b/forge/build.gradle index b2c81567e..0b63f3df9 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -19,7 +19,7 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask plugins { - id "com.github.johnrengelman.shadow" version "8.0.0" + id "com.gradleup.shadow" version "9.0.0-rc3" } archivesBaseName = archivesBaseName + "-forge" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 15de90249..3ae1e2f12 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/api/java/baritone/api/BaritoneAPI.java b/src/api/java/baritone/api/BaritoneAPI.java index fa98525bf..a98d72ea4 100644 --- a/src/api/java/baritone/api/BaritoneAPI.java +++ b/src/api/java/baritone/api/BaritoneAPI.java @@ -35,7 +35,7 @@ public final class BaritoneAPI { SettingsUtil.readAndApply(settings, SettingsUtil.SETTINGS_DEFAULT_NAME); try { - provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").newInstance(); + provider = (IBaritoneProvider) Class.forName("baritone.BaritoneProvider").getDeclaredConstructor().newInstance(); } catch (ReflectiveOperationException ex) { throw new RuntimeException(ex); } diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 8fd09fc15..39debb97f 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -17,10 +17,9 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask -//import baritone.gradle.task.TweakerJsonAssembler plugins { - id "com.github.johnrengelman.shadow" version "8.0.0" + id "com.gradleup.shadow" version "9.0.0-rc3" } unimined.minecraft { From 2614117094793b488953b8e871a1b25622e4f70c Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 09:13:51 -0400 Subject: [PATCH 04/12] Update nether pathfinder to 1.6 and Unimined to 1.3.15. --- buildSrc/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b704ea88f..3cadb21f1 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -40,5 +40,5 @@ dependencies { implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1' implementation group: 'commons-io', name: 'commons-io', version: '2.20.0' - implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.3.4' + implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.3.15' } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 926a40ced..b53d44eac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ forge_version=45.0.43 fabric_version=0.14.11 -nether_pathfinder_version=1.4.1 +nether_pathfinder_version=1.6 # These dependencies are used for common and tweaker # while mod loaders usually ship their own version From 4b77b58d1f7117ec522a9d3b615261169d9ef43c Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 09:27:37 -0400 Subject: [PATCH 05/12] Roll back nether_pathfinder_version. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b53d44eac..926a40ced 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ forge_version=45.0.43 fabric_version=0.14.11 -nether_pathfinder_version=1.6 +nether_pathfinder_version=1.4.1 # These dependencies are used for common and tweaker # while mod loaders usually ship their own version From 58ee6bb211a02b70e62f42dfa5986aee1b634640 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 12:12:28 -0400 Subject: [PATCH 06/12] Change everything to double quotes. --- build.gradle | 24 ++++++++++++------------ buildSrc/build.gradle | 22 +++++++++++----------- fabric/build.gradle | 4 ++-- forge/build.gradle | 13 +++++++------ settings.gradle | 14 +++++++------- tweaker/build.gradle | 22 +++++++++++----------- 6 files changed, 50 insertions(+), 49 deletions(-) diff --git a/build.gradle b/build.gradle index a39cb97d3..f113d91b6 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ allprojects { - apply plugin: 'java' + apply plugin: "java" apply plugin: "xyz.wagyourtail.unimined" apply plugin: "maven-publish" @@ -24,7 +24,7 @@ allprojects { def vers = "" try { - vers = 'git describe --always --tags --first-parent --dirty'.execute().text.trim() + vers = "git describe --always --tags --first-parent --dirty".execute().text.trim() } catch (Exception e) { println "Version detection failed: " + e } @@ -45,16 +45,16 @@ allprojects { repositories { maven { - name = 'spongepowered-repo' - url = 'https://repo.spongepowered.org/repository/maven-public/' + name = "spongepowered-repo" + url = "https://repo.spongepowered.org/repository/maven-public/" } maven { - name = 'fabric-maven' - url = 'https://maven.fabricmc.net/' + name = "fabric-maven" + url = "https://maven.fabricmc.net/" } maven { - name = 'impactdevelopment-repo' - url = 'https://impactdevelopment.github.io/maven/' + name = "impactdevelopment-repo" + url = "https://impactdevelopment.github.io/maven/" } maven { name = "ldtteam" @@ -70,8 +70,8 @@ allprojects { } mavenCentral() maven { - name = 'babbaj-repo' - url = 'https://babbaj.github.io/maven/' + name = "babbaj-repo" + url = "https://babbaj.github.io/maven/" } } @@ -137,7 +137,7 @@ sourceSets { } dependencies { - testImplementation 'junit:junit:4.13.2' + testImplementation "junit:junit:4.13.2" } jar { @@ -145,7 +145,7 @@ jar { } javadoc { - options.addStringOption('Xwerror', '-quiet') // makes the build fail on travis when there is a javadoc error + options.addStringOption("Xwerror", "-quiet") // makes the build fail on travis when there is a javadoc error options.linkSource true options.encoding "UTF-8" // allow emoji in comments :^) source = sourceSets.api.allJava diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 3cadb21f1..c75276f2d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -18,27 +18,27 @@ repositories { mavenLocal() maven { - name = 'WagYourMaven' - url = 'https://maven.wagyourtail.xyz/releases' + name = "WagYourMaven" + url = "https://maven.wagyourtail.xyz/releases" } maven { - name = 'ForgeMaven' - url = 'https://maven.minecraftforge.net/' + name = "ForgeMaven" + url = "https://maven.minecraftforge.net/" } maven { - name = 'FabricMaven' - url = 'https://maven.fabricmc.net/' + name = "FabricMaven" + url = "https://maven.fabricmc.net/" } maven { - name = 'NeoForgedMaven' - url = 'https://maven.neoforged.net/' + name = "NeoForgedMaven" + url = "https://maven.neoforged.net/" } mavenCentral() } dependencies { - implementation group: 'com.google.code.gson', name: 'gson', version: '2.9.1' - implementation group: 'commons-io', name: 'commons-io', version: '2.20.0' + implementation group: "com.google.code.gson", name: "gson", version: "2.9.1" + implementation group: "commons-io", name: "commons-io", version: "2.20.0" - implementation group: 'xyz.wagyourtail.unimined', name: 'xyz.wagyourtail.unimined.gradle.plugin', version: '1.3.15' + implementation group: "xyz.wagyourtail.unimined", name: "xyz.wagyourtail.unimined.gradle.plugin", version: "1.3.15" } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index b1cce8d68..bb7c533c4 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -77,12 +77,12 @@ components.java { } } -tasks.register('proguard', ProguardTask) { +tasks.register("proguard", ProguardTask) { proguardVersion "7.2.1" compType "fabric" } -tasks.register('createDist', CreateDistTask) { +tasks.register("createDist", CreateDistTask) { dependsOn proguard compType "fabric" } diff --git a/forge/build.gradle b/forge/build.gradle index 0b63f3df9..3b0662894 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -37,7 +37,7 @@ unimined.minecraft { //loom { // forge { -// mixinConfig 'mixins.baritone.json' +// mixinConfig "mixins.baritone.json" // } //} @@ -83,11 +83,11 @@ jar { manifest { attributes( - 'MixinConfigs': 'mixins.baritone.json', + "MixinConfigs": "mixins.baritone.json", "MixinConnector": "baritone.launch.BaritoneMixinConnector", - 'Implementation-Title': 'Baritone', - 'Implementation-Version': version, + "Implementation-Title": "Baritone", + "Implementation-Version": version, ) } } @@ -98,12 +98,13 @@ components.java { } } -task proguard(type: ProguardTask) { +tasks.register("proguard", ProguardTask) { proguardVersion "7.2.1" compType "forge" } -task createDist(type: CreateDistTask, dependsOn: proguard) { +tasks.register("createDist", CreateDistTask) { + dependsOn proguard compType "forge" } diff --git a/settings.gradle b/settings.gradle index 2475b0845..b1cb1e29b 100755 --- a/settings.gradle +++ b/settings.gradle @@ -19,16 +19,16 @@ pluginManagement { repositories { mavenLocal() maven { - name = 'WagYourMaven' - url = 'https://maven.wagyourtail.xyz/snapshots' + name = "WagYourMaven" + url = "https://maven.wagyourtail.xyz/snapshots" } maven { - name = 'ForgeMaven' - url = 'https://maven.minecraftforge.net/' + name = "ForgeMaven" + url = "https://maven.minecraftforge.net/" } maven { - name = 'FabricMaven' - url = 'https://maven.fabricmc.net/' + name = "FabricMaven" + url = "https://maven.fabricmc.net/" } mavenCentral() gradlePluginPortal() { @@ -39,7 +39,7 @@ pluginManagement { } } -rootProject.name = 'baritone' +rootProject.name = "baritone" include("tweaker") if (System.getProperty("Baritone.enabled_platforms") == null) { diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 39debb97f..90bb8a227 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -33,7 +33,7 @@ unimined.minecraft { configurations { common - shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. + shadowCommon // Don't use shadow from the shadow plugin because we don"t want IDEA to index this. compileClasspath.extendsFrom common runtimeClasspath.extendsFrom common } @@ -49,13 +49,13 @@ dependencies { implementation "org.ow2.asm:asm-analysis:${project.asm_version}" - implementation 'com.github.ImpactDevelopment:SimpleTweaker:1.2' - implementation('net.minecraft:launchwrapper:of-2.3') { - exclude module: 'lwjgl' - exclude module: 'asm-debug-all' + implementation "com.github.ImpactDevelopment:SimpleTweaker:1.2" + implementation("net.minecraft:launchwrapper:of-2.3") { + exclude module: "lwjgl" + exclude module: "asm-debug-all" } - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly "com.google.code.findbugs:jsr305:3.0.2" // because of multiple sourcesets `common project(":")` doesn't work for (sourceSet in rootProject.sourceSets) { @@ -86,20 +86,20 @@ jar { manifest { attributes( - 'MixinConfigs': 'mixins.baritone.json', + "MixinConfigs": "mixins.baritone.json", "MixinConnector": "baritone.launch.BaritoneMixinConnector", - 'Implementation-Title': 'Baritone', - 'Implementation-Version': version, + "Implementation-Title": "Baritone", + "Implementation-Version": version, ) } } -tasks.register('proguard', ProguardTask) { +tasks.register("proguard", ProguardTask) { proguardVersion "7.2.1" } -tasks.register('createDist', CreateDistTask) { dependsOn proguard } +tasks.register("createDist", CreateDistTask) { dependsOn proguard } build.finalizedBy(createDist) From 023e9ca2388b44e0d4f257307388c93db045fcd8 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 12:29:18 -0400 Subject: [PATCH 07/12] Redirect license to a URL that actually exists. --- forge/src/main/resources/META-INF/mods.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index b1d54af8b..9709c3a92 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -7,7 +7,7 @@ modLoader="javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version loaderVersion="[33,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. -license="https://raw.githubusercontent.com/cabaletta/baritone/1.16.2/LICENSE" +license="https://raw.githubusercontent.com/cabaletta/baritone/1.19.4/LICENSE" # A URL to refer people to when problems occur with this mod issueTrackerURL="https://github.com/cabaletta/baritone/issues" #optional # A list of mods - how many allowed here is determined by the individual mod loader From bef664b0bd01661ec8f821a4af209a0ee4bf1e9d Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 22:34:57 -0400 Subject: [PATCH 08/12] I mean... it builds I guess? --- build.gradle | 2 +- .../java/baritone/gradle/task/ProguardTask.java | 16 +++++++--------- fabric/build.gradle | 2 +- forge/build.gradle | 4 ++-- gradle.properties | 4 ++-- settings.gradle | 8 ++------ 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index f113d91b6..76bbc8225 100755 --- a/build.gradle +++ b/build.gradle @@ -107,7 +107,7 @@ unimined.minecraft { defaultRemapJar = false } -archivesBaseName = archivesBaseName + "-common" +//archivesBaseName = archivesBaseName + "-common" sourceSets { api { diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index c0728d4ef..273577f18 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -19,10 +19,7 @@ import baritone.gradle.util.Determinizer; import org.gradle.api.plugins.JavaPluginExtension; -import org.gradle.api.tasks.Input; -import org.gradle.api.tasks.JavaExec; -import org.gradle.api.tasks.SourceSetContainer; -import org.gradle.api.tasks.TaskAction; +import org.gradle.api.tasks.*; import org.gradle.jvm.toolchain.JavaLanguageVersion; import org.gradle.jvm.toolchain.JavaLauncher; import org.gradle.jvm.toolchain.JavaToolchainService; @@ -210,10 +207,11 @@ private void runProguard(Path config) throws Exception { Path workingDirectory = getTemporaryFile(""); - JavaExec javaExecTask = getProject().getObjects().newInstance(JavaExec.class); - javaExecTask.workingDir(workingDirectory.toFile()); - javaExecTask.args("@" + workingDirectory.relativize(config)); - javaExecTask.classpath(getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion))); - javaExecTask.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile()); + getProject().javaexec(javaExecSpec -> { + javaExecSpec.workingDir(workingDirectory.toFile()); + javaExecSpec.args("@" + workingDirectory.relativize(config)); + javaExecSpec.classpath(getTemporaryFile(String.format(PROGUARD_JAR, proguardVersion))); + javaExecSpec.executable(getJavaLauncherForProguard().getExecutablePath().getAsFile()); + }); } } diff --git a/fabric/build.gradle b/fabric/build.gradle index bb7c533c4..b30ea3963 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -19,7 +19,7 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask plugins { - id "com.gradleup.shadow" version "9.0.0-rc3" + id "com.gradleup.shadow" version "8.3.5" } archivesBaseName = archivesBaseName + "-fabric" diff --git a/forge/build.gradle b/forge/build.gradle index 3b0662894..b977b2521 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -19,10 +19,10 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask plugins { - id "com.gradleup.shadow" version "9.0.0-rc3" + id "com.gradleup.shadow" version "8.3.5" } -archivesBaseName = archivesBaseName + "-forge" +//base.archivesName = base.archivesName + "-forge" unimined.minecraft { mappings { diff --git a/gradle.properties b/gradle.properties index 926a40ced..44e3378b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ nether_pathfinder_version=1.4.1 # These dependencies are used for common and tweaker # while mod loaders usually ship their own version -mixin_version=0.8.5 -asm_version=9.3 +mixin_version=0.8.7 +asm_version=9.5 diff --git a/settings.gradle b/settings.gradle index b1cb1e29b..7debb7fd5 100755 --- a/settings.gradle +++ b/settings.gradle @@ -42,9 +42,5 @@ pluginManagement { rootProject.name = "baritone" include("tweaker") -if (System.getProperty("Baritone.enabled_platforms") == null) { - System.setProperty("Baritone.enabled_platforms", "fabric,forge") -} -for (platform in System.getProperty("Baritone.enabled_platforms").split(",")) { - include(platform) -} +include("forge") +include("fabric") \ No newline at end of file From f4ed086c4d43002c5aa07c58baaec388f0e4d224 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 4 Aug 2025 22:45:49 -0400 Subject: [PATCH 09/12] Wait now it builds I think. --- build.gradle | 5 +++++ fabric/build.gradle | 6 +----- forge/build.gradle | 4 ---- tweaker/build.gradle | 4 ---- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 76bbc8225..68110168e 100755 --- a/build.gradle +++ b/build.gradle @@ -15,10 +15,15 @@ * along with Baritone. If not, see . */ +plugins { + id "com.gradleup.shadow" version "8.3.5" +} + allprojects { apply plugin: "java" apply plugin: "xyz.wagyourtail.unimined" apply plugin: "maven-publish" + apply plugin: "com.gradleup.shadow" archivesBaseName = rootProject.archives_base_name diff --git a/fabric/build.gradle b/fabric/build.gradle index b30ea3963..e6cd810f2 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -18,11 +18,7 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask -plugins { - id "com.gradleup.shadow" version "8.3.5" -} - -archivesBaseName = archivesBaseName + "-fabric" +//archivesBaseName = archivesBaseName + "-fabric" unimined.minecraft { fabric { diff --git a/forge/build.gradle b/forge/build.gradle index b977b2521..802a296cc 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -18,10 +18,6 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask -plugins { - id "com.gradleup.shadow" version "8.3.5" -} - //base.archivesName = base.archivesName + "-forge" unimined.minecraft { diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 90bb8a227..c48044491 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -18,10 +18,6 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask -plugins { - id "com.gradleup.shadow" version "9.0.0-rc3" -} - unimined.minecraft { runs { config("client") { From a661fa5f05509113f580a94293ab2ccd047a9b28 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Tue, 5 Aug 2025 12:13:55 -0400 Subject: [PATCH 10/12] Update. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 68110168e..f5cf6ddbc 100755 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ allprojects { println "Version detection failed: " + e } if (!vers.startsWith("v")) { - println "using version number: " + rootProject.mod_version + println "using version number: ${rootProject.mod_version}" version = rootProject.mod_version } else { version = vers.substring(1) @@ -142,7 +142,7 @@ sourceSets { } dependencies { - testImplementation "junit:junit:4.13.2" + testImplementation 'junit:junit:4.13.2' } jar { From f2802911d1f84d97094227e97d16bab48a4239e1 Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Mon, 11 Aug 2025 16:24:20 -0400 Subject: [PATCH 11/12] Small change. Still won't build lol. --- fabric/build.gradle | 2 +- forge/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 1 + .../java/baritone/launch/mixins/MixinPalettedContainer.java | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index e6cd810f2..bd2336621 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -18,7 +18,7 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask -//archivesBaseName = archivesBaseName + "-fabric" +archivesBaseName = archivesBaseName + "-fabric" unimined.minecraft { fabric { diff --git a/forge/build.gradle b/forge/build.gradle index 802a296cc..b6d189515 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -25,7 +25,7 @@ unimined.minecraft { devFallbackNamespace "intermediary" } - forge { + minecraftForge { loader project.forge_version mixinConfig ["mixins.baritone.json"] } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3ae1e2f12..18f4d9871 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java b/src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java index a1b409a09..24e06cbba 100644 --- a/src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java +++ b/src/launch/java/baritone/launch/mixins/MixinPalettedContainer.java @@ -34,6 +34,7 @@ @Mixin(PalettedContainer.class) public abstract class MixinPalettedContainer implements IPalettedContainer { + @Unique private static final MethodHandle DATA_GETTER; // Mixin has no way of referring to the data field and we can't use inheritance From b800e2da7a14fad747a8061d350cbc841ca5998b Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Sat, 30 Aug 2025 09:18:25 -0400 Subject: [PATCH 12/12] Minor formatting changes. --- build.gradle | 10 +++------- .../java/baritone/gradle/task/BaritoneGradleTask.java | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index f5cf6ddbc..395f36b42 100755 --- a/build.gradle +++ b/build.gradle @@ -41,12 +41,8 @@ allprojects { println "Detected version " + version } group = rootProject.maven_group - - java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(sourceCompatibility.majorVersion.toInteger())) - } - } + + java.toolchain.languageVersion = JavaLanguageVersion.of(sourceCompatibility.majorVersion.toInteger()) repositories { maven { @@ -112,7 +108,7 @@ unimined.minecraft { defaultRemapJar = false } -//archivesBaseName = archivesBaseName + "-common" +archivesBaseName = archivesBaseName + "-common" sourceSets { api { diff --git a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java index f27df9aaa..c439d5c22 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/BaritoneGradleTask.java @@ -108,7 +108,7 @@ protected String formatVersion(String string) { } protected Path getRelativeFile(String file) { - return Paths.get(new File(getProject().getBuildDir(), file).getAbsolutePath()); + return getProject().getLayout().getBuildDirectory().file(file).get().getAsFile().toPath(); } protected Path getRootRelativeFile(String file) {