Complete SpawnerMenuFormUI enhancement with all requested features

Copilot · ptthanh02 · Copilot · commit d50469c5c747 · 2025-09-16T01:23:53.000Z
Co-authored-by: ptthanh02 &lt;73684260+ptthanh02@users.noreply.github.com&gt;
diff --git a/core/src/main/java/github/nighter/smartspawner/spawner/gui/main/SpawnerMenuFormUI.java b/core/src/main/java/github/nighter/smartspawner/spawner/gui/main/SpawnerMenuFormUI.java
@@ -154,9 +154,8 @@ private GuiButton getSpawnerInfoButton(GuiLayout layout, boolean hasShopPermissi
     }
 
     private String createInfoContent(Player player, SpawnerData spawner) {
-        // Get configured info content from language file
-        List<String> headerList = languageManager.getConfig().getStringList("bedrock_gui.info_content.header");
-        String header = headerList.isEmpty() ? "INFORMATION:" : String.join(" ", headerList);
+        // Get configured info content from language file - use hardcoded header as fallback
+        String header = "INFORMATION:";
         
         StringBuilder content = new StringBuilder();
         content.append(header).append("\n\n");
@@ -218,10 +217,39 @@ private Map<String, String> createContentPlaceholders(Player player, SpawnerData
     }
 
     private void addConfiguredSection(StringBuilder content, String sectionName, Map<String, String> placeholders) {
-        List<String> sectionLines = languageManager.getConfig().getStringList("bedrock_gui.info_content.sections." + sectionName);
+        // Use the GUI item lore method which can access configuration
+        List<String> sectionLines = languageManager.getGuiItemLoreList("bedrock_gui.info_content.sections." + sectionName, placeholders);
+        
+        // If the configuration key doesn't exist, add default content
+        if (sectionLines.isEmpty()) {
+            addDefaultSection(content, sectionName, placeholders);
+            return;
+        }
+        
         for (String line : sectionLines) {
-            String processedLine = languageManager.replacePlaceholders(line, placeholders);
-            content.append(processedLine).append("\n");
+            content.append(line).append("\n");
+        }
+    }
+
+    private void addDefaultSection(StringBuilder content, String sectionName, Map<String, String> placeholders) {
+        // Default fallback content if configuration is missing
+        switch (sectionName) {
+            case "spawner_info":
+                content.append("Stack: ").append(placeholders.get("stack_size")).append("\n");
+                content.append("Range: ").append(placeholders.get("range")).append(" blocks\n");
+                content.append("Mobs: ").append(placeholders.get("min_mobs")).append(" - ").append(placeholders.get("max_mobs")).append("\n");
+                content.append("Delay: ").append(placeholders.get("delay")).append("s\n\n");
+                break;
+            case "storage_info":
+                content.append("STORAGE:\n");
+                content.append("Slots: ").append(placeholders.get("current_items")).append("/").append(placeholders.get("max_items")).append("\n");
+                content.append("Status: ").append(placeholders.get("storage_status")).append("\n\n");
+                break;
+            case "experience_info":
+                content.append("EXPERIENCE:\n");
+                content.append("Current: ").append(placeholders.get("current_exp")).append("/").append(placeholders.get("max_exp")).append(" XP\n");
+                content.append("Status: ").append(placeholders.get("exp_status")).append("\n");
+                break;
         }
     }
 
diff --git a/core/src/main/resources/gui_layouts/DonutSMP/main_gui.yml b/core/src/main/resources/gui_layouts/DonutSMP/main_gui.yml
@@ -23,7 +23,7 @@ buttons:
     condition: "shop_integration"
     actions:
       left_click: "sell_inventory"    # Collect EXP and sell items in storage
-      right_click: "sell_inventory"     # Open stacker GUI
+      right_click: "open_stacker"     # Open stacker GUI
 
   # Spawner information display without shop integration
   # Without shop integration: Both clicks open stacker GUI
@@ -32,6 +32,9 @@ buttons:
     material: PLAYER_HEAD
     enabled: true
     condition: "no_shop_integration"
+    actions:
+      left_click: "open_stacker"      # Open stacker GUI
+      right_click: "open_stacker"     # Open stacker GUI
 
   # Experience collection button
   exp:
@@ -40,4 +43,14 @@ buttons:
     enabled: true
     actions:
       left_click: "collect_exp"
-      right_click: "collect_exp"
+      right_click: "collect_exp"
+
+  # Sell all items button (only items, no experience)
+  sell_all:
+    slot: 10
+    material: GOLD_INGOT
+    enabled: true
+    condition: "shop_integration"
+    actions:
+      left_click: "sell_all"
+      right_click: "sell_all"
diff --git a/core/src/main/resources/language/DonutSMP/gui.yml b/core/src/main/resources/language/DonutSMP/gui.yml
@@ -33,29 +33,55 @@ bedrock_gui:
   # Button text configuration for Bedrock forms
   buttons:
     # Storage button - opens spawner loot storage
-    storage: '&#F97603Open Storage'
+    storage: 'Open Storage'
     
     # Info/Stack button - opens spawner stacking menu  
-    stack_info: '&#FCE300Open Stack Menu'
+    stack_info: 'Open Stack Menu'
     
     # Experience button - collects stored experience
-    experience: '&#FCE300Collect Experience'
+    experience: 'Collect Experience'
+    
+    # Sell inventory button - collects XP and sells all items
+    sell_inventory: 'Claim XP & Sell All'
+    
+    # Sell all button - sells all items only
+    sell_all: 'Sell All Items'
   
   # Status text for storage and experience displays
   status:
     storage:
-      empty: '&#aEmpty'
-      plenty_space: '&#aPlenty of Space'
-      half_full: '&#eHalf Full'
-      filling_up: '&#F97603Filling Up'
-      nearly_full: '&#cNearly Full'
+      empty: 'Empty'
+      plenty_space: 'Plenty of Space'
+      half_full: 'Half Full'
+      filling_up: 'Filling Up'
+      nearly_full: 'Nearly Full'
     
     experience:
-      empty: '&#aEmpty'
-      small_amount: '&#aSmall Amount'
-      medium_amount: '&#FCE300Medium Amount'
-      large_amount: '&#F97603Large Amount'
-      almost_full: '&#cAlmost Full'
+      empty: 'Empty'
+      small_amount: 'Small Amount'
+      medium_amount: 'Medium Amount'
+      large_amount: 'Large Amount'
+      almost_full: 'Almost Full'
+
+  # Configurable spawner info content for Bedrock forms (displayed at bottom)
+  info_content:
+    header: 'INFORMATION:'
+    sections:
+      spawner_info:
+        - 'Stack: %stack_size%'
+        - 'Range: %range% blocks'
+        - 'Mobs: %min_mobs% - %max_mobs%'
+        - 'Delay: %delay%s'
+        - ''
+      storage_info:
+        - 'STORAGE:'
+        - 'Slots: %current_items%/%max_items%'
+        - 'Status: %storage_status%'
+        - ''
+      experience_info:
+        - 'EXPERIENCE:'
+        - 'Current: %current_exp%/%max_exp% XP'
+        - 'Status: %exp_status%'
 
 spawner_storage_item:
   name: '&#F97603sᴘᴀᴡɴᴇʀ sᴛᴏʀᴀɢᴇ'
diff --git a/core/src/main/resources/language/en_US/gui.yml b/core/src/main/resources/language/en_US/gui.yml
@@ -74,13 +74,13 @@ bedrock_gui:
         - 'Range: %range% blocks'
         - 'Mobs: %min_mobs% - %max_mobs%'
         - 'Delay: %delay%s'
-      storage_info:
         - ''
+      storage_info:
         - 'STORAGE:'
         - 'Slots: %current_items%/%max_items%'
         - 'Status: %storage_status%'
-      experience_info:
         - ''
+      experience_info:
         - 'EXPERIENCE:'
         - 'Current: %current_exp%/%max_exp% XP'
         - 'Status: %exp_status%'
diff --git a/core/src/main/resources/language/vi_VN/gui.yml b/core/src/main/resources/language/vi_VN/gui.yml
@@ -33,29 +33,55 @@ bedrock_gui:
   # Button text configuration for Bedrock forms
   buttons:
     # Storage button - opens spawner loot storage
-    storage: '&#fce96aᴍở ᴋʜᴏ ᴄʜứᴀ'
+    storage: 'Mở Kho Chứa'
     
     # Info/Stack button - opens spawner stacking menu  
-    stack_info: '&#ab7afdᴍở ᴍᴇɴᴜ xếᴘ ᴄʜồɴɢ'
+    stack_info: 'Mở Menu Xếp Chồng'
     
     # Experience button - collects stored experience
-    experience: '&#37eb9aThu thập ᴋɪɴʜ ɴɢʜɪệᴍ'
+    experience: 'Thu Thập Kinh Nghiệm'
+    
+    # Sell inventory button - collects XP and sells all items
+    sell_inventory: 'Nhận XP & Bán Tất Cả'
+    
+    # Sell all button - sells all items only
+    sell_all: 'Bán Tất Cả Vật Phẩm'
   
   # Status text for storage and experience displays
   status:
     storage:
-      empty: '&#aTrống'
-      plenty_space: '&#aCòn ɴʜɪềᴜ ᴄʜỗ'
-      half_full: '&#eNửᴀ đầʏ'
-      filling_up: '&#6Đang đầʏ dần'
-      nearly_full: '&#cGầɴ đầʏ'
+      empty: 'Trống'
+      plenty_space: 'Còn nhiều chỗ'
+      half_full: 'Nửa đầy'
+      filling_up: 'Đang đầy dần'
+      nearly_full: 'Gần đầy'
     
     experience:
-      empty: '&#aTrống'
-      small_amount: '&#aSố ʟượɴɢ ɪ́ᴛ'
-      medium_amount: '&#eSố ʟượɴɢ ᴛrung bình'
-      large_amount: '&#6Số ʟượɴɢ ʟớɴ'
-      almost_full: '&#cGầɴ đầʏ'
+      empty: 'Trống'
+      small_amount: 'Số lượng ít'
+      medium_amount: 'Số lượng trung bình'
+      large_amount: 'Số lượng lớn'
+      almost_full: 'Gần đầy'
+
+  # Configurable spawner info content for Bedrock forms (displayed at bottom)
+  info_content:
+    header: 'THÔNG TIN:'
+    sections:
+      spawner_info:
+        - 'Chồng: %stack_size%'
+        - 'Phạm vi: %range% khối'
+        - 'Quái vật: %min_mobs% - %max_mobs%'
+        - 'Độ trễ: %delay%s'
+        - ''
+      storage_info:
+        - 'KHO CHỨA:'
+        - 'Ô: %current_items%/%max_items%'
+        - 'Trạng thái: %storage_status%'
+        - ''
+      experience_info:
+        - 'KINH NGHIỆM:'
+        - 'Hiện tại: %current_exp%/%max_exp% XP'
+        - 'Trạng thái: %exp_status%'
 
 spawner_storage_item:
   name: '&#fce96aᴋʜᴏ ᴄʜứᴀ'
