Moved to the text component api (first stage of dumping Faucet)

Renamed the plugin to PlayerBalancer (from LobbyBalancer) since this plugin does not only balance lobbies. I kinda have a issue with the naming of this plugin, I don't know what name is appropriate for it.

Author: jamezrin

README.md

@@ -1,19 +1,21 @@
-# LobbyBalancer
+# PlayerBalancer
 [Spigot Resource](https://www.spigotmc.org/resources/10788/)
 
-[![Build Status](https://travis-ci.com/jaime29010/LobbyBalancer.svg?token=2yUi9WpA9QzSbJx9eTmy&branch=master)](https://travis-ci.com/jaime29010/LobbyBalancer)
+[![Build Status](https://travis-ci.com/jaime29010/PlayerBalancer.svg?token=2yUi9WpA9QzSbJx9eTmy&branch=master)](https://travis-ci.com/jaime29010/LobbyBalancer)
 
 ### Things to do:
 - [x] Get dummy sections able to have already registered servers on other sections
 - [x] Add a new message for when a player gets connected to a server and repurpose the connecting one
 - [ ] Add support for wildcards, contains, equalsIgnoreCase and regex at the same time
 - [ ] Add a identifier to get the servers of a section (auto complete)
-- [ ] Add tooltip when you hover over a server in /section info
+- [x] Add tooltip when you hover over a server in /section info
+- [ ] Stop using inventivetalent's deprecated bungee-update
 - [ ] Create a LobbyBalancer spigot addon that adds connector signs and placeholders
 - [ ] Separate the types of connections in classes instead of being in ConnectionIntent
 - [ ] Make the plugin API not be so dependent on a instance of LobbyBalancer
 - [ ] Separate connection providers in classes instead of being hardcoded in an enum
 - [ ] Make the feature `marker-descs` work per section
+- [ ] Implement fast connect (dimension change)
 - [ ] Unify the code that loads server into a section (duplicated at SectionManager and ServerSection) 
 - [ ] Unify some of the code used in the FallbackCommand and SectionCommand
 - [x] Use https://github.com/kennedyoliveira/pastebin4j instead of jpaste

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.jaimemartz</groupId>
     <artifactId>playerbalancer</artifactId>
-    <version>2.1</version>
+    <version>2.1-dev</version>
     <name>LobbyBalancer</name>
 
     <properties>
@@ -84,18 +84,6 @@
             <version>1.11-SNAPSHOT</version>
             <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>org.inventivetalent.update</groupId>
-            <artifactId>bungee</artifactId>
-            <version>1.0.1</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>ch.jalu</groupId>
             <artifactId>configme</artifactId>
@@ -108,29 +96,50 @@
             <version>1.2.0</version>
             <scope>compile</scope>
         </dependency>
+
+
+        <!-- TODO Ditch this dependency, move to ConfigMe -->
         <dependency>
             <groupId>me.jaimemartz</groupId>
             <artifactId>faucet-bungee</artifactId>
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+
+        <!-- TODO Replace with HTTP call to Spigot's API -->
+        <dependency>
+            <groupId>org.inventivetalent.update</groupId>
+            <artifactId>bungee</artifactId>
+            <version>1.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- TODO Replace with our own alternative to "RedisBunge" (maybe) -->
+        <dependency>
+            <groupId>com.imaginarycode.minecraft</groupId>
+            <artifactId>RedisBungee</artifactId>
+            <version>0.3.8-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>
             <version>LATEST</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.16.16</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

…memartz/lobbybalancer/LobbyBalancer.java …emartz/lobbybalancer/PlayerBalancer.javasrc/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java renamed to src/main/java/me/jaimemartz/lobbybalancer/PlayerBalancer.java src/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java renamed to src/main/java/me/jaimemartz/lobbybalancer/PlayerBalancer.java

@@ -23,14 +23,16 @@
 import java.io.IOException;
 import java.util.logging.Level;
 
-public class LobbyBalancer extends Plugin {
+public class PlayerBalancer extends Plugin {
     private static final int LAST_VER_CONFIG_UPDATE = 20950000;
 
     @Getter private ConfigFactory factory;
+
     @Getter private boolean failed = false;
+
     @Getter private StatusManager statusManager;
     @Getter private SectionManager sectionManager;
-    @Getter private static LobbyBalancer instance;
+    @Getter private static PlayerBalancer instance;
 
     private Command fallbackCommand, mainCommand, manageCommand;
     private Listener connectListener, kickListener, messageListener, reloadListener;
@@ -116,7 +118,7 @@ private void enable() {
 
                 getLogger().info("The plugin has finished loading without any problems");
             } catch (RuntimeException e) {
-                failed = true;
+                this.failed = true;
                 getLogger().severe("The plugin could not continue loading due to an unexpected exception");
                 e.printStackTrace();
             }
@@ -175,11 +177,12 @@ private void disable() {
                 ServerAssignRegistry.getTable().clear();
             }
         }
+
         PlayerLocker.flush();
         failed = false;
     }
 
-    public void reloadPlugin() {
+    public boolean reloadPlugin() {
         getLogger().info("Reloading the plugin...");
         long starting = System.currentTimeMillis();
 
@@ -188,6 +191,8 @@ public void reloadPlugin() {
 
         long ending = System.currentTimeMillis() - starting;
         getLogger().info(String.format("The plugin has been reloaded, took %sms", ending));
+
+        return !failed;
     }
 
     public Configuration getConfigHandle() {

src/main/java/me/jaimemartz/lobbybalancer/commands/FallbackCommand.java

@@ -1,12 +1,13 @@
 package me.jaimemartz.lobbybalancer.commands;
 
-import me.jaimemartz.faucet.Messager;
-import me.jaimemartz.lobbybalancer.LobbyBalancer;
+import me.jaimemartz.lobbybalancer.PlayerBalancer;
 import me.jaimemartz.lobbybalancer.configuration.ConfigEntries;
 import me.jaimemartz.lobbybalancer.connection.ConnectionIntent;
 import me.jaimemartz.lobbybalancer.section.ServerSection;
+import me.jaimemartz.lobbybalancer.utils.MessageUtils;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
@@ -15,16 +16,15 @@
 import java.util.concurrent.Callable;
 
 public class FallbackCommand extends Command {
-    private final LobbyBalancer plugin;
+    private final PlayerBalancer plugin;
 
-    public FallbackCommand(LobbyBalancer plugin) {
+    public FallbackCommand(PlayerBalancer plugin) {
         super(ConfigEntries.FALLBACK_COMMAND_NAME.get(), ConfigEntries.FALLBACK_COMMAND_PERMISSION.get(), (ConfigEntries.FALLBACK_COMMAND_ALIASES.get().stream()).toArray(String[]::new));
         this.plugin = plugin;
     }
 
     @Override
     public void execute(CommandSender sender, String[] args) {
-        Messager msgr = new Messager(sender);
         if (sender instanceof ProxiedPlayer) {
             ProxiedPlayer player = (ProxiedPlayer) sender;
 
@@ -33,7 +33,7 @@ public void execute(CommandSender sender, String[] args) {
 
                 if (section != null) {
                     if ((ConfigEntries.FALLBACK_COMMAND_IGNORED_SECTIONS.get()).contains(section.getName())) {
-                        msgr.send(ConfigEntries.UNAVAILABLE_MESSAGE.get());
+                        MessageUtils.send(player, ConfigEntries.UNAVAILABLE_MESSAGE.get());
                         return null;
                     }
 
@@ -45,14 +45,14 @@ public void execute(CommandSender sender, String[] args) {
                         if (section.getParent() != null) {
                             target = section.getParent();
                         } else {
-                            msgr.send(ConfigEntries.UNAVAILABLE_MESSAGE.get());
+                            MessageUtils.send(player, ConfigEntries.UNAVAILABLE_MESSAGE.get());
                             return null;
                         }
                     }
 
                     if (ConfigEntries.FALLBACK_COMMAND_RESTRICTED.get()) {
                         if (section.getPosition() >= 0 && target.getPosition() < 0) {
-                            msgr.send(ConfigEntries.UNAVAILABLE_MESSAGE.get());
+                            MessageUtils.send(player, ConfigEntries.UNAVAILABLE_MESSAGE.get());
                             return null;
                         }
                     }
@@ -74,15 +74,15 @@ public void execute(CommandSender sender, String[] args) {
                         try {
                             int number = Integer.parseInt(args[0]);
                             if (number <= 0) {
-                                msgr.send(ConfigEntries.INVALID_INPUT_MESSAGE.get());
+                                MessageUtils.send(player, ConfigEntries.INVALID_INPUT_MESSAGE.get());
                             } else if (number > section.getServers().size()) {
-                                msgr.send(ConfigEntries.FAILURE_MESSAGE.get());
+                                MessageUtils.send(player, ConfigEntries.FAILURE_MESSAGE.get());
                             } else {
                                 ServerInfo server = section.getSortedServers().get(number - 1);
                                 ConnectionIntent.direct(plugin, player, server);
                             }
                         } catch (NumberFormatException e) {
-                            msgr.send(ConfigEntries.INVALID_INPUT_MESSAGE.get());
+                            MessageUtils.send(player, ConfigEntries.INVALID_INPUT_MESSAGE.get());
                         }
                     } else {
                         ConnectionIntent.simple(plugin, player, section);
@@ -92,7 +92,7 @@ public void execute(CommandSender sender, String[] args) {
                 //Nothing to do
             }
         } else {
-            msgr.send(ChatColor.RED + "This command can only be executed by a player");
+            sender.sendMessage(new ComponentBuilder("This command can only be executed by a player").color(ChatColor.RED).create());
         }
     }
 }

src/main/java/me/jaimemartz/lobbybalancer/commands/MainCommand.java

@@ -1,73 +1,61 @@
 package me.jaimemartz.lobbybalancer.commands;
 
-import me.jaimemartz.faucet.Messager;
-import me.jaimemartz.lobbybalancer.LobbyBalancer;
+import me.jaimemartz.lobbybalancer.PlayerBalancer;
 import me.jaimemartz.lobbybalancer.manager.PasteHelper;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.plugin.Command;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
+import org.apache.commons.lang3.StringUtils;
 
 public class MainCommand extends Command {
-    private final LobbyBalancer plugin;
-    private final URL hastebin;
+    private final PlayerBalancer plugin;
 
-    public MainCommand(LobbyBalancer plugin) {
+    public MainCommand(PlayerBalancer plugin) {
         super("balancer");
         this.plugin = plugin;
-
-        try {
-            this.hastebin = new URL("https://hastebin.com/documents");
-        } catch (MalformedURLException ignored) {}
     }
 
     @Override
     public void execute(final CommandSender sender, String[] args) {
-        Messager msgr = new Messager(sender);
-        if (args.length == 0) {
-            msgr.send(
-                    "&7&m-----------------------------------------------------",
-                    "&7Information: LobbyBalancer version " + plugin.getDescription().getVersion(),
-                    "&7Available commands:",
-                    "&3/balancer &7- &cShows this message",
-                    "&3/balancer paste &7- &cCreates a paste with the important files",
-                    "&3/balancer reload &7- &cReloads the plugin completely",
-                    "&7&m-----------------------------------------------------"
-            );
-        } else {
-            switch (args[0]) {
+        if (args.length != 0) {
+            switch (args[0].toLowerCase()) {
                 case "paste": {
                     if (sender.hasPermission("lobbybalancer.admin")) {
                         PasteHelper.PLUGIN.send(plugin, sender, "Plugin config paste link: {link}");
                         PasteHelper.BUNGEE.send(plugin, sender, "Bungee config paste link (sensitive): {link}");
                     } else {
-                        msgr.send(ChatColor.RED + "You do not have permission to execute this command!");
+                        sender.sendMessage(new ComponentBuilder("You do not have permission to execute this command!").color(ChatColor.RED).create());
                     }
                     break;
                 }
 
                 case "reload": {
                     if (sender.hasPermission("lobbybalancer.admin")) {
-                        msgr.send(ChatColor.GREEN + "Reloading the configuration, this may take a while...");
-                        plugin.reloadPlugin();
-                        msgr.send(ChatColor.GREEN + "The configuration has been reloaded");
+                        sender.sendMessage(new ComponentBuilder("Reloading the configuration, this may take a while...").color(ChatColor.GREEN).create());
+                        if (plugin.reloadPlugin()) {
+                            sender.sendMessage(new ComponentBuilder("The plugin has successfully reloaded").color(ChatColor.GREEN).create());
+                        } else {
+                            sender.sendMessage(new ComponentBuilder("Something went badly while reloading the plugin").color(ChatColor.RED).create());
+                        }
                     } else {
-                        msgr.send(ChatColor.RED + "You do not have permission to execute this command!");
+                        sender.sendMessage(new ComponentBuilder("You do not have permission to execute this command!").color(ChatColor.RED).create());
                     }
                     break;
                 }
 
                 default: {
-                    msgr.send(ChatColor.RED + "This is not a valid argument for this command!");
+                    sender.sendMessage(new ComponentBuilder("This is not a valid argument for this command!").color(ChatColor.RED).create());
                 }
             }
+        } else {
+            sender.sendMessage(new ComponentBuilder(StringUtils.repeat('-', 53)).strikethrough(true).color(ChatColor.GRAY).create());
+            sender.sendMessage(new ComponentBuilder("LobbyBalancer " + plugin.getDescription().getVersion()).color(ChatColor.GRAY).create());
+            sender.sendMessage(new ComponentBuilder("Available commands:").color(ChatColor.GRAY).create());
+            sender.sendMessage(new ComponentBuilder("/balancer").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Shows you this message").color(ChatColor.RED).create());
+            sender.sendMessage(new ComponentBuilder("/balancer paste").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Creates a paste with the important files").color(ChatColor.RED).create());
+            sender.sendMessage(new ComponentBuilder("/balancer reload").color(ChatColor.AQUA).append(" - ").color(ChatColor.GRAY).append("Reloads the plugin completely").color(ChatColor.RED).create());
+            sender.sendMessage(new ComponentBuilder(StringUtils.repeat('-', 53)).strikethrough(true).color(ChatColor.GRAY).create());
         }
     }
 }