added pinginfo from a server specified in the config

Author: bierdosenhalter

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.zeroBzeroT</groupId>
     <artifactId>ServerPingPlayerList</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
 

src/main/java/org/zeroBzeroT/serverPingPlayerList/Config.java

@@ -19,6 +19,8 @@ public class Config {
     public static boolean messageOfTheDayOverride = false;
     public static String messageOfTheDay = "";
     public static boolean bStats = false;
+    public static boolean useMainServer = false;
+    public static String mainServer = "main";
 
     /**
      * Loads a config file, and if it doesn't exist creates one

src/main/java/org/zeroBzeroT/serverPingPlayerList/Main.java

@@ -37,8 +37,8 @@ public void onEnable() {
         log("config", "§3Version Name: §r" + ChatColor.translateAlternateColorCodes('&', Config.versionName));
         log("config", "§3Version Minimum Protocol: §r" + Config.versionMinProtocol);
         log("config", "§3Set Hover Info: §r" + Config.setHoverInfo);
-        if(Config.messageOfTheDayOverride)
-            log("config", "§3Message Of The Day: §r" + ChatColor.translateAlternateColorCodes('&',Config.messageOfTheDay));
+        if (Config.messageOfTheDayOverride)
+            log("config", "§3Message Of The Day: §r" + ChatColor.translateAlternateColorCodes('&', Config.messageOfTheDay));
 
         // Load Plugin Metrics
         if (Config.bStats) {

src/main/java/org/zeroBzeroT/serverPingPlayerList/ServerInfoRetriever.java

@@ -0,0 +1,35 @@
+package org.zeroBzeroT.serverPingPlayerList;
+
+import net.md_5.bungee.api.Callback;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.ServerPing;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Test a Server Connection
+ */
+public class ServerInfoRetriever implements Callback<ServerPing> {
+    public ServerPing ping = null;
+    public final FutureTask<Object> task = new FutureTask<>(() -> {
+    }, new Object());
+
+    public static ServerPing getServerPing(String name) throws ExecutionException, InterruptedException, TimeoutException {
+        ServerInfoRetriever sig = new ServerInfoRetriever();
+        ProxyServer.getInstance().getServerInfo(name).ping(sig);
+        sig.task.get(1000, TimeUnit.MILLISECONDS);
+
+        return sig.ping;
+    }
+
+    @Override
+    public void done(ServerPing serverPing, Throwable throwable) {
+        if (throwable == null)
+            ping = serverPing;
+
+        task.run();
+    }
+}

src/main/java/org/zeroBzeroT/serverPingPlayerList/listener/ServerListListener.java

@@ -8,9 +8,9 @@
 import net.md_5.bungee.event.EventHandler;
 import org.zeroBzeroT.serverPingPlayerList.Config;
 import org.zeroBzeroT.serverPingPlayerList.Main;
+import org.zeroBzeroT.serverPingPlayerList.ServerInfoRetriever;
 
 public final class ServerListListener implements Listener {
-
     private final transient Main plugin;
 
     public ServerListListener(Main plugin) {
@@ -36,9 +36,28 @@ public void onProxyPing(final ProxyPingEvent event) {
 
         // Server info player list
         if (Config.setHoverInfo) {
-            final ServerPing.Players players = response.getPlayers();
-            final ServerPing.PlayerInfo[] playerHoverInfo = this.plugin.getProxy().getPlayers().stream().map(player -> new ServerPing.PlayerInfo(player.getName(), player.getUniqueId())).toArray(ServerPing.PlayerInfo[]::new);
-            players.setSample(playerHoverInfo);
+            ServerPing ping = null;
+
+            if (Config.useMainServer) {
+                try {
+                    ping = ServerInfoRetriever.getServerPing(Config.mainServer);
+                } catch (Exception e) {
+                    plugin.log("onProxyPing", "Error retrieving server ping from '" + Config.mainServer + "': " + e.getClass().getSimpleName());
+                }
+
+                if (ping != null) {
+                    final ServerPing.Players players = response.getPlayers();
+                    players.setSample(ping.getPlayers().getSample());
+                    players.setOnline(ping.getPlayers().getSample().length);
+                }
+            }
+
+            if (ping == null || !Config.useMainServer) {
+                final ServerPing.Players players = response.getPlayers();
+                final ServerPing.PlayerInfo[] playerHoverInfo = this.plugin.getProxy().getPlayers().stream().map(player -> new ServerPing.PlayerInfo(player.getName(), player.getUniqueId())).toArray(ServerPing.PlayerInfo[]::new);
+                players.setSample(playerHoverInfo);
+                players.setOnline(this.plugin.getProxy().getPlayers().size());
+            }
         }
 
         event.setResponse(response);

src/main/resources/config.yml

@@ -1,7 +1,9 @@
 # ServerPingPlayerList V${project.version}
-versionName: "ZeroPaper 1.12.2+"
+versionName: "LimeWire 5.5.16"
 versionMinProtocol: 340 # 1.12.2
 setHoverInfo: true
 messageOfTheDayOverride: false
 messageOfTheDay: "A Minecraft Server"
-bStats: true
+bStats: true
+useMainServer: false
+mainServer: main