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

safe landing improvements

This commit is contained in:
Babbaj 2023-07-23 14:26:31 -04:00
parent f7f0521093
commit 75e8035551
No known key found for this signature in database
GPG Key ID: F044309848A07CAC
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/baritone/process/ElytraProcess.java
View File

@ -383,36 +383,57 @@ public class ElytraProcess extends BaritoneProcessHelper implements IBaritonePro
return pos.getY() >= 0 && pos.getY() < 128; return pos.getY() >= 0 && pos.getY() < 128;
} }
private boolean isAtEdge(BlockPos pos) { private boolean isSafeBlock(Block block) {
return ctx.world().isAirBlock(pos.north()) return block == Blocks.NETHERRACK || block == Blocks.GRAVEL || block == Blocks.NETHER_BRICK;
|| ctx.world().isAirBlock(pos.south()) }
|| ctx.world().isAirBlock(pos.east()) private boolean isSafeBlock(BlockPos pos) {
|| ctx.world().isAirBlock(pos.west()) return isSafeBlock(ctx.world().getBlockState(pos).getBlock());
// corners
|| ctx.world().isAirBlock(pos.north().west())
|| ctx.world().isAirBlock(pos.north().east())
|| ctx.world().isAirBlock(pos.south().west())
|| ctx.world().isAirBlock(pos.south().east());
} }
private boolean isSafeLandingSpot(BlockPos pos, LongOpenHashSet checkedSpots) { private boolean isAtEdge(BlockPos pos) {
return !isSafeBlock(pos.north())
|| !isSafeBlock(pos.south())
|| !isSafeBlock(pos.east())
|| !isSafeBlock(pos.west())
// corners
|| !isSafeBlock(pos.north().west())
|| !isSafeBlock(pos.north().east())
|| !isSafeBlock(pos.south().west())
|| !isSafeBlock(pos.south().east());
}
private boolean isColumnAir(BlockPos landingSpot, int minHeight) {
BlockPos.MutableBlockPos mut = new BlockPos.MutableBlockPos(landingSpot);
final int maxY = mut.getY() + minHeight;
for (int y = mut.getY() + 1; y <= maxY; y++) {
mut.setPos(mut.getX(), y, mut.getZ());
if (!ctx.world().isAirBlock(mut)) {
return false;
}
}
return true;
}
private BetterBlockPos checkLandingSpot(BlockPos pos, LongOpenHashSet checkedSpots) {
BlockPos.MutableBlockPos mut = new BlockPos.MutableBlockPos(pos); BlockPos.MutableBlockPos mut = new BlockPos.MutableBlockPos(pos);
while (mut.getY() >= 0) { while (mut.getY() >= 0) {
if (checkedSpots.contains(mut.toLong())) { if (checkedSpots.contains(mut.toLong())) {
return false; return null;
} }
checkedSpots.add(mut.toLong()); checkedSpots.add(mut.toLong());
IBlockState state = ctx.world().getBlockState(mut); Block block = ctx.world().getBlockState(mut).getBlock();
Block block = state.getBlock();
if (block == Blocks.NETHERRACK || block == Blocks.GRAVEL || block == Blocks.NETHER_BRICK) { if (isSafeBlock(block)) {
return !isAtEdge(mut); if (!isAtEdge(mut)) {
return new BetterBlockPos(mut);
}
return null;
} else if (block != Blocks.AIR) { } else if (block != Blocks.AIR) {
return false; return null;
} }
mut.setPos(mut.getX(), mut.getY() - 1, mut.getZ()); mut.setPos(mut.getX(), mut.getY() - 1, mut.getZ());
} }
return false; // void return null; // void
} }
private BetterBlockPos findSafeLandingSpot() { private BetterBlockPos findSafeLandingSpot() {
@ -425,8 +446,9 @@ public class ElytraProcess extends BaritoneProcessHelper implements IBaritonePro
while (!queue.isEmpty()) { while (!queue.isEmpty()) {
BetterBlockPos pos = queue.poll(); BetterBlockPos pos = queue.poll();
if (ctx.world().isBlockLoaded(pos) && isInBounds(pos) && ctx.world().getBlockState(pos).getBlock() == Blocks.AIR) { if (ctx.world().isBlockLoaded(pos) && isInBounds(pos) && ctx.world().getBlockState(pos).getBlock() == Blocks.AIR) {
if (isSafeLandingSpot(pos, checkedPositions)) { BetterBlockPos actualLandingSpot = checkLandingSpot(pos, checkedPositions);
return pos; if (actualLandingSpot != null && isColumnAir(actualLandingSpot, 15)) {
return actualLandingSpot.up(15);
} }
if (visited.add(pos.north())) queue.add(pos.north()); if (visited.add(pos.north())) queue.add(pos.north());
if (visited.add(pos.east())) queue.add(pos.east()); if (visited.add(pos.east())) queue.add(pos.east());