Adapt Bukkit to new Logger implementation

Author: renvins

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

@@ -9,12 +9,14 @@
 import it.renvins.serverpulse.api.service.IDatabaseService;
 import it.renvins.serverpulse.api.service.IMetricsService;
 import it.renvins.serverpulse.api.service.Service;
+import it.renvins.serverpulse.bukkit.logger.BukkitLogger;
 import it.renvins.serverpulse.bukkit.metrics.BukkitTPSRetriever;
 import it.renvins.serverpulse.common.DatabaseService;
 import it.renvins.serverpulse.common.config.DatabaseConfiguration;
 import it.renvins.serverpulse.common.config.MetricsConfiguration;
 import it.renvins.serverpulse.bukkit.commands.ServerPulseCommand;
 import it.renvins.serverpulse.bukkit.config.BukkitConfiguration;
+import it.renvins.serverpulse.common.logger.PulseLogger;
 import it.renvins.serverpulse.common.metrics.DiskRetriever;
 import it.renvins.serverpulse.bukkit.config.BukkitDatabaseConfiguration;
 import it.renvins.serverpulse.bukkit.config.BukkitMetricsConfiguration;
@@ -31,9 +33,6 @@ public class ServerPulseBukkitLoader implements Service {
 
     private final BukkitConfiguration config;
 
-    private final BukkitPlatform platform;
-    private final BukkitTaskScheduler taskScheduler;
-
     private final IDatabaseService databaseService;
     private final IMetricsService metricsService;
 
@@ -47,14 +46,16 @@ public ServerPulseBukkitLoader(ServerPulseBukkit plugin) {
 
         this.config = new BukkitConfiguration(plugin, "config.yml");
 
-        this.platform = new BukkitPlatform(plugin);
-        this.taskScheduler = new BukkitTaskScheduler(plugin);
+        PulseLogger logger = new BukkitLogger(LOGGER);
+
+        BukkitPlatform platform = new BukkitPlatform(plugin);
+        BukkitTaskScheduler taskScheduler = new BukkitTaskScheduler(plugin);
 
         DatabaseConfiguration databaseConfiguration = new BukkitDatabaseConfiguration(config);
         MetricsConfiguration metricsConfiguration = new BukkitMetricsConfiguration(config);
 
-        this.databaseService = new DatabaseService(LOGGER, platform, databaseConfiguration, taskScheduler);
-        this.metricsService = new MetricsService(LOGGER, platform, metricsConfiguration, taskScheduler);
+        this.databaseService = new DatabaseService(logger, platform, databaseConfiguration, taskScheduler);
+        this.metricsService = new MetricsService(logger, platform, metricsConfiguration, taskScheduler);
 
         if (isPaper()) {
             this.tpsRetriever = new PaperTPSRetriever();
@@ -76,6 +77,8 @@ public void load() {
 
             return;
         }
+        ServerPulseProvider.register(new ServerPulseBukkitAPI(databaseService, metricsService, tpsRetriever, diskRetriever, pingRetriever));
+
         databaseService.load();
         if (!plugin.isEnabled()) {
             return;
@@ -88,7 +91,6 @@ public void load() {
         }
 
         plugin.getCommand("serverpulse").setExecutor(new ServerPulseCommand(config));
-        ServerPulseProvider.register(new ServerPulseBukkitAPI(databaseService, metricsService, tpsRetriever, diskRetriever, pingRetriever));
     }
 
     @Override