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

move is transparent to movement helper and circle maker

This commit is contained in:
Sam Corbett 2020-09-08 17:39:03 +01:00
parent 547db3a6b4
commit 071243b99a
2 changed files with 19 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/baritone/pathing/movement/MovementHelper.java
View File

@ -562,4 +562,11 @@ public interface MovementHelper extends ActionCosts, Helper {
enum PlaceResult {
READY_TO_PLACE, ATTEMPTING, NO_OPTION;
}
public static boolean isTransparent(Block b) {
return b== Blocks.AIR ||
b == Blocks.FLOWING_LAVA ||
b == Blocks.FLOWING_WATER ||
b == Blocks.WATER;
}
}

96
src/main/java/baritone/process/MineProcess.java
View File

@ -429,8 +429,18 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
}
public static boolean isNextToAir(CalculationContext ctx, BlockPos pos) {
//need to remove diagonals
return makeSphere(pos, Baritone.settings().allowOnlyExposedOresDistance.value, ctx);
int radius = Baritone.settings().allowOnlyExposedOresDistance.value;
for (int dx = -radius; dx <= radius; dx++) {
for (int dy = -radius; dy <= radius; dy++) {
for (int dz = -radius; dz <= radius; dz++) {
if (Math.abs(dx) + Math.abs(dy) + Math.abs(dz) <= radius
&& MovementHelper.isTransparent(ctx.getBlock(pos.getX()+dx, pos.getY()+dy, pos.getZ()+dz))) {
return true;
}
}
}
}
return false;
}
@ -466,86 +476,4 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
rescan(new ArrayList<>(), new CalculationContext(baritone));
}
}
public static boolean makeSphere(BlockPos pos, double radius, CalculationContext ctx) {
double radiusX = radius;
double radiusY = radius;
double radiusZ = radius;
radiusX += 0.5;
radiusY += 0.5;
radiusZ += 0.5;
final double invRadiusX = 1 / radiusX;
final double invRadiusY = 1 / radiusY;
final double invRadiusZ = 1 / radiusZ;
final int ceilRadiusX = (int) Math.ceil(radiusX);
final int ceilRadiusY = (int) Math.ceil(radiusY);
final int ceilRadiusZ = (int) Math.ceil(radiusZ);
double nextXn = 0;
forX:
for (int x = 0; x <= ceilRadiusX; ++x) {
final double xn = nextXn;
nextXn = (x + 1) * invRadiusX;
double nextYn = 0;
forY:
for (int y = 0; y <= ceilRadiusY; ++y) {
final double yn = nextYn;
nextYn = (y + 1) * invRadiusY;
double nextZn = 0;
forZ:
for (int z = 0; z <= ceilRadiusZ; ++z) {
final double zn = nextZn;
nextZn = (z + 1) * invRadiusZ;
double distanceSq = new Vec3d(xn, yn, zn).lengthSquared();
if (distanceSq > 1) {
if (z == 0) {
if (y == 0) {
break forX;
}
break forY;
}
break forZ;
}
if (isTransparent(pos.add(x, y, z), ctx)) {
return true;
}
if (isTransparent(pos.add(-x, y, z), ctx)) {
return true;
}
if (isTransparent(pos.add(x, -y, z), ctx)) {
return true;
}
if (isTransparent(pos.add(x, y, -z), ctx)) {
return true;
}
if (isTransparent(pos.add(-x, -y, z), ctx)) {
return true;
}
if (isTransparent(pos.add(x, -y, -z), ctx)) {
return true;
}
if (isTransparent(pos.add(-x, y, -z), ctx)) {
return true;
}
if (isTransparent(pos.add(-x, -y, -z), ctx)) {
return true;
}
}
}
}
return false;
}
public static boolean isTransparent(BlockPos pos, CalculationContext ctx) {
IBlockState blockState = ctx.bsi.get0(pos);
return blockState.getBlock() == Blocks.AIR ||
blockState.getBlock() == Blocks.FLOWING_LAVA ||
blockState.getBlock() == Blocks.FLOWING_WATER ||
blockState.getBlock() == Blocks.WATER;
}
}