Include HopperPullListener performance fixes
This commit is contained in:
Intelli
parent
38ba3abc9a
commit
5211374e14
1 changed files with 130 additions and 65 deletions
|
|
@ -4,6 +4,9 @@ import java.util.Arrays;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.inventory.Inventory;
|
import org.bukkit.inventory.Inventory;
|
||||||
|
|
@ -18,6 +21,12 @@ import net.coreprotect.utility.ItemUtils;
|
||||||
|
|
||||||
public final class HopperPullListener {
|
public final class HopperPullListener {
|
||||||
|
|
||||||
|
private static final ConcurrentLinkedQueue<Object[]> hopperQueue = new ConcurrentLinkedQueue<>();
|
||||||
|
private static final AtomicBoolean processorRunning = new AtomicBoolean(false);
|
||||||
|
private static final int BATCH_SIZE = 100;
|
||||||
|
private static final int MAX_CONCURRENT_PROCESSORS = 4;
|
||||||
|
private static final AtomicInteger activeProcessors = new AtomicInteger(0);
|
||||||
|
|
||||||
static void processHopperPull(Location location, String user, InventoryHolder sourceHolder, InventoryHolder destinationHolder, ItemStack item) {
|
static void processHopperPull(Location location, String user, InventoryHolder sourceHolder, InventoryHolder destinationHolder, ItemStack item) {
|
||||||
String loggingChestId = "#hopper-pull." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ();
|
String loggingChestId = "#hopper-pull." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ();
|
||||||
Object[] lastAbort = ConfigHandler.hopperAbort.get(loggingChestId);
|
Object[] lastAbort = ConfigHandler.hopperAbort.get(loggingChestId);
|
||||||
|
|
@ -31,72 +40,128 @@ public final class HopperPullListener {
|
||||||
ItemStack[] destinationContainer = ItemUtils.getContainerState(destinationHolder.getInventory().getContents());
|
ItemStack[] destinationContainer = ItemUtils.getContainerState(destinationHolder.getInventory().getContents());
|
||||||
ItemStack movedItem = item.clone();
|
ItemStack movedItem = item.clone();
|
||||||
|
|
||||||
final long taskStarted = InventoryChangeListener.tasksStarted.incrementAndGet();
|
// Queue the hopper pull operation instead of creating a new thread immediately
|
||||||
Scheduler.runTaskAsynchronously(CoreProtect.getInstance(), () -> {
|
hopperQueue.add(new Object[] { location, user, sourceHolder, destinationHolder, movedItem, destinationContainer, loggingChestId, lastAbort });
|
||||||
try {
|
|
||||||
if (sourceHolder == null || destinationHolder == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean abort = false;
|
// Start the processor if it's not already running
|
||||||
boolean addedInventory = ItemUtils.canAddContainer(destinationContainer, movedItem, destinationHolder.getInventory().getMaxStackSize());
|
if (processorRunning.compareAndSet(false, true)) {
|
||||||
if (!addedInventory) {
|
startHopperProcessor();
|
||||||
abort = true;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (abort) {
|
|
||||||
Set<ItemStack> movedItems = new HashSet<>();
|
|
||||||
ItemStack[] destinationContents = destinationHolder.getInventory().getContents();
|
|
||||||
if (lastAbort != null && Arrays.equals(destinationContents, (ItemStack[]) lastAbort[1])) {
|
|
||||||
((Set<?>) lastAbort[0]).forEach(itemStack -> movedItems.add((ItemStack) itemStack));
|
|
||||||
}
|
|
||||||
movedItems.add(movedItem);
|
|
||||||
|
|
||||||
ConfigHandler.hopperAbort.put(loggingChestId, new Object[] { movedItems, ItemUtils.getContainerState(destinationContents) });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ConfigHandler.hopperAbort.get(loggingChestId) != null) {
|
|
||||||
ConfigHandler.hopperAbort.remove(loggingChestId);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean hopperTransactions = Config.getConfig(location.getWorld()).HOPPER_TRANSACTIONS;
|
|
||||||
if (!hopperTransactions) {
|
|
||||||
List<Object> list = ConfigHandler.transactingChest.get(location.getWorld().getUID().toString() + "." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ());
|
|
||||||
if (list != null) {
|
|
||||||
list.add(movedItem);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Location destinationLocation = destinationHolder.getInventory().getLocation();
|
|
||||||
List<Object> list = ConfigHandler.transactingChest.get(destinationLocation.getWorld().getUID().toString() + "." + destinationLocation.getBlockX() + "." + destinationLocation.getBlockY() + "." + destinationLocation.getBlockZ());
|
|
||||||
if (list != null) {
|
|
||||||
list.add(new ItemStack[] { null, movedItem });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Config.getConfig(location.getWorld()).HOPPER_FILTER_META && !movedItem.hasItemMeta()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Inventory sourceInventory = sourceHolder.getInventory();
|
|
||||||
ItemStack[] inventoryContents = sourceInventory.getContents();
|
|
||||||
ItemStack[] originalSource = new ItemStack[inventoryContents.length + 1];
|
|
||||||
for (int i = 0; i < inventoryContents.length; i++) {
|
|
||||||
ItemStack itemStack = inventoryContents[i];
|
|
||||||
if (itemStack != null) {
|
|
||||||
originalSource[i] = itemStack.clone();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
originalSource[inventoryContents.length] = movedItem;
|
|
||||||
InventoryChangeListener.checkTasks(taskStarted);
|
|
||||||
InventoryChangeListener.onInventoryInteract(user, sourceInventory, originalSource, null, sourceInventory.getLocation(), true);
|
|
||||||
}
|
|
||||||
catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void startHopperProcessor() {
|
||||||
|
if (activeProcessors.incrementAndGet() <= MAX_CONCURRENT_PROCESSORS) {
|
||||||
|
Scheduler.runTaskAsynchronously(CoreProtect.getInstance(), () -> {
|
||||||
|
try {
|
||||||
|
// Use the same server running check as Consumer class
|
||||||
|
while (!hopperQueue.isEmpty() && (ConfigHandler.serverRunning || ConfigHandler.converterRunning)) {
|
||||||
|
processHopperBatch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
activeProcessors.decrementAndGet();
|
||||||
|
processorRunning.set(false);
|
||||||
|
|
||||||
|
// If more items were added and we're still running, restart the processor
|
||||||
|
if (!hopperQueue.isEmpty() && (ConfigHandler.serverRunning || ConfigHandler.converterRunning) && activeProcessors.get() == 0) {
|
||||||
|
startHopperProcessor();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
activeProcessors.decrementAndGet();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void processHopperBatch() {
|
||||||
|
int processed = 0;
|
||||||
|
final long taskStarted = InventoryChangeListener.tasksStarted.incrementAndGet();
|
||||||
|
|
||||||
|
while (!hopperQueue.isEmpty() && processed < BATCH_SIZE && (ConfigHandler.serverRunning || ConfigHandler.converterRunning)) {
|
||||||
|
Object[] data = hopperQueue.poll();
|
||||||
|
if (data == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
Location location = (Location) data[0];
|
||||||
|
String user = (String) data[1];
|
||||||
|
InventoryHolder sourceHolder = (InventoryHolder) data[2];
|
||||||
|
InventoryHolder destinationHolder = (InventoryHolder) data[3];
|
||||||
|
ItemStack movedItem = (ItemStack) data[4];
|
||||||
|
ItemStack[] destinationContainer = (ItemStack[]) data[5];
|
||||||
|
String loggingChestId = (String) data[6];
|
||||||
|
Object[] lastAbort = (Object[]) data[7];
|
||||||
|
|
||||||
|
processSingleHopperPull(location, user, sourceHolder, destinationHolder, movedItem, destinationContainer, loggingChestId, lastAbort);
|
||||||
|
|
||||||
|
processed++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure sequential processing just like the original code
|
||||||
|
InventoryChangeListener.checkTasks(taskStarted);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void processSingleHopperPull(Location location, String user, InventoryHolder sourceHolder, InventoryHolder destinationHolder, ItemStack movedItem, ItemStack[] destinationContainer, String loggingChestId, Object[] lastAbort) {
|
||||||
|
|
||||||
|
if (sourceHolder == null || destinationHolder == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean abort = false;
|
||||||
|
boolean addedInventory = ItemUtils.canAddContainer(destinationContainer, movedItem, destinationHolder.getInventory().getMaxStackSize());
|
||||||
|
if (!addedInventory) {
|
||||||
|
abort = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (abort) {
|
||||||
|
Set<ItemStack> movedItems = new HashSet<>();
|
||||||
|
ItemStack[] destinationContents = destinationHolder.getInventory().getContents();
|
||||||
|
if (lastAbort != null && Arrays.equals(destinationContents, (ItemStack[]) lastAbort[1])) {
|
||||||
|
((Set<?>) lastAbort[0]).forEach(itemStack -> movedItems.add((ItemStack) itemStack));
|
||||||
|
}
|
||||||
|
movedItems.add(movedItem);
|
||||||
|
|
||||||
|
ConfigHandler.hopperAbort.put(loggingChestId, new Object[] { movedItems, ItemUtils.getContainerState(destinationContents) });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ConfigHandler.hopperAbort.get(loggingChestId) != null) {
|
||||||
|
ConfigHandler.hopperAbort.remove(loggingChestId);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean hopperTransactions = Config.getConfig(location.getWorld()).HOPPER_TRANSACTIONS;
|
||||||
|
if (!hopperTransactions) {
|
||||||
|
List<Object> list = ConfigHandler.transactingChest.get(location.getWorld().getUID().toString() + "." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ());
|
||||||
|
if (list != null) {
|
||||||
|
list.add(movedItem);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Location destinationLocation = destinationHolder.getInventory().getLocation();
|
||||||
|
List<Object> list = ConfigHandler.transactingChest.get(destinationLocation.getWorld().getUID().toString() + "." + destinationLocation.getBlockX() + "." + destinationLocation.getBlockY() + "." + destinationLocation.getBlockZ());
|
||||||
|
if (list != null) {
|
||||||
|
list.add(new ItemStack[] { null, movedItem });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Config.getConfig(location.getWorld()).HOPPER_FILTER_META && !movedItem.hasItemMeta()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Inventory sourceInventory = sourceHolder.getInventory();
|
||||||
|
ItemStack[] inventoryContents = sourceInventory.getContents();
|
||||||
|
ItemStack[] originalSource = new ItemStack[inventoryContents.length + 1];
|
||||||
|
for (int i = 0; i < inventoryContents.length; i++) {
|
||||||
|
ItemStack itemStack = inventoryContents[i];
|
||||||
|
if (itemStack != null) {
|
||||||
|
originalSource[i] = itemStack.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
originalSource[inventoryContents.length] = movedItem;
|
||||||
|
InventoryChangeListener.onInventoryInteract(user, sourceInventory, originalSource, null, sourceInventory.getLocation(), true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue