Refactor FabricTPSRetriever to use ServerTickEvents

Author: renvins

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

@@ -60,7 +60,7 @@ public ServerPulseFabric() {
         this.databaseService = new DatabaseService(logger, platform, dbConfig, scheduler);
         this.metricsService = new MetricsService(logger, platform, metricsConfig, scheduler);
 
-        this.tpsRetriever = new FabricTPSRetriever(scheduler);
+        this.tpsRetriever = new FabricTPSRetriever();
         this.diskRetriever = new DiskRetriever(FabricLoader.getInstance().getGameDir().toFile());
         this.pingRetriever = new FabricPingRetriever(this);
     }

fabric/src/main/java/it/renvins/serverpulse/fabric/metrics/FabricTPSRetriever.java

@@ -1,8 +1,8 @@
 package it.renvins.serverpulse.fabric.metrics;
 
 import it.renvins.serverpulse.api.metrics.ITPSRetriever;
-import it.renvins.serverpulse.common.scheduler.TaskScheduler;
 import lombok.RequiredArgsConstructor;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 
 @RequiredArgsConstructor
 public class FabricTPSRetriever implements ITPSRetriever {
@@ -17,8 +17,6 @@ public class FabricTPSRetriever implements ITPSRetriever {
     // Maximum history to keep (15 minutes worth of ticks)
     private static final int MAX_SAMPLES = FIFTEEN_MINUTES * TICKS_PER_SECOND;
 
-    private final TaskScheduler scheduler;
-
     // Ring buffer for storing tick times
     private final long[] tickTimes = new long[MAX_SAMPLES];
     private int tickIndex = 0;
@@ -40,8 +38,8 @@ public double[] getTPS() {
     public void startTickMonitor() {
         lastTickTime = System.nanoTime();
 
-        // Schedule a task to run every server tick
-        scheduler.runTaskTimer(() -> {
+        // Use ServerTickEvents instead of a scheduled task
+        ServerTickEvents.END_SERVER_TICK.register(server -> {
             long now = System.nanoTime();
 
             // Only record after first tick
@@ -62,7 +60,7 @@ public void startTickMonitor() {
             }
 
             lastTickTime = now;
-        }, 1, 1);
+        });
     }
 
     private void updateTPS() {

fabric/src/main/java/it/renvins/serverpulse/fabric/task/FabricScheduler.java

@@ -7,6 +7,7 @@
 
 import it.renvins.serverpulse.common.scheduler.Task;
 import it.renvins.serverpulse.common.scheduler.TaskScheduler;
+import it.renvins.serverpulse.fabric.ServerPulseFabric;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.minecraft.server.MinecraftServer;
 
@@ -26,19 +27,27 @@ public void runSync(Runnable task) {
 
     @Override
     public void runTaskTimer(Runnable task, long delayTicks, long periodTicks) {
-        FabricTask fabricTask = new FabricTask(task, false, delayTicks, periodTicks);
+        FabricTask fabricTask = new FabricTask(task, true, delayTicks, periodTicks);
         tasks.add(fabricTask);
     }
 
     @Override
     public void runAsync(Runnable task) {
-        CompletableFuture.runAsync(task);
+        CompletableFuture.runAsync(task).exceptionally(
+                throwable -> {
+                    ServerPulseFabric.LOGGER.log(java.util.logging.Level.SEVERE, "An error occurred while executing task!", throwable);
+                    return null;
+                }
+        );
     }
 
     @Override
     public Task runTaskTimerAsync(Runnable task, long delayTicks, long periodTicks) {
-        FabricTask fabricTask = new FabricTask(() -> CompletableFuture.runAsync(task),
-                true, delayTicks, periodTicks);
+        FabricTask fabricTask = new FabricTask(() -> CompletableFuture.runAsync(task).exceptionally(
+                throwable -> {
+                    ServerPulseFabric.LOGGER.log(java.util.logging.Level.SEVERE, "An error occurred while executing task!", throwable);
+                    return null;
+                }), true, delayTicks, periodTicks);
         tasks.add(fabricTask);
         return fabricTask;
     }