Merge regex code into shared

Author: AlexProgrammerDE

src/main/java/net/pistonmaster/pistonqueue/bungee/PistonQueueBungee.java

@@ -27,7 +27,6 @@
 import net.md_5.bungee.api.plugin.PluginManager;
 import net.pistonmaster.pistonqueue.bungee.commands.MainCommand;
 import net.pistonmaster.pistonqueue.bungee.listeners.QueueListenerBungee;
-import net.pistonmaster.pistonqueue.bungee.listeners.RegexListener;
 import net.pistonmaster.pistonqueue.bungee.utils.ChatUtils;
 import net.pistonmaster.pistonqueue.hooks.PistonMOTDPlaceholder;
 import net.pistonmaster.pistonqueue.shared.PistonQueuePlugin;
@@ -75,7 +74,6 @@ public void onEnable() {
 
         info(ChatColor.BLUE + "Registering listeners");
         manager.registerListener(this, queueListenerBungee);
-        manager.registerListener(this, new RegexListener());
 
         info(ChatColor.BLUE + "Loading Metrics");
         new Metrics(this, 8755);

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

@@ -21,17 +21,15 @@
 
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.event.PostLoginEvent;
-import net.md_5.bungee.api.event.ServerConnectEvent;
-import net.md_5.bungee.api.event.ServerKickEvent;
-import net.md_5.bungee.api.event.ServerSwitchEvent;
+import net.md_5.bungee.api.event.*;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
 import net.pistonmaster.pistonqueue.bungee.PistonQueueBungee;
 import net.pistonmaster.pistonqueue.bungee.utils.ChatUtils;
 import net.pistonmaster.pistonqueue.shared.PlayerWrapper;
 import net.pistonmaster.pistonqueue.shared.QueueListenerShared;
 import net.pistonmaster.pistonqueue.shared.events.PQKickedFromServerEvent;
+import net.pistonmaster.pistonqueue.shared.events.PQPreLoginEvent;
 import net.pistonmaster.pistonqueue.shared.events.PQServerConnectedEvent;
 import net.pistonmaster.pistonqueue.shared.events.PQServerPreConnectEvent;
 
@@ -45,6 +43,11 @@ public QueueListenerBungee(PistonQueueBungee plugin) {
         this.plugin = plugin;
     }
 
+    @EventHandler
+    public void onPreLogin(PreLoginEvent event) {
+        onPreLogin(wrap(event));
+    }
+
     @EventHandler
     public void onPostLogin(PostLoginEvent event) {
         onPostLogin(plugin.wrapPlayer(event.getPlayer()));
@@ -132,4 +135,24 @@ public Optional<String> getKickReason() {
             }
         };
     }
+
+    private PQPreLoginEvent wrap(PreLoginEvent event) {
+        return new PQPreLoginEvent() {
+            @Override
+            public boolean isCancelled() {
+                return event.isCancelled();
+            }
+
+            @Override
+            public void setCancelled(String reason) {
+                event.setCancelReason(ChatUtils.parseToComponent(reason));
+                event.setCancelled(true);
+            }
+
+            @Override
+            public String getUsername() {
+                return event.getConnection().getName();
+            }
+        };
+    }
 }

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

@@ -25,6 +25,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import net.pistonmaster.pistonqueue.shared.events.PQKickedFromServerEvent;
+import net.pistonmaster.pistonqueue.shared.events.PQPreLoginEvent;
 import net.pistonmaster.pistonqueue.shared.events.PQServerConnectedEvent;
 import net.pistonmaster.pistonqueue.shared.events.PQServerPreConnectEvent;
 import net.pistonmaster.pistonqueue.shared.utils.BanType;
