Some more progress

Author: jamezrin

README.md

@@ -4,20 +4,14 @@
 [![Build Status](https://travis-ci.com/Jamezrin/PlayerBalancer.svg?token=2yUi9WpA9QzSbJx9eTmy&branch=master)](https://travis-ci.com/Jamezrin/PlayerBalancer)
 
 ### Things to do:
-- [x] Get dummy sections able to have already registered serverEntries on other sections
-- [x] Add a new message for when a player gets connected to a serverName and repurpose the connecting one
 - [ ] Add support for wildcards, contains, equalsIgnoreCase and regex at the same time
-- [ ] Add option to force joining a specific section (to the command)
-- [x] Add tooltip when you hover over a serverName in /section info
-- [ ] Stop using inventivetalent's deprecated bungee-update
 - [ ] Create a spigot addon that adds connector signs and placeholders
-- [x] Separate the types of connections in classes instead of being in ConnectionIntent
+- [ ] Separate the types of connections in classes instead of being in ConnectionIntent
 - [ ] Make the plugin API be not so dependent on a instance of PlayerBalancer
 - [ ] Separate connection providers in classes instead of being hardcoded in an enum
 - [ ] Make the feature `marker-descs` work per section
-- [ ] Add a identifier to get the serverEntries of a section (auto complete)
 - [ ] Implement fast connect (dimension change)
 - [ ] Implement a way to redirect premium players to a section and cracked ones to other section (not sure how this works)
-- [ ] Unify the code that loads serverName into a section (duplicated at SectionManager and ServerSection) 
-- [ ] Unify some of the code used in the FallbackCommand and SectionCommand
+- [x] Unify the code that loads serverName into a section (duplicated at SectionManager and ServerSection) 
+- [x] Unify some of the code used in the FallbackCommand and SectionCommand
 - [ ] Make the section initialization work in stages instead of being hardcoded

src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

@@ -14,12 +14,9 @@
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
-import ninja.leaping.configurate.ConfigurationOptions;
 import ninja.leaping.configurate.commented.CommentedConfigurationNode;
 import ninja.leaping.configurate.hocon.HoconConfigurationLoader;
 import ninja.leaping.configurate.loader.ConfigurationLoader;
-import ninja.leaping.configurate.objectmapping.serialize.TypeSerializerCollection;
-import ninja.leaping.configurate.objectmapping.serialize.TypeSerializers;
 import org.bstats.bungeecord.Metrics;
 import org.inventivetalent.update.bungee.BungeeUpdater;
 
@@ -32,7 +29,7 @@
 public class PlayerBalancer extends Plugin {
     private boolean failed = false;
     private StatusManager statusManager;
-    private SettingsHolder mainSettings;
+    private SettingsHolder settings;
     private ConfigurationLoader<CommentedConfigurationNode> loader;
     private SectionManager sectionManager;
     private NetworkManager networkManager;
@@ -52,36 +49,34 @@ private void enable() {
 
         File file = new File(getDataFolder(), "plugin.conf");
 
+        if (!file.exists()) {
+            try (InputStream in = getResourceAsStream("default.conf")) {
+                Files.copy(in, file.toPath());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
         if (loader == null) {
-            TypeSerializerCollection serializers = TypeSerializers.getDefaultSerializers().newChild();
-            ConfigurationOptions options = ConfigurationOptions.defaults().setSerializers(serializers);
-            loader = HoconConfigurationLoader.builder().setFile(file).setDefaultOptions(options).build();
+            loader = HoconConfigurationLoader.builder().setFile(file).build();
         }
 
         try {
-            if (!file.exists()) {
-                try (InputStream in = getResourceAsStream("default.conf")) {
-                    Files.copy(in, file.toPath());
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
             CommentedConfigurationNode node = loader.load();
-            mainSettings = node.getValue(TypeToken.of(SettingsHolder.class));
+            settings = node.getValue(TypeToken.of(SettingsHolder.class));
         } catch (Exception e) {
             e.printStackTrace();
         }
 
         mainCommand = new MainCommand(this);
         getProxy().getPluginManager().registerCommand(this, mainCommand);
 
-        if (mainSettings.getGeneralProps().isEnabled()) {
-            if (mainSettings.getGeneralProps().isSilent()) {
+        if (settings.getGeneralProps().isEnabled()) {
+            if (settings.getGeneralProps().isSilent()) {
                 getLogger().setLevel(Level.WARNING);
             }
 
-            if (mainSettings.getGeneralProps().isAutoReload()) {
+            if (settings.getGeneralProps().isAutoReload()) {
                 reloadListener = new ProxyReloadListener(this);
                 getProxy().getPluginManager().registerListener(this, reloadListener);
             }
@@ -99,12 +94,12 @@ private void enable() {
                 sectionManager.load();
 
                 statusManager = new StatusManager(this);
-                if (mainSettings.getServerCheckerProps().isEnabled()) {
+                if (settings.getServerCheckerProps().isEnabled()) {
                     statusManager.start();
                 }
 
-                if (mainSettings.getFallbackCommandProps().isEnabled()) {
-                    fallbackCommand = new FallbackCommand(this, mainSettings.getFallbackCommandProps().getCommand());
+                if (settings.getFallbackCommandProps().isEnabled()) {
+                    fallbackCommand = new FallbackCommand(this, settings.getFallbackCommandProps().getCommand());
                     getProxy().getPluginManager().registerCommand(this, fallbackCommand);
                 }
 
@@ -123,7 +118,7 @@ private void enable() {
 
                 PasteHelper.reset();
 
-                if (mainSettings.getKickHandlerProps().isEnabled()) {
+                if (settings.getKickHandlerProps().isEnabled()) {
                     kickListener = new ServerKickListener(this);
                     getProxy().getPluginManager().registerListener(this, kickListener);
                 }
@@ -151,25 +146,25 @@ private void disable() {
         getProxy().getPluginManager().unregisterCommand(mainCommand);
         mainCommand = null;
 
-        if (mainSettings.getGeneralProps().isEnabled()) {
+        if (settings.getGeneralProps().isEnabled()) {
             //Do not try to do anything if the plugin has not loaded correctly
             if (failed) return;
 
-            if (mainSettings.getGeneralProps().isAutoReload()) {
+            if (settings.getGeneralProps().isAutoReload()) {
                 getProxy().getPluginManager().unregisterListener(reloadListener);
                 reloadListener = null;
             }
 
-            if (mainSettings.getServerCheckerProps().isEnabled()) {
+            if (settings.getServerCheckerProps().isEnabled()) {
                 statusManager.stop();
             }
 
-            if (mainSettings.getFallbackCommandProps().isEnabled()) {
+            if (settings.getFallbackCommandProps().isEnabled()) {
                 getProxy().getPluginManager().unregisterCommand(fallbackCommand);
                 fallbackCommand = null;
             }
 
-            if (mainSettings.getKickHandlerProps().isEnabled()) {
+            if (settings.getKickHandlerProps().isEnabled()) {
                 getProxy().getPluginManager().unregisterListener(kickListener);
                 kickListener = null;
             }
@@ -186,7 +181,7 @@ private void disable() {
             sectionManager.flush();
 
             /*
-            if (mainSettings.getGeneralProps().isAssignTargets()) {
+            if (settings.getGeneralProps().isAssignTargets()) {
                 ServerAssignRegistry.getTable().clear();
             }
             */
@@ -210,7 +205,7 @@ public boolean reloadPlugin() {
     }
 
     public SettingsHolder getSettings() {
-        return mainSettings;
+        return settings;
     }
 
     public SectionManager getSectionManager() {

src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java

@@ -14,6 +14,8 @@
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 
+import java.util.ArrayList;
+
 public class FallbackCommand extends Command {
     protected final PlayerBalancer plugin;
     protected final MessagesProps messages;
@@ -38,10 +40,10 @@ public void execute(CommandSender sender, String[] args) {
                         int number = Integer.parseInt(args[0]);
                         if (number <= 0) {
                             MessageUtils.send(player, messages.getInvalidInputMessage());
-                        } else if (number > target.getMappedServers().size()) {
+                        } else if (number > target.getServers().size()) {
                             MessageUtils.send(player, messages.getFailureMessage());
                         } else {
-                            ServerInfo server = target.getSortedServers().get(number - 1);
+                            ServerInfo server = new ArrayList<>(target.getServers()).get(number - 1);
                             ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {
                                 //todo something missing
                             });

src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java

@@ -104,9 +104,9 @@ public void execute(CommandSender sender, String[] args) {
 
                                 sender.sendMessage(new ComponentBuilder("Provider: ")
                                         .color(ChatColor.GRAY)
-                                        .append(section.getEffectiveProvider().name())
+                                        .append(section.getImplicitProvider().name())
                                         .color(ChatColor.AQUA)
-                                        .append(String.format(" (%s)", section.isInherited() ? "Inherited" : "Specified"))
+                                        .append(String.format(" (%s)", section.isInherited() ? "Implicit" : "Explicit"))
                                         .color(ChatColor.GRAY)
                                         .create()
                                 );
@@ -160,13 +160,13 @@ public void execute(CommandSender sender, String[] args) {
                                     );
                                 }
 
-                                if (!section.getMappedServers().isEmpty()) {
+                                if (!section.getServers().isEmpty()) {
                                     sender.sendMessage(new ComponentBuilder("Section Servers: ")
                                             .color(ChatColor.GRAY)
                                             .create()
                                     );
 
-                                    section.getMappedServers().forEach(server -> {
+                                    section.getServers().forEach(server -> {
                                         ServerStatus status = plugin.getStatusManager().getStatus(server);
                                         sender.sendMessage(new ComponentBuilder("\u2022 Server: ")
                                                 .color(ChatColor.GRAY)

src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java

@@ -28,19 +28,19 @@ public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ProviderTyp
                 (str) -> str.replace("{section}", section.getName())
         );
 
-        if (servers == section.getMappedServers()) {
+        if (servers == section.getServers()) {
             throw new IllegalStateException("The servers list parameter is the same reference, this cannot happen");
         }
 
         Server current = player.getServer();
         if (current != null) {
-            if (section.getMappedServers().contains(current.getInfo())) {
+            if (section.getServers().contains(current.getInfo())) {
                 MessageUtils.send(player, plugin.getSettings().getMessagesProps().getSameSectionMessage());
                 return;
             }
         }
 
-        if (section.getEffectiveProvider() != ProviderType.NONE) {
+        if (section.getImplicitProvider() != ProviderType.NONE) {
             ServerInfo target = this.fetchServer(plugin, player, section, provider, servers);
             if (target != null) {
                 this.connect(target, (response, throwable) -> {
@@ -57,15 +57,15 @@ public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ProviderTyp
     }
 
     public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ServerSection section) {
-        this(plugin, player, section.getEffectiveProvider(), section);
+        this(plugin, player, section.getImplicitProvider(), section);
     }
 
     public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ProviderType type, ServerSection section) {
-        this(plugin, player, type, section, new ArrayList<>(section.getMappedServers()));
+        this(plugin, player, type, section, new ArrayList<>(section.getServers()));
     }
 
     public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ServerSection section, List<ServerInfo> servers) {
-        this(plugin, player, section.getEffectiveProvider(), section, servers);
+        this(plugin, player, section.getImplicitProvider(), section, servers);
     }
 
     private ServerInfo fetchServer(PlayerBalancer plugin, ProxiedPlayer player, ServerSection section, ProviderType provider, List<ServerInfo> servers) {

src/main/java/com/jaimemartz/playerbalancer/listener/ServerConnectListener.java

@@ -51,7 +51,7 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo target) {
             }
 
             //Checks only for servers (not the section server)
-            if (section.getMappedServers().contains(target)) {
+            if (section.getServers().contains(target)) {
                 if (plugin.getSectionManager().isDummy(section)) {
                     return null;
                 }
@@ -61,7 +61,7 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo target) {
                     return null;
                 }
 
-                if (player.getServer() != null && section.getMappedServers().contains(player.getServer().getInfo())) {
+                if (player.getServer() != null && section.getServers().contains(player.getServer().getInfo())) {
                     if (plugin.getSectionManager().isReiterative(section)) {
                         ServerAssignRegistry.assignTarget(player, section, target);
                     }

src/main/java/com/jaimemartz/playerbalancer/listener/ServerKickListener.java

@@ -22,8 +22,8 @@
 
 public class ServerKickListener implements Listener {
     private final KickHandlerProps props;
-    private final PlayerBalancer plugin;
     private final MessagesProps messages;
+    private final PlayerBalancer plugin;
 
     public ServerKickListener(PlayerBalancer plugin) {
         this.props = plugin.getSettings().getKickHandlerProps();
@@ -64,19 +64,19 @@ public void onKick(ServerKickEvent event) {
 
             if (section != null) {
                 List<ServerInfo> servers = new ArrayList<>();
-                servers.addAll(section.getMappedServers());
+                servers.addAll(section.getServers());
                 servers.remove(from);
 
                 new ConnectionIntent(plugin, player, section, servers) {
                     @Override
                     public void connect(ServerInfo server, Callback<Boolean> callback) {
                         PlayerLocker.lock(player);
-                        MessageUtils.send(player, messages.getKickMessage(), (str) ->
-                                str.replace("{from}", from.getName())
-                                        .replace("{to}", server.getName())
-                                        .replace("{reason}", event.getKickReason()));
                         event.setCancelled(true);
                         event.setCancelServer(server);
+                        MessageUtils.send(player, messages.getKickMessage(), (str) -> str
+                                .replace("{reason}", event.getKickReason())
+                                .replace("{from}", from.getName())
+                                .replace("{to}", server.getName()));
                         plugin.getProxy().getScheduler().schedule(plugin, () -> {
                             PlayerLocker.unlock(player);
                         }, 5, TimeUnit.SECONDS);

src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java

@@ -34,7 +34,7 @@ public void start() {
             storage.forEach((k, v) -> v.setOutdated(true));
 
             for (ServerSection section : plugin.getSectionManager().getSections().values()) {
-                for (ServerInfo server : section.getMappedServers()) {
+                for (ServerInfo server : section.getServers()) {
                     if (stopped) {
                         break;
                     }