Finished implementation of some channels, fixed some stuff up, added regex caching

jamezrin · jamezrin · commit 8db9300820cf · 2017-12-26T11:46:18.000+01:00
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
@@ -91,12 +91,12 @@ private void execStart() {
         }
 
         try {
-            CommentedConfigurationNode node = loader.load();
-            settings = node.getValue(TypeToken.of(SettingsHolder.class));
-
             mainCommand = new MainCommand(this);
             getProxy().getPluginManager().registerCommand(this, mainCommand);
 
+            CommentedConfigurationNode node = loader.load();
+            settings = node.getValue(TypeToken.of(SettingsHolder.class));
+
             if (settings.getGeneralProps().isEnabled()) {
                 if (settings.getGeneralProps().isSilent()) {
                     getLogger().setLevel(Level.WARNING);
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/AbstractMoveCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/AbstractMoveCommand.java
@@ -40,7 +40,7 @@ public void execute(CommandSender sender, String[] args) {
                             MessageUtils.send(player, messages.getInvalidInputMessage());
                         } else {
                             ServerInfo server = Iterables.get(target.getServers(), number - 1);
-                            ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {});
+                            ConnectionIntent.direct(plugin, player, server, null);
                         }
                     } catch (NumberFormatException e) {
                         MessageUtils.send(player, messages.getInvalidInputMessage());
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java
@@ -34,7 +34,7 @@ public void execute(final CommandSender sender, String[] args) {
                     if (sender.hasPermission("playerbalancer.admin")) {
                         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());
+                            sender.sendMessage(new ComponentBuilder("The plugin has been successfully reloaded").color(ChatColor.GREEN).create());
                         } else {
                             sender.sendMessage(new ComponentBuilder("Something went badly while reloading the plugin").color(ChatColor.RED).create());
                         }
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
@@ -146,11 +146,22 @@ public void execute(CommandSender sender, String[] args) {
                                             .color(ChatColor.GRAY)
                                             .append(section.getCommand().getName())
                                             .color(ChatColor.AQUA)
-                                            .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Permission: ")
+                                            .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
+                                                    new ComponentBuilder("Name: ")
+                                                    .color(ChatColor.GRAY)
+                                                    .append(section.getCommand().getName())
+                                                    .color(ChatColor.AQUA)
+                                                    .append("\n")
+
+                                                    .append("Permission: ")
                                                     .color(ChatColor.GRAY)
                                                     .append("\"")
+                                                    .color(ChatColor.AQUA)
                                                     .append(section.getCommand().getPermission())
+                                                    .color(ChatColor.RED)
+                                                    .append("\"")
                                                     .color(ChatColor.AQUA)
+
                                                     .append("\n")
                                                     .append("Aliases: ")
                                                     .color(ChatColor.GRAY)
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
@@ -116,7 +116,9 @@ public static void direct(PlayerBalancer plugin, ProxiedPlayer player, ServerInf
             plugin.getProxy().getScheduler().schedule(plugin, () -> {
                 PlayerLocker.unlock(player);
             }, 5, TimeUnit.SECONDS);
-            callback.done(result, throwable);
+
+            if (callback != null)
+                callback.done(result, throwable);
         });
     }
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java
@@ -20,7 +20,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.concurrent.TimeUnit;
 
 public class PluginMessageListener implements Listener {
     private final PlayerBalancer plugin;
@@ -212,10 +211,12 @@ public void onPluginMessage(PluginMessageEvent event) {
                         if (server == null)
                             break;
 
-                        PlayerLocker.lock(player);
-                        plugin.getProxy().getScheduler().schedule(plugin, () -> {
-                            PlayerLocker.unlock(player);
-                        }, 5, TimeUnit.SECONDS);
+                        ConnectionIntent.direct(
+                                plugin,
+                                player,
+                                server,
+                                null
+                        );
                     }
                     break;
                 }
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
@@ -5,6 +5,7 @@
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.section.ServerSection;
 import com.jaimemartz.playerbalancer.settings.props.features.ServerCheckerProps;
+import com.jaimemartz.playerbalancer.utils.RegExUtils;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.Server;
 import net.md_5.bungee.api.event.PluginMessageEvent;
@@ -108,7 +109,7 @@ public boolean isAccessible(ServerInfo server) {
         }
 
         for (String pattern : props.getMarkerDescs()) {
-            if (status.getDescription().matches(pattern)) {
+            if (RegExUtils.matches(status.getDescription(), pattern)) {
                 return false;
             }
         }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/DigitUtils.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/DigitUtils.java
@@ -32,4 +32,6 @@ public static int getDigits(String string) {
 
         return Integer.parseInt(builder.toString());
     }
+
+    private DigitUtils() {}
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/MessageUtils.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/MessageUtils.java
@@ -25,4 +25,6 @@ public static void send(CommandSender sender, String text, Function<String, Stri
     public static String revertColor(String string) {
         return string.replace(ChatColor.COLOR_CHAR, '&');
     }
+
+    private MessageUtils() {}
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/RegExUtils.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/utils/RegExUtils.java
@@ -0,0 +1,37 @@
+package com.jaimemartz.playerbalancer.utils;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+
+import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class RegExUtils {
+    private static final LoadingCache<String, Pattern> COMPILED_PATTERNS = CacheBuilder.newBuilder().build(new CacheLoader<String, Pattern>() {
+        @Override
+        public Pattern load(String string) throws Exception {
+            return Pattern.compile(string);
+        }
+    });
+
+    public static Pattern getPattern(String regexp) {
+        try {
+            return COMPILED_PATTERNS.get(regexp);
+        } catch (ExecutionException e) {
+            throw new RuntimeException("Error while getting a pattern from the cache");
+        }
+    }
+
+    public static boolean matches(String string, String expression) {
+        return getMatcher(string, expression).matches();
+    }
+
+    private static Matcher getMatcher(String string, String expression) {
+        Pattern pattern = getPattern(expression);
+        return pattern.matcher(string);
+    }
+
+    private RegExUtils() {}
+}
diff --git a/Spigot Addon/pom.xml b/Spigot Addon/pom.xml
@@ -11,7 +11,7 @@
 
     <name>PlayerBalancer Addon</name>
     <artifactId>playerbalancer-addon</artifactId>
-    <version>1.3 for 2.1.3+</version>
+    <version>1.3 for 2.1.4+</version>
 
     <build>
         <finalName>PlayerBalancerAddon</finalName>
diff --git a/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java b/Spigot Addon/src/main/java/com/jaimemartz/playerbalanceraddon/PluginMessageManager.java
@@ -168,6 +168,7 @@ public void setPlayerBypass(Player player) {
     public void bypassConnect(Player player, String server) {
         ByteArrayDataOutput out = ByteStreams.newDataOutput();
         out.writeUTF("BypassConnect");
+        out.writeUTF(server);
         player.sendPluginMessage(plugin, "PlayerBalancer", out.toByteArray());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void execute(CommandSender sender, String[] args) {`
`40`	`40`	`MessageUtils.send(player, messages.getInvalidInputMessage());`
`41`	`41`	`} else {`
`42`	`42`	`ServerInfo server = Iterables.get(target.getServers(), number - 1);`
`43`		`- ConnectionIntent.direct(plugin, player, server, (response, throwable) -> {});`
	`43`	`+ ConnectionIntent.direct(plugin, player, server, null);`
`44`	`44`	`}`
`45`	`45`	`} catch (NumberFormatException e) {`
`46`	`46`	`MessageUtils.send(player, messages.getInvalidInputMessage());`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void execute(final CommandSender sender, String[] args) {`
`34`	`34`	`if (sender.hasPermission("playerbalancer.admin")) {`
`35`	`35`	`sender.sendMessage(new ComponentBuilder("Reloading the configuration, this may take a while...").color(ChatColor.GREEN).create());`
`36`	`36`	`if (plugin.reloadPlugin()) {`
`37`		`- sender.sendMessage(new ComponentBuilder("The plugin has successfully reloaded").color(ChatColor.GREEN).create());`
	`37`	`+ sender.sendMessage(new ComponentBuilder("The plugin has been successfully reloaded").color(ChatColor.GREEN).create());`
`38`	`38`	`} else {`
`39`	`39`	`sender.sendMessage(new ComponentBuilder("Something went badly while reloading the plugin").color(ChatColor.RED).create());`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,9 @@ public static void direct(PlayerBalancer plugin, ProxiedPlayer player, ServerInf`
`116`	`116`	`plugin.getProxy().getScheduler().schedule(plugin, () -> {`
`117`	`117`	`PlayerLocker.unlock(player);`
`118`	`118`	`}, 5, TimeUnit.SECONDS);`
`119`		`- callback.done(result, throwable);`
	`119`	`+`
	`120`	`+ if (callback != null)`
	`121`	`+ callback.done(result, throwable);`
`120`	`122`	`});`
`121`	`123`	`}`
`122`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import com.jaimemartz.playerbalancer.PlayerBalancer;`
`6`	`6`	`import com.jaimemartz.playerbalancer.section.ServerSection;`
`7`	`7`	`import com.jaimemartz.playerbalancer.settings.props.features.ServerCheckerProps;`
	`8`	`+import com.jaimemartz.playerbalancer.utils.RegExUtils;`
`8`	`9`	`import net.md_5.bungee.api.config.ServerInfo;`
`9`	`10`	`import net.md_5.bungee.api.connection.Server;`
`10`	`11`	`import net.md_5.bungee.api.event.PluginMessageEvent;`
`@@ -108,7 +109,7 @@ public boolean isAccessible(ServerInfo server) {`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`for (String pattern : props.getMarkerDescs()) {`
`111`		`- if (status.getDescription().matches(pattern)) {`
	`112`	`+ if (RegExUtils.matches(status.getDescription(), pattern)) {`
`112`	`113`	`return false;`
`113`	`114`	`}`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,6 @@ public static int getDigits(String string) {`
`32`	`32`
`33`	`33`	`return Integer.parseInt(builder.toString());`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ private DigitUtils() {}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,6 @@ public static void send(CommandSender sender, String text, Function<String, Stri`
`25`	`25`	`public static String revertColor(String string) {`
`26`	`26`	`return string.replace(ChatColor.COLOR_CHAR, '&');`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ private MessageUtils() {}`
`28`	`30`	`}`