Logic rewrite

build.gradle.kts

@@ -10,7 +10,7 @@ allprojects {
     apply(plugin = "maven-publish")
 
     group = "github.nighter"
-    version = "1.7.1.2"
+    version = "1.7.1.2-DEV"
 
     repositories {
         mavenCentral()

core/src/main/java/github/nighter/smartspawner/Scheduler.java

@@ -49,6 +49,11 @@ public final class Scheduler {
      */
     public static Task runTask(Runnable runnable) {
         if (isFolia) {
+            if (Bukkit.isGlobalTickThread()) {
+                runnable.run();
+                return new Task(null);
+            }
+
             try {
                 io.papermc.paper.threadedregions.scheduler.ScheduledTask task =
                         Bukkit.getGlobalRegionScheduler().run(plugin, scheduledTask -> runnable.run());
@@ -192,6 +197,11 @@ public static Task runTaskTimerAsync(Runnable runnable, long delayTicks, long pe
      */
     public static Task runEntityTask(Entity entity, Runnable runnable) {
         if (isFolia && entity != null) {
+            if (Bukkit.isOwnedByCurrentRegion(entity)) {
+                runnable.run();
+                return new Task(null);
+            }
+
             try {
                 io.papermc.paper.threadedregions.scheduler.ScheduledTask task =
                         entity.getScheduler().run(plugin, scheduledTask -> runnable.run(), null);
@@ -264,6 +274,11 @@ public static Task runEntityTaskTimer(Entity entity, Runnable runnable, long del
      */
     public static Task runLocationTask(Location location, Runnable runnable) {
         if (isFolia && location != null && location.getWorld() != null) {
+            if (Bukkit.isOwnedByCurrentRegion(location)) {
+                runnable.run();
+                return new Task(null);
+            }
+
             try {
                 io.papermc.paper.threadedregions.scheduler.ScheduledTask task =
                         Bukkit.getRegionScheduler().run(plugin, location, scheduledTask -> runnable.run());
@@ -290,6 +305,11 @@ public static Task runLocationTask(Location location, Runnable runnable) {
      */
     public static Task runChunkTask(World world, int chunkX, int chunkZ, Runnable runnable) {
         if (isFolia && world != null) {
+            if (Bukkit.isOwnedByCurrentRegion(world, chunkX, chunkZ)) {
+                runnable.run();
+                return new Task(null);
+            }
+
             try {
                 io.papermc.paper.threadedregions.scheduler.ScheduledTask task =
                         Bukkit.getRegionScheduler().run(plugin, world, chunkX, chunkZ, scheduledTask -> runnable.run());
@@ -352,53 +372,6 @@ public static Task runLocationTaskTimer(Location location, Runnable runnable, lo
         }
     }
 
-    /**
-     * Runs a task in the region of a specific location in a world.
-     * Falls back to regular scheduling on non-Folia servers.
-     *
-     * @param location  The location in whose region to run the task
-     * @param runnable  The task to run
-     * @return A Task object representing the scheduled task
-     */
-    public static Task runWorldTask(Location location, Runnable runnable) {
-        if (isFolia && location != null && location.getWorld() != null) {
-            try {
-                io.papermc.paper.threadedregions.scheduler.ScheduledTask task =
-                        Bukkit.getRegionScheduler().run(plugin, location, scheduledTask -> runnable.run());
-                return new Task(task);
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.WARNING, "Error scheduling world task in Folia, falling back to global scheduler", e);
-                return runTask(runnable);
-            }
-        } else {
-            return runTask(runnable);
-        }
-    }
-
-    /**
-     * Runs a delayed task in the region of a specific location in a world.
-     *
-     * @param location   The location in whose region to run the task
-     * @param runnable   The task to run
-     * @param delayTicks The delay in ticks before running the task
-     * @return A Task object representing the scheduled task
-     */
-    public static Task runWorldTaskLater(Location location, Runnable runnable, long delayTicks) {
-        if (isFolia && location != null && location.getWorld() != null) {
-            try {
-                io.papermc.paper.threadedregions.scheduler.ScheduledTask task =
-                        Bukkit.getRegionScheduler().runDelayed(plugin, location, scheduledTask -> runnable.run(),
-                                delayTicks < 1 ? 1 : delayTicks);
-                return new Task(task);
-            } catch (Exception e) {
-                plugin.getLogger().log(Level.WARNING, "Error scheduling delayed world task in Folia, falling back to global scheduler", e);
-                return runTaskLater(runnable, delayTicks);
-            }
-        } else {
-            return runTaskLater(runnable, delayTicks);
-        }
-    }
-
     /**
      * Creates a CompletableFuture that will be completed on the main thread or global region.
      *

core/src/main/java/github/nighter/smartspawner/api/SmartSpawnerAPIImpl.java

@@ -36,6 +36,8 @@ public class SmartSpawnerAPIImpl implements SmartSpawnerAPI {
     private final SpawnerManager spawnerManager;
     private final SpawnerRemovalService spawnerRemovalService;
     private final GuiLayoutRegistryImpl guiLayoutRegistry;
+    private final NamespacedKey vanillaSpawnerKey;
+    private final NamespacedKey itemSpawnerMaterialKey;
     private volatile SpawnerGuiLayoutProvider spawnerGuiLayoutProvider;
 
     public SmartSpawnerAPIImpl(SmartSpawner plugin) {
@@ -44,6 +46,8 @@ public SmartSpawnerAPIImpl(SmartSpawner plugin) {
         this.spawnerManager = plugin.getSpawnerManager();
         this.spawnerRemovalService = plugin.getSpawnerRemovalService();
         this.guiLayoutRegistry = plugin.getGuiLayoutRegistry();
+        this.vanillaSpawnerKey = new NamespacedKey(plugin, "vanilla_spawner");
+        this.itemSpawnerMaterialKey = new NamespacedKey(plugin, "item_spawner_material");
     }
 
     @Override
@@ -78,49 +82,30 @@ public ItemStack createItemSpawnerItem(Material itemMaterial, int amount) {
 
     @Override
     public boolean isSmartSpawner(ItemStack item) {
-        if (item == null || item.getType() != Material.SPAWNER || !item.hasItemMeta()) {
-            return false;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-        if (meta == null) {
+        if (item == null || item.getType() != Material.SPAWNER) {
             return false;
         }
 
         // A SmartSpawner is a spawner that is NOT vanilla and NOT an item spawner
-        return !isVanillaSpawner(item) && !isItemSpawner(item);
+        return !hasVanillaSpawnerKey(item) && !hasItemSpawnerKey(item);
     }
 
     @Override
     public boolean isVanillaSpawner(ItemStack item) {
-        if (item == null || item.getType() != Material.SPAWNER || !item.hasItemMeta()) {
+        if (item == null || item.getType() != Material.SPAWNER) {
             return false;
         }
 
-        ItemMeta meta = item.getItemMeta();
-        if (meta == null) {
-            return false;
-        }
-
-        return meta.getPersistentDataContainer().has(
-                new org.bukkit.NamespacedKey(plugin, "vanilla_spawner"),
-                org.bukkit.persistence.PersistentDataType.BOOLEAN);
+        return hasVanillaSpawnerKey(item);
     }
 
     @Override
     public boolean isItemSpawner(ItemStack item) {
-        if (item == null || item.getType() != Material.SPAWNER || !item.hasItemMeta()) {
+        if (item == null || item.getType() != Material.SPAWNER) {
             return false;
         }
 
-        ItemMeta meta = item.getItemMeta();
-        if (meta == null) {
-            return false;
-        }
-
-        return meta.getPersistentDataContainer().has(
-                new org.bukkit.NamespacedKey(plugin, "item_spawner_material"),
-                org.bukkit.persistence.PersistentDataType.STRING);
+        return hasItemSpawnerKey(item);
     }
 
     @Override
@@ -148,13 +133,8 @@ public Material getItemSpawnerMaterial(ItemStack item) {
             return null;
         }
 
-        ItemMeta meta = item.getItemMeta();
-        if (meta == null) {
-            return null;
-        }
-
-        String materialName = meta.getPersistentDataContainer().get(
-                new NamespacedKey(plugin, "item_spawner_material"), PersistentDataType.STRING);
+        String materialName = item.getPersistentDataContainer()
+                .get(itemSpawnerMaterialKey, PersistentDataType.STRING);
 
         if (materialName == null) {
             return null;
@@ -249,6 +229,16 @@ public void clearSpawnerLayoutProvider() {
         plugin.getGuiLayoutConfig().setProvider(null);
     }
 
+    private boolean hasVanillaSpawnerKey(ItemStack spawnerItem) {
+        return spawnerItem.getPersistentDataContainer()
+                .has(vanillaSpawnerKey, PersistentDataType.BOOLEAN);
+    }
+
+    private boolean hasItemSpawnerKey(ItemStack spawnerItem) {
+        return spawnerItem.getPersistentDataContainer()
+                .has(itemSpawnerMaterialKey, PersistentDataType.STRING);
+    }
+
     /**
      * Gets the currently active per-spawner layout provider.
      *

core/src/main/java/github/nighter/smartspawner/extras/HopperTransfer.java

@@ -6,6 +6,7 @@
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
 import github.nighter.smartspawner.spawner.properties.VirtualInventory;
 import github.nighter.smartspawner.utils.BlockPos;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -64,36 +65,47 @@ private void transferItems(Location hopperLoc, Location spawnerLoc) {
             var state = hopperLoc.getBlock().getState(false);
             if (!(state instanceof Hopper hopper)) return;
 
-            Map<Integer, ItemStack> displayItems = virtualInv.getDisplayInventory();
-            if (displayItems == null || displayItems.isEmpty()) return;
-
             Inventory hopperInv = hopper.getInventory();
 
             int transferred = 0;
-
+            int rangeStart = 0;
+            int rangeSize = Math.max(plugin.getHopperConfig().getStackPerTransfer(), 9);
             List<ItemStack> removed = new ArrayList<>();
 
-            for (ItemStack item : displayItems.values()) {
-                if (transferred >= plugin.getHopperConfig().getStackPerTransfer()) break;
-                if (item == null || item.getType() == Material.AIR) continue;
+            while (transferred < plugin.getHopperConfig().getStackPerTransfer()) {
+                Int2ObjectMap<ItemStack> displayItems = virtualInv.getDisplayRange(rangeStart, rangeSize);
+                if (displayItems.isEmpty()) {
+                    break;
+                }
+
+                for (ItemStack item : displayItems.values()) {
+                    if (transferred >= plugin.getHopperConfig().getStackPerTransfer()) {
+                        break;
+                    }
+                    if (item == null || item.getType() == Material.AIR) {
+                        continue;
+                    }
 
-                ItemStack clone = item.clone();
-                int originalAmount = clone.getAmount();
+                    ItemStack clone = item.clone();
+                    int originalAmount = clone.getAmount();
 
-                HashMap<Integer, ItemStack> leftovers = hopperInv.addItem(clone);
+                    HashMap<Integer, ItemStack> leftovers = hopperInv.addItem(clone);
 
-                int insertedAmount = originalAmount;
+                    int insertedAmount = originalAmount;
 
-                if (!leftovers.isEmpty()) {
-                    insertedAmount -= leftovers.values().iterator().next().getAmount();
-                }
+                    if (!leftovers.isEmpty()) {
+                        insertedAmount -= leftovers.values().iterator().next().getAmount();
+                    }
 
-                if (insertedAmount > 0) {
-                    ItemStack toRemove = item.clone();
-                    toRemove.setAmount(insertedAmount);
-                    removed.add(toRemove);
-                    transferred++;
+                    if (insertedAmount > 0) {
+                        ItemStack toRemove = item.clone();
+                        toRemove.setAmount(insertedAmount);
+                        removed.add(toRemove);
+                        transferred++;
+                    }
                 }
+
+                rangeStart += rangeSize;
             }
 
             if (!removed.isEmpty()) {

core/src/main/java/github/nighter/smartspawner/language/cache/LanguageCache.java

@@ -1,5 +1,7 @@
 package github.nighter.smartspawner.language.cache;
 
+import github.nighter.smartspawner.utils.LRUCache;
+
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 

core/src/main/java/github/nighter/smartspawner/language/section/GuiLanguageSection.java

@@ -1,6 +1,6 @@
 package github.nighter.smartspawner.language.section;
 
-import github.nighter.smartspawner.language.cache.LRUCache;
+import github.nighter.smartspawner.utils.LRUCache;
 import github.nighter.smartspawner.language.format.ColorUtil;
 import github.nighter.smartspawner.language.format.LanguageComponentFormatter;
 

core/src/main/java/github/nighter/smartspawner/spawner/data/SpawnerFileHandler.java

@@ -438,13 +438,7 @@ private SpawnerData loadSpawnerFromConfig(String spawnerId, boolean logErrors, b
                     int amount = entry.getValue();
 
                     if (item != null && amount > 0) {
-                        while (amount > 0) {
-                            int batchSize = Math.min(amount, item.getMaxStackSize());
-                            ItemStack batch = item.clone();
-                            batch.setAmount(batchSize);
-                            virtualInv.addItems(Collections.singletonList(batch));
-                            amount -= batchSize;
-                        }
+                        virtualInv.addItem(item, amount);
                     }
                 }
             } catch (Exception e) {

core/src/main/java/github/nighter/smartspawner/spawner/data/database/SpawnerDatabaseHandler.java

@@ -680,13 +680,7 @@ private void loadInventoryFromJson(String jsonData, VirtualInventory virtualInv)
                 int amount = entry.getValue();
 
                 if (item != null && amount > 0) {
-                    while (amount > 0) {
-                        int batchSize = Math.min(amount, item.getMaxStackSize());
-                        ItemStack batch = item.clone();
-                        batch.setAmount(batchSize);
-                        virtualInv.addItems(Collections.singletonList(batch));
-                        amount -= batchSize;
-                    }
+                    virtualInv.addItem(item, amount);
                 }
             }
         } catch (Exception e) {