0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc cleanup

Browse Source
This commit is contained in:
Leijurv 2018-09-10 14:48:18 -07:00
parent fb07e47141
commit d8790e1dc6
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/baritone/pathing/calc/AStarPathFinder.java
View File

@ -210,36 +210,43 @@ public class AStarPathFinder extends AbstractNodeCostSearch implements Helper {
public static Movement[] getConnectedPositions(BetterBlockPos pos, CalculationContext calcContext) { public static Movement[] getConnectedPositions(BetterBlockPos pos, CalculationContext calcContext) {
int x = pos.getX(); int x = pos.x;
int y = pos.getY(); int y = pos.y;
int z = pos.getZ(); int z = pos.z;
BetterBlockPos east = new BetterBlockPos(x + 1, y, z); BetterBlockPos east = new BetterBlockPos(x + 1, y, z);
BetterBlockPos west = new BetterBlockPos(x - 1, y, z); BetterBlockPos west = new BetterBlockPos(x - 1, y, z);
BetterBlockPos south = new BetterBlockPos(x, y, z + 1); BetterBlockPos south = new BetterBlockPos(x, y, z + 1);
BetterBlockPos north = new BetterBlockPos(x, y, z - 1); BetterBlockPos north = new BetterBlockPos(x, y, z - 1);
return new Movement[]{ return new Movement[]{
new MovementDownward(pos, new BetterBlockPos(x, y - 1, z)),
new MovementPillar(pos, new BetterBlockPos(x, y + 1, z)),
new MovementTraverse(pos, east), new MovementTraverse(pos, east),
new MovementTraverse(pos, west), new MovementTraverse(pos, west),
new MovementTraverse(pos, north), new MovementTraverse(pos, north),
new MovementTraverse(pos, south), new MovementTraverse(pos, south),
new MovementAscend(pos, new BetterBlockPos(x + 1, y + 1, z)), new MovementAscend(pos, new BetterBlockPos(x + 1, y + 1, z)),
new MovementAscend(pos, new BetterBlockPos(x - 1, y + 1, z)), new MovementAscend(pos, new BetterBlockPos(x - 1, y + 1, z)),
new MovementAscend(pos, new BetterBlockPos(x, y + 1, z + 1)), new MovementAscend(pos, new BetterBlockPos(x, y + 1, z + 1)),
new MovementAscend(pos, new BetterBlockPos(x, y + 1, z - 1)), new MovementAscend(pos, new BetterBlockPos(x, y + 1, z - 1)),
MovementHelper.generateMovementFallOrDescend(pos, east, calcContext), MovementHelper.generateMovementFallOrDescend(pos, east, calcContext),
MovementHelper.generateMovementFallOrDescend(pos, west, calcContext), MovementHelper.generateMovementFallOrDescend(pos, west, calcContext),
MovementHelper.generateMovementFallOrDescend(pos, north, calcContext), MovementHelper.generateMovementFallOrDescend(pos, north, calcContext),
MovementHelper.generateMovementFallOrDescend(pos, south, calcContext), MovementHelper.generateMovementFallOrDescend(pos, south, calcContext),
new MovementDownward(pos, new BetterBlockPos(x, y - 1, z)),
new MovementDiagonal(pos, EnumFacing.NORTH, EnumFacing.WEST),
new MovementDiagonal(pos, EnumFacing.NORTH, EnumFacing.EAST), new MovementDiagonal(pos, EnumFacing.NORTH, EnumFacing.EAST),
new MovementDiagonal(pos, EnumFacing.SOUTH, EnumFacing.WEST), new MovementDiagonal(pos, EnumFacing.NORTH, EnumFacing.WEST),
new MovementDiagonal(pos, EnumFacing.SOUTH, EnumFacing.EAST), new MovementDiagonal(pos, EnumFacing.SOUTH, EnumFacing.EAST),
new MovementPillar(pos, new BetterBlockPos(x, y + 1, z)),
MovementParkour.calculate(pos, EnumFacing.NORTH), new MovementDiagonal(pos, EnumFacing.SOUTH, EnumFacing.WEST),
MovementParkour.calculate(pos, EnumFacing.SOUTH),
MovementParkour.calculate(pos, EnumFacing.EAST), MovementParkour.generate(pos, EnumFacing.EAST),
MovementParkour.calculate(pos, EnumFacing.WEST), MovementParkour.generate(pos, EnumFacing.WEST),
MovementParkour.generate(pos, EnumFacing.NORTH),
MovementParkour.generate(pos, EnumFacing.SOUTH),
}; };
} }

6
src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java
View File

@ -107,9 +107,9 @@ public abstract class AbstractNodeCostSearch implements IPathFinder {
* @return The distance, squared * @return The distance, squared
*/ */
protected double getDistFromStartSq(PathNode n) { protected double getDistFromStartSq(PathNode n) {
int xDiff = n.pos.getX() - start.getX(); int xDiff = n.pos.x - start.x;
int yDiff = n.pos.getY() - start.getY(); int yDiff = n.pos.y - start.y;
int zDiff = n.pos.getZ() - start.getZ(); int zDiff = n.pos.z - start.z;
return xDiff * xDiff + yDiff * yDiff + zDiff * zDiff; return xDiff * xDiff + yDiff * yDiff + zDiff * zDiff;
} }

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

@ -42,7 +42,7 @@ public class MovementParkour extends Movement {
super.override(costFromJumpDistance(dist)); super.override(costFromJumpDistance(dist));
} }
public static MovementParkour calculate(BetterBlockPos src, EnumFacing dir) { public static MovementParkour generate(BetterBlockPos src, EnumFacing dir) {
if (!Baritone.settings().allowParkour.get()) { if (!Baritone.settings().allowParkour.get()) {
return null; return null;
} }