Merge pull request #23 from NighterDevelopment/copilot/fix-ec45c5c9-739b-40d1-a098-ee3400726b64

ptthanh02 · web-flow · commit bc3f5cb60a90 · 2025-09-30T01:20:23.000+07:00
Implement items layout sorter for spawner storage GUI and update vi_VN translations
diff --git a/core/src/main/java/github/nighter/smartspawner/spawner/gui/storage/SpawnerStorageAction.java b/core/src/main/java/github/nighter/smartspawner/spawner/gui/storage/SpawnerStorageAction.java
@@ -39,6 +39,7 @@
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 public class SpawnerStorageAction implements Listener {
     private final SmartSpawner plugin;
@@ -162,8 +163,8 @@ private void handleControlSlotClick(Player player, int slot, StoragePageHolder h
         }
 
         switch (action) {
-            case "discard_all":
-                handleDiscardAllItems(player, spawner, inventory);
+            case "sort_items":
+                handleSortItemsClick(player, spawner, inventory);
                 break;
             case "item_filter":
                 openFilterConfig(player, spawner);
@@ -217,8 +218,8 @@ private void handleLegacyButtonType(Player player, int slot, StoragePageHolder h
         String buttonType = buttonTypeOpt.get();
 
         switch (buttonType) {
-            case "discard_all":
-                handleDiscardAllItems(player, spawner, inventory);
+            case "sort_items":
+                handleSortItemsClick(player, spawner, inventory);
                 break;
             case "item_filter":
                 openFilterConfig(player, spawner);
@@ -587,6 +588,84 @@ private void handleDiscardAllItems(Player player, SpawnerData spawner, Inventory
         }
     }
 
+    private void handleSortItemsClick(Player player, SpawnerData spawner, Inventory inventory) {
+        // Use same permission as storage access
+        if (!player.hasPermission("smartspawner.storage")) {
+            messageService.sendMessage(player, "no_permission");
+            return;
+        }
+
+        // Get available loot items
+        if (spawner.getLootConfig() == null || spawner.getLootConfig().getLootItems() == null) {
+            return; // No items to sort by
+        }
+
+        var lootItems = spawner.getLootConfig().getLootItems();
+        if (lootItems.isEmpty()) {
+            return; // No items to sort by
+        }
+
+        // Get current sort item
+        Material currentSort = spawner.getPreferredSortItem();
+        
+        // Find next sort item in the list
+        Material nextSort = null;
+        boolean foundCurrent = false;
+        
+        // Sort items for consistent ordering
+        var sortedLoot = lootItems.stream()
+            .map(item -> item.getMaterial())
+            .sorted(Comparator.comparing(Material::name))
+            .collect(Collectors.toList());
+        
+        if (currentSort == null) {
+            // No current sort, select first item
+            nextSort = sortedLoot.get(0);
+        } else {
+            // Find current item and select next one
+            for (int i = 0; i < sortedLoot.size(); i++) {
+                if (sortedLoot.get(i) == currentSort) {
+                    // Found current, get next (or wrap to first)
+                    nextSort = sortedLoot.get((i + 1) % sortedLoot.size());
+                    foundCurrent = true;
+                    break;
+                }
+            }
+            
+            // If current sort item is not in the loot list anymore, reset to first
+            if (!foundCurrent) {
+                nextSort = sortedLoot.get(0);
+            }
+        }
+
+        // Set new sort preference
+        spawner.setPreferredSortItem(nextSort);
+        
+        // Mark spawner as modified to save the preference
+        spawnerManager.queueSpawnerForSaving(spawner.getSpawnerId());
+
+        // Re-sort the virtual inventory
+        spawner.getVirtualInventory().sortItems(nextSort);
+
+        // Update the display
+        StoragePageHolder holder = (StoragePageHolder) inventory.getHolder(false);
+        if (holder != null) {
+            updatePageContent(player, spawner, holder.getCurrentPage(), inventory, false);
+        }
+
+        // Play sound and show feedback
+        player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 1.0f, 1.2f);
+        
+        String itemName = languageManager.getVanillaItemName(nextSort);
+        Map<String, String> placeholders = new HashMap<>();
+        placeholders.put("item", itemName);
+        messageService.sendMessage(player, "sort_changed", placeholders);
+        
+        if (!spawner.isInteracted()) {
+            spawner.markInteracted();
+        }
+    }
+
     private void openLootPage(Player player, SpawnerData spawner, int page, boolean refresh) {
         SpawnerStorageUI lootManager = plugin.getSpawnerStorageUI();
         String title = languageManager.getGuiTitle("gui_title_storage");
diff --git a/core/src/main/java/github/nighter/smartspawner/spawner/gui/storage/SpawnerStorageUI.java b/core/src/main/java/github/nighter/smartspawner/spawner/gui/storage/SpawnerStorageUI.java
@@ -18,6 +18,7 @@
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 public class SpawnerStorageUI {
     private static final int INVENTORY_SIZE = 54;
@@ -90,13 +91,13 @@ private void initializeStaticButtons() {
             ));
         }
 
-        // Create discard all button
-        GuiButton discardAllButton = layout.getButton("discard_all");
-        if (discardAllButton != null) {
-            staticButtons.put("discardAll", createButton(
-                    discardAllButton.getMaterial(),
-                    languageManager.getGuiItemName("discard_all_button.name"),
-                    languageManager.getGuiItemLoreAsList("discard_all_button.lore")
+        // Create sort items button
+        GuiButton sortItemsButton = layout.getButton("sort_items");
+        if (sortItemsButton != null) {
+            staticButtons.put("sortItems", createButton(
+                    sortItemsButton.getMaterial(),
+                    languageManager.getGuiItemName("sort_items_button.name"),
+                    languageManager.getGuiItemLoreAsList("sort_items_button.lore")
             ));
         }
 
@@ -264,10 +265,11 @@ private void addNavigationButtons(Map<Integer, ItemStack> updates, SpawnerData s
             updates.put(takeAllButton.getSlot(), staticButtons.get("takeAll"));
         }
 
-        // Add discard all button if enabled
-        if (layout.hasButton("discard_all")) {
-            GuiButton discardAllButton = layout.getButton("discard_all");
-            updates.put(discardAllButton.getSlot(), staticButtons.get("discardAll"));
+        // Add sort items button if enabled
+        if (layout.hasButton("sort_items")) {
+            GuiButton sortItemsButton = layout.getButton("sort_items");
+            ItemStack sortButton = createSortButton(spawner, sortItemsButton.getMaterial());
+            updates.put(sortItemsButton.getSlot(), sortButton);
         }
 
         // Add drop page button if enabled
@@ -339,6 +341,43 @@ private ItemStack createSellButton(Material material) {
         return createButton(material, name, lore);
     }
 
+    private ItemStack createSortButton(SpawnerData spawner, Material material) {
+        Map<String, String> placeholders = new HashMap<>();
+        
+        // Get current sort item
+        Material currentSort = spawner.getPreferredSortItem();
+        String currentSortName = currentSort != null ? 
+            languageManager.getVanillaItemName(currentSort) : "&#f8f8ffNone";
+        placeholders.put("current_sort_item", "  &#37eb9a• " + currentSortName);
+        
+        // Get available items from spawner drops
+        StringBuilder availableItems = new StringBuilder();
+        if (spawner.getLootConfig() != null && spawner.getLootConfig().getLootItems() != null) {
+            boolean first = true;
+            var sortedLoot = spawner.getLootConfig().getLootItems().stream()
+                .sorted(Comparator.comparing(item -> item.getMaterial().name()))
+                .collect(java.util.stream.Collectors.toList());
+                
+            for (var lootItem : sortedLoot) {
+                if (!first) availableItems.append("\n");
+                String itemName = languageManager.getVanillaItemName(lootItem.getMaterial());
+                String color = currentSort == lootItem.getMaterial() ? "&#37eb9a" : "&#bdc3c7";
+                availableItems.append("  ").append(color).append("• ").append(itemName);
+                first = false;
+            }
+        }
+        
+        if (availableItems.length() == 0) {
+            availableItems.append("  &#bdc3c7• None");
+        }
+        
+        placeholders.put("available_items", availableItems.toString());
+        
+        String name = languageManager.getGuiItemName("sort_items_button.name", placeholders);
+        List<String> lore = languageManager.getItemLoreWithMultilinePlaceholders("sort_items_button.lore", placeholders);
+        return createButton(material, name, lore);
+    }
+
     private void startCleanupTask() {
         cleanupTask = Scheduler.runTaskTimer(this::cleanupCaches, 20L * 30, 20L * 30); // Run every 30 seconds
     }
diff --git a/core/src/main/java/github/nighter/smartspawner/spawner/properties/SpawnerData.java b/core/src/main/java/github/nighter/smartspawner/spawner/properties/SpawnerData.java
@@ -92,6 +92,10 @@ public class SpawnerData {
     @Getter @Setter
     private long cachedSpawnDelay = 0;
 
+    // Sort preference for spawner storage
+    @Getter @Setter
+    private Material preferredSortItem;
+
     public SpawnerData(String id, Location location, EntityType type, SmartSpawner plugin) {
         this.plugin = plugin;
         this.spawnerId = id;
@@ -112,6 +116,7 @@ private void initializeDefaults() {
         this.isAtCapacity = false;
         this.stackSize = 1;
         this.lastSpawnTime = System.currentTimeMillis();
+        this.preferredSortItem = null; // Initialize sort preference as null
     }
 
     public void loadConfigurationValues() {
diff --git a/core/src/main/java/github/nighter/smartspawner/spawner/properties/VirtualInventory.java b/core/src/main/java/github/nighter/smartspawner/spawner/properties/VirtualInventory.java
@@ -6,6 +6,7 @@
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 public class VirtualInventory {
     private final Map<ItemSignature, Long> consolidatedItems;
@@ -302,4 +303,45 @@ private void updateMetricsCache() {
     public boolean isDirty() {
         return displayCacheDirty;
     }
+
+    /**
+     * Sorts items with the specified material type prioritized first.
+     * This method optimizes by only invalidating caches when necessary.
+     * 
+     * @param preferredMaterial The material to sort first, or null for no preference
+     */
+    public void sortItems(org.bukkit.Material preferredMaterial) {
+        // Clear the sorted cache to force re-sorting with new preference
+        this.sortedEntriesCache = null;
+        
+        // Only proceed if we have items to sort
+        if (consolidatedItems.isEmpty()) {
+            this.displayCacheDirty = true;
+            return;
+        }
+        
+        // Generate new sorted entries with preference
+        if (preferredMaterial != null) {
+            this.sortedEntriesCache = consolidatedItems.entrySet().stream()
+                .sorted((e1, e2) -> {
+                    boolean e1Preferred = e1.getKey().getTemplate().getType() == preferredMaterial;
+                    boolean e2Preferred = e2.getKey().getTemplate().getType() == preferredMaterial;
+                    
+                    if (e1Preferred && !e2Preferred) return -1;
+                    if (!e1Preferred && e2Preferred) return 1;
+                    
+                    // Both preferred or both not preferred, sort by material name
+                    return e1.getKey().getMaterialName().compareTo(e2.getKey().getMaterialName());
+                })
+                .collect(java.util.stream.Collectors.toList());
+        } else {
+            // No preference, sort alphabetically by material name
+            this.sortedEntriesCache = consolidatedItems.entrySet().stream()
+                .sorted(Comparator.comparing(e -> e.getKey().getMaterialName()))
+                .collect(java.util.stream.Collectors.toList());
+        }
+        
+        // Mark display cache as dirty to force regeneration
+        this.displayCacheDirty = true;
+    }
 }
diff --git a/core/src/main/java/github/nighter/smartspawner/spawner/utils/SpawnerFileHandler.java b/core/src/main/java/github/nighter/smartspawner/spawner/utils/SpawnerFileHandler.java
@@ -194,6 +194,10 @@ private boolean saveSpawnerBatch(Map<String, SpawnerData> spawners) {
                 // Save last interacted player separately
                 spawnerData.set(path + ".lastInteractedPlayer", spawner.getLastInteractedPlayer());
 
+                // Save preferred sort item
+                spawnerData.set(path + ".preferredSortItem", spawner.getPreferredSortItem() != null ?
+                        spawner.getPreferredSortItem().name() : null);
+
                 Set<Material> filteredItems = spawner.getFilteredItems();
                 if (filteredItems != null && !filteredItems.isEmpty()) {
                     List<String> materials = filteredItems.stream()
@@ -440,6 +444,17 @@ private SpawnerData loadSpawnerFromConfig(String spawnerId, boolean logErrors) {
         // Load last interacted player
         String lastInteractedPlayer = spawnerData.getString(path + ".lastInteractedPlayer");
         spawner.setLastInteractedPlayer(lastInteractedPlayer);
+
+        // Load preferred sort item
+        String preferredSortItemStr = spawnerData.getString(path + ".preferredSortItem");
+        if (preferredSortItemStr != null && !preferredSortItemStr.isEmpty()) {
+            try {
+                Material preferredSortItem = Material.valueOf(preferredSortItemStr);
+                spawner.setPreferredSortItem(preferredSortItem);
+            } catch (IllegalArgumentException e) {
+                logger.warning("Invalid preferred sort item for spawner " + spawnerId + ": " + preferredSortItemStr);
+            }
+        }
         
         return spawner;
     }
diff --git a/core/src/main/resources/gui_layouts/default/storage_gui.yml b/core/src/main/resources/gui_layouts/default/storage_gui.yml
@@ -10,10 +10,10 @@ buttons:
     material: SPECTRAL_ARROW
     enabled: true
 
-  # Discard all items button
-  discard_all:
+  # Item sort button (replaces discard all)
+  sort_items:
     slot: 3
-    material: CAULDRON
+    material: COMPARATOR
     enabled: true
 
   # Item filter configuration button
diff --git a/core/src/main/resources/language/en_US/gui.yml b/core/src/main/resources/language/en_US/gui.yml
@@ -198,10 +198,16 @@ item_filter_button:
   lore:
     - '&#3498db⊳ &#f8f8ffᴄʟɪᴄᴋ ᴛᴏ ᴄᴏɴꜰɪɢᴜʀᴇ'
 
-discard_all_button:
-  name: '&#ff5252ᴅɪꜱᴄᴀʀᴅ ᴀʟʟ ɪᴛᴇᴍꜱ'
+sort_items_button:
+  name: '&#ffd700ꜱᴏʀᴛ ɪᴛᴇᴍꜱ'
   lore:
-    - '&#e63939⊳ &#f8f8ffᴄʟɪᴄᴋ ᴛᴏ &#ff5252ʀᴇᴍᴏᴠᴇ&#f8f8ff ᴀʟʟ ɪᴛᴇᴍꜱ'
+    - '&#ffd700◈ ᴄᴜʀʀᴇɴᴛ ꜱᴏʀᴛ:'
+    - '  %current_sort_item%'
+    - ''
+    - '&#ffd700◈ ᴀᴠᴀɪʟᴀʙʟᴇ ɪᴛᴇᴍꜱ:'
+    - '%available_items%'
+    - ''
+    - '&#ffd700⊳ &#f8f8ffᴄʟɪᴄᴋ ᴛᴏ ᴄʏᴄʟᴇ ꜱᴏʀᴛ ᴏᴘᴛɪᴏɴ'
 
 drop_page_button:
   name: '&#607D8Bᴅʀᴏᴘ ᴀʟʟ ɪᴛᴇᴍꜱ'
diff --git a/core/src/main/resources/language/en_US/messages.yml b/core/src/main/resources/language/en_US/messages.yml
@@ -280,4 +280,11 @@ spawner_management:
 
   stack_decreased:
     message: "&#e6e6faꜱᴛᴀᴄᴋ &#ff6b6bᴅᴇᴄʀᴇᴀꜱᴇᴅ &#e6e6faby &#fce96a%amount% &#e6e6fa- ɴᴇᴡ ꜱɪᴢᴇ: &#37eb9a%new_size%"
-    sound: entity.experience_orb.pickup
+    sound: entity.experience_orb.pickup
+
+# ------------------------------------------------------
+#             Spawner Storage - Sort Messages
+# ------------------------------------------------------
+sort_changed:
+  message: "&#ffd700ɪᴛᴇᴍ ꜱᴏʀᴛ ᴄʜᴀɴɢᴇᴅ ᴛᴏ: &#f8f8ff%item%"
+  sound: entity.experience_orb.pickup
diff --git a/core/src/main/resources/language/vi_VN/gui.yml b/core/src/main/resources/language/vi_VN/gui.yml
@@ -145,10 +145,16 @@ item_filter_button:
   lore:
     - '&#7b68ee⊳ &#f8f8ffɴʜấᴘ ᴠàᴏ để ᴄàɪ đặᴛ'
 
-discard_all_button:
-  name: '&#ff5252ʟᴏạɪ ʙỏ ᴛấᴛ ᴄả ᴠậᴛ ᴘʜẩᴍ'
+sort_items_button:
+  name: '&#ffd700sắᴘ xếᴘ ᴠậᴛ ᴘʜẩᴍ'
   lore:
-    - '&#e63939⊳ &#f8f8ffɴʜấᴘ để &#ff5252xóᴀ&#f8f8ff ᴛấᴛ ᴄả ᴠậᴛ ᴘʜẩᴍ'
+    - '&#ffd700◈ ᴄáᴄʜ sắᴘ xếᴘ ʜɪệɴ ᴛạɪ:'
+    - '  %current_sort_item%'
+    - ''
+    - '&#ffd700◈ ᴠậᴛ ᴘʜẩᴍ ᴄó sẵɴ:'
+    - '%available_items%'
+    - ''
+    - '&#ffd700⊳ &#f8f8ffɴʜấᴘ để ᴄʜuyểɴ đổɪ ᴄáᴄʜ sắᴘ xếᴘ'
 
 drop_page_button:
   name: '&#7b68eeᴛʜả đồ'
@@ -357,4 +363,17 @@ price_item:
     - ''
     - '&#d9b50c◈ &#fce96aɢɪá ᴄʜɪ ᴛɪếᴛ:'
     - '  &#f8f8ff•  ᴛùʏ ᴄʜỉɴʜ: &#37eb9a$%custom_price%'
-    - '  &#f8f8ff•  ᴄửᴀ ʜàɴɢ: &#37eb9a$%shop_price%'
+    - '  &#f8f8ff•  ᴄửᴀ ʜàɴɢ: &#37eb9a$%shop_price%'
+
+# ---------------------------------------------------
+#                  Bedrock GUI
+# ---------------------------------------------------
+bedrock:
+  main_gui:
+    title_single_spawner: 'ʟồɴɢ sᴘᴀᴡɴ %entity%'
+    title_stacked_spawner: '%amount% ʟồɴɢ sᴘᴀᴡɴ %entity%'
+
+    button_names:
+      storage: Mở ᴋʜᴏ ᴄʜứᴀ
+      exp: Thu ᴛʜậᴘ XP
+      stacker: Qᴜảɴ ʟý xếᴘ ᴄʜồɴɢ
diff --git a/core/src/main/resources/language/vi_VN/messages.yml b/core/src/main/resources/language/vi_VN/messages.yml
