From e51c729acbd59ac49a58596ef956407b0a7e225c Mon Sep 17 00:00:00 2001 From: Leijurv Date: Thu, 6 Sep 2018 21:31:10 -0700 Subject: [PATCH 1/4] update in progress --- FEATURES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FEATURES.md b/FEATURES.md index 998b546a..397755eb 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -37,11 +37,11 @@ And finally `GoalComposite`. `GoalComposite` is a list of other goals, any one o Things it doesn't have yet - Trapdoors - Sprint jumping in a 1x2 corridor +- Parkour (jumping over gaps of any length) [IN PROGRESS] See issues for more. Things it may not ever have, from most likely to least likely =( -- Parkour (jumping over gaps of any length) - Boats - Pigs - Horses (2x3 path instead of 1x2) From 0d515b336f1637b5dc633c89c2f466130581b416 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 7 Sep 2018 10:50:49 -0700 Subject: [PATCH 2/4] can get to block at eye level adjacent too --- src/main/java/baritone/pathing/goals/GoalGetToBlock.java | 3 +++ src/test/java/baritone/pathing/goals/GoalGetToBlockTest.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/baritone/pathing/goals/GoalGetToBlock.java b/src/main/java/baritone/pathing/goals/GoalGetToBlock.java index ed927a12..bc32c5ca 100644 --- a/src/main/java/baritone/pathing/goals/GoalGetToBlock.java +++ b/src/main/java/baritone/pathing/goals/GoalGetToBlock.java @@ -50,6 +50,9 @@ public class GoalGetToBlock implements Goal { if (yDiff == -2 && xDiff == 0 && zDiff == 0) { return true; } + if (yDiff == -1) { + yDiff = 0; + } return Math.abs(xDiff) + Math.abs(yDiff) + Math.abs(zDiff) <= 1; } diff --git a/src/test/java/baritone/pathing/goals/GoalGetToBlockTest.java b/src/test/java/baritone/pathing/goals/GoalGetToBlockTest.java index 3c3905aa..a908a8dd 100644 --- a/src/test/java/baritone/pathing/goals/GoalGetToBlockTest.java +++ b/src/test/java/baritone/pathing/goals/GoalGetToBlockTest.java @@ -30,7 +30,7 @@ public class GoalGetToBlockTest { @Test public void isInGoal() { - List acceptableOffsets = new ArrayList<>(Arrays.asList("0,0,0", "0,0,1", "0,0,-1", "1,0,0", "-1,0,0", "0,1,0", "0,-1,0", "0,-2,0")); + List acceptableOffsets = new ArrayList<>(Arrays.asList("0,0,0", "0,0,1", "0,0,-1", "1,0,0", "-1,0,0", "0,-1,1", "0,-1,-1", "1,-1,0", "-1,-1,0", "0,1,0", "0,-1,0", "0,-2,0")); for (int x = -10; x <= 10; x++) { for (int y = -10; y <= 10; y++) { for (int z = -10; z <= 10; z++) { From 439ff92727699e4c04f6f509141c579089a11098 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 7 Sep 2018 13:33:51 -0700 Subject: [PATCH 3/4] crucial performance optimization --- src/main/java/baritone/pathing/goals/GoalGetToBlock.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/baritone/pathing/goals/GoalGetToBlock.java b/src/main/java/baritone/pathing/goals/GoalGetToBlock.java index bc32c5ca..30937772 100644 --- a/src/main/java/baritone/pathing/goals/GoalGetToBlock.java +++ b/src/main/java/baritone/pathing/goals/GoalGetToBlock.java @@ -47,11 +47,8 @@ public class GoalGetToBlock implements Goal { int xDiff = pos.getX() - this.x; int yDiff = pos.getY() - this.y; int zDiff = pos.getZ() - this.z; - if (yDiff == -2 && xDiff == 0 && zDiff == 0) { - return true; - } - if (yDiff == -1) { - yDiff = 0; + if (yDiff < 0) { + yDiff++; } return Math.abs(xDiff) + Math.abs(yDiff) + Math.abs(zDiff) <= 1; } From dcad5fb79e5f7ee24546a95c13169c63c909c65a Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 7 Sep 2018 13:34:34 -0700 Subject: [PATCH 4/4] shouldn't be on master yet --- .../baritone/pathing/movement/movements/MovementParkour.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/main/java/baritone/pathing/movement/movements/MovementParkour.java diff --git a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java b/src/main/java/baritone/pathing/movement/movements/MovementParkour.java deleted file mode 100644 index 56d7cbce..00000000 --- a/src/main/java/baritone/pathing/movement/movements/MovementParkour.java +++ /dev/null @@ -1,4 +0,0 @@ -package baritone.pathing.movement.movements; - -public class MovementParkour { -}