@@ -48,6 +49,15 @@ public abstract class QueueListenerShared {
     @Setter
     protected Instant onlineSince = null;
 
+    protected void onPreLogin(PQPreLoginEvent event) {
+        if (event.isCancelled())
+            return;
+
+        if (Config.ENABLE_USERNAME_REGEX && !event.getUsername().matches(Config.USERNAME_REGEX)) {
+            event.setCancelled(Config.USERNAME_REGEX_MESSAGE.replace("%regex%", Config.USERNAME_REGEX));
+        }
+    }
+
     protected void onPostLogin(PlayerWrapper player) {
         if (StorageTool.isShadowBanned(player.getUniqueId()) && Config.SHADOW_BAN_TYPE == BanType.KICK) {
             player.disconnect(Config.SERVER_DOWN_KICK_MESSAGE);
@@ -269,7 +279,7 @@ private void connectPlayer(QueueType type) {
 
                 type.getQueueMap().put(entry.getKey(), entry.getValue());
 
-                return;
+                continue;
             }
 
             indexPositionTime();
@@ -283,8 +293,9 @@ private void connectPlayer(QueueType type) {
             player.connect(entry.getValue());
         }
 
-        if (Config.SEND_XP_SOUND)
+        if (Config.SEND_XP_SOUND) {
             sendXPSoundToQueueType(type);
+        }
     }
 
     private void sendXPSoundToQueueType(QueueType type) {

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

@@ -0,0 +1,9 @@
+package net.pistonmaster.pistonqueue.shared.events;
+
+public interface PQPreLoginEvent {
+    boolean isCancelled();
+
+    void setCancelled(String reason);
+
+    String getUsername();
+}

src/main/java/net/pistonmaster/pistonqueue/shared/events/PQPreLoginEvent.java

@@ -41,7 +41,6 @@
 import net.pistonmaster.pistonqueue.shared.utils.UpdateChecker;
 import net.pistonmaster.pistonqueue.velocity.commands.MainCommand;
 import net.pistonmaster.pistonqueue.velocity.listeners.QueueListenerVelocity;
-import net.pistonmaster.pistonqueue.velocity.listeners.RegexListener;
 import net.pistonmaster.pistonqueue.velocity.utils.ChatUtils;
 import org.bstats.velocity.Metrics;
 import org.slf4j.Logger;
@@ -100,7 +99,6 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
         proxyServer.getCommandManager().register("pistonqueue", new MainCommand(this), "pq");
 
         info("Registering listeners");
-        proxyServer.getEventManager().register(this, new RegexListener());
         proxyServer.getEventManager().register(this, queueListenerVelocity);
 
         info("Loading Metrics");

src/main/java/net/pistonmaster/pistonqueue/velocity/PistonQueueVelocity.java

@@ -21,6 +21,7 @@
 
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
+import com.velocitypowered.api.event.connection.PreLoginEvent;
 import com.velocitypowered.api.event.player.KickedFromServerEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
 import com.velocitypowered.api.event.player.ServerPreConnectEvent;
@@ -30,6 +31,7 @@
 import net.pistonmaster.pistonqueue.shared.PlayerWrapper;
 import net.pistonmaster.pistonqueue.shared.QueueListenerShared;
 import net.pistonmaster.pistonqueue.shared.events.PQKickedFromServerEvent;
+import net.pistonmaster.pistonqueue.shared.events.PQPreLoginEvent;
 import net.pistonmaster.pistonqueue.shared.events.PQServerConnectedEvent;
 import net.pistonmaster.pistonqueue.shared.events.PQServerPreConnectEvent;
 import net.pistonmaster.pistonqueue.velocity.PistonQueueVelocity;
@@ -45,6 +47,11 @@ public QueueListenerVelocity(PistonQueueVelocity plugin) {
         this.plugin = plugin;
     }
 
+    @Subscribe
+    public void onPreLogin(PreLoginEvent event) {
+        onPreLogin(wrap(event));
+    }
+
     @Subscribe
     public void onPostLogin(PostLoginEvent event) {
         onPostLogin(plugin.wrapPlayer(event.getPlayer()));
@@ -134,4 +141,23 @@ public Optional<String> getKickReason() {
             }
         };
     }
+
+    private PQPreLoginEvent wrap(PreLoginEvent event) {
+        return new PQPreLoginEvent() {
+            @Override
+            public boolean isCancelled() {
+                return event.getResult() != PreLoginEvent.PreLoginComponentResult.allowed();
+            }
+
+            @Override
+            public void setCancelled(String reason) {
+                event.setResult(PreLoginEvent.PreLoginComponentResult.denied(ChatUtils.parseToComponent(reason)));
+            }
+
+            @Override
+            public String getUsername() {
+                return event.getUsername();
+            }
+        };
+    }
 }