Improve error handling and logging in YAML storage and player/world loading

Author: thomasmny

buildsystem-core/src/main/java/de/eintosti/buildsystem/BuildSystemPlugin.java

@@ -107,6 +107,7 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitTask;
 
 public class BuildSystemPlugin extends JavaPlugin {
 
@@ -132,6 +133,8 @@ public class BuildSystemPlugin extends JavaPlugin {
 
     private BuildSystemApi api;
 
+    private BukkitTask configSaveTask;
+
     @Override
     public void onLoad() {
         instance = this;
@@ -169,7 +172,7 @@ public void onEnable() {
 
         registerStats();
 
-        Bukkit.getScheduler().runTaskTimer(this, this::saveBuildConfig, 6000L, 6000L);
+        this.configSaveTask = Bukkit.getScheduler().runTaskTimer(this, this::saveBuildConfig, 6000L, 6000L);
 
         Bukkit.getConsoleSender().sendMessage(
                 "%sBuildSystem » Plugin %senabled%s!".formatted(ChatColor.RESET, ChatColor.GREEN, ChatColor.RESET)
@@ -194,6 +197,10 @@ public void onDisable() {
         saveConfig();
         saveBuildConfig();
 
+        if (this.configSaveTask != null) {
+            this.configSaveTask.cancel();
+        }
+
         unregisterExpansions();
         this.api.unregister();
 

buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/PlayerStorageImpl.java

@@ -27,8 +27,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.bukkit.entity.Player;
@@ -51,13 +51,14 @@ public PlayerStorageImpl(BuildSystemPlugin plugin) {
     }
 
     public void loadPlayers() {
-        try {
-            this.buildPlayers.putAll(
-                    load().get().stream().collect(Collectors.toMap(BuildPlayer::getUniqueId, Function.identity()))
-            );
-        } catch (InterruptedException | ExecutionException e) {
-            logger.severe("Failed to load players from storage: " + e.getMessage());
-        }
+        load().thenAccept(players -> {
+            Map<UUID, BuildPlayer> loadedPlayers = players.stream().collect(Collectors.toMap(BuildPlayer::getUniqueId, Function.identity()));
+            this.buildPlayers.putAll(loadedPlayers);
+            logger.info("Loaded " + players.size() + " players from storage");
+        }).exceptionally(throwable -> {
+            logger.log(Level.SEVERE, "Failed to load players from storage", throwable);
+            return null;
+        });
     }
 
     @Override

buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/WorldStorageImpl.java

@@ -36,7 +36,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -164,32 +164,29 @@ public boolean isCorrectVisibility(boolean privateWorld, Visibility visibility)
     }
 
     public void loadWorlds() {
-        try {
-            load().get().forEach(this::addBuildWorld);
+        load().thenAccept(worlds -> {
+            worlds.forEach(this::addBuildWorld);
             assignWorldsToFolders();
-        } catch (InterruptedException | ExecutionException e) {
-            logger.severe("Failed to load worlds from storage: " + e.getMessage());
-            return;
-        }
-
-        boolean loadAllWorlds = !Unload.enabled;
-        if (loadAllWorlds) {
-            logger.info("*** All worlds will be loaded now ***");
-        } else {
-            logger.info("*** World unloading is enabled ('world.unload.enabled' = true); skipping pre-loading of worlds ***");
-        }
 
-        List<BuildWorld> notLoaded = new ArrayList<>();
-        getBuildWorlds().forEach(buildWorld -> {
-            if (loadWorld(buildWorld, loadAllWorlds) == LoadResult.FAILED) {
-                notLoaded.add(buildWorld);
+            boolean loadAllWorlds = !Unload.enabled;
+            if (loadAllWorlds) {
+                logger.info("*** All worlds will be loaded now ***");
             }
-        });
-        notLoaded.forEach(this::removeBuildWorld);
 
-        if (loadAllWorlds) {
-            logger.info("*** All worlds have been loaded ***");
-        }
+            List<BuildWorld> notLoaded = new ArrayList<>();
+            getBuildWorlds().forEach(buildWorld -> {
+                LoadResult loadResult = loadWorld(buildWorld, loadAllWorlds);
+                if (loadResult == LoadResult.FAILED) {
+                    notLoaded.add(buildWorld);
+                }
+            });
+            notLoaded.forEach(this::removeBuildWorld);
+
+            logger.info("Loaded " + worlds.size() + " worlds from storage");
+        }).exceptionally(throwable -> {
+            logger.log(Level.SEVERE, "Failed to load worlds from storage", throwable);
+            return null;
+        });
     }
 
     /**

buildsystem-core/src/main/java/de/eintosti/buildsystem/storage/yaml/AbstractYamlStorage.java

@@ -20,6 +20,8 @@
 import de.eintosti.buildsystem.BuildSystemPlugin;
 import java.io.File;
 import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -31,10 +33,12 @@ public abstract class AbstractYamlStorage {
 
     private final File file;
     private final FileConfiguration configuration;
+    private final Logger logger;
 
     public AbstractYamlStorage(BuildSystemPlugin plugin, String fileName) {
         this.file = new File(plugin.getDataFolder(), fileName);
         this.configuration = YamlConfiguration.loadConfiguration(file);
+        this.logger = plugin.getLogger();
         loadFile();
     }
 
@@ -48,15 +52,15 @@ public void loadFile() {
         try {
             configuration.load(file);
         } catch (IOException | InvalidConfigurationException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Failed to load configuration file: " + file.getName(), e);
         }
     }
 
     public void saveFile() {
         try {
             configuration.save(file);
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.log(Level.SEVERE, "Failed to save configuration file: " + file.getName(), e);
         }
     }
 

buildsystem-core/src/main/java/de/eintosti/buildsystem/util/UUIDFetcher.java

@@ -23,6 +23,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import de.eintosti.buildsystem.BuildSystemPlugin;
 import de.eintosti.buildsystem.util.ServerModeChecker.ServerMode;
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -34,6 +35,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
+import java.util.logging.Level;
 import org.bukkit.Bukkit;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
@@ -83,7 +85,7 @@ public static UUID getUUID(String name) {
             cacheUser(uuid, name);
             return uuid;
         } catch (Exception e) {
-            e.printStackTrace();
+            BuildSystemPlugin.get().getLogger().log(Level.SEVERE, "Failed to fetch UUID for player: " + name, e);
         }
 
         return null;
@@ -126,7 +128,7 @@ public static String getName(UUID uuid) {
             cacheUser(uuid, name);
             return name;
         } catch (Exception e) {
-            e.printStackTrace();
+            BuildSystemPlugin.get().getLogger().log(Level.SEVERE, "Failed to fetch name for UUID: " + uuid, e);
         }
 
         return null;