Skip to content

Fix O(n²) item cramp check and cache per-cycle display names #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wling-art wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix O(n²) item cramp check and cache per-cycle display names #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 additions & 7 deletions common/src/main/java/com/loohp/interactionvisualizer/entities/ItemDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@
import org.bukkit.inventory.meta.Damageable;
import org.bukkit.inventory.meta.ItemMeta;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -142,23 +144,28 @@ public void run() {
return;
}
i = updateRate;
Map<ItemStack, Component> nameCache = new ConcurrentHashMap<>();
for (World world : Bukkit.getWorlds()) {
WrappedIterable<?, Entity> itr = NMS.getInstance().getEntities(world);
Set<Item> items = new HashSet<>();
Map<Long, List<Item>> grid = new HashMap<>();
for (Entity entity : itr) {
if (entity instanceof Item) {
items.add((Item) entity);
Item item = (Item) entity;
items.add(item);
Location itemLoc = item.getLocation();
grid.computeIfAbsent(blockKey(itemLoc.getBlockX(), itemLoc.getBlockY(), itemLoc.getBlockZ()), k -> new ArrayList<>()).add(item);
}
}
for (Item item : items) {
SyncUtils.runAsyncWithSyncCondition(item.getLocation(), item::isValid, () -> tick(item, items));
SyncUtils.runAsyncWithSyncCondition(item.getLocation(), item::isValid, () -> tick(item, grid, nameCache));
}
}
}
}.runTaskTimer(InteractionVisualizer.plugin, 0, 1);
}

private void tick(Item item, Collection<Item> items) {
private void tick(Item item, Map<Long, List<Item>> grid, Map<ItemStack, Component> nameCache) {
try {
World world = item.getWorld();
Location location = item.getLocation();
Expand All @@ -172,11 +179,11 @@ private void tick(Item item, Collection<Item> items) {
itemstack = itemstack.clone();
}
ItemStack finalItemstack = itemstack;
Component name = ItemNameUtils.getDisplayName(finalItemstack);
Component name = nameCache.computeIfAbsent(finalItemstack, ItemNameUtils::getDisplayName);
String matchingname = getMatchingName(finalItemstack, stripColorBlacklist);

if (!blacklist.test(matchingname, finalItemstack.getType())) {
if (item.getPickupDelay() >= Short.MAX_VALUE || ticks < 0 || isCramping(world, area, items)) {
if (item.getPickupDelay() >= Short.MAX_VALUE || ticks < 0 || isCramping(world, area, grid, location)) {
List<?> watcher = NMS.getInstance().resetCustomNameWatchableCollection(item);
Object defaultPacket = NMS.getInstance()
.createEntityMetadataPacket(item.getEntityId(), watcher);
Expand Down Expand Up @@ -301,15 +308,40 @@ private String getMatchingName(ItemStack item, boolean stripColor) {
return "";
}

private boolean isCramping(World world, BoundingBox area, Collection<? extends Entity> items) {
private boolean isCramping(World world, BoundingBox area, Map<Long, List<Item>> grid, Location location) {
if (cramp <= 0) {
return false;
}
try {
return items.stream().filter(each -> each != null && each.getWorld().equals(world) && area.contains(each.getLocation().toVector())).skip(cramp).findAny().isPresent();
int bx = location.getBlockX();
int by = location.getBlockY();
int bz = location.getBlockZ();
int count = 0;
for (int dx = -1; dx <= 1; dx++) {
for (int dy = -1; dy <= 1; dy++) {
for (int dz = -1; dz <= 1; dz++) {
List<Item> bucket = grid.get(blockKey(bx + dx, by + dy, bz + dz));
if (bucket == null) {
continue;
}
for (Item each : bucket) {
if (each != null && each.getWorld().equals(world) && area.contains(each.getLocation().toVector())) {
if (++count > cramp) {
return true;
}
}
}
}
}
}
return false;
} catch (Throwable e) {
return false;
}
}

private static long blockKey(int x, int y, int z) {
return ((x & 0x3FFFFFFL) << 38) | ((y & 0xFFFL) << 26) | (z & 0x3FFFFFFL);
}

}