diff --git a/src/main/java/anticope/rejects/modules/TillAura.java b/src/main/java/anticope/rejects/modules/TillAura.java index 70a3218..8e9bc78 100644 --- a/src/main/java/anticope/rejects/modules/TillAura.java +++ b/src/main/java/anticope/rejects/modules/TillAura.java @@ -1,6 +1,7 @@ package anticope.rejects.modules; import anticope.rejects.MeteorRejectsAddon; +import anticope.rejects.utils.WorldUtils; import meteordevelopment.meteorclient.events.world.TickEvent; import meteordevelopment.meteorclient.mixin.MinecraftClientAccessor; import meteordevelopment.meteorclient.settings.BoolSetting; @@ -75,8 +76,7 @@ public class TillAura extends Module { return; // get valid blocks - ArrayList validBlocks = - getValidBlocks(range.get(), this::isCorrectBlock); + ArrayList validBlocks = getValidBlocks(range.get(), this::isCorrectBlock); if (multiTill.get()) { boolean shouldSwing = false; @@ -96,23 +96,7 @@ public class TillAura extends Module { break; } - public static ArrayList getAllInBox(BlockPos from, BlockPos to) { - ArrayList blocks = new ArrayList<>(); - - BlockPos min = new BlockPos(Math.min(from.getX(), to.getX()), - Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ())); - BlockPos max = new BlockPos(Math.max(from.getX(), to.getX()), - Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ())); - - for (int x = min.getX(); x <= max.getX(); x++) - for (int y = min.getY(); y <= max.getY(); y++) - for (int z = min.getZ(); z <= max.getZ(); z++) - blocks.add(new BlockPos(x, y, z)); - - return blocks; - } - - public Vec3d getEyesPos() { + private Vec3d getEyesPos() { ClientPlayerEntity player = mc.player; return new Vec3d(player.getX(), @@ -130,7 +114,7 @@ public class TillAura extends Module { BlockPos min = center.add(-rangeI, -rangeI, -rangeI); BlockPos max = center.add(rangeI, rangeI, rangeI); - return getAllInBox(min, max).stream() + return WorldUtils.getAllInBox(min, max).stream() .filter(pos -> eyesVec.squaredDistanceTo(Vec3d.of(pos)) <= rangeSq) .filter(validator) .sorted(Comparator.comparingDouble( diff --git a/src/main/java/anticope/rejects/utils/WorldUtils.java b/src/main/java/anticope/rejects/utils/WorldUtils.java index f67840f..44d916c 100644 --- a/src/main/java/anticope/rejects/utils/WorldUtils.java +++ b/src/main/java/anticope/rejects/utils/WorldUtils.java @@ -24,6 +24,23 @@ public class WorldUtils { return blocks; } + public static List getAllInBox(BlockPos from, BlockPos to) { + blocks.clear(); + + BlockPos min = new BlockPos(Math.min(from.getX(), to.getX()), + Math.min(from.getY(), to.getY()), Math.min(from.getZ(), to.getZ())); + BlockPos max = new BlockPos(Math.max(from.getX(), to.getX()), + Math.max(from.getY(), to.getY()), Math.max(from.getZ(), to.getZ())); + + for (int x = min.getX(); x <= max.getX(); x++) + for (int y = min.getY(); y <= max.getY(); y++) + for (int z = min.getZ(); z <= max.getZ(); z++) + blocks.add(new BlockPos(x, y, z)); + + return blocks; + } + + public static double distanceBetween(BlockPos pos1, BlockPos pos2) { double d = pos1.getX() - pos2.getX(); double e = pos1.getY() - pos2.getY();