Merge pull request #10 from NighterDevelopment/copilot/fix-ea55fb49-7ecc-4a1b-be75-020e758f762e

Fix configuration updater backup issues and sell button functionality

Author: ptthanh02

core/src/main/java/github/nighter/smartspawner/spawner/gui/storage/SpawnerStorageUI.java

@@ -121,7 +121,7 @@ private void initializeStaticButtons() {
         }
 
         // Create sell button
-        GuiButton sellButton = layout.getButton("sell");
+        GuiButton sellButton = layout.getButton("sell_all");
         if (sellButton != null) {
             staticButtons.put("sell", createButton(
                     sellButton.getMaterial(),
@@ -289,8 +289,8 @@ private void addNavigationButtons(Map<Integer, ItemStack> updates, SpawnerData s
         }
 
         // Add sell button if shop integration is available and button is enabled
-        if (layout.hasButton("sell")) {
-            GuiButton sellButton = layout.getButton("sell");
+        if (layout.hasButton("sell_all")) {
+            GuiButton sellButton = layout.getButton("sell_all");
             String indicatorKey = getPageIndicatorKey(page, totalPages, spawner);
             int finalTotalPages = totalPages;
             ItemStack sellIndicator = pageIndicatorCache.computeIfAbsent(

core/src/main/java/github/nighter/smartspawner/updates/ConfigUpdater.java

@@ -170,10 +170,14 @@ private void applyUserValues(FileConfiguration newConfig, Map<String, Object> us
             // Don't override config_version
             if (path.equals(CONFIG_VERSION_KEY)) continue;
 
-            if (newConfig.contains(path)) {
-                newConfig.set(path, value);
-            } else {
-                plugin.getLogger().warning("Config path '" + path + "' from old config no longer exists in new config");
+            // Check if path exists in new config before applying
+            boolean existsInNew = newConfig.contains(path);
+            
+            // Always apply user values to preserve their customizations
+            newConfig.set(path, value);
+            
+            if (!existsInNew) {
+                plugin.getLogger().fine("Preserving custom config path '" + path + "' from old config that doesn't exist in new default");
             }
         }
     }

core/src/main/java/github/nighter/smartspawner/updates/GuiLayoutUpdater.java

@@ -52,8 +52,30 @@ private void updateLayoutFile(String layoutName, File layoutFile, String fileNam
             String configVersionStr = currentConfig.getString(GUI_LAYOUT_VERSION_KEY, "0.0.0");
 
             if (configVersionStr.equals("0.0.0")) {
-                plugin.debug("No version found in " + layoutName + "/" + fileName + ", creating default layout file with header");
-                createDefaultLayoutFileWithHeader(layoutName, layoutFile, fileName);
+                plugin.debug("No version found in " + layoutName + "/" + fileName + ", backing up and adding version header");
+                
+                // Create backup of the user's file before overwriting
+                File backupFile = new File(layoutFile.getParent(), fileName.replace(".yml", "_backup_" + configVersionStr + ".yml"));
+                Files.copy(layoutFile.toPath(), backupFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                plugin.getLogger().info("Layout backup created at " + backupFile.getName());
+                
+                // Get user's current values
+                Map<String, Object> userValues = flattenConfig(currentConfig);
+                
+                // Create temp file with default layout
+                File tempFile = new File(layoutFile.getParent(), fileName.replace(".yml", "_new.yml"));
+                createDefaultLayoutFileWithHeader(layoutName, tempFile, fileName);
+                
+                // Load the default config and set version
+                FileConfiguration newConfig = YamlConfiguration.loadConfiguration(tempFile);
+                newConfig.set(GUI_LAYOUT_VERSION_KEY, currentVersion);
+                
+                // Apply user values to preserve their customizations
+                applyUserValues(newConfig, userValues);
+                
+                // Save final config to user's file
+                newConfig.save(layoutFile);
+                tempFile.delete();
                 return;
             }
 
@@ -161,10 +183,14 @@ private void applyUserValues(FileConfiguration newConfig, Map<String, Object> us
 
             if (path.equals(GUI_LAYOUT_VERSION_KEY)) continue;
 
-            if (newConfig.contains(path)) {
-                newConfig.set(path, value);
-            } else {
-                plugin.getLogger().fine("Layout path '" + path + "' from old config no longer exists in new config");
+            // Check if path exists in new config before applying
+            boolean existsInNew = newConfig.contains(path);
+            
+            // Always apply user values to preserve their customizations
+            newConfig.set(path, value);
+            
+            if (!existsInNew) {
+                plugin.getLogger().fine("Preserving custom layout path '" + path + "' from old config that doesn't exist in new default");
             }
         }
     }