RepoMirrors/baritone
1
0
Fork 1
mirror of https://github.com/cabaletta/baritone synced 2024-12-18 13:15:13 +00:00
Code Issues Releases Wiki Activity

sprint through ascends whenever possible, fixes #149

Browse Source
This commit is contained in:
Leijurv 2019-02-13 16:55:08 -08:00
parent e8d3bf509c
commit a84b3bfc7a
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 46 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/baritone/pathing/movement/movements/MovementAscend.java
View File

@ -200,7 +200,7 @@ public class MovementAscend extends Movement {
return state.setInput(Input.JUMP, true);
}
private boolean headBonkClear() {
public boolean headBonkClear() {
BetterBlockPos startUp = src.up(2);
for (int i = 0; i < 4; i++) {
BetterBlockPos check = startUp.offset(EnumFacing.byHorizontalIndex(i));

47
src/main/java/baritone/pathing/path/PathExecutor.java
View File

@ -380,14 +380,26 @@ public class PathExecutor implements IPathExecutor, Helper {
if (!new CalculationContext(behavior.baritone).canSprint) {
return false;
}
IMovement current = path.movements().get(pathPosition);
// traverse requests sprinting, so we need to do this check first
if (current instanceof MovementTraverse && pathPosition < path.length() - 2) {
IMovement next = path.movements().get(pathPosition + 1);
if (next instanceof MovementAscend && sprintableAscend(ctx, (MovementTraverse) current, (MovementAscend) next)) {
logDebug("Skipping traverse to straight ascend");
pathPosition++;
onChangeInPathPosition();
onTick();
return true;
}
}
// if the movement requested sprinting, then we're done
if (requested) {
return true;
}
// however, descend doesn't request sprinting, beceause it doesn't know the context of what movement comes after it
IMovement current = path.movements().get(pathPosition);
// however, descend and ascend don't request sprinting, because they don't know the context of what movement comes after it
if (current instanceof MovementDescend) {
if (((MovementDescend) current).safeMode() && !((MovementDescend) current).skipToAscend()) {
@ -401,6 +413,7 @@ public class PathExecutor implements IPathExecutor, Helper {
// a descend then an ascend in the same direction
pathPosition++;
onChangeInPathPosition();
onTick();
// okay to skip clearKeys and / or onChangeInPathPosition here since this isn't possible to repeat, since it's asymmetric
logDebug("Skipping descend to straight ascend");
return true;
@ -425,10 +438,40 @@ public class PathExecutor implements IPathExecutor, Helper {
return true;
}
}
if (prev instanceof MovementTraverse && sprintableAscend(ctx, (MovementTraverse) prev, (MovementAscend) current)) {
return true;
}
}
return false;
}
private static boolean sprintableAscend(IPlayerContext ctx, MovementTraverse current, MovementAscend next) {
if (!current.getDirection().equals(next.getDirection().down())) {
return false;
}
if (!MovementHelper.canWalkOn(ctx, current.getDest().down())) {
return false;
}
if (!next.headBonkClear()) {
return false;
}
for (int x = 0; x < 2; x++) {
for (int y = 0; y < 3; y++) {
BlockPos chk = current.getSrc().up(y);
if (x == 1) {
chk = chk.add(current.getDirection());
}
if (!MovementHelper.fullyPassable(ctx.world().getBlockState(chk))) {
return false;
}
}
}
if (MovementHelper.avoidWalkingInto(ctx.world().getBlockState(current.getSrc().up(3)).getBlock())) {
return false;
}
return true;
}
private static boolean canSprintFromDescendInto(IPlayerContext ctx, IMovement current, IMovement next) {
if (next instanceof MovementDescend && next.getDirection().equals(current.getDirection())) {
return true;