From 0eb0e6709a63aee91799cb4c254bb1ffa5e9558d Mon Sep 17 00:00:00 2001 From: Murat65536 Date: Sun, 17 Aug 2025 20:12:22 -0400 Subject: [PATCH] Condense more. --- .../baritone/pathing/movement/MovementHelper.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 6d6f780da..89f61659c 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -666,16 +666,8 @@ public interface MovementHelper extends ActionCosts, Helper { Rotation blockRotation = RotationUtils.calcRotationFromVec3d(ctx.playerHead(), VecUtils.getBlockPosCenter(dest), ctx.playerRotations()); - Arrays.stream(getOptions(ax, az)).min(Comparator.comparing(option -> option.distanceToSq( - Mth.sin(blockRotation.getYaw() * DEG_TO_RAD_F), - Mth.cos(blockRotation.getYaw() * DEG_TO_RAD_F) - ))).ifPresent(selection -> selection.setInputs(state)); - } - - private static MovementOption[] getOptions(float ax, float az) { boolean canSprint = Baritone.settings().allowSprint.value; - - return new MovementOption[]{ + Arrays.stream(new MovementOption[]{ new MovementOption(Input.MOVE_FORWARD, canSprint ? ax * 1.3f : ax, canSprint ? az * 1.3f : az), new MovementOption(Input.MOVE_BACK, -ax, -az), new MovementOption(Input.MOVE_LEFT, -az, ax), @@ -684,7 +676,10 @@ public interface MovementHelper extends ActionCosts, Helper { new MovementOption(Input.MOVE_FORWARD, Input.MOVE_RIGHT, (canSprint ? ax * 1.3f : ax) + az, (canSprint ? az * 1.3f : az) - ax), new MovementOption(Input.MOVE_BACK, Input.MOVE_LEFT, -ax - az, -az + ax), new MovementOption(Input.MOVE_BACK, Input.MOVE_RIGHT, -ax + az, -az - ax), - }; + }).min(Comparator.comparing(option -> option.distanceToSq( + Mth.sin(blockRotation.getYaw() * DEG_TO_RAD_F), + Mth.cos(blockRotation.getYaw() * DEG_TO_RAD_F) + ))).ifPresent(selection -> selection.setInputs(state)); } /**