Logic rewrite

build.gradle.kts

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

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/LanguageManager.java

@@ -1,6 +1,7 @@
 package github.nighter.smartspawner.language;
 
 import github.nighter.smartspawner.SmartSpawner;
+import github.nighter.smartspawner.utils.LRUCache;
 import lombok.Getter;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -17,7 +18,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
-import java.text.Normalizer;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;

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

@@ -437,13 +437,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) {