mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
44 lines
3.0 KiB
Diff
44 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Sat, 10 May 2025 22:04:42 +0200
|
|
Subject: [PATCH] Smart sort items in NearestItemSensor
|
|
|
|
|
|
diff --git a/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
|
|
index 09fd13e2d958da8326276c4dadf25bf488aff5ac..a5ec595efe568cccee53b016531a56f721bc99f2 100644
|
|
--- a/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
|
|
+++ b/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java
|
|
@@ -16,6 +16,13 @@ public class NearestItemSensor extends Sensor<Mob> {
|
|
private static final long Y_RANGE = 16L;
|
|
public static final int MAX_DISTANCE_TO_WANTED_ITEM = 32;
|
|
|
|
+ // Leaf start - Smart sort items in NearestItemSensor
|
|
+ private final org.dreeam.leaf.util.FastBitRadixSort itemSorter;
|
|
+ private static final double MAX_DIST_SQ = (double) MAX_DISTANCE_TO_WANTED_ITEM * MAX_DISTANCE_TO_WANTED_ITEM;
|
|
+ public NearestItemSensor() {
|
|
+ this.itemSorter = new org.dreeam.leaf.util.FastBitRadixSort();
|
|
+ }
|
|
+ // Leaf end - Smart sort items in NearestItemSensor
|
|
@Override
|
|
public Set<MemoryModuleType<?>> requires() {
|
|
return ImmutableSet.of(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM);
|
|
@@ -24,8 +31,16 @@ public class NearestItemSensor extends Sensor<Mob> {
|
|
@Override
|
|
protected void doTick(ServerLevel level, Mob entity) {
|
|
Brain<?> brain = entity.getBrain();
|
|
- List<ItemEntity> entitiesOfClass = level.getEntitiesOfClass(ItemEntity.class, entity.getBoundingBox().inflate(32.0, 16.0, 32.0), itemEntity -> itemEntity.closerThan(entity, MAX_DISTANCE_TO_WANTED_ITEM) && entity.wantsToPickUp(level, itemEntity.getItem())); // Paper - Perf: Move predicate into getEntities
|
|
- entitiesOfClass.sort(Comparator.comparingDouble(entity::distanceToSqr));
|
|
+ // Leaf start - Smart sort items in NearestItemSensor
|
|
+ net.minecraft.core.Position pos = entity.position();
|
|
+ double x = pos.x();
|
|
+ double y = pos.y();
|
|
+ double z = pos.z();
|
|
+ net.minecraft.world.phys.AABB boundingBox = entity.getBoundingBox().inflate(32.0, 16.0, 32.0);
|
|
+ it.unimi.dsi.fastutil.objects.ObjectArrayList<ItemEntity> entitiesOfClass = new it.unimi.dsi.fastutil.objects.ObjectArrayList<>();
|
|
+ ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel) level).moonrise$getEntityLookup().getEntities(ItemEntity.class, null, boundingBox, entitiesOfClass, (ItemEntity itemEntity) -> itemEntity.distanceToSqr(x, y, z) < MAX_DIST_SQ && entity.wantsToPickUp(level, itemEntity.getItem())); // Paper - Perf: Move predicate into getEntities
|
|
+ itemSorter.sort(entitiesOfClass.elements(), entitiesOfClass.size(), pos);
|
|
+ // Leaf end - Smart sort items in NearestItemSensor
|
|
// Paper start - Perf: remove streams from hot code
|
|
ItemEntity nearest = null;
|
|
for (final ItemEntity itemEntity : entitiesOfClass) {
|