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

4 files changed, 56 insertions, 3 deletions

diff --git a/spark-waterdog/build.gradle b/spark-waterdog/build.gradle
index 07be15c..c11e3fb 100644
--- a/spark-waterdog/build.gradle
+++ b/spark-waterdog/build.gradle
@@ -28,7 +28,7 @@ processResources {
 }
 
 shadowJar {
-    archiveName = 'spark-waterdog.jar'
+    archiveName = "spark-${project.pluginVersion}-waterdog.jar"
 
     relocate 'okio', 'me.lucko.spark.lib.okio'
     relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3'
diff --git a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlatformInfo.java b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlatformInfo.java
index bfbe768..14b8f60 100644
--- a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlatformInfo.java
+++ b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlatformInfo.java
@@ -20,11 +20,11 @@
 
 package me.lucko.spark.waterdog;
 
-import me.lucko.spark.common.platform.AbstractPlatformInfo;
+import me.lucko.spark.common.platform.PlatformInfo;
 
 import dev.waterdog.waterdogpe.WaterdogPE;
 
-public class WaterdogPlatformInfo extends AbstractPlatformInfo {
+public class WaterdogPlatformInfo implements PlatformInfo {
 
     @Override
     public Type getType() {
diff --git a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlayerPingProvider.java b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlayerPingProvider.java
new file mode 100644
index 0000000..b22325c
--- /dev/null
+++ b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogPlayerPingProvider.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.waterdog;
+
+import com.google.common.collect.ImmutableMap;
+
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
+
+import dev.waterdog.waterdogpe.ProxyServer;
+import dev.waterdog.waterdogpe.player.ProxiedPlayer;
+
+import java.util.Map;
+
+public class WaterdogPlayerPingProvider implements PlayerPingProvider {
+    private final ProxyServer proxy;
+
+    public WaterdogPlayerPingProvider(ProxyServer proxy) {
+        this.proxy = proxy;
+    }
+
+    @Override
+    public Map<String, Integer> poll() {
+        ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
+        for (ProxiedPlayer player : this.proxy.getPlayers().values()) {
+            builder.put(player.getName(), (int) player.getPing());
+        }
+        return builder.build();
+    }
+}
diff --git a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java
index fd2f031..07b153a 100644
--- a/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java
+++ b/spark-waterdog/src/main/java/me/lucko/spark/waterdog/WaterdogSparkPlugin.java
@@ -22,6 +22,7 @@ package me.lucko.spark.waterdog;
 
 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;
 
@@ -100,6 +101,11 @@ public class WaterdogSparkPlugin extends Plugin implements SparkPlugin {
     }
 
     @Override
+    public PlayerPingProvider createPlayerPingProvider() {
+        return new WaterdogPlayerPingProvider(getProxy());
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new WaterdogPlatformInfo();
     }