From fef7ba47010072af6bae29a204b60b00eca08296 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Sat, 17 Jun 2023 20:03:30 -0700 Subject: [PATCH] tweaks --- build.gradle | 4 ++-- src/main/java/baritone/behavior/ElytraBehavior.java | 12 ++++++------ .../behavior/elytra/NetherPathfinderContext.java | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index a389ae08f..6d0ba4f1a 100755 --- a/build.gradle +++ b/build.gradle @@ -175,9 +175,9 @@ dependencies { transitive = false } launchAnnotationProcessor 'org.spongepowered:mixin:0.8.4-SNAPSHOT:processor' - launchImplementation('dev.babbaj:nether-pathfinder:0.8') + launchImplementation('dev.babbaj:nether-pathfinder:0.12') testImplementation 'junit:junit:4.12' - implementation 'dev.babbaj:nether-pathfinder:0.8' + implementation 'dev.babbaj:nether-pathfinder:0.12' } mixin { diff --git a/src/main/java/baritone/behavior/ElytraBehavior.java b/src/main/java/baritone/behavior/ElytraBehavior.java index 94033d60a..e745ad53c 100644 --- a/src/main/java/baritone/behavior/ElytraBehavior.java +++ b/src/main/java/baritone/behavior/ElytraBehavior.java @@ -160,9 +160,9 @@ public final class ElytraBehavior extends Behavior implements Helper { private Vec3d pathAt(int i) { return new Vec3d( - this.path.get(i).x + 0.5, - this.path.get(i).y + 0.5, - this.path.get(i).z + 0.5 + this.path.get(i).x, + this.path.get(i).y, + this.path.get(i).z ); } @@ -326,7 +326,7 @@ public final class ElytraBehavior extends Behavior implements Helper { final int playerNear = this.pathManager.getNear(); this.visiblePath = path.subList( Math.max(playerNear - 30, 0), - Math.min(playerNear + 30, path.size()) + Math.min(playerNear + 100, path.size()) ); if (!ctx.player().isElytraFlying()) { @@ -429,7 +429,7 @@ public final class ElytraBehavior extends Behavior implements Helper { } final AxisAlignedBB bb = ctx.player().getEntityBoundingBox().grow(growAmount); - final Vec3d[] corners = new Vec3d[] { + final Vec3d[] corners = new Vec3d[]{ new Vec3d(bb.minX, bb.minY, bb.minZ), new Vec3d(bb.minX, bb.minY, bb.maxZ), new Vec3d(bb.minX, bb.maxY, bb.minZ), @@ -479,7 +479,7 @@ public final class ElytraBehavior extends Behavior implements Helper { totalMotion = totalMotion.add(stepped); Vec3d actualPosition = ctx.playerFeetAsVec().add(totalMotion); for (int x = MathHelper.floor(Math.min(actualPosition.x, actualPositionPrevTick.x) - 0.31); x <= Math.max(actualPosition.x, actualPositionPrevTick.x) + 0.31; x++) { - for (int y = MathHelper.floor(Math.min(actualPosition.y, actualPositionPrevTick.y) - 0.2); y <= Math.max(actualPosition.y, actualPositionPrevTick.y) + 0.8; y++) { + for (int y = MathHelper.floor(Math.min(actualPosition.y, actualPositionPrevTick.y) - 0.2); y <= Math.max(actualPosition.y, actualPositionPrevTick.y) + 1; y++) { for (int z = MathHelper.floor(Math.min(actualPosition.z, actualPositionPrevTick.z) - 0.31); z <= Math.max(actualPosition.z, actualPositionPrevTick.z) + 0.31; z++) { if (!passable(bsi.get0(x, y, z))) { continue outer; diff --git a/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java b/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java index 0fb1983f9..1c512b9c2 100644 --- a/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java +++ b/src/main/java/baritone/behavior/elytra/NetherPathfinderContext.java @@ -56,7 +56,8 @@ public final class NetherPathfinderContext { NetherPathfinder.pathFind( this.context, src.getX(), src.getY(), src.getZ(), - dst.getX(), dst.getY(), dst.getZ() + dst.getX(), dst.getY(), dst.getZ(), + true ), this.executor); }