Add nether portal to POI search test

Author: 2No2Name

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

@@ -7,6 +7,7 @@
 import net.minecraft.world.entity.ai.village.poi.PoiSection;
 import net.minecraft.world.level.ChunkPos;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
@@ -47,6 +48,10 @@ default void checkOrderOrThrow(BlockPos center, PoiManager poiManager, List<Bloc
         }
     }
 
+    default Comparator<BlockPos> getAsComparator(BlockPos center, PoiManager poiManager) {
+        return (posA, posB) -> compare(center, poiManager, posA, posB);
+    }
+
     int compare(BlockPos center, PoiManager poiManager, BlockPos posA, BlockPos posB);
 
 
@@ -144,4 +149,27 @@ public int compare(BlockPos center, PoiManager poiManager, BlockPos posA, BlockP
             return InSquare.INSTANCE.compare(center, poiManager, posA, posB);
         }
     }
+
+    record L2ThenMinYThenInSquare() implements PoiOrdering {
+
+        public static final L2ThenMinYThenInSquare INSTANCE = new L2ThenMinYThenInSquare();
+
+        @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;
+            }
+
+            int orderY = Integer.compare(posA.getY(), posB.getY());
+            if (orderY != 0) {
+                return orderY;
+            }
+
+            return InSquare.INSTANCE.compare(center, poiManager, posA, posB);
+        }
+    }
 }

fabric/src/gametest/java/net/caffeinemc/mods/lithium/fabric/gametest/mixin/ai/poi/POI_Search.java

@@ -16,8 +16,11 @@
 import net.minecraft.world.entity.ai.village.poi.PoiTypes;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.border.WorldBorder;
 
 import java.lang.reflect.Method;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -27,8 +30,9 @@ public class POI_Search implements CustomTestMethodInvoker {
 
     @GameTest(manualOnly = true)
     public void test(GameTestHelper context, BlockPos center, RandomSource randomSource) {
-        PoiManager poiManager = context.getLevel().getPoiManager();
-        Predicate<Holder<PoiType>> predicate = holder -> holder.is(PoiTypes.SHEPHERD);
+        ServerLevel serverLevel = context.getLevel();
+        PoiManager poiManager = serverLevel.getPoiManager();
+        Predicate<Holder<PoiType>> predicate = holder -> holder.is(PoiTypes.NETHER_PORTAL);
 
         long countInRange = poiManager.getCountInRange(predicate, center, 128, PoiManager.Occupancy.ANY);
 
@@ -50,6 +54,28 @@ public void test(GameTestHelper context, BlockPos center, RandomSource randomSou
         List<BlockPos> allClosestFirstWithTypePositions = poiManager.findAllClosestFirstWithType(predicate, blockPos1 -> true, center, 128, PoiManager.Occupancy.ANY).map(Pair::getSecond).collect(Collectors.toList());
         PoiOrdering.L2ThenInSquare.INSTANCE.checkOrderOrThrow(center, poiManager, allClosestFirstWithTypePositions);
 
+        boolean fromOverworld = randomSource.nextBoolean();
+        WorldBorder worldBorder = serverLevel.getWorldBorder();
+        Optional<BlockPos> closestPortalPosition = serverLevel.getPortalForcer().findClosestPortalPosition(center, fromOverworld, worldBorder);
+        int radius = fromOverworld ? 16 : 128;
+        List<BlockPos> closestPortalPositions =
+                poiManager.getInSquare(holder -> holder.is(PoiTypes.NETHER_PORTAL), center, radius, PoiManager.Occupancy.ANY)
+                        .map(PoiRecord::getPos)
+                        .filter(worldBorder::isWithinBounds)
+                        .filter(blockPosx -> serverLevel.getBlockState(blockPosx).hasProperty(BlockStateProperties.HORIZONTAL_AXIS))
+                        .sorted(Comparator.comparingDouble((BlockPos blockPos2) -> blockPos2.distSqr(center)).thenComparingInt(BlockPos::getY))
+                        .toList();
+        PoiOrdering.L2ThenMinYThenInSquare.INSTANCE.checkOrderOrThrow(center, poiManager, closestPortalPositions);
+        if (closestPortalPositions.isEmpty() != closestPortalPosition.isEmpty()) {
+            throw new IllegalStateException("findClosestPortalPosition() emptiness does not match sorted and filtered getInSquare() emptiness");
+        } else if (closestPortalPosition.isPresent()) {
+            BlockPos closestPos = closestPortalPosition.get();
+            if (!closestPortalPositions.getFirst().equals(closestPos)) {
+                throw new IllegalStateException("findClosestPortalPosition() result is not the first of sorted and filtered getInSquare()");
+            }
+        }
+
+
         Optional<BlockPos> firstOfAll = poiManager.find(predicate, blockPos -> true, center, 128, PoiManager.Occupancy.ANY);
         if (firstOfAll.isEmpty() != inRangePositions.isEmpty()) {
             throw new IllegalStateException("find() result presence does not match getInRange() emptiness");
@@ -175,7 +201,7 @@ public void invokeTestMethod(GameTestHelper context, Method method) throws Refle
             for (BlockPos blockPos : BlockPos.betweenClosed(x - radius, y - radius, z - radius, x + radius, y + radius, z + radius)) {
                 if (random.nextFloat() < randomPct && level.isInWorldBounds(blockPos)) {
                     poiCount++;
-                    level.setBlock(blockPos, Blocks.LOOM.defaultBlockState(), 0);
+                    level.setBlock(blockPos, Blocks.NETHER_PORTAL.defaultBlockState(), 0);
                 }
             }