Added new API subchannel and other small improvements

jamezrin · jamezrin · commit 0eacf4da31b4 · 2017-10-29T15:20:46.000+01:00
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java
@@ -180,8 +180,8 @@ public void execute(CommandSender sender, String[] args) {
                                                 .color(ChatColor.AQUA)
                                                 .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Accessible: ")
                                                         .color(ChatColor.GRAY)
-                                                        .append(status.isAccessible(plugin) ? "yes" : "no")
-                                                        .color(status.isAccessible(plugin) ? ChatColor.GREEN : ChatColor.RED)
+                                                        .append(status.isAccessible() ? "yes" : "no")
+                                                        .color(status.isAccessible() ? ChatColor.GREEN : ChatColor.RED)
                                                         .append("\nDescription: ")
                                                         .color(ChatColor.GRAY)
                                                         .append("\"")
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java
@@ -74,7 +74,7 @@ private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, Prov
             if (ServerAssignRegistry.hasAssignedServer(player, section)) {
                 ServerInfo target = ServerAssignRegistry.getAssignedServer(player, section);
                 ServerStatus status = plugin.getStatusManager().getStatus(target);
-                if (status.isAccessible(plugin)) {
+                if (status.isAccessible()) {
                     return target;
                 } else {
                     ServerAssignRegistry.revokeTarget(player, section);
@@ -90,7 +90,7 @@ private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, Prov
             if (target == null) continue;
 
             ServerStatus status = plugin.getStatusManager().getStatus(target);
-            if (status.isAccessible(plugin)) {
+            if (status.isAccessible()) {
                 return target;
             } else {
                 servers.remove(target);
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/manager/PasteHelper.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/manager/PasteHelper.java
@@ -101,7 +101,7 @@ public void send(PlayerBalancer plugin, CommandSender sender) {
             try {
                 url = paste(plugin);
             } catch (PasteException e) {
-                sender.sendMessage(new ComponentBuilder("An pastebin exception occurred: " + e.getMessage())
+                sender.sendMessage(new ComponentBuilder("A pastebin exception occurred: " + e.getMessage())
                         .color(ChatColor.RED)
                         .create()
                 );
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java
@@ -1,10 +1,10 @@
 package com.jaimemartz.playerbalancer.ping;
 
+import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.utils.ServerListPing;
 import com.jaimemartz.playerbalancer.utils.ServerListPing.StatusResponse;
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.plugin.Plugin;
 
 import java.io.IOException;
 
@@ -13,14 +13,15 @@ public enum PingTactic {
         ServerListPing utility = new ServerListPing();
 
         @Override
-        public void ping(ServerInfo server, Callback<ServerStatus> callback, Plugin plugin) {
+        public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalancer plugin) {
             plugin.getProxy().getScheduler().runAsync(plugin, () -> {
                 try {
                     StatusResponse response = utility.ping(server.getAddress());
                     callback.done(new ServerStatus(
                             response.getDescription().toLegacyText(),
                             response.getPlayers().getOnline(),
-                            response.getPlayers().getMax()),
+                            response.getPlayers().getMax(),
+                            plugin.getSettings().getServerCheckerProps().getMarkerDescs()),
                             null);
                 } catch (IOException e) {
                     callback.done(null, e);
@@ -31,15 +32,16 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, Plugin plug
 
     GENERIC {
         @Override
-        public void ping(ServerInfo server, Callback<ServerStatus> callback, Plugin plugin) {
+        public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalancer plugin) {
             try {
                 server.ping((ping, throwable) -> {
                     if (ping != null) {
                         //using deprecated method for 1.8 compatibility
                         callback.done(new ServerStatus(
                                 ping.getDescription(),
                                 ping.getPlayers().getOnline(),
-                                ping.getPlayers().getMax()
+                                ping.getPlayers().getMax(),
+                                plugin.getSettings().getServerCheckerProps().getMarkerDescs()
                         ), throwable);
                     } else {
                         callback.done(null, throwable);
@@ -51,5 +53,5 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, Plugin plug
         }
     };
 
-    public abstract void ping(ServerInfo server, Callback<ServerStatus> callback, Plugin plugin);
+    public abstract void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalancer plugin);
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/ServerStatus.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/ServerStatus.java
@@ -1,39 +1,39 @@
 package com.jaimemartz.playerbalancer.ping;
 
-import com.jaimemartz.playerbalancer.PlayerBalancer;
 import net.md_5.bungee.api.config.ServerInfo;
 
+import java.util.Collections;
+import java.util.List;
+
 public final class ServerStatus {
     private final String description;
     private final int online, maximum;
     private boolean outdated = true;
+    private final boolean accessible;
 
     public ServerStatus() {
-        this("Server Unreachable", 0, 0);
+        this("Server Unreachable", 0, 0, Collections.emptyList());
     }
 
     public ServerStatus(ServerInfo server) {
-        this(server.getMotd(), server.getPlayers().size(), Integer.MAX_VALUE);
+        this(server.getMotd(), server.getPlayers().size(), Integer.MAX_VALUE, Collections.emptyList());
     }
 
-    public ServerStatus(String description, int online, int maximum) {
+    public ServerStatus(String description, int online, int maximum, List<String> descs) {
         this.description = description;
         this.online = online;
         this.maximum = maximum;
-    }
 
-    public boolean isAccessible(PlayerBalancer plugin) {
-        if (maximum == 0) {
-            return false;
-        }
+        this.accessible = (maximum != 0 && online < maximum && !isMarked(descs));
+    }
 
-        for (String pattern : plugin.getSettings().getServerCheckerProps().getMarkerDescs()) {
+    private boolean isMarked(List<String> descs) {
+        for (String pattern : descs) {
             if (description.matches(pattern)) {
-                return false;
+                return true;
             }
         }
-
-        return online < maximum;
+        return false;
     }
 
     public String getDescription() {
@@ -55,4 +55,8 @@ public boolean isOutdated() {
     public void setOutdated(boolean outdated) {
         this.outdated = outdated;
     }
+
+    public boolean isAccessible() {
+        return accessible;
+    }
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java
@@ -66,7 +66,7 @@ private void update(ServerInfo server) {
             if (plugin.getSettings().getServerCheckerProps().isDebug()) {
                 plugin.getLogger().info(String.format(
                         "Updated server %s, status: [Description: \"%s\", Online Players: %s, Maximum Players: %s, Accessible: %s]",
-                        server.getName(), status.getDescription(), status.getOnline(), status.getMaximum(), status.isAccessible(plugin)
+                        server.getName(), status.getDescription(), status.getOnline(), status.getMaximum(), status.isAccessible()
                 ));
             }
 
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/FallbackService.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/FallbackService.java
@@ -46,7 +46,7 @@ public void execute(CommandSender sender, String[] args) {
                         if (number <= 0) {
                             MessageUtils.send(player, messages.getInvalidInputMessage());
                         } else if (number > target.getServers().size()) {
-                            MessageUtils.send(player, messages.getFailureMessage());
+                            MessageUtils.send(player, messages.getInvalidInputMessage());
                         } else {
                             ServerInfo server = Iterables.get(target.getServers(), number - 1);
                             ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {});
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/MessagingService.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/MessagingService.java
@@ -7,6 +7,7 @@
 import com.google.gson.JsonSerializer;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
+import com.jaimemartz.playerbalancer.ping.ServerStatus;
 import com.jaimemartz.playerbalancer.section.ServerSection;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -163,6 +164,27 @@ public void onPluginMessage(PluginMessageEvent event) {
                     sender.sendData("PlayerBalancer", stream.toByteArray());
                     break;
                 }
+
+                case "GetServerStatus": {
+                    ByteArrayOutputStream stream = new ByteArrayOutputStream();
+                    DataOutputStream out = new DataOutputStream(stream);
+
+                    ServerInfo server = plugin.getProxy().getServerInfo(in.readUTF());
+                    if (server == null)
+                        break;
+
+                    ServerStatus status = plugin.getStatusManager().getStatus(server);
+
+                    try {
+                        String output = gson.toJson(status);
+                        out.writeUTF("GetServerStatus");
+                        out.writeUTF(output);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+
+                    sender.sendData("PlayerBalancer", stream.toByteArray());
+                }
             }
         }
     }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/ServerInfoAdapter.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/ServerInfoAdapter.java
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/SpigotUpdater.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/SpigotUpdater.java
diff --git a/Main Plugin/src/main/resources/default.conf b/Main Plugin/src/main/resources/default.conf
@@ -135,10 +135,10 @@ features {
     # When true, the plugin will print useful info when a server gets checked
     debug-info=false
 
-    # The descriptions that mark a server as non accessible
+    # When the description of a server matches these, it will be set as non accessible
     marker-descs=[
-      "Server is not accessible",
-      "Gamemode has already started"
+      "(?i).*maintenance*" # match if contains (regex)
+      "Game in progress", # match if exactly equal
     ]
   }
 
diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
@@ -1,14 +1,16 @@
 package com.jaimemartz.playerbalanceraddon;
 
-import com.google.common.collect.*;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.messaging.PluginMessageListener;
 
-import java.util.*;
-import java.util.concurrent.Future;
+import java.util.Iterator;
+import java.util.UUID;
 import java.util.function.Consumer;
 
 public class PluginMessageManager implements PluginMessageListener {
@@ -124,6 +126,26 @@ public void getSectionOfPlayer(Player player, Consumer<String> consumer) {
         player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
     }
 
+    public boolean getServerStatus(String server, Consumer<String> consumer) {
+        Player player = Iterables.getFirst(plugin.getServer().getOnlinePlayers(), null);
+        if (player == null) {
+            return false;
+        }
+
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("GetServerStatus");
+        out.writeUTF(player.getName());
+
+        contexts.put(new MessageContext(
+                "PlayerBalancer",
+                "GetServerStatus",
+                player.getUniqueId()
+        ), (response) -> consumer.accept(response.readUTF()));
+
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
+        return true;
+    }
+
     public void fallbackPlayer(Player player) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("FallbackPlayer");

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ private void update(ServerInfo server) {`
`66`	`66`	`if (plugin.getSettings().getServerCheckerProps().isDebug()) {`
`67`	`67`	`plugin.getLogger().info(String.format(`
`68`	`68`	`"Updated server %s, status: [Description: \"%s\", Online Players: %s, Maximum Players: %s, Accessible: %s]",`
`69`		`- server.getName(), status.getDescription(), status.getOnline(), status.getMaximum(), status.isAccessible(plugin)`
	`69`	`+ server.getName(), status.getDescription(), status.getOnline(), status.getMaximum(), status.isAccessible()`
`70`	`70`	`));`
`71`	`71`	`}`
`72`	`72`