RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

pushing around corners

This commit is contained in:
Leijurv 2018-08-11 21:27:46 -07:00
parent cf3d3cb48d
commit f8d1675973
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/baritone/bot/pathing/movement/Movement.java
View File

@ -107,7 +107,7 @@ public abstract class Movement implements Helper, MovementHelper {
return currentState.getStatus();
}
private boolean prepared(MovementState state) {
protected boolean prepared(MovementState state) {
if (state.getStatus() == MovementStatus.WAITING)
return true;

37
src/main/java/baritone/bot/pathing/movement/movements/MovementDiagonal.java
View File

@ -27,6 +27,8 @@ import net.minecraft.util.math.BlockPos;
public class MovementDiagonal extends Movement {
private static final double SQRT_2 = Math.sqrt(2);
public MovementDiagonal(BlockPos start, EnumFacing dir1, EnumFacing dir2) {
this(start, start.offset(dir1), start.offset(dir2), dir2);
// super(start, start.offset(dir1).offset(dir2), new BlockPos[]{start.offset(dir1), start.offset(dir1).up(), start.offset(dir2), start.offset(dir2).up(), start.offset(dir1).offset(dir2), start.offset(dir1).offset(dir2).up()}, new BlockPos[]{start.offset(dir1).offset(dir2).down()});
@ -67,12 +69,43 @@ public class MovementDiagonal extends Movement {
@Override
protected double calculateCost(CalculationContext context) {
if (getTotalHardnessOfBlocksToBreak(context.getToolSet()) != 0) {
double lastPos = MovementHelper.getMiningDurationTicks(context.getToolSet(), positionsToBreak[4]) + MovementHelper.getMiningDurationTicks(context.getToolSet(), positionsToBreak[5]);
if (lastPos != 0) {
return COST_INF;
}
if (!MovementHelper.canWalkOn(positionsToPlace[0])) {
return COST_INF;
}
return Math.sqrt(2) * (BlockStateInterface.isWater(src) || BlockStateInterface.isWater(dest) ? WALK_ONE_IN_WATER_COST : WALK_ONE_BLOCK_COST);
double optionA = MovementHelper.getMiningDurationTicks(context.getToolSet(), positionsToBreak[0]) + MovementHelper.getMiningDurationTicks(context.getToolSet(), positionsToBreak[1]);
double optionB = MovementHelper.getMiningDurationTicks(context.getToolSet(), positionsToBreak[2]) + MovementHelper.getMiningDurationTicks(context.getToolSet(), positionsToBreak[3]);
if (optionA != 0 && optionB != 0) {
return COST_INF;
}
if (optionA == 0) {
if (MovementHelper.avoidWalkingInto(BlockStateInterface.getBlock(positionsToBreak[2]))) {
return COST_INF;
}
if (MovementHelper.avoidWalkingInto(BlockStateInterface.getBlock(positionsToBreak[3]))) {
return COST_INF;
}
}
if (optionB == 0) {
if (MovementHelper.avoidWalkingInto(BlockStateInterface.getBlock(positionsToBreak[0]))) {
return COST_INF;
}
if (MovementHelper.avoidWalkingInto(BlockStateInterface.getBlock(positionsToBreak[1]))) {
return COST_INF;
}
}
double multiplier = 1;
if (optionA != 0 || optionB != 0) {
multiplier = 1.5;
}
return multiplier * SQRT_2 * (BlockStateInterface.isWater(src) || BlockStateInterface.isWater(dest) ? WALK_ONE_IN_WATER_COST : WALK_ONE_BLOCK_COST);
}
@Override
protected boolean prepared(MovementState state) {
return true;
}
}