Improve regex config naming

Author: AlexProgrammerDE

src/main/java/net/pistonmaster/pistonqueue/bungee/listeners/RegexListener.java

@@ -31,8 +31,8 @@ public void onPreLogin(PreLoginEvent ple) {
         if (ple.isCancelled())
             return;
 
-        if (Config.ENABLE_REGEX && !ple.getConnection().getName().matches(Config.REGEX)) {
-            ple.setCancelReason(ChatUtils.parseToComponent(Config.REGEX_MESSAGE.replace("%regex%", Config.REGEX)));
+        if (Config.ENABLE_USERNAME_REGEX && !ple.getConnection().getName().matches(Config.USERNAME_REGEX)) {
+            ple.setCancelReason(ChatUtils.parseToComponent(Config.USERNAME_REGEX_MESSAGE.replace("%regex%", Config.USERNAME_REGEX)));
             ple.setCancelled(true);
         }
     }

src/main/java/net/pistonmaster/pistonqueue/shared/Config.java

@@ -25,15 +25,15 @@
 
 public final class Config {
     public static String SERVER_NAME, SERVER_IS_FULL_MESSAGE, QUEUE_POSITION, JOINING_MAIN_SERVER,
-            QUEUE_BYPASS_PERMISSION, QUEUE_SERVER, QUEUE_PRIORITY_PERMISSION, REGEX,
+            QUEUE_BYPASS_PERMISSION, QUEUE_SERVER, QUEUE_PRIORITY_PERMISSION, USERNAME_REGEX,
             KICK_MESSAGE, ADMIN_PERMISSION, MAIN_SERVER, AUTH_SERVER, SERVER_DOWN_KICK_MESSAGE,
-            QUEUE_VETERAN_PERMISSION, REGEX_MESSAGE, PAUSE_QUEUE_IF_MAIN_DOWN_MESSAGE,
+            QUEUE_VETERAN_PERMISSION, USERNAME_REGEX_MESSAGE, PAUSE_QUEUE_IF_MAIN_DOWN_MESSAGE,
             SHADOW_BAN_MESSAGE, IF_MAIN_DOWN_SEND_TO_QUEUE_MESSAGE, RECOVERY_MESSAGE;
 
     public static boolean POSITION_MESSAGE_HOT_BAR, ENABLE_KICK_MESSAGE,
             ENABLE_AUTH_SERVER, ALWAYS_QUEUE, REGISTER_TAB, AUTH_FIRST, POSITION_MESSAGE_CHAT,
             PAUSE_QUEUE_IF_MAIN_DOWN, KICK_WHEN_DOWN, FORCE_MAIN_SERVER, ALLOW_AUTH_SKIP,
-            IF_MAIN_DOWN_SEND_TO_QUEUE, RECOVERY, ENABLE_REGEX, SEND_XP_SOUND;
+            IF_MAIN_DOWN_SEND_TO_QUEUE, RECOVERY, ENABLE_USERNAME_REGEX, SEND_XP_SOUND;
 
     public static int QUEUE_MOVE_DELAY, SERVER_ONLINE_CHECK_DELAY, POSITION_MESSAGE_DELAY,
             START_TIME, REGULAR_SLOTS, PRIORITY_SLOTS, VETERAN_SLOTS, CUSTOM_PERCENT_PERCENTAGE,

src/main/java/net/pistonmaster/pistonqueue/velocity/listeners/RegexListener.java

@@ -30,8 +30,8 @@ public void onPreLogin(PreLoginEvent ple) {
         if (ple.getResult() != PreLoginEvent.PreLoginComponentResult.allowed())
             return;
 
-        if (Config.ENABLE_REGEX && !ple.getUsername().matches(Config.REGEX)) {
-            ple.setResult(PreLoginEvent.PreLoginComponentResult.denied(ChatUtils.parseToComponent(Config.REGEX_MESSAGE.replace("%regex%", Config.REGEX))));
+        if (Config.ENABLE_USERNAME_REGEX && !ple.getUsername().matches(Config.USERNAME_REGEX)) {
+            ple.setResult(PreLoginEvent.PreLoginComponentResult.denied(ChatUtils.parseToComponent(Config.USERNAME_REGEX_MESSAGE.replace("%regex%", Config.USERNAME_REGEX))));
         }
     }
 }

src/main/resources/proxyconfig.yml

@@ -11,9 +11,9 @@
 SERVERNAME: "SERVERNAME"
 
 # Username regex
-ENABLE_REGEX: true
-REGEX: "[a-zA-Z0-9_]*"
-REGEX_MESSAGE: "&6[PQ] Invalid username please use: %regex%"
+ENABLE_USERNAME_REGEX: true
+USERNAME_REGEX: "[a-zA-Z0-9_]*"
+USERNAME_REGEX_MESSAGE: "&6[PQ] Invalid username please use: %regex%"
 
 # Tab auto completion
 REGISTER_TAB: true