From f4cb19c113e2e4d9a8a32d508286878b7b10b35c Mon Sep 17 00:00:00 2001 From: Cyramek Date: Wed, 11 Sep 2024 05:00:06 +0200 Subject: [PATCH] fix searching for main supporting block --- .../grim/grimac/utils/nmsutil/Collisions.java | 82 ++++++++++++++++++- .../nmsutil/MainSupportingBlockPosFinder.java | 12 +-- 2 files changed, 83 insertions(+), 11 deletions(-) diff --git a/src/main/java/ac/grim/grimac/utils/nmsutil/Collisions.java b/src/main/java/ac/grim/grimac/utils/nmsutil/Collisions.java index 622fc7b442..aa1c69ffa0 100644 --- a/src/main/java/ac/grim/grimac/utils/nmsutil/Collisions.java +++ b/src/main/java/ac/grim/grimac/utils/nmsutil/Collisions.java @@ -31,6 +31,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.function.Consumer; import java.util.function.Predicate; public class Collisions { @@ -699,7 +700,7 @@ public static boolean hasMaterial(GrimPlayer player, SimpleCollisionBox checkBox int x = currX | chunkXGlobalPos; int z = currZ | chunkZGlobalPos; - WrappedBlockState data = section.get(CompensatedWorld.blockVersion, x & 0xF, y & 0xF, z & 0xF); + WrappedBlockState data = section.get(CompensatedWorld.blockVersion, x & 0xF, y & 0xF, z & 0xF, false); if (searchingFor.test(new Pair<>(data, new Vector3d(x, y, z)))) return true; } @@ -710,6 +711,85 @@ public static boolean hasMaterial(GrimPlayer player, SimpleCollisionBox checkBox return false; } + // Thanks Tuinity + public static void forEachCollisionBoxes(GrimPlayer player, SimpleCollisionBox checkBox, Consumer searchingFor) { + int minBlockX = (int) Math.floor(checkBox.minX - COLLISION_EPSILON) - 1; + int maxBlockX = (int) Math.floor(checkBox.maxX + COLLISION_EPSILON) + 1; + int minBlockY = (int) Math.floor(checkBox.minY - COLLISION_EPSILON) - 1; + int maxBlockY = (int) Math.floor(checkBox.maxY + COLLISION_EPSILON) + 1; + int minBlockZ = (int) Math.floor(checkBox.minZ - COLLISION_EPSILON) - 1; + int maxBlockZ = (int) Math.floor(checkBox.maxZ + COLLISION_EPSILON) + 1; + + final int minSection = player.compensatedWorld.getMinHeight() >> 4; + final int minBlock = minSection << 4; + final int maxBlock = player.compensatedWorld.getMaxHeight() - 1; + + int minChunkX = minBlockX >> 4; + int maxChunkX = maxBlockX >> 4; + + int minChunkZ = minBlockZ >> 4; + int maxChunkZ = maxBlockZ >> 4; + + int minYIterate = Math.max(minBlock, minBlockY); + int maxYIterate = Math.min(maxBlock, maxBlockY); + + for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) { + int minZ = currChunkZ == minChunkZ ? minBlockZ & 15 : 0; // coordinate in chunk + int maxZ = currChunkZ == maxChunkZ ? maxBlockZ & 15 : 15; // coordinate in chunk + + for (int currChunkX = minChunkX; currChunkX <= maxChunkX; ++currChunkX) { + int minX = currChunkX == minChunkX ? minBlockX & 15 : 0; // coordinate in chunk + int maxX = currChunkX == maxChunkX ? maxBlockX & 15 : 15; // coordinate in chunk + + int chunkXGlobalPos = currChunkX << 4; + int chunkZGlobalPos = currChunkZ << 4; + + Column chunk = player.compensatedWorld.getChunk(currChunkX, currChunkZ); + + if (chunk == null) continue; + BaseChunk[] sections = chunk.getChunks(); + + for (int y = minYIterate; y <= maxYIterate; ++y) { + BaseChunk section = sections[(y >> 4) - minSection]; + + if (section == null || (IS_FOURTEEN && section.isEmpty())) { // Check for empty on 1.13+ servers + // empty + // skip to next section + y = (y & ~(15)) + 15; // increment by 15: iterator loop increments by the extra one + continue; + } + + for (int currZ = minZ; currZ <= maxZ; ++currZ) { + for (int currX = minX; currX <= maxX; ++currX) { + int x = currX | chunkXGlobalPos; + int z = currZ | chunkZGlobalPos; + + WrappedBlockState data = section.get(CompensatedWorld.blockVersion, x & 0xF, y & 0xF, z & 0xF, false); + + // Works on both legacy and modern! Faster than checking for material types, most common case + if (data.getGlobalId() == 0) continue; + + // Thanks SpottedLeaf for this optimization, I took edgeCount from Tuinity + int edgeCount = ((x == minBlockX || x == maxBlockX) ? 1 : 0) + + ((y == minBlockY || y == maxBlockY) ? 1 : 0) + + ((z == minBlockZ || z == maxBlockZ) ? 1 : 0); + + final StateType type = data.getType(); + if (edgeCount != 3 && (edgeCount != 1 || Materials.isShapeExceedsCube(type)) + && (edgeCount != 2 || type == StateTypes.PISTON_HEAD)) { + final CollisionBox collisionBox = CollisionData.getData(type).getMovementCollisionBox(player, player.getClientVersion(), data, x, y, z); + + if (collisionBox.isIntersected(checkBox)) { + searchingFor.accept(new Vector3d(x, y, z)); + } + } + } + } + } + } + } + } + public static boolean onClimbable(GrimPlayer player, double x, double y, double z) { WrappedBlockState blockState = player.compensatedWorld.getWrappedBlockStateAt(x, y, z); StateType blockMaterial = blockState.getType(); diff --git a/src/main/java/ac/grim/grimac/utils/nmsutil/MainSupportingBlockPosFinder.java b/src/main/java/ac/grim/grimac/utils/nmsutil/MainSupportingBlockPosFinder.java index fd130be9db..e15aca466e 100644 --- a/src/main/java/ac/grim/grimac/utils/nmsutil/MainSupportingBlockPosFinder.java +++ b/src/main/java/ac/grim/grimac/utils/nmsutil/MainSupportingBlockPosFinder.java @@ -1,8 +1,6 @@ package ac.grim.grimac.utils.nmsutil; import ac.grim.grimac.player.GrimPlayer; -import ac.grim.grimac.utils.collisions.CollisionData; -import ac.grim.grimac.utils.collisions.datatypes.CollisionBox; import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox; import ac.grim.grimac.utils.data.MainSupportingBlockData; import com.github.retrooper.packetevents.util.Vector3d; @@ -42,12 +40,8 @@ private Optional findSupportingBlock(GrimPlayer player, SimpleCollisio AtomicReference bestBlockPos = new AtomicReference<>(); AtomicDouble blockPosDistance = new AtomicDouble(Double.MAX_VALUE); - Collisions.hasMaterial(player, searchBox, (thing) -> { - Vector3i blockPos = thing.getSecond().toVector3i(); - - CollisionBox collision = CollisionData.getData(thing.getFirst().getType()).getMovementCollisionBox(player, player.getClientVersion(), thing.getFirst(), blockPos.getX(), blockPos.getY(), blockPos.getZ()); - if (!collision.isIntersected(searchBox)) return false; - + Collisions.forEachCollisionBoxes(player, searchBox, (pos) -> { + Vector3i blockPos = pos.toVector3i(); Vector3d blockPosAsVector3d = new Vector3d(blockPos.getX() + 0.5, blockPos.getY() + 0.5, blockPos.getZ() + 0.5); double distance = playerPos.distanceSquared(blockPosAsVector3d); @@ -55,8 +49,6 @@ private Optional findSupportingBlock(GrimPlayer player, SimpleCollisio bestBlockPos.set(blockPos); blockPosDistance.set(distance); } - - return false; });