Improved Portal Search

common/src/main/java/net/caffeinemc/mods/lithium/common/util/Distances.java

@@ -30,17 +30,29 @@ public static boolean isWithinCircleRadius(BlockPos origin, double radiusSq, Blo
         return origin.distSqr(pos) <= radiusSq;
     }
 
-    public static int getClosestAlongSectionAxis(int originAxis, int chunkMinAxis){
+    public static int getClosestAlongSectionAxis(int originAxis, int chunkAxis){
+        final int chunkMinAxis = SectionPos.sectionToBlockCoord(chunkAxis);
         return Math.min(Math.max(originAxis, chunkMinAxis), chunkMinAxis+15);
     }
 
     public static long getClosestPositionWithinChunk(BlockPos origin, int chunkX, int chunkZ){
-        int chunkMinX = SectionPos.sectionToBlockCoord(chunkX);
-        int chunkMinZ = SectionPos.sectionToBlockCoord(chunkZ);
+        return BlockPos.asLong(getClosestAlongSectionAxis(origin.getX(), chunkX),
+                origin.getY(), getClosestAlongSectionAxis(origin.getZ(), chunkZ));
 
-        return BlockPos.asLong(getClosestAlongSectionAxis(origin.getX(), chunkMinX),
-                origin.getY(), getClosestAlongSectionAxis(origin.getZ(), chunkMinZ));
+    }
 
+    public static double getMinSectionDistanceSq(BlockPos origin, int chunkX, int chunkY, int chunkZ){
+        final int originX = origin.getX(), originY = origin.getY(), originZ = origin.getZ();
+        final int distX = getClosestAlongSectionAxis(originX, chunkX) - originX;
+        final int distY = getClosestAlongSectionAxis(originY, chunkY) - originY;
+        final int distZ = getClosestAlongSectionAxis(originZ, chunkZ) - originZ;
+
+        return distX * distX + distY * distY + distZ * distZ;
     }
 
+    public static long getClosestPositionWithinSubchunk(BlockPos origin, int chunkX, int chunkY, int chunkZ){
+        return BlockPos.asLong(getClosestAlongSectionAxis(origin.getX(), chunkX),
+                getClosestAlongSectionAxis(origin.getY(), chunkY),
+                getClosestAlongSectionAxis(origin.getZ(), chunkZ));
+    }
 }

common/src/main/java/net/caffeinemc/mods/lithium/common/world/interests/RegionBasedStorageSectionExtended.java

@@ -1,6 +1,8 @@
 package net.caffeinemc.mods.lithium.common.world.interests;
 
 import java.util.stream.Stream;
+import java.util.BitSet;
+import java.util.Optional;
 
 public interface RegionBasedStorageSectionExtended<R> {
     /**
@@ -20,4 +22,9 @@ public interface RegionBasedStorageSectionExtended<R> {
      * @param chunkZ The z-coordinate of the chunk column
      */
     Iterable<R> lithium$getInChunkColumn(int chunkX, int chunkZ);
+
+    BitSet lithium$getNonEmptyPOISections(int chunkX, int chunkZ);
+    int lithium$getChunkYMin();
+    int lithium$getChunkYMaxInclusive();
+    Optional<R> lithium$getElementAt(long sectionPos);
 }