From 60d6791f0c9aa695d5afcd75a4b9ae767b5fe2c1 Mon Sep 17 00:00:00 2001 From: Babbaj Date: Wed, 16 Aug 2023 00:27:23 -0400 Subject: [PATCH 1/7] proguard: get java from gradle runtime before JAVA_HOME --- .../src/main/java/baritone/gradle/task/ProguardTask.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java index 435eabcf3..810d5ef27 100644 --- a/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java +++ b/buildSrc/src/main/java/baritone/gradle/task/ProguardTask.java @@ -114,6 +114,9 @@ public class ProguardTask extends BaritoneGradleTask { ex.printStackTrace(); } + path = findJavaByGradleCurrentRuntime(); + if (path != null) return path; + try { path = findJavaByJavaHome(); if (path != null) return path; @@ -122,10 +125,6 @@ public class ProguardTask extends BaritoneGradleTask { ex.printStackTrace(); } - - path = findJavaByGradleCurrentRuntime(); - if (path != null) return path; - throw new Exception("Unable to find java to determine ProGuard libraryjars. Please specify forkOptions.executable in javaCompile," + " JAVA_HOME environment variable, or make sure to run Gradle with the correct JDK (a v1.8 only)"); } From 8a2a20a1b353170162499bb678c86b9231cc04cf Mon Sep 17 00:00:00 2001 From: leijurv Date: Thu, 17 Aug 2023 14:40:26 -0700 Subject: [PATCH 2/7] 1.16 and 1.18 deprecated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bc3552c5a..dc97c1fc6 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ Minecraft Minecraft Minecraft - Minecraft + Minecraft Minecraft - Minecraft + Minecraft Minecraft Minecraft Minecraft From d4b95110f52398971af17a380ebd0fa05f272365 Mon Sep 17 00:00:00 2001 From: leijurv Date: Thu, 17 Aug 2023 16:56:22 -0700 Subject: [PATCH 3/7] fml --- src/main/java/baritone/command/defaults/ElytraCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/baritone/command/defaults/ElytraCommand.java b/src/main/java/baritone/command/defaults/ElytraCommand.java index 5895c36ad..879a6eabf 100644 --- a/src/main/java/baritone/command/defaults/ElytraCommand.java +++ b/src/main/java/baritone/command/defaults/ElytraCommand.java @@ -177,7 +177,6 @@ public class ElytraCommand extends Command { } private boolean detectOn2b2t() { - if (true) return true; ServerData data = ctx.minecraft().getCurrentServerData(); return data != null && data.serverIP.toLowerCase().contains("2b2t.org"); } From d9cb2d91a06501c5bcba2181509d0df80361f413 Mon Sep 17 00:00:00 2001 From: leijurv Date: Thu, 17 Aug 2023 16:57:11 -0700 Subject: [PATCH 4/7] v1.2.19 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b91dcf43c..888a818ac 100755 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ */ group 'baritone' -version '1.2.18' +version '1.2.19' buildscript { repositories { From 75b8554a11759e8057ba2a936cf5d8e848259f8e Mon Sep 17 00:00:00 2001 From: leijurv Date: Thu, 17 Aug 2023 17:14:33 -0700 Subject: [PATCH 5/7] bump readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc97c1fc6..11a12e822 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Baritone is the pathfinding system used in [Impact](https://impactclient.net/) s | Forge | Fabric | |---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------| -| [1.12.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.2.18/baritone-api-forge-1.2.18.jar) | | +| [1.12.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.2.19/baritone-api-forge-1.2.19.jar) | | | [1.16.5 Forge](https://github.com/cabaletta/baritone/releases/download/v1.6.5/baritone-api-forge-1.6.5.jar) | [1.16.5 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.6.5/baritone-api-fabric-1.6.5.jar) | | [1.17.1 Forge](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-forge-1.7.3.jar) | [1.17.1 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.7.3/baritone-api-fabric-1.7.3.jar) | | [1.18.2 Forge](https://github.com/cabaletta/baritone/releases/download/v1.8.5/baritone-api-forge-1.8.5.jar) | [1.18.2 Fabric](https://github.com/cabaletta/baritone/releases/download/v1.8.5/baritone-api-fabric-1.8.5.jar) | From c2308c650a1dc2d712d8a1ea7b7530dd67836e64 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 18 Aug 2023 14:35:02 -0700 Subject: [PATCH 6/7] mapping --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 5b420a0e4..03a2f7d64 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ baritone_Client.launch libs/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar libs/java-objc-bridge-1.1.jar + +mapping From 4efa2b1272e9e4244eada40130080fd490ccf560 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 18 Aug 2023 15:02:13 -0700 Subject: [PATCH 7/7] fix backtracking bad behavior when render distance is tiny --- .../baritone/process/elytra/ElytraBehavior.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/baritone/process/elytra/ElytraBehavior.java b/src/main/java/baritone/process/elytra/ElytraBehavior.java index 709d22334..c6207b08f 100644 --- a/src/main/java/baritone/process/elytra/ElytraBehavior.java +++ b/src/main/java/baritone/process/elytra/ElytraBehavior.java @@ -330,12 +330,19 @@ public final class ElytraBehavior implements Helper { } if (!ElytraBehavior.this.clearView(this.path.getVec(i), this.path.getVec(i + 1), false)) { // obstacle. where do we return to pathing? - // find the next valid segment + // if the end of render distance is closer to goal, then that's fine, otherwise we'd be "digging our hole deeper" and making an already bad backtrack worse + int rejoinMainPathAt; + if (this.path.get(rangeEndExcl - 1).distanceSq(this.path.get(path.size() - 1)) < ctx.playerFeet().distanceSq(this.path.get(path.size() - 1))) { + rejoinMainPathAt = rangeEndExcl - 1; // rejoin after current render distance + } else { + rejoinMainPathAt = path.size() - 1; // large backtrack detected. ignore render distance, rejoin later on + } + final BetterBlockPos blockage = this.path.get(i); - final double distance = ctx.playerFeet().distanceTo(this.path.get(rangeEndExcl - 1)); + final double distance = ctx.playerFeet().distanceTo(this.path.get(rejoinMainPathAt)); final long start = System.nanoTime(); - this.pathRecalcSegment(rangeEndExcl - 1) + this.pathRecalcSegment(rejoinMainPathAt) .thenRun(() -> { logDirect(String.format("Recalculated segment around path blockage near %s %s %s (next %.1f blocks in %.4f seconds)", SettingsUtil.maybeCensor(blockage.x),