diff --git a/src/main/java/baritone/builder/Blip.java b/src/main/java/baritone/builder/Blip.java index 691a0b4bf..fb8b2829f 100644 --- a/src/main/java/baritone/builder/Blip.java +++ b/src/main/java/baritone/builder/Blip.java @@ -30,8 +30,7 @@ import baritone.api.utils.IPlayerContext; */ public class Blip { - public static final int PER_BLOCK = 16; - public static final int FULL_BLOCK = PER_BLOCK; + public static final int FULL_BLOCK = 16; public static final double RATIO = 0.0625; public static final int HALF_BLOCK = 8; public static final int PLAYER_HEIGHT_SLIGHT_UNDERESTIMATE = 28; @@ -50,7 +49,7 @@ public class Blip { if (PLAYER_HEIGHT_SLIGHT_OVERESTIMATE * RATIO <= realPlayerHeight || PLAYER_HEIGHT_SLIGHT_UNDERESTIMATE * RATIO >= realPlayerHeight || PLAYER_HEIGHT_SLIGHT_OVERESTIMATE != PLAYER_HEIGHT_SLIGHT_UNDERESTIMATE + 1) { throw new IllegalStateException(); } - if (PER_BLOCK * RATIO != 1) { + if (FULL_BLOCK * RATIO != 1) { throw new IllegalStateException(); } } diff --git a/src/main/java/baritone/builder/Column.java b/src/main/java/baritone/builder/Column.java index e865d652b..0a21ddeaf 100644 --- a/src/main/java/baritone/builder/Column.java +++ b/src/main/java/baritone/builder/Column.java @@ -108,7 +108,7 @@ public class Column { } } - private static final Integer[] BLIPS = IntStream.range(-1, Blip.PER_BLOCK).boxed().toArray(Integer[]::new); + private static final Integer[] BLIPS = IntStream.range(-1, Blip.FULL_BLOCK).boxed().toArray(Integer[]::new); static { BLIPS[0] = null; diff --git a/src/test/java/baritone/builder/NavigableSurfaceBlipTest.java b/src/test/java/baritone/builder/NavigableSurfaceBlipTest.java index 2c1ecf21e..f960ac132 100644 --- a/src/test/java/baritone/builder/NavigableSurfaceBlipTest.java +++ b/src/test/java/baritone/builder/NavigableSurfaceBlipTest.java @@ -73,10 +73,10 @@ public class NavigableSurfaceBlipTest { } private static void fillColumnToHeight(CountingSurface surface, int x, int z, int yHeightBlips) { - for (int i = 0; i < yHeightBlips / Blip.PER_BLOCK; i++) { + for (int i = 0; i < yHeightBlips / Blip.FULL_BLOCK; i++) { surface.setBlock(x, i, z, FakeStates.SOLID); } - surface.setBlock(x, yHeightBlips / Blip.PER_BLOCK, z, FakeStates.BY_HEIGHT[yHeightBlips % Blip.PER_BLOCK]); + surface.setBlock(x, yHeightBlips / Blip.FULL_BLOCK, z, FakeStates.BY_HEIGHT[yHeightBlips % Blip.FULL_BLOCK]); } @Test @@ -90,7 +90,7 @@ public class NavigableSurfaceBlipTest { int y = startY; while (true) { fillColumnToHeight(surface, x, 0, y); - if (!surface.connected(new BetterBlockPos(0, 1, 1), new BetterBlockPos(x, y / Blip.PER_BLOCK, 0))) { + if (!surface.connected(new BetterBlockPos(0, 1, 1), new BetterBlockPos(x, y / Blip.FULL_BLOCK, 0))) { fillColumnToHeight(surface, x, 0, y - step); y -= step; break; @@ -112,7 +112,7 @@ public class NavigableSurfaceBlipTest { int y = startY; while (true) { fillColumnToHeight(surface, x, 0, y); - if (!surface.connected(new BetterBlockPos(0, 1, 1), new BetterBlockPos(x, y / Blip.PER_BLOCK, 0))) { + if (!surface.connected(new BetterBlockPos(0, 1, 1), new BetterBlockPos(x, y / Blip.FULL_BLOCK, 0))) { fillColumnToHeight(surface, x, 0, y - 1); y--; break; diff --git a/src/test/java/baritone/builder/PlayerPhysicsTest.java b/src/test/java/baritone/builder/PlayerPhysicsTest.java index 28ea7a67e..c0c9540a2 100644 --- a/src/test/java/baritone/builder/PlayerPhysicsTest.java +++ b/src/test/java/baritone/builder/PlayerPhysicsTest.java @@ -118,7 +118,7 @@ public class PlayerPhysicsTest { continue; } - for (int endHeight = startHeight - 3 * Blip.PER_BLOCK; endHeight <= startHeight + 3 * Blip.PER_BLOCK; endHeight++) { + for (int endHeight = startHeight - 3 * Blip.FULL_BLOCK; endHeight <= startHeight + 3 * Blip.FULL_BLOCK; endHeight++) { for (int endCeil = 5; endCeil <= 7; endCeil++) { BlockStateCachedData[] toCol = makeColToHeight(endHeight); if (endCeil < toCol.length) { @@ -133,7 +133,7 @@ public class PlayerPhysicsTest { int minCeilRelative = Math.min(startCeil, endCeil) - 3; int maxBlip = Math.max(startHeight, endHeight); - if (maxBlip + Blip.PLAYER_HEIGHT_SLIGHT_OVERESTIMATE > minCeilRelative * Blip.PER_BLOCK) { + if (maxBlip + Blip.PLAYER_HEIGHT_SLIGHT_OVERESTIMATE > minCeilRelative * Blip.FULL_BLOCK) { assertEquals(PlayerPhysics.Collision.BLOCKED, col); continue; }