Add ping statistics and command

3 files changed, 72 insertions, 18 deletions

diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java
new file mode 100644
index 0000000..bae6c41
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricPlayerPingProvider.java
@@ -0,0 +1,47 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.fabric;
+
+import com.google.common.collect.ImmutableMap;
+
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayerEntity;
+
+import java.util.Map;
+
+public class FabricPlayerPingProvider implements PlayerPingProvider {
+    private final MinecraftServer server;
+
+    public FabricPlayerPingProvider(MinecraftServer server) {
+        this.server = server;
+    }
+
+    @Override
+    public Map<String, Integer> poll() {
+        ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
+        for (ServerPlayerEntity player : this.server.getPlayerManager().getPlayerList()) {
+            builder.put(player.getGameProfile().getName(), player.pingMilliseconds);
+        }
+        return builder.build();
+    }
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
index 9171cbb..b9cff691 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
@@ -4,10 +4,10 @@ import eu.pb4.placeholders.PlaceholderAPI;
 import eu.pb4.placeholders.PlaceholderResult;
 
 import me.lucko.spark.common.SparkPlatform;
-import me.lucko.spark.common.command.modules.HealthModule;
 import me.lucko.spark.common.monitor.cpu.CpuMonitor;
 import me.lucko.spark.common.monitor.tick.TickStatistics;
 import me.lucko.spark.common.util.RollingAverage;
+import me.lucko.spark.common.util.StatisticFormatter;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
@@ -47,16 +47,16 @@ public class SparkFabricPlaceholderApi {
                         if (tps == null) {
                             return PlaceholderResult.invalid("Invalid argument");
                         } else {
-                            return PlaceholderResult.value(toText(HealthModule.formatTps(tps)));
+                            return PlaceholderResult.value(toText(StatisticFormatter.formatTps(tps)));
                         }
                     } else {
                         return PlaceholderResult.value(toText(
                                 Component.text()
-                                        .append(HealthModule.formatTps(tickStatistics.tps5Sec())).append(Component.text(", "))
-                                        .append(HealthModule.formatTps(tickStatistics.tps10Sec())).append(Component.text(", "))
-                                        .append(HealthModule.formatTps(tickStatistics.tps1Min())).append(Component.text(", "))
-                                        .append(HealthModule.formatTps(tickStatistics.tps5Min())).append(Component.text(", "))
-                                        .append(HealthModule.formatTps(tickStatistics.tps15Min()))
+                                        .append(StatisticFormatter.formatTps(tickStatistics.tps5Sec())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatTps(tickStatistics.tps10Sec())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatTps(tickStatistics.tps1Min())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatTps(tickStatistics.tps5Min())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatTps(tickStatistics.tps15Min()))
                                         .build()
                         ));
                     }
@@ -84,13 +84,13 @@ public class SparkFabricPlaceholderApi {
                         if (duration == null) {
                             return PlaceholderResult.invalid("Invalid argument");
                         } else {
-                            return PlaceholderResult.value(toText(HealthModule.formatTickDurations(duration)));
+                            return PlaceholderResult.value(toText(StatisticFormatter.formatTickDurations(duration)));
                         }
                     } else {
                         return PlaceholderResult.value(toText(
                                 Component.text()
-                                        .append(HealthModule.formatTickDurations(tickStatistics.duration10Sec())).append(Component.text(";  "))
-                                        .append(HealthModule.formatTickDurations(tickStatistics.duration1Min()))
+                                        .append(StatisticFormatter.formatTickDurations(tickStatistics.duration10Sec())).append(Component.text(";  "))
+                                        .append(StatisticFormatter.formatTickDurations(tickStatistics.duration1Min()))
                                         .build()
                         ));
                     }
@@ -115,14 +115,14 @@ public class SparkFabricPlaceholderApi {
                         if (usage == null) {
                             return PlaceholderResult.invalid("Invalid argument");
                         } else {
-                            return PlaceholderResult.value(toText(HealthModule.formatCpuUsage(usage)));
+                            return PlaceholderResult.value(toText(StatisticFormatter.formatCpuUsage(usage)));
                         }
                     } else {
                         return PlaceholderResult.value(toText(
                                 Component.text()
-                                        .append(HealthModule.formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(Component.text(", "))
-                                        .append(HealthModule.formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(Component.text(", "))
-                                        .append(HealthModule.formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
+                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
                                         .build()
                         ));
                     }
@@ -147,14 +147,14 @@ public class SparkFabricPlaceholderApi {
                         if (usage == null) {
                             return PlaceholderResult.invalid("Invalid argument");
                         } else {
-                            return PlaceholderResult.value(toText(HealthModule.formatCpuUsage(usage)));
+                            return PlaceholderResult.value(toText(StatisticFormatter.formatCpuUsage(usage)));
                         }
                     } else {
                         return PlaceholderResult.value(toText(
                                 Component.text()
-                                        .append(HealthModule.formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(Component.text(", "))
-                                        .append(HealthModule.formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(Component.text(", "))
-                                        .append(HealthModule.formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
+                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(Component.text(", "))
+                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
                                         .build()
                         ));
                     }
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
index 617564a..6dc5483 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
@@ -29,11 +29,13 @@ import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
 import me.lucko.fabric.api.permissions.v0.Permissions;
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
 import me.lucko.spark.common.tick.TickHook;
 import me.lucko.spark.common.tick.TickReporter;
 import me.lucko.spark.fabric.FabricCommandSender;
 import me.lucko.spark.fabric.FabricPlatformInfo;
+import me.lucko.spark.fabric.FabricPlayerPingProvider;
 import me.lucko.spark.fabric.FabricSparkMod;
 import me.lucko.spark.fabric.FabricTickHook;
 import me.lucko.spark.fabric.FabricTickReporter;
@@ -141,6 +143,11 @@ public class FabricServerSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public PlayerPingProvider createPlayerPingProvider() {
+        return new FabricPlayerPingProvider(this.server);
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new FabricPlatformInfo(PlatformInfo.Type.SERVER);
     }