Refactor GUI button handling and update layout configuration for spawner info buttons

Author: ptthanh02

core/src/main/java/github/nighter/smartspawner/spawner/gui/layout/GuiButton.java

@@ -14,10 +14,6 @@ public class GuiButton {
     private final String condition;
     private final Map<String, String> actions;
 
-    public GuiButton(String buttonType, int slot, Material material, boolean enabled) {
-        this(buttonType, slot, material, enabled, null, null);
-    }
-
     public GuiButton(String buttonType, int slot, Material material, boolean enabled, String condition, Map<String, String> actions) {
         this.buttonType = buttonType;
         this.slot = slot;
@@ -34,16 +30,4 @@ public String getAction(String clickType) {
     public boolean hasCondition() {
         return condition != null && !condition.isEmpty();
     }
-
-    @Override
-    public String toString() {
-        return "GuiButton{" +
-                "buttonType='" + buttonType + '\'' +
-                ", slot=" + slot +
-                ", material=" + material +
-                ", enabled=" + enabled +
-                ", condition='" + condition + '\'' +
-                ", actions=" + actions +
-                '}';
-    }
 }

core/src/main/java/github/nighter/smartspawner/spawner/gui/main/SpawnerMenuUI.java

@@ -59,8 +59,8 @@ public void openSpawnerMenu(Player player, SpawnerData spawner, boolean refresh)
             items[storageButton.getSlot()] = createLootStorageItem(spawner);
         }
 
-        // Add spawner info button if enabled in layout
-        GuiButton spawnerInfoButton = layout.getButton("spawner_info");
+        // Add spawner info button if enabled in layout - handle conditional buttons
+        GuiButton spawnerInfoButton = getSpawnerInfoButton(layout, player);
         if (spawnerInfoButton != null) {
             items[spawnerInfoButton.getSlot()] = createSpawnerInfoItem(player, spawner);
         }
@@ -396,4 +396,25 @@ public ItemStack createExpItem(SpawnerData spawner) {
     private int calculatePercentage(long current, long maximum) {
         return maximum > 0 ? (int) ((double) current / maximum * 100) : 0;
     }
-}
+
+    private GuiButton getSpawnerInfoButton(GuiLayout layout, Player player) {
+        // Check for shop integration permission
+        boolean hasShopPermission = plugin.hasSellIntegration() && player.hasPermission("smartspawner.sellall");
+
+        // Try to get the appropriate conditional button first
+        if (hasShopPermission) {
+            GuiButton shopButton = layout.getButton("spawner_info_with_shop");
+            if (shopButton != null) {
+                return shopButton;
+            }
+        } else {
+            GuiButton noShopButton = layout.getButton("spawner_info_no_shop");
+            if (noShopButton != null) {
+                return noShopButton;
+            }
+        }
+
+        // Fallback to the generic spawner_info button if conditional ones don't exist
+        return layout.getButton("spawner_info");
+    }
+}

core/src/main/resources/gui_layouts/DonutSMP/main_gui.yml

@@ -3,8 +3,6 @@
 # Valid materials can be found at: https://jd.papermc.io/paper/1.21.8/org/bukkit/Material.html
 # Note: For PLAYER_HEAD material, the texture will be automatically set based on the spawner entity type
 
-gui_layout_version: "1.0.0"
-
 buttons:
 
   # Storage access button

core/src/main/resources/gui_layouts/DonutSMP/storage_gui.yml

@@ -2,8 +2,6 @@
 # Slot positions: 1-9 corresponds to inventory slots 46-54 (bottom row)
 # Valid materials can be found at: https://jd.papermc.io/paper/1.21.6/org/bukkit/Material.html
 
-gui_layout_version: "1.0.0"
-
 buttons:
   # Return to main menu button
   return:

core/src/main/resources/gui_layouts/default/main_gui.yml

@@ -3,13 +3,11 @@
 # Valid materials can be found at: https://jd.papermc.io/paper/1.21.8/org/bukkit/Material.html
 # Note: For PLAYER_HEAD material, the texture will be automatically set based on the spawner entity type
 
-gui_layout_version: "1.0.0"
-
 buttons:
 
   # Storage access button
   storage:
-    slot: 11
+    slot: 12
     material: CHEST
     enabled: true
     actions:
@@ -19,7 +17,7 @@ buttons:
   # Spawner information display with shop integration
   # With shop integration: Left click for selling/XP, right click for stacker
   spawner_info_with_shop:
-    slot: 13
+    slot: 14
     material: PLAYER_HEAD
     enabled: true
     condition: "shop_integration"
@@ -30,7 +28,7 @@ buttons:
   # Spawner information display without shop integration
   # Without shop integration: Both clicks open stacker GUI
   spawner_info_no_shop:
-    slot: 13
+    slot: 14
     material: PLAYER_HEAD
     enabled: true
     condition: "no_shop_integration"
@@ -40,7 +38,7 @@ buttons:
 
   # Experience collection button
   exp:
-    slot: 15
+    slot: 16
     material: EXPERIENCE_BOTTLE
     enabled: true
     actions:

core/src/main/resources/gui_layouts/default/storage_gui.yml

@@ -2,8 +2,6 @@
 # Slot positions: 1-9 corresponds to inventory slots 46-54 (bottom row)
 # Valid materials can be found at: https://jd.papermc.io/paper/1.21.8/org/bukkit/Material.html
 
-gui_layout_version: "1.0.0"
-
 buttons:
 
   # Previous page navigation button