diff --git a/balancer/pom.xml b/balancer/pom.xml index 310cec1..279a2ed 100644 --- a/balancer/pom.xml +++ b/balancer/pom.xml @@ -66,12 +66,6 @@ jar provided - - com.imaginarycode.minecraft - RedisBungee - 0.3.8-SNAPSHOT - provided - ninja.leaping.configurate configurate-hocon diff --git a/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/balancer/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java index 518bbaa..6df0b48 100644 --- 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.FallbackCommand; 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 loader; private FallbackCommand fallbackCommand; @@ -128,8 +126,6 @@ public class PlayerBalancer extends Plugin { getProxy().getPluginManager().registerListener(this, reloadListener); } - networkManager = new NetworkManager(this); - sectionManager = new SectionManager(this); sectionManager.load(); @@ -284,10 +280,6 @@ public class PlayerBalancer extends Plugin { return statusManager; } - public NetworkManager getNetworkManager() { - return networkManager; - } - public FallbackCommand getFallbackCommand() { return fallbackCommand; } 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 index ca06e93..057452f 100644 --- 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 class ProgressiveFillerProvider extends AbstractProvider { 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 index 30fc042..0e7f29f 100644 --- 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 class ProgressiveLowestProvider extends AbstractProvider { 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 index 5329989..6dc99c4 100644 --- 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 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 index d68178e..53374be 100644 --- 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 class RandomFillerProvider extends AbstractProvider { 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 index cd9f593..2ec8ed4 100644 --- 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 class RandomLowestProvider extends AbstractProvider { 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 deleted file mode 100644 index 44cb45a..0000000 --- a/balancer/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jaimemartz.playerbalancer.helper; - -import com.imaginarycode.minecraft.redisbungee.RedisBungee; -import com.jaimemartz.playerbalancer.PlayerBalancer; -import net.md_5.bungee.api.config.ServerInfo; - -public class NetworkManager { - private final PlayerBalancer plugin; - - public NetworkManager(PlayerBalancer plugin) { - this.plugin = plugin; - } - - public int getPlayers(ServerInfo server) { - if (plugin.getSettings().getGeneralProps().isRedisBungee()) { - try { - return RedisBungee.getApi().getPlayersOnServer(server.getName()).size(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - return server.getPlayers().size(); - } -} 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 index ce33895..af10050 100644 --- 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/resources/default.conf b/balancer/src/main/resources/default.conf index f83268f..81c0e9d 100644 --- a/balancer/src/main/resources/default.conf +++ b/balancer/src/main/resources/default.conf @@ -11,9 +11,6 @@ general { # When true, the plugin will reload when you execute /greload auto-reload=true - # When true, the plugin will get player counts from RedisBungee - redis-bungee=false - # When true, this plugin will print less messages when loading silent=false