diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 56c11e193..1d7d9f373 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -13,12 +13,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' @@ -31,13 +31,13 @@ jobs: run: ./gradlew build -Pmod_version="$(git describe --always --tags --first-parent | cut -c2-)" - name: Archive Artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Artifacts path: dist/ - name: Archive mapping.txt - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Mappings path: mapping/ diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 04b26b422..e07cf2af6 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' diff --git a/build.gradle b/build.gradle index 5f3776219..8bb1c6ec0 100755 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,9 @@ allprojects { apply plugin: "xyz.wagyourtail.unimined" apply plugin: "maven-publish" - archivesBaseName = rootProject.archives_base_name + base { + archivesName = rootProject.archives_base_name + } def vers = "" try { @@ -36,10 +38,9 @@ allprojects { println "Detected version " + version } group = rootProject.maven_group - - sourceCompatibility = targetCompatibility = JavaVersion.toVersion(project.java_version) java { + sourceCompatibility = JavaVersion.toVersion(project.java_version) toolchain { languageVersion.set(JavaLanguageVersion.of(sourceCompatibility.majorVersion.toInteger())) } @@ -109,7 +110,9 @@ unimined.minecraft { defaultRemapJar = false } -archivesBaseName = archivesBaseName + "-common" +base { + archivesName = archivesName.get() + "-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 d5e05a19c..ca296107b 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -18,7 +18,7 @@ package baritone.gradle.task; import baritone.gradle.util.Determinizer; -import org.gradle.api.plugins.JavaPluginConvention; +import org.gradle.api.plugins.JavaPluginExtension; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.SourceSetContainer; import org.gradle.api.tasks.TaskAction; @@ -33,7 +33,7 @@ import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig; import java.io.*; -import java.net.URL; +import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; @@ -97,7 +97,8 @@ private void processArtifact() throws Exception { private void downloadProguard() throws Exception { Path proguardZip = getTemporaryFile(String.format(PROGUARD_ZIP, proguardVersion)); if (!Files.exists(proguardZip)) { - write(new URL(String.format("https://github.com/Guardsquare/proguard/releases/download/v%s/proguard-%s.zip", proguardVersion, proguardVersion)).openStream(), proguardZip); + String downloadAddress = String.format("https://github.com/Guardsquare/proguard/releases/download/v%s/proguard-%s.zip", proguardVersion, proguardVersion); + write(new URI(downloadAddress).toURL().openStream(), proguardZip); } } @@ -175,7 +176,7 @@ 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().findByName("main").getCompileClasspath().getFiles() .stream() .filter(File::isFile); } diff --git a/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java b/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java index 04bd74947..f95db3846 100644 --- a/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java +++ b/buildSrc/src/main/java/baritone/gradle/util/Determinizer.java @@ -65,7 +65,7 @@ public static void determinize(String inputPath, String outputPath, List t clone.setTime(42069); jos.putNextEntry(clone); if (entry.getName().endsWith(".refmap.json")) { - JsonElement json = new JsonParser().parse(new InputStreamReader(jarFile.getInputStream(entry))); + JsonElement json = JsonParser.parseReader(new InputStreamReader(jarFile.getInputStream(entry))); jos.write(writeSorted(json).getBytes()); } else if (entry.getName().equals("META-INF/MANIFEST.MF") && doForgeReplacementOfMetaInf) { // only replace for forge jar ByteArrayOutputStream cancer = new ByteArrayOutputStream(); diff --git a/fabric/build.gradle b/fabric/build.gradle index caeb009aa..af7f2980e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -19,10 +19,12 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask plugins { - id "com.github.johnrengelman.shadow" version "8.0.0" + id "com.github.johnrengelman.shadow" version "8.1.1" } -archivesBaseName = archivesBaseName + "-fabric" +base { + archivesName = archivesName.get() + "-fabric" +} unimined.minecraft { fabric { diff --git a/forge/build.gradle b/forge/build.gradle index b2c81567e..aaa682228 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -19,10 +19,12 @@ import baritone.gradle.task.CreateDistTask import baritone.gradle.task.ProguardTask plugins { - id "com.github.johnrengelman.shadow" version "8.0.0" + id "com.github.johnrengelman.shadow" version "8.1.1" } -archivesBaseName = archivesBaseName + "-forge" +base { + archivesName = archivesName.get() + "-forge" +} unimined.minecraft { mappings { diff --git a/src/api/java/baritone/api/command/datatypes/ItemById.java b/src/api/java/baritone/api/command/datatypes/ItemById.java index eb4f230b4..965dc2343 100644 --- a/src/api/java/baritone/api/command/datatypes/ItemById.java +++ b/src/api/java/baritone/api/command/datatypes/ItemById.java @@ -42,7 +42,7 @@ public Item get(IDatatypeContext ctx) throws CommandException { public Stream tabComplete(IDatatypeContext ctx) throws CommandException { return new TabCompleteHelper() .append( - BuiltInRegistries.BLOCK.keySet() + BuiltInRegistries.ITEM.keySet() .stream() .map(ResourceLocation::toString) ) diff --git a/src/main/java/baritone/command/defaults/PathCommand.java b/src/main/java/baritone/command/defaults/PathCommand.java index b2021adf6..1a98b0c27 100644 --- a/src/main/java/baritone/command/defaults/PathCommand.java +++ b/src/main/java/baritone/command/defaults/PathCommand.java @@ -38,6 +38,10 @@ public PathCommand(IBaritone baritone) { public void execute(String label, IArgConsumer args) throws CommandException { ICustomGoalProcess customGoalProcess = baritone.getCustomGoalProcess(); args.requireMax(0); + if (customGoalProcess.getGoal() == null) { + logDirect("No goal set"); + return; + } BaritoneAPI.getProvider().getWorldScanner().repack(ctx); customGoalProcess.path(); logDirect("Now pathing"); diff --git a/tweaker/build.gradle b/tweaker/build.gradle index 3e4758c87..9fb7d0816 100644 --- a/tweaker/build.gradle +++ b/tweaker/build.gradle @@ -20,7 +20,7 @@ import baritone.gradle.task.ProguardTask //import baritone.gradle.task.TweakerJsonAssembler plugins { - id "com.github.johnrengelman.shadow" version "8.0.0" + id "com.github.johnrengelman.shadow" version "8.1.1" } unimined.minecraft {