Define POI search order explicitly

Author: 2No2Name

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

@@ -0,0 +1,147 @@
+package net.caffeinemc.mods.lithium.common.world.interests;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.SectionPos;
+import net.minecraft.world.entity.ai.village.poi.PoiManager;
+import net.minecraft.world.entity.ai.village.poi.PoiRecord;
+import net.minecraft.world.entity.ai.village.poi.PoiSection;
+import net.minecraft.world.level.ChunkPos;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface PoiOrdering {
+
+    default boolean isOrdered(BlockPos center, PoiManager poiManager, List<BlockPos> positions) {
+        if (!positions.isEmpty()) {
+            BlockPos curr = positions.getFirst();
+            for (int i = 1; i < positions.size(); i++) {
+                BlockPos next = positions.get(i);
+                int order = compare(center, poiManager, curr, next);
+                if (order != 1) {
+                    return false;
+                }
+                curr = next;
+            }
+        }
+        return true;
+    }
+
+    default void checkOrderOrThrow(BlockPos center, PoiManager poiManager, List<BlockPos> positions) {
+        if (!positions.isEmpty()) {
+            BlockPos curr = positions.getFirst();
+            for (int i = 1; i < positions.size(); i++) {
+                BlockPos next = positions.get(i);
+                int order = compare(center, poiManager, curr, next);
+                if (order != 1) {
+                    if (order == 0) {
+                        order = compare(center, poiManager, curr, next); //Line for debugging
+                        throw new IllegalStateException("Positions are equal at index " + i + ": " + curr + " == " + next);
+                    } else {
+                        order = compare(center, poiManager, curr, next); //Line for debugging
+                        throw new IllegalStateException("Positions are ordered incorrectly at index " + i + ": " + curr + " < " + next);
+                    }
+                }
+                curr = next;
+            }
+        }
+    }
+
+    int compare(BlockPos center, PoiManager poiManager, BlockPos posA, BlockPos posB);
+
+
+    record InChunk() implements PoiOrdering {
+
+        public static final InChunk INSTANCE = new InChunk();
+
+        @Override
+        public int compare(BlockPos center, PoiManager poiManager, BlockPos posA, BlockPos posB) {
+            int aChunkZ = posA.getZ() >> 4;
+            int bChunkZ = posB.getZ() >> 4;
+
+            int orderZ = Integer.compare(bChunkZ, aChunkZ);
+            if (orderZ != 0) {
+                throw new IllegalStateException("Positions are not in the same chunk: " + posA + " in " + new ChunkPos(posA) + " vs " + posB + " in " + new ChunkPos(posB));
+            }
+
+            int aChunkX = posA.getX() >> 4;
+            int bChunkX = posB.getX() >> 4;
+
+            int orderX = Integer.compare(bChunkX, aChunkX);
+            if (orderX != 0) {
+                throw new IllegalStateException("Positions are not in the same chunk: " + posA + " in " + new ChunkPos(posA) + " vs " + posB + " in " + new ChunkPos(posB));
+            }
+
+            int aChunkY = posA.getY() >> 4;
+            int bChunkY = posB.getY() >> 4;
+
+            int orderY = Integer.compare(bChunkY, aChunkY);
+            if (orderY != 0) {
+                return orderY;
+            }
+
+            Optional<PoiSection> poiSection = poiManager.getOrLoad(SectionPos.asLong(posA));
+            if (poiSection.isEmpty()) {
+                throw new IllegalStateException("PoiManager " + poiManager + " has no section at position " + posA);
+            }
+            PoiSection poiSection1 = poiSection.get();
+            List<PoiRecord> retrievedRecords = poiSection1.getRecords(a -> true, PoiManager.Occupancy.ANY).filter(poiRecord -> poiRecord.getPos().equals(posA) || poiRecord.getPos().equals(posB)).toList();
+            if (retrievedRecords.size() != 2) {
+                throw new IllegalStateException("Expected two POI records at " + posA + ", " + posB + ", found " + retrievedRecords.size());
+            }
+
+            if (retrievedRecords.getFirst().getPos().equals(posA)) {
+                return 1;
+            }
+            if (retrievedRecords.getFirst().getPos().equals(posB)) {
+                return -1;
+            }
+
+            throw new IllegalStateException("Expected two differing poi positions matching " + posA + ", " + posB + ", found " + retrievedRecords);
+        }
+    }
+
+    record InSquare() implements PoiOrdering {
+
+        public static final InSquare INSTANCE = new InSquare();
+
+        @Override
+        public int compare(BlockPos center, PoiManager poiManager, BlockPos posA, BlockPos posB) {
+            int aChunkZ = posA.getZ() >> 4;
+            int bChunkZ = posB.getZ() >> 4;
+
+            int orderZ = Integer.compare(bChunkZ, aChunkZ);
+            if (orderZ != 0) {
+                return orderZ;
+            }
+
+            int aChunkX = posA.getX() >> 4;
+            int bChunkX = posB.getX() >> 4;
+
+            int orderX = Integer.compare(bChunkX, aChunkX);
+            if (orderX != 0) {
+                return orderX;
+            }
+
+            return InChunk.INSTANCE.compare(center, poiManager, posA, posB);
+        }
+    }
+
+    record L2ThenInSquare() implements PoiOrdering {
+
+        public static final L2ThenInSquare INSTANCE = new L2ThenInSquare();
+
+        @Override
+        public int compare(BlockPos center, PoiManager poiManager, BlockPos posA, BlockPos posB) {
+            double distASq = center.distSqr(posA);
+            double distBSq = center.distSqr(posB);
+
+            int orderDist = Double.compare(distBSq, distASq);
+            if (orderDist != 0) {
+                return orderDist;
+            }
+
+            return InSquare.INSTANCE.compare(center, poiManager, posA, posB);
+        }
+    }
+}

common/src/main/resources/lithium.accesswidener

@@ -22,4 +22,5 @@ accessible method net/minecraft/world/phys/shapes/Shapes findBits (DD)I
 accessible field net/minecraft/server/level/ChunkMap level Lnet/minecraft/server/level/ServerLevel;
 accessible field net/minecraft/world/level/chunk/Strategy LINEAR_PALETTE_FACTORY Lnet/minecraft/world/level/chunk/Palette$Factory;
 accessible field net/minecraft/world/level/chunk/Strategy SINGLE_VALUE_PALETTE_FACTORY Lnet/minecraft/world/level/chunk/Palette$Factory;
-accessible class net/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper
+accessible class net/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper
+accessible method net/minecraft/world/level/chunk/storage/SectionStorage getOrLoad (J)Ljava/util/Optional;