From 071243b99a7ea3ff7c64b1171cdbaecf0081ec94 Mon Sep 17 00:00:00 2001
From: Sam Corbett <sam@corbettchocolates.com>
Date: Tue, 8 Sep 2020 17:39:03 +0100
Subject: [PATCH] move is transparent to movement helper and circle maker

---
 .../pathing/movement/MovementHelper.java      |  7 ++
 .../java/baritone/process/MineProcess.java    | 96 +++----------------
 2 files changed, 19 insertions(+), 84 deletions(-)

diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java
index 7165303c4..df8218e86 100644
--- a/src/main/java/baritone/pathing/movement/MovementHelper.java
+++ b/src/main/java/baritone/pathing/movement/MovementHelper.java
@@ -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;
+    }
 }
diff --git a/src/main/java/baritone/process/MineProcess.java b/src/main/java/baritone/process/MineProcess.java
index c733658b2..2d51daf9e 100644
--- a/src/main/java/baritone/process/MineProcess.java
+++ b/src/main/java/baritone/process/MineProcess.java
@@ -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;
-    }
 }