Merge remote-tracking branch 'lucko/master' into forge-1.7.10

3 files changed, 55 insertions, 2 deletions

diff --git a/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlatformInfo.java b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlatformInfo.java
index 9ef5ba2..ab7a40b 100644
--- a/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlatformInfo.java
+++ b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlatformInfo.java
@@ -20,11 +20,11 @@
 
 package me.lucko.spark.nukkit;
 
-import me.lucko.spark.common.platform.AbstractPlatformInfo;
+import me.lucko.spark.common.platform.PlatformInfo;
 
 import cn.nukkit.Server;
 
-public class NukkitPlatformInfo extends AbstractPlatformInfo {
+public class NukkitPlatformInfo implements PlatformInfo {
     private final Server server;
 
     public NukkitPlatformInfo(Server server) {
diff --git a/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlayerPingProvider.java b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlayerPingProvider.java
new file mode 100644
index 0000000..fc25d7c
--- /dev/null
+++ b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitPlayerPingProvider.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.nukkit;
+
+import com.google.common.collect.ImmutableMap;
+
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
+
+import cn.nukkit.Player;
+import cn.nukkit.Server;
+
+import java.util.Map;
+
+public class NukkitPlayerPingProvider implements PlayerPingProvider {
+    private final Server server;
+
+    public NukkitPlayerPingProvider(Server server) {
+        this.server = server;
+    }
+
+    @Override
+    public Map<String, Integer> poll() {
+        ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
+        for (Player player : this.server.getOnlinePlayers().values()) {
+            builder.put(player.getName(), player.getPing());
+        }
+        return builder.build();
+    }
+}
diff --git a/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitSparkPlugin.java b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitSparkPlugin.java
index c9e099d..18132c3 100644
--- a/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitSparkPlugin.java
+++ b/spark-nukkit/src/main/java/me/lucko/spark/nukkit/NukkitSparkPlugin.java
@@ -23,6 +23,7 @@ package me.lucko.spark.nukkit;
 import me.lucko.spark.api.Spark;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
 import me.lucko.spark.common.util.ClassSourceLookup;
 
@@ -108,6 +109,11 @@ public class NukkitSparkPlugin extends PluginBase implements SparkPlugin {
     }
 
     @Override
+    public PlayerPingProvider createPlayerPingProvider() {
+        return new NukkitPlayerPingProvider(getServer());
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new NukkitPlatformInfo(getServer());
     }