Progress for more subchannels and some other little changes

jamezrin · jamezrin · commit a15c59103359 · 2017-11-12T18:13:42.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
@@ -178,10 +178,10 @@ public void execute(CommandSender sender, String[] args) {
                                                 .color(ChatColor.GRAY)
                                                 .append(server.getName())
                                                 .color(ChatColor.AQUA)
-                                                .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Accessible: ")
+                                                .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Online: ")
                                                         .color(ChatColor.GRAY)
-                                                        .append(status.isAccessible() ? "yes" : "no")
-                                                        .color(status.isAccessible() ? ChatColor.GREEN : ChatColor.RED)
+                                                        .append(status.isOnline() ? "yes" : "no")
+                                                        .color(status.isOnline() ? ChatColor.GREEN : ChatColor.RED)
                                                         .append("\nDescription: ")
                                                         .color(ChatColor.GRAY)
                                                         .append("\"")
@@ -196,7 +196,7 @@ public void execute(CommandSender sender, String[] args) {
                                                         .color(ChatColor.AQUA)
                                                         .create()))
                                                 .append(String.format(" (%d/%d) ",
-                                                        status.getOnline(),
+                                                        status.getPlayers(),
                                                         status.getMaximum()))
                                                 .color(ChatColor.RED)
                                                 .create()
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
@@ -2,7 +2,6 @@
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
-import com.jaimemartz.playerbalancer.ping.ServerStatus;
 import com.jaimemartz.playerbalancer.section.ServerSection;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.Callback;
@@ -73,8 +72,7 @@ private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, Prov
         if (plugin.getSectionManager().isReiterative(section)) {
             if (ServerAssignRegistry.hasAssignedServer(player, section)) {
                 ServerInfo target = ServerAssignRegistry.getAssignedServer(player, section);
-                ServerStatus status = plugin.getStatusManager().getStatus(target);
-                if (status.isAccessible()) {
+                if (plugin.getStatusManager().isAccessible(target)) {
                     return target;
                 } else {
                     ServerAssignRegistry.revokeTarget(player, section);
@@ -89,8 +87,7 @@ private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, Prov
             ServerInfo target = provider.requestTarget(plugin, section, servers, player);
             if (target == null) continue;
 
-            ServerStatus status = plugin.getStatusManager().getStatus(target);
-            if (status.isAccessible()) {
+            if (plugin.getStatusManager().isAccessible(target)) {
                 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("A pastebin exception occurred: " + e.getMessage())
+                sender.sendMessage(new ComponentBuilder("An 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
@@ -22,8 +22,7 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalan
                     callback.done(new ServerStatus(
                             response.getDescription().toLegacyText(),
                             response.getPlayers().getOnline(),
-                            response.getPlayers().getMax(),
-                            plugin.getSettings().getServerCheckerProps().getMarkerDescs()),
+                            response.getPlayers().getMax()),
                             null);
                 } catch (IOException e) {
                     callback.done(null, e);
@@ -42,8 +41,7 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalan
                         callback.done(new ServerStatus(
                                 ping.getDescription(),
                                 ping.getPlayers().getOnline(),
-                                ping.getPlayers().getMax(),
-                                plugin.getSettings().getServerCheckerProps().getMarkerDescs()
+                                ping.getPlayers().getMax()
                         ), throwable);
                     } else {
                         callback.done(null, throwable);
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
@@ -2,46 +2,33 @@
 
 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 final int players, maximum;
     private boolean outdated = true;
-    private final boolean accessible;
+    private final boolean online;
 
     public ServerStatus() {
-        this("Server Unreachable", 0, 0, Collections.emptyList());
+        this("Server Unreachable", 0, 0);
     }
 
     public ServerStatus(ServerInfo server) {
-        this(server.getMotd(), server.getPlayers().size(), Integer.MAX_VALUE, Collections.emptyList());
+        this(server.getMotd(), server.getPlayers().size(), Integer.MAX_VALUE);
     }
 
-    public ServerStatus(String description, int online, int maximum, List<String> descs) {
+    public ServerStatus(String description, int players, int maximum) {
         this.description = description;
-        this.online = online;
+        this.players = players;
         this.maximum = maximum;
-
-        this.accessible = (maximum != 0 && online < maximum && !isMarked(descs));
-    }
-
-    private boolean isMarked(List<String> descs) {
-        for (String pattern : descs) {
-            if (description.matches(pattern)) {
-                return true;
-            }
-        }
-        return false;
+        this.online = maximum != 0 && players < maximum;
     }
 
     public String getDescription() {
         return description;
     }
 
-    public int getOnline() {
-        return online;
+    public int getPlayers() {
+        return players;
     }
 
     public int getMaximum() {
@@ -56,7 +43,7 @@ public void setOutdated(boolean outdated) {
         this.outdated = outdated;
     }
 
-    public boolean isAccessible() {
-        return accessible;
+    public boolean isOnline() {
+        return online;
     }
 }
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
@@ -2,6 +2,7 @@
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.props.features.ServerCheckerProps;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 
@@ -11,13 +12,16 @@
 
 public class StatusManager {
     private final PlayerBalancer plugin;
+    private final ServerCheckerProps props;
+
     private boolean stopped = true;
     private PingTactic tactic;
     private ScheduledTask task;
     private final Map<ServerInfo, ServerStatus> storage = new HashMap<>();
 
     public StatusManager(PlayerBalancer plugin) {
         this.plugin = plugin;
+        this.props = plugin.getSettings().getServerCheckerProps();
     }
 
     public void start() {
@@ -65,8 +69,8 @@ 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()
+                        "Updated server %s, status: [Description: \"%s\", Players: %s, Maximum Players: %s, Online: %s]",
+                        server.getName(), status.getDescription(), status.getPlayers(), status.getMaximum(), status.isOnline()
                 ));
             }
 
@@ -84,4 +88,16 @@ public ServerStatus getStatus(ServerInfo server) {
             return status;
         }
     }
+
+    public boolean isAccessible(ServerInfo server) {
+        ServerStatus status = getStatus(server);
+
+        for (String pattern : props.getMarkerDescs()) {
+            if (status.getDescription().matches(pattern)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java
@@ -359,6 +359,10 @@ public Map<String, ServerSection> getSections() {
         return sections;
     }
 
+    public Map<ServerInfo, ServerSection> getServers() {
+        return servers;
+    }
+
     public Stage getStage(String name) {
         return stages.get(name);
     }
diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
@@ -153,6 +153,55 @@ public void fallbackPlayer(Player player) {
         player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
     }
 
+    //TODO Implement this on the bungeecord side
+    public boolean unmarkServer(String server) {
+        Player player = Iterables.getFirst(plugin.getServer().getOnlinePlayers(), null);
+        if (player == null) {
+            return false;
+        }
+
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("ServerUnmark");
+        out.writeUTF(server);
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
+
+        return true;
+    }
+
+    public boolean markServer(String server, boolean status) {
+        Player player = Iterables.getFirst(plugin.getServer().getOnlinePlayers(), null);
+        if (player == null) {
+            return false;
+        }
+
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("ServerMark");
+        out.writeUTF(server);
+        out.writeBoolean(status);
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
+
+        return true;
+    }
+
+    public void unbypassPlayer(Player player) {
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("PlayerUnbypass");
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
+    }
+
+    public void bypassPlayer(Player player) {
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("PlayerBypass");
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
+    }
+
+    public void bypassConnect(Player player, String server) {
+        ByteArrayDataOutput out = ByteStreams.newDataOutput();
+        out.writeUTF("BypassConnect");
+        player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
+    }
+    //END TODO Implement this on the bungeecord side
+
     private final class MessageContext {
         private final String channel;
         private final String subchannel;

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,10 @@ public Map<String, ServerSection> getSections() {`
`359`	`359`	`return sections;`
`360`	`360`	`}`
`361`	`361`
	`362`	`+ public Map<ServerInfo, ServerSection> getServers() {`
	`363`	`+ return servers;`
	`364`	`+ }`
	`365`	`+`
`362`	`366`	`public Stage getStage(String name) {`
`363`	`367`	`return stages.get(name);`
`364`	`368`	`}`