Implement supporting block

AlexProgrammerDE · Nov 21, 2024 · 1ecaf99 · 1ecaf99
1 parent b534326
commit 1ecaf99
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 12 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/Level.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/Level.java
@@ -22,6 +22,7 @@
 import com.soulfiremc.server.protocol.bot.state.entity.Entity;
 import com.soulfiremc.server.protocol.bot.state.registry.DimensionType;
 import com.soulfiremc.server.util.MathHelper;
+import com.soulfiremc.server.util.VectorHelper;
 import com.soulfiremc.server.util.mcstructs.AABB;
 import com.soulfiremc.server.util.structs.TickRateManager;
 import lombok.Getter;
@@ -112,7 +113,7 @@ public BlockState getBlockState(int x, int y, int z) {
     return chunks.getBlockState(x, y, z);
   }
 
-  public List<AABB> getCollisionBoxes(AABB aabb) {
+  public List<Vector3i> getTouchedPositions(AABB aabb) {
     var startX = MathHelper.floorDouble(aabb.minX - AABB.EPSILON) - 1;
     var endX = MathHelper.floorDouble(aabb.maxX + AABB.EPSILON) + 1;
     var startY = MathHelper.floorDouble(aabb.minY - AABB.EPSILON) - 1;
@@ -121,24 +122,24 @@ public List<AABB> getCollisionBoxes(AABB aabb) {
     var endZ = MathHelper.floorDouble(aabb.maxZ + AABB.EPSILON) + 1;
 
     var predictedSize = (endX - startX + 1) * (endY - startY + 1) * (endZ - startZ + 1);
-    var surroundingBBs = new ArrayList<AABB>(predictedSize);
+    var surroundingBlocks = new ArrayList<Vector3i>(predictedSize);
 
     for (var x = startX; x <= endX; x++) {
       for (var y = startY; y <= endY; y++) {
         for (var z = startZ; z <= endZ; z++) {
-          var cursor = Vector3i.from(x, y, z);
-          var blockState = getBlockState(cursor);
-
-          for (var collisionBox : blockState.getCollisionBoxes(cursor)) {
-            if (collisionBox.intersects(aabb)) {
-              surroundingBBs.add(collisionBox);
-            }
-          }
+          surroundingBlocks.add(Vector3i.from(x, y, z));
         }
       }
     }
 
-    return surroundingBBs;
+    return surroundingBlocks;
+  }
+
+  public List<AABB> getCollisionBoxes(AABB aabb) {
+    return getTouchedPositions(aabb).stream()
+      .flatMap(cursor -> getBlockState(cursor).getCollisionBoxes(cursor).stream())
+      .filter(collisionBox -> collisionBox.intersects(aabb))
+      .toList();
   }
 
   public boolean containsAnyLiquid(AABB bb) {
@@ -168,6 +169,17 @@ public boolean noCollision(AABB bb) {
   }
 
   public Optional<Vector3i> findSupportingBlock(Entity entity, AABB bb) {
-    return Optional.empty(); // TODO
+    Vector3i block = null;
+    var distance = Double.MAX_VALUE;
+
+    for (var position : getTouchedPositions(bb)) {
+      var distanceToCenter = VectorHelper.distToCenterSqr(position, entity.pos());
+      if (distanceToCenter < distance || distanceToCenter == distance && (block == null || block.compareTo(position) < 0)) {
+        block = position;
+        distance = distanceToCenter;
+      }
+    }
+
+    return Optional.ofNullable(block);
   }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/util/VectorHelper.java b/server/src/main/java/com/soulfiremc/server/util/VectorHelper.java
@@ -20,6 +20,7 @@
 import com.soulfiremc.server.data.BlockShapeGroup;
 import com.soulfiremc.server.data.BlockState;
 import org.cloudburstmc.math.vector.Vector3d;
+import org.cloudburstmc.math.vector.Vector3i;
 
 public class VectorHelper {
   private VectorHelper() {}
@@ -63,4 +64,11 @@ public static Vector3d normalizeSafe(Vector3d vec) {
     var length = vec.length();
     return length < 1.0E-5F ? Vector3d.ZERO : Vector3d.from(vec.getX() / length, vec.getY() / length, vec.getZ() / length);
   }
+
+  public static double distToCenterSqr(Vector3i current, Vector3d other) {
+    var x = current.getX() + 0.5 - other.getX();
+    var y = current.getY() + 0.5 - other.getY();
+    var z = current.getZ() + 0.5 - other.getZ();
+    return x * x + y * y + z * z;
+  }
 }