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

need to remove diagonals, however this does most of what you suggest. 

Signed-off-by: scorbett123 <sam@corbettchocolates.com>
This commit is contained in:
scorbett123 2020-09-04 18:42:06 +01:00 committed by Sam Corbett
parent bcbfca100f
commit 063f698bd2
2 changed files with 95 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/java/baritone/api/Settings.java
View File

@ -731,6 +731,13 @@ public final class Settings {
*/
public final Setting<Boolean> allowOnlyExposedOres = new Setting<>(false);
/**
* When allowOnlyExposedOres is enabled this is the distance around to search.
* <p>
* I recommend keeping this value low as the amount of blocks that need to be scanned increases exponentially.
*/
public final Setting<Integer> allowOnlyExposedOresDistance = new Setting<>(1);
/**
* When GetToBlock doesn't know any locations for the desired block, explore randomly instead of giving up.
*/

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

@ -424,15 +424,8 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro
}
public static boolean isNextToAir(CalculationContext ctx, BlockPos pos) {
if (!Baritone.settings().allowOnlyExposedOres.value) {
return true;
}
return (ctx.bsi.get0(pos.down()).getBlock() == Blocks.AIR ||
ctx.bsi.get0(pos.up()).getBlock() == Blocks.AIR
|| ctx.bsi.get0(pos.north()).getBlock() == Blocks.AIR ||
ctx.bsi.get0(pos.south()).getBlock() == Blocks.AIR ||
ctx.bsi.get0(pos.east()).getBlock() == Blocks.AIR
|| ctx.bsi.get0(pos.west()).getBlock() == Blocks.AIR);
//need to remove diagonals
return makeSphere(pos, Baritone.settings().allowOnlyExposedOresDistance.value, ctx);
}
@ -468,4 +461,90 @@ 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 = lengthSq(xn, yn, zn);
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;
}
private static double lengthSq(double x, double y, double z) {
return (x * x) + (y * y) + (z * z);
}
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;
}
}