Refactor layout update logic to improve config handling and logging

Author: ptthanh02

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

@@ -41,7 +41,7 @@ public void loadLayout() {
         initializeLayoutsDirectory();
 
         // Check and update layout files before loading
-        layoutUpdater.checkAndUpdateLayouts();
+        // layoutUpdater.checkAndUpdateLayouts();
 
         this.currentStorageLayout = loadCurrentStorageLayout();
         this.currentMainLayout = loadCurrentMainLayout();

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

@@ -170,14 +170,10 @@ private void applyUserValues(FileConfiguration newConfig, Map<String, Object> us
             // Don't override config_version
             if (path.equals(CONFIG_VERSION_KEY)) continue;
 
-            // 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");
+            if (newConfig.contains(path)) {
+                newConfig.set(path, value);
+            } else {
+                plugin.getLogger().warning("Config path '" + path + "' from old config no longer exists in new config");
             }
         }
     }

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

@@ -24,174 +24,4 @@ public GuiLayoutUpdater(SmartSpawner plugin) {
         this.plugin = plugin;
         this.currentVersion = plugin.getDescription().getVersion();
     }
-
-    public void checkAndUpdateLayouts() {
-        File layoutsDir = new File(plugin.getDataFolder(), GUI_LAYOUTS_DIR);
-        if (!layoutsDir.exists()) {
-            return;
-        }
-
-        for (String layoutName : LAYOUT_NAMES) {
-            File layoutDir = new File(layoutsDir, layoutName);
-            if (!layoutDir.exists()) {
-                continue;
-            }
-
-            for (String fileName : LAYOUT_FILES) {
-                File layoutFile = new File(layoutDir, fileName);
-                if (layoutFile.exists()) {
-                    updateLayoutFile(layoutName, layoutFile, fileName);
-                }
-            }
-        }
-    }
-
-    private void updateLayoutFile(String layoutName, File layoutFile, String fileName) {
-        try {
-            FileConfiguration currentConfig = YamlConfiguration.loadConfiguration(layoutFile);
-            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 + ", 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;
-            }
-
-            Version configVersion = new Version(configVersionStr);
-            Version pluginVersion = new Version(currentVersion);
-
-            if (configVersion.compareTo(pluginVersion) >= 0) {
-                return;
-            }
-
-            Map<String, Object> userValues = flattenConfig(currentConfig);
-
-            File tempFile = new File(layoutFile.getParent(), fileName.replace(".yml", "_new.yml"));
-            createDefaultLayoutFileWithHeader(layoutName, tempFile, fileName);
-
-            FileConfiguration newConfig = YamlConfiguration.loadConfiguration(tempFile);
-            newConfig.set(GUI_LAYOUT_VERSION_KEY, currentVersion);
-
-            boolean configDiffers = hasConfigDifferences(userValues, newConfig);
-
-            if (configDiffers) {
-                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());
-            } else {
-                plugin.debug("No significant layout changes detected for " + layoutName + "/" + fileName + ", skipping backup creation");
-            }
-
-            applyUserValues(newConfig, userValues);
-            newConfig.save(layoutFile);
-            tempFile.delete();
-
-        } catch (Exception e) {
-            plugin.getLogger().log(Level.WARNING, "Failed to update layout " + layoutName + "/" + fileName + ": " + e.getMessage(), e);
-        }
-    }
-
-    private void createDefaultLayoutFileWithHeader(String layoutName, File destinationFile, String fileName) {
-        try {
-            String resourcePath = GUI_LAYOUTS_DIR + "/" + layoutName + "/" + fileName;
-            plugin.saveResource(resourcePath, true);
-
-            FileConfiguration config = YamlConfiguration.loadConfiguration(destinationFile);
-
-            // Create a new configuration with version at the top
-            FileConfiguration newConfig = new YamlConfiguration();
-            newConfig.set(GUI_LAYOUT_VERSION_KEY, currentVersion);
-
-            // Copy all existing keys to preserve order, with version first
-            for (String key : config.getKeys(false)) {
-                if (!key.equals(GUI_LAYOUT_VERSION_KEY)) {
-                    newConfig.set(key, config.get(key));
-                }
-            }
-
-            newConfig.save(destinationFile);
-
-        } catch (Exception e) {
-            plugin.getLogger().log(Level.WARNING, "Failed to create default layout file with header for " + layoutName + "/" + fileName, e);
-        }
-    }
-
-    private boolean hasConfigDifferences(Map<String, Object> userValues, FileConfiguration newConfig) {
-        Map<String, Object> newValues = flattenConfig(newConfig);
-
-        for (Map.Entry<String, Object> entry : userValues.entrySet()) {
-            String path = entry.getKey();
-            Object userValue = entry.getValue();
-
-            if (path.equals(GUI_LAYOUT_VERSION_KEY)) continue;
-
-            if (!newValues.containsKey(path)) {
-                return true;
-            }
-
-            Object newValue = newValues.get(path);
-            if (!Objects.equals(userValue, newValue)) {
-                return true;
-            }
-        }
-
-        for (String path : newValues.keySet()) {
-            if (!path.equals(GUI_LAYOUT_VERSION_KEY) && !userValues.containsKey(path)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private Map<String, Object> flattenConfig(ConfigurationSection config) {
-        Map<String, Object> result = new HashMap<>();
-        for (String key : config.getKeys(true)) {
-            if (!config.isConfigurationSection(key)) {
-                result.put(key, config.get(key));
-            }
-        }
-        return result;
-    }
-
-    private void applyUserValues(FileConfiguration newConfig, Map<String, Object> userValues) {
-        for (Map.Entry<String, Object> entry : userValues.entrySet()) {
-            String path = entry.getKey();
-            Object value = entry.getValue();
-
-            if (path.equals(GUI_LAYOUT_VERSION_KEY)) continue;
-
-            // 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");
-            }
-        }
-    }
 }