Refactor configuration management and enhance logging

Author: renvins

bukkit/src/main/java/it/renvins/serverpulse/bukkit/ServerPulseBukkitLoader.java

@@ -68,6 +68,8 @@ public ServerPulseBukkitLoader(ServerPulseBukkit plugin) {
         }
         this.diskRetriever = new DiskRetriever(plugin.getDataFolder());
         this.pingRetriever = new BukkitPingRetriever();
+
+        LOGGER.info("ServerPulse for Bukkit/Paper initialized - waiting for server starting...");
     }
 
     @Override

bukkit/src/main/java/it/renvins/serverpulse/bukkit/config/BukkitConfiguration.java

@@ -16,21 +16,11 @@ public class BukkitConfiguration {
     private File file;
     @Getter private YamlConfiguration config;
 
-    /**
-     * Constructs a new CustomConfig manager.
-     *
-     * @param plugin The main ServerPulsePlugin instance.
-     * @param name   The name of the configuration file (e.g., "config.yml").
-     */
     public BukkitConfiguration(ServerPulseBukkit plugin, String name) {
         this.plugin = plugin;
         this.name = name;
     }
 
-    /**
-     * Loads the configuration file. If the file doesn't exist,
-     * it saves the default resource from the plugin JAR.
-     */
     public void load() {
         if (!plugin.getDataFolder().exists()) {
             plugin.getDataFolder().mkdir();
@@ -42,10 +32,6 @@ public void load() {
         config = YamlConfiguration.loadConfiguration(file);
     }
 
-    /**
-     * Saves the current configuration state back to the file.
-     * Logs an error if saving fails.
-     */
     public void save() {
         try {
             config.save(file);
@@ -54,12 +40,6 @@ public void save() {
         }
     }
 
-    /**
-     * Reloads the configuration file, reloading the YamlConfiguration.
-     * Logs an error if the file is null.
-     *
-     * @return true if the reload was successful, false otherwise.
-     */
     public boolean reload() {
         if (file == null) {
             ServerPulseBukkitLoader.LOGGER.log(Level.SEVERE, "File is null, cannot reload configuration.");

bukkit/src/main/java/it/renvins/serverpulse/bukkit/platform/BukkitPlatform.java

@@ -23,7 +23,7 @@ public boolean isEnabled() {
 
     @Override
     public void disable() {
-        plugin.getServer().getPluginManager().disablePlugin(plugin);
+        plugin.getServer().shutdown();
     }
 
     @Override

fabric/src/main/java/it/renvins/serverpulse/fabric/ServerPulseFabric.java

@@ -80,9 +80,9 @@ public void onInitialize() {
     }
 
     private void onServerStarting(MinecraftServer server) {
-        LOGGER.info("ServerPulse is starting...");
         this.server = server;
 
+        LOGGER.info("Loading configuration...");
         config.load();
 
         ServerPulseProvider.register(new ServerPulseFabricAPI(databaseService, metricsService, tpsRetriever, diskRetriever, pingRetriever));
@@ -98,8 +98,6 @@ private void onServerStarting(MinecraftServer server) {
     }
 
     private void onServerStopped(MinecraftServer server) {
-        LOGGER.info("ServerPulse is stopping...");
-
         databaseService.unload();
         metricsService.unload();
 

velocity/build.gradle.kts

@@ -41,7 +41,6 @@ tasks.withType<ShadowJar> {
     relocate("okhttp3", "$relocatePath.okhttp3")
     relocate("okio", "$relocatePath.okio")
     relocate("org.jetbrains", "$relocatePath.jetbrains")
-    relocate("com.google", "$relocatePath.google")
     relocate("io.reactivex", "$relocatePath.reactivex")
     relocate("javax.annotation", "$relocatePath.annotation")
     relocate("org.apache", "$relocatePath.apache")
@@ -50,4 +49,6 @@ tasks.withType<ShadowJar> {
     relocate("retrofit2", "$relocatePath.retrofit2")
     relocate("kotlin", "$relocatePath.kotlin") // Relocate instead of exclude
     relocate("org.jetbrains.kotlin", "$relocatePath.jetbrains.kotlin") // Relocate instead of exclude
+    relocate("org.simpleyaml", "$relocatePath.simpleyaml")
+    relocate("org.yaml", "$relocatePath.yaml")
 }

velocity/src/main/java/it/renvins/serverpulse/velocity/ServerPulseVelocity.java

@@ -6,6 +6,7 @@
 import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
@@ -38,29 +39,36 @@
 public class ServerPulseVelocity {
 
     @Getter private final ProxyServer server;
-    private final PulseLogger logger;
+    private final Logger logger;
+    private final Path dataDirectory;
 
-    private final VelocityConfiguration config;
+    private PulseLogger pulseLogger;
 
-    private final IDiskRetriever diskRetriever;
-    private final IPingRetriever pingRetriever;
+    private VelocityConfiguration config;
+
+    private IDiskRetriever diskRetriever;
+    private IPingRetriever pingRetriever;
 
     private IDatabaseService databaseService;
     private IMetricsService metricsService;
 
     @Inject
-    public ServerPulseVelocity(ProxyServer server, @DataDirectory Path dataDirectory, Logger logger) {
+    public ServerPulseVelocity(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) {
         this.server = server;
+        this.logger = logger;
+        this.dataDirectory = dataDirectory;
+
+        logger.info("ServerPulse for Fabric initialized - waiting for proxy starting...");
+    }
 
-        this.logger = new VelocityLogger(logger);
+    @Subscribe
+    public void onProxyInitialization(ProxyInitializeEvent event) {
+        this.pulseLogger = new VelocityLogger(logger);
         this.config = new VelocityConfiguration(logger, dataDirectory, "config.yml");
 
         this.diskRetriever = new DiskRetriever(dataDirectory.toFile());
         this.pingRetriever = new VelocityPingRetriever(this);
-    }
 
-    @Subscribe
-    public void onProxyInitialization(ProxyInitializeEvent event) {
         logger.info("Loading configuration file...");
         config.load();
 
@@ -70,8 +78,8 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         Platform platform = new VelocityPlatform(this);
         TaskScheduler scheduler = new VelocityTaskScheduler(this);
 
-        this.databaseService = new DatabaseService(logger, platform, dbConfig, scheduler);
-        this.metricsService = new MetricsService(logger, platform, metricsConfig, scheduler);
+        this.databaseService = new DatabaseService(pulseLogger, platform, dbConfig, scheduler);
+        this.metricsService = new MetricsService(pulseLogger, platform, metricsConfig, scheduler);
 
         ServerPulseProvider.register(new ServerPulseVelocityAPI(databaseService, metricsService, diskRetriever, pingRetriever));
 
@@ -86,4 +94,21 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
                 .plugin(this).aliases("spv").build();
         server.getCommandManager().register(meta, new ServerPulseCommand(config).createCommand());
     }
+
+    @Subscribe
+    public void onProxyShutdown(ProxyShutdownEvent event) {
+        if (databaseService != null) {
+            databaseService.unload();
+        }
+        if (metricsService != null) {
+            metricsService.unload();
+        }
+
+        try {
+            ServerPulseProvider.unregister();
+        } catch (IllegalStateException e) {
+            // API might already be unregistered, that's okay
+        }
+        logger.info("ServerPulse for Velocity has been shut down.");
+    }
 }