rewrote ping code

Author: bierdosenhalter

pom.xml

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

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

@@ -1,13 +1,22 @@
 package org.zeroBzeroT.serverPingPlayerList;
 
+import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.plugin.Plugin;
+import net.md_5.bungee.api.scheduler.ScheduledTask;
 import org.bstats.bungeecord.Metrics;
 import org.zeroBzeroT.serverPingPlayerList.listener.ServerListListener;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 public final class Main extends Plugin {
+    public ServerPing mainPing = null;
+
+    ScheduledTask pingTask = null;
+
     @Override
     public void onEnable() {
         super.onEnable();
@@ -27,6 +36,9 @@ public void onEnable() {
             return;
         }
 
+        // Server Ping Update Task
+        StartPingTask();
+
         // Commands
         getProxy().getPluginManager().registerCommand(this, new ReloadCommand(this));
 
@@ -39,17 +51,38 @@ public void onEnable() {
         log("config", "§3Set Hover Info: §r" + Config.setHoverInfo);
         if (Config.messageOfTheDayOverride)
             log("config", "§3Message Of The Day: §r" + ChatColor.translateAlternateColorCodes('&', Config.messageOfTheDay));
+        if (Config.useMainServer)
+            log("config", "§3Ping Pass-Through-Server: §r" + Config.mainServer);
 
         // Load Plugin Metrics
         if (Config.bStats) {
             new Metrics(this, 16229);
         }
     }
 
+    void StartPingTask() {
+        mainPing = null;
+
+        if (pingTask != null)
+            pingTask.cancel();
+
+        if (Config.useMainServer) {
+            Callback<ServerPing> pingBack = (result, error) -> mainPing = result;
+
+            pingTask = getProxy().getScheduler().schedule(this,
+                    () -> ProxyServer.getInstance().getServerInfo(Config.mainServer).ping(pingBack),
+                    5, 5, TimeUnit.SECONDS
+            );
+        }
+    }
+
     @Override
     public void onDisable() {
         super.onDisable();
 
+        if (pingTask != null)
+            pingTask.cancel();
+
         getProxy().getPluginManager().unregisterListeners(this);
     }
 

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

@@ -4,15 +4,14 @@
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.api.plugin.Plugin;
 
 /**
  * ReloadCommand
  */
 public class ReloadCommand extends Command {
-    private final Plugin plugin;
+    private final Main plugin;
 
-    public ReloadCommand(Plugin plugin) {
+    public ReloadCommand(Main plugin) {
         super("spplreload");
         this.plugin = plugin;
     }
@@ -32,5 +31,8 @@ public void execute(CommandSender sender, String[] args) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+        // Restart the ping task
+        plugin.StartPingTask();
     }
 }

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

@@ -8,7 +8,6 @@
 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;
@@ -27,7 +26,7 @@ public void onProxyPing(final ProxyPingEvent event) {
         if (version.getProtocol() < Config.versionMinProtocol) version.setProtocol(Config.versionMinProtocol);
         response.setVersion(version);
 
-        // message of the day
+        // Message of the day
         if (Config.messageOfTheDayOverride) {
             response.setDescriptionComponent(
                     new TextComponent(ChatColor.translateAlternateColorCodes('&', Config.messageOfTheDay))
@@ -36,24 +35,12 @@ public void onProxyPing(final ProxyPingEvent event) {
 
         // Server info player list
         if (Config.setHoverInfo) {
-            ServerPing ping = null;
+            final ServerPing.Players players = response.getPlayers();
 
-            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();
+            if (Config.useMainServer && plugin.mainPing != null && plugin.mainPing.getPlayers().getSample() != null) {
+                players.setSample(plugin.mainPing.getPlayers().getSample());
+                players.setOnline(plugin.mainPing.getPlayers().getSample().length);
+            } else {
                 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());