Merge branch 'master' of github.com:jamezrin/PlayerBalancer

jamezrin · jamezrin · commit eea1bb42cd83 · 2020-07-12T20:16:13.000+02:00
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # PlayerBalancer
-[Spigot Resource](https://www.spigotmc.org/resources/10788/)
+[Spigot Resource](https://www.spigotmc.org/resources/playerbalancer.55011/)
 
 ### Build
 * Clone this repository
diff --git a/addon/pom.xml b/addon/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.jaimemartz</groupId>
-        <version>2.1.6.2-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <artifactId>playerbalancer-parent</artifactId>
     </parent>
 
diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerAddon.java
@@ -19,7 +19,7 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        //Nothing to do...
+        // Nothing to do...
     }
 
     public PluginMessageManager getManager() {
diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerPlaceholderExpansion.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PlayerBalancerPlaceholderExpansion.java
@@ -22,8 +22,8 @@ public String onRequest(OfflinePlayer player, String identifier) {
             if (section == null)
                 return null;
 
-            //For the first call this placeholder will return 0
-            //For the next one, the result of the previous one
+            // For the first call this placeholder will return 0
+            // For the next one, the result of the previous one
             plugin.getManager().getSectionPlayerCount(section, (count) -> {
                 sectionPlayerCounts.put(section, count);
             });
diff --git a/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
@@ -27,7 +27,7 @@ public PluginMessageManager(PlayerBalancerAddon plugin) {
         plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, PB_CHANNEL, this);
         plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, PB_CHANNEL);
 
-        //In case we need to use BungeeCord channels
+        // In case we need to use BungeeCord channels
         plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, BC_CHANNEL, this);
         plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, BC_CHANNEL);
     }
diff --git a/balancer/pom.xml b/balancer/pom.xml
@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.jaimemartz</groupId>
-        <version>2.1.6.2-SNAPSHOT</version>
+        <version>2.2-SNAPSHOT</version>
         <artifactId>playerbalancer-parent</artifactId>
     </parent>
 
@@ -66,12 +66,6 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>com.imaginarycode.minecraft</groupId>
-            <artifactId>RedisBungee</artifactId>
-            <version>0.3.8-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>ninja.leaping.configurate</groupId>
             <artifactId>configurate-hocon</artifactId>
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
@@ -5,7 +5,6 @@
 import com.jaimemartz.playerbalancer.commands.MainCommand;
 import com.jaimemartz.playerbalancer.commands.ManageCommand;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
-import com.jaimemartz.playerbalancer.helper.NetworkManager;
 import com.jaimemartz.playerbalancer.helper.PasteHelper;
 import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import com.jaimemartz.playerbalancer.listeners.*;
@@ -34,7 +33,6 @@ public class PlayerBalancer extends Plugin {
     private StatusManager statusManager;
     private SettingsHolder settings;
     private SectionManager sectionManager;
-    private NetworkManager networkManager;
     private ConfigurationLoader<CommentedConfigurationNode> loader;
 
     private FallbackCommand fallbackCommand;
@@ -78,7 +76,7 @@ public void onEnable() {
 
     public boolean checkUpToDate() {
         try {
-            URLConnection con = new URL("https://api.spigotmc.org/legacy/update.php?resource=10788").openConnection();
+            URLConnection con = new URL("https:// api.spigotmc.org/legacy/update.php?resource=10788").openConnection();
             String reply = new BufferedReader(new InputStreamReader(con.getInputStream())).readLine();
             return getDescription().getVersion().equals(reply);
         } catch (IOException e) {
@@ -89,7 +87,7 @@ public boolean checkUpToDate() {
 
     @Override
     public void onDisable() {
-        //Nothing else to do than normal stop
+        // Nothing else to do than normal stop
         this.execStop();
     }
 
@@ -128,8 +126,6 @@ private void execStart() {
                     getProxy().getPluginManager().registerListener(this, reloadListener);
                 }
 
-                networkManager = new NetworkManager(this);
-
                 sectionManager = new SectionManager(this);
                 sectionManager.load();
 
@@ -198,7 +194,7 @@ private void execStop() {
         }
 
         if (settings.getGeneralProps().isEnabled()) {
-            //Do not try to do anything if the plugin has not loaded correctly
+            // Do not try to do anything if the plugin has not loaded correctly
             if (failed) return;
 
             if (settings.getGeneralProps().isAutoReload()) {
@@ -284,10 +280,6 @@ public StatusManager getStatusManager() {
         return statusManager;
     }
 
-    public NetworkManager getNetworkManager() {
-        return networkManager;
-    }
-
     public FallbackCommand getFallbackCommand() {
         return fallbackCommand;
     }
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java
@@ -39,14 +39,10 @@ public void execute() {
                         .replace("{alias}", safeNull(section.getProps().getAlias()))
         );
 
+        // Ensure a new copy of the section servers
         List<ServerInfo> servers = new ArrayList<>(section.getServers());
 
-        //Prevents removing servers from the section
-        if (servers == section.getServers()) {
-            throw new IllegalStateException("The servers list parameter is the same reference, this cannot happen");
-        }
-
-        //Prevents connections to the same server
+        // Prevents connections to the same server
         Server current = player.getServer();
         if (current != null) {
             servers.remove(current.getInfo());
@@ -56,7 +52,7 @@ public void execute() {
             ServerInfo target = this.fetchServer(player, section, section.getImplicitProvider(), servers);
             if (target != null) {
                 this.connect(target, (response, throwable) -> {
-                    if (response) { //only if the connect has been executed correctly
+                    if (response) { // only if the connect has been executed correctly
                         MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectedMessage(),
                                 (str) -> str.replace("{server}", target.getName())
                                         .replace("{section}", section.getName())
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveFillerProvider.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveFillerProvider.java
@@ -17,7 +17,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
 
         for (ServerInfo server : servers) {
             ServerStatus status = plugin.getStatusManager().getStatus(server);
-            int count = plugin.getNetworkManager().getPlayers(server);
+            int count = server.getPlayers().size();
 
             if (count > max && count <= status.getMaximum()) {
                 max = count;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveLowestProvider.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveLowestProvider.java
@@ -15,7 +15,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
         ServerInfo target = null;
 
         for (ServerInfo server : servers) {
-            int count = plugin.getNetworkManager().getPlayers(server);
+            int count = server.getPlayers().size();
 
             if (count < min) {
                 min = count;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveProvider.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/progressive/ProgressiveProvider.java
@@ -14,7 +14,7 @@ public class ProgressiveProvider extends AbstractProvider {
     public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, List<ServerInfo> servers, ProxiedPlayer player) {
         for (ServerInfo server : servers) {
             ServerStatus status = plugin.getStatusManager().getStatus(server);
-            if (plugin.getNetworkManager().getPlayers(server) < status.getMaximum()) {
+            if (server.getPlayers().size() < status.getMaximum()) {
                 return server;
             }
         }
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomFillerProvider.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomFillerProvider.java
@@ -18,7 +18,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
         int max = Integer.MIN_VALUE;
 
         for (ServerInfo server : servers) {
-            int count = plugin.getNetworkManager().getPlayers(server);
+            int count = server.getPlayers().size();
 
             if (count >= max) {
                 if (count > max) {
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomLowestProvider.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/connection/provider/types/random/RandomLowestProvider.java
@@ -18,7 +18,7 @@ public ServerInfo requestTarget(PlayerBalancer plugin, ServerSection section, Li
         int min = Integer.MAX_VALUE;
 
         for (ServerInfo server : servers) {
-            int count = plugin.getNetworkManager().getPlayers(server);
+            int count = server.getPlayers().size();
 
             if (count <= min) {
                 if (count < min) {
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java
@@ -37,7 +37,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
             try (FileInputStream stream = new FileInputStream(file)) {
                 try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
                     String content = CharStreams.toString(reader);
-                    HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
+                    HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);
                     return paste.paste();
                 }
             }
@@ -62,7 +62,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
                 try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
                     String content = CharStreams.toString(reader);
                     content = content.replaceAll("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}", "?.?.?.?");
-                    HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
+                    HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);
                     return paste.paste();
                 }
             }
@@ -86,7 +86,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
             try (FileInputStream stream = new FileInputStream(file)) {
                 try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
                     String content = CharStreams.toString(reader);
-                    HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
+                    HastebinPaste paste = new HastebinPaste("https:// file.properties/paste/", content);
                     return paste.paste();
                 }
             }
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java
@@ -31,7 +31,7 @@ public PluginMessageListener(PlayerBalancer plugin) {
         this.plugin = plugin;
         GsonBuilder builder = new GsonBuilder();
 
-        //Only serialize the name of ServerInfo
+        // Only serialize the name of ServerInfo
         builder.registerTypeAdapter(ServerInfo.class, (JsonSerializer<ServerInfo>) (server, type, context) ->
                 context.serialize(server.getName())
         );
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java
@@ -56,7 +56,7 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo target) {
         ServerSection section = plugin.getSectionManager().getByServer(target);
 
         if (section != null) {
-            //Checks only for servers (not the section server)
+            // Checks only for servers (not the section server)
             if (!target.equals(section.getServer())) {
                 if (plugin.getSectionManager().isDummy(section)) {
                     return null;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java
@@ -37,7 +37,7 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalan
             try {
                 server.ping((ping, throwable) -> {
                     if (ping != null) {
-                        //using deprecated method for bungee 1.8 compatibility
+                        //  Using deprecated method for bungee 1.8 compatibility
                         callback.done(new ServerStatus(
                                 ping.getDescription(),
                                 ping.getPlayers().getOnline(),
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java
@@ -235,28 +235,31 @@ public ServerSection getByPlayer(ProxiedPlayer player) {
     }
 
     public void registerServer(ServerInfo server, ServerSection section) {
-        //Checking for duplicated server on non dummy sections
-        if (servers.containsKey(server) && !isDummy(section)) {
-            ServerSection other = servers.get(server);
-            throw new IllegalArgumentException(String.format(
-                    "The server \"%s\" is already in the section \"%s\"",
+        if (!isDummy(section)) {
+            //  Checking for already we already added this server to other section
+            //  This can only happen if another non dummy section registers this server
+            if (servers.containsKey(server)) {
+                ServerSection other = servers.get(server);
+                throw new IllegalArgumentException(String.format(
+                        "The server \"%s\" is already in the section \"%s\"",
+                        server.getName(),
+                        other.getName()
+                ));
+            }
+
+            plugin.getLogger().info(String.format("Registering server \"%s\" to section \"%s\"",
                     server.getName(),
-                    other.getName()
+                    section.getName()
             ));
-        }
-
-        plugin.getLogger().info(String.format("Registering server \"%s\" to section \"%s\"",
-                server.getName(),
-                section.getName()
-        ));
 
-        servers.put(server, section);
+            servers.put(server, section);
+        }
     }
 
     public void calculateServers(ServerSection section) {
         Set<ServerInfo> results = new HashSet<>();
 
-        //Searches for matches
+        // Searches for matches
         section.getProps().getServerEntries().forEach(entry -> {
             Pattern pattern = Pattern.compile(entry);
             plugin.getProxy().getServers().forEach((name, server) -> {
@@ -267,7 +270,7 @@ public void calculateServers(ServerSection section) {
             });
         });
 
-        //Checks if there are servers previously matched that are no longer valid
+        // Checks if there are servers previously matched that are no longer valid
         section.getServers().forEach(server -> {
             if (!results.contains(server)) {
                 servers.remove(server);
@@ -278,7 +281,7 @@ public void calculateServers(ServerSection section) {
             }
         });
 
-        //Add matched servers to the section
+        // Add matched servers to the section
         int addedServers = 0;
         for (ServerInfo server : results) {
             if (!section.getServers().contains(server)) {
@@ -303,7 +306,7 @@ public void calculateServers(ServerSection section) {
     public int calculatePosition(ServerSection section) {
         ServerSection current = section;
 
-        //Calculate above principal
+        // Calculate above principal
         int iterations = 0;
         while (current != null) {
             if (current == principal) {
@@ -314,7 +317,7 @@ public int calculatePosition(ServerSection section) {
             iterations++;
         }
 
-        //Calculate below principal
+        // Calculate below principal
         if (principal != null) {
             iterations = 0;
             current = principal;
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/section/SectionServer.java
@@ -47,7 +47,7 @@ public void sendData(String channel, byte[] data) {
 
     @Override
     public boolean sendData(String channel, byte[] data, boolean queue) {
-        //Nothing to do
+        // Nothing to do
         return true;
     }
 
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/GeneralProps.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/settings/props/GeneralProps.java
@@ -16,9 +16,6 @@ public class GeneralProps {
     @Setting(value = "auto-reload")
     private boolean autoReload;
 
-    @Setting(value = "redis-bungee")
-    private boolean redisBungee;
-
     @Setting(value = "plugin-messaging")
     private boolean pluginMessaging;
 
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AdapterWrapper.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AdapterWrapper.java
@@ -11,7 +11,7 @@ public class AdapterWrapper implements ConfigurationAdapter {
     private final ConfigurationAdapter wrapped;
 
     public AdapterWrapper(ConfigurationAdapter adapter) {
-        //Prevents memory leak
+        // Prevents memory leak
         if (adapter instanceof AdapterWrapper) {
             this.wrapped = ((AdapterWrapper) adapter).wrapped;
         } else {
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AlphanumComparator.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/AlphanumComparator.java
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/LevenshteinDistance.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/LevenshteinDistance.java
diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/ServerListPing.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/utils/ServerListPing.java
diff --git a/balancer/src/main/resources/default.conf b/balancer/src/main/resources/default.conf
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public void onEnable() {`
`19`	`19`
`20`	`20`	`@Override`
`21`	`21`	`public void onDisable() {`
`22`		`- //Nothing to do...`
	`22`	`+ // Nothing to do...`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public PluginMessageManager getManager() {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public PluginMessageManager(PlayerBalancerAddon plugin) {`
`27`	`27`	`plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, PB_CHANNEL, this);`
`28`	`28`	`plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, PB_CHANNEL);`
`29`	`29`
`30`		`- //In case we need to use BungeeCord channels`
	`30`	`+ // In case we need to use BungeeCord channels`
`31`	`31`	`plugin.getServer().getMessenger().registerIncomingPluginChannel(plugin, BC_CHANNEL, this);`
`32`	`32`	`plugin.getServer().getMessenger().registerOutgoingPluginChannel(plugin, BC_CHANNEL);`
`33`	`33`	`}`