From 547db3a6b4dbd624a7f9baf24f26e16624712db3 Mon Sep 17 00:00:00 2001 From: Sam Corbett Date: Sat, 5 Sep 2020 17:07:06 +0100 Subject: [PATCH] make the ability to turn it off. Signed-off-by: Sam Corbett --- src/api/java/baritone/api/Settings.java | 2 +- src/main/java/baritone/process/MineProcess.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java index 3001ab574..55b5ca888 100644 --- a/src/api/java/baritone/api/Settings.java +++ b/src/api/java/baritone/api/Settings.java @@ -734,7 +734,7 @@ public final class Settings { /** * When allowOnlyExposedOres is enabled this is the distance around to search. *

- * I recommend keeping this value low as the amount of blocks that need to be scanned increases exponentially. + * It is recommended to keep this value low, as it exponentially increases calculation times and also to keep the */ public final Setting allowOnlyExposedOresDistance = new Setting<>(1); diff --git a/src/main/java/baritone/process/MineProcess.java b/src/main/java/baritone/process/MineProcess.java index 2bf44f06e..c733658b2 100644 --- a/src/main/java/baritone/process/MineProcess.java +++ b/src/main/java/baritone/process/MineProcess.java @@ -40,7 +40,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; +import net.minecraft.util.math.Vec3d; import java.util.*; import java.util.stream.Collectors; @@ -410,7 +410,12 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro // remove any that are implausible to mine (encased in bedrock, or touching lava) .filter(pos -> MineProcess.plausibleToBreak(ctx, pos)) - .filter(pos -> isNextToAir(ctx, pos)) + .filter(pos -> { + if (Baritone.settings().allowOnlyExposedOres.value) + return isNextToAir(ctx, pos); + else + return true; + }) .filter(pos -> !blacklist.contains(pos)) @@ -494,7 +499,7 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro final double zn = nextZn; nextZn = (z + 1) * invRadiusZ; - double distanceSq = lengthSq(xn, yn, zn); + double distanceSq = new Vec3d(xn, yn, zn).lengthSquared(); if (distanceSq > 1) { if (z == 0) { if (y == 0) { @@ -536,10 +541,6 @@ public final class MineProcess extends BaritoneProcessHelper implements IMinePro 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 ||