reimplemented passthrough when the queue is empty and the server not full

Author: bierdosenhalter

build.gradle

@@ -73,6 +73,10 @@ tasks {
         runDirectory = layout.projectDirectory.dir('run').dir('proxy')
         velocityVersion("${project.velocity_api_version}")
         dependsOn('build')
+        downloadPlugins {
+            url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.3.2/ViaBackwards-5.3.2.jar")
+            url("https://github.com/ViaVersion/ViaVersion/releases/download/5.3.2/ViaVersion-5.3.2.jar")
+        }
     }
 }
 
@@ -90,8 +94,8 @@ tasks.register('runServerQueue', runServer.getClass() as Class<Task>) {
     systemProperty('Paper.skipServerPropertiesComments', 'true')
     runDirectory = layout.projectDirectory.dir('run').dir('queue')
     downloadPlugins {
-        github("zeroBzeroT", "QueueServerPlugin", "3.0.0-SNAPSHOT", "queueplugin-3.0.0-SNAPSHOT+1.20.6-paper.jar")
-        url("https://ci.dmulloy2.net/job/ProtocolLib/723/artifact/build/libs/ProtocolLib.jar")
+        github("zeroBzeroT", "QueuePlugin", "v3.0.1", "QueuePlugin-3.0.1+1.21-paper.jar")
+        url("https://github.com/dmulloy2/ProtocolLib/releases/download/5.3.0/ProtocolLib.jar")
     }
     dependsOn('build')
 }

gradle.properties

@@ -1,3 +1,3 @@
-plugin_version=3.0.10
+plugin_version=3.0.11
 velocity_api_version=3.4.0-SNAPSHOT
 minecraft_version=1.20.6

run/main/server.properties

@@ -1,3 +1,5 @@
+
+
 accepts-transfers=false
 allow-flight=true
 allow-nether=false

run/proxy/velocity.toml

@@ -1,16 +1,17 @@
 # Config version. Do not change this
 config-version = "2.7"
 
-# What port should the proxy be bound to? By default, we'll bind to all addresses on port 25577.
+# What port should the proxy be bound to? By default, we'll bind to all addresses on port 25565.
 bind = "0.0.0.0:25565"
 
 # What should be the MOTD? This gets displayed when the player adds your server to
 # their server list. Only MiniMessage format is accepted.
-motd = "<#09add3>A Velocity Server"
+#motd = "<dark_gray><i><b>0B</b></i></dark_gray> <dark_red>0B</dark_red><blue>0T</blue><green>.ORG</green><newline><dark_gray><i><b>0T</b></i></dark_gray> <gold>Aloha snackbar!</gold>"
+motd = "<dark_gray><i><b>0B</b></i></dark_gray> <dark_red>0B</dark_red><blue>0T</blue><green>.ORG</green><newline><dark_gray><i><b>0T</b></i></dark_gray> <gold>You will be baked, and then there will be cake.</gold>"
 
 # What should we display for the maximum number of players? (Velocity does not support a cap
 # on the number of players online.)
-show-max-players = 500
+show-max-players = 1337
 
 # Should we authenticate players with Mojang? By default, this is on.
 online-mode = true
@@ -34,15 +35,15 @@ prevent-client-proxy-connections = false
 #                  unable to implement network level firewalling (on a shared host).
 # - "modern":      Forward player IPs and UUIDs as part of the login process using
 #                  Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher.
-player-info-forwarding-mode = "MODERN"
+player-info-forwarding-mode = "modern"
 
 # If you are using modern or BungeeGuard IP forwarding, configure a file that contains a unique secret here.
 # The file is expected to be UTF-8 encoded and not empty.
 forwarding-secret-file = "forwarding.secret"
 
-# Announce whether your server supports Forge. If you run a modded server, we
+# Announce whether or not your server supports Forge. If you run a modded server, we
 # suggest turning this on.
-#
+# 
 # If your network runs one modpack consistently, consider using ping-passthrough = "mods"
 # instead for a nicer display in the server list.
 announce-forge = false
@@ -64,30 +65,46 @@ kick-existing-players = false
 #                  description and mod list.
 # - "all":         Uses the backend server's response as the proxy response. The Velocity
 #                  configuration is used if no servers could be contacted.
-ping-passthrough = "DISABLED"
+ping-passthrough = "mods"
 
 # If not enabled (default is true) player IP addresses will be replaced by <ip address withheld> in logs
-enable-player-address-logging = true
+enable-player-address-logging = false
 
 [servers]
 # Configure your servers here. Each key represents the server's name, and the value
 # represents the IP address of the server to connect to.
 main = "127.0.0.1:25567"
 queue = "127.0.0.1:25566"
+test = "127.0.0.1:9200"
+temp = "127.0.0.1:9300"
 
 # In what order we should try servers when a player logs in or is kicked from a server.
 try = [
-  "main",
-  "queue"
+    "queue"
 ]
 
 [forced-hosts]
-
+# Configure your forced hosts here.
+"0b0t.org" = [
+    "queue"
+]
+"0b0t.net" = [
+    "queue"
+]
+"shield.0b0t.org" = [
+    "queue"
+]
+"test.0b0t.org" = [
+    "test"
+]
+"temp.0b0t.org" = [
+    "temp"
+]
 
 [advanced]
 # How large a Minecraft packet has to be before we compress it. Setting this to zero will
 # compress all packets, and setting it to -1 will disable compression entirely.
-compression-threshold = 256
+compression-threshold = 512
 
 # How much compression should be done (from 0-9). The default is -1, which uses the
 # default level of 6.
@@ -108,7 +125,7 @@ read-timeout = 30000
 haproxy-protocol = false
 
 # Enables TCP fast open support on the proxy. Requires the proxy to run on Linux.
-tcp-fast-open = false
+tcp-fast-open = true
 
 # Enables BungeeCord plugin messaging channel support on Velocity.
 bungee-plugin-message-channel = true
@@ -123,29 +140,28 @@ show-ping-requests = false
 failover-on-unexpected-server-disconnect = true
 
 # Declares the proxy commands to 1.13+ clients.
-announce-proxy-commands = true
+announce-proxy-commands = false
 
 # Enables the logging of commands
 log-command-executions = false
 
 # Enables logging of player connections when connecting to the proxy, switching servers
 # and disconnecting from the proxy.
-log-player-connections = true
+log-player-connections = false
 
 # Allows players transferred from other hosts via the
 # Transfer packet (Minecraft 1.20.5) to be received.
-# TODO: is this required by something we use?
 accepts-transfers = false
 
 [query]
 # Whether to enable responding to GameSpy 4 query responses or not.
 enabled = false
 
 # If query is enabled, on what port should the query protocol listen on?
-port = 25577
+port = 25575
 
 # This is the map name that is reported to the query services.
-map = "Velocity"
+map = "Zerocity"
 
 # Whether plugins should be shown in query response by default or not
 show-plugins = false

run/queue/server.properties

@@ -1,3 +1,5 @@
+
+
 accepts-transfers=false
 allow-flight=true
 allow-nether=false

src/main/java/org/zeroBzeroT/anarchyqueue/Config.java

@@ -21,9 +21,9 @@ public class Config {
 
     public static String messageConnecting = null;
 
-    public static String messageFull = null; // TODO: not in use, implement or remove this
+    public static String messageFull = null;
 
-    public static String messageOffline = null; // TODO: not in use, implement or remove this
+    public static String messageOffline = null;
 
     public static boolean kick = true;
 
@@ -66,7 +66,7 @@ static void loadConfig(Path path) throws IOException {
         messagePosition = toml.getString("message-position", "Position in queue: ");
         messageConnecting = toml.getString("message-connecting", "Connecting to the server...");
         messageFull = toml.getString("message-full", "Server is currently full!");
-        messageOffline = toml.getString("message-offline", "Server is currently down!");
+        messageOffline = toml.getString("message-offline", "Server is currently offline!");
         kick = toml.getBoolean("kick", true);
         waitOnKick = toml.getLong("wait-on-kick", 16L).intValue();
         sendTitle = toml.getBoolean("send-title", true);

src/main/java/org/zeroBzeroT/anarchyqueue/Queue.java

@@ -4,6 +4,7 @@
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.player.KickedFromServerEvent;
 import com.velocitypowered.api.event.player.ServerConnectedEvent;
+import com.velocitypowered.api.event.player.ServerPreConnectEvent;
 import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.RegisteredServer;
@@ -21,7 +22,6 @@
 
 // velocity api event docs:
 // https://jd.papermc.io/velocity/3.3.0/com/velocitypowered/api/event/package-summary.html
-// TODO: direct connection to the main server if the queue is empty
 // TODO: replace player objects with uuids
 
 public class Queue {
@@ -73,6 +73,40 @@ public int getSize() {
         return playerQueue.size();
     }
 
+    /**
+     * This event is fired before the player connects to a server.
+     * Velocity will wait on this event to finish firing before initiating the connection.
+     */
+    @Subscribe
+    public void onServerPreConnect(ServerPreConnectEvent event) {
+        // Check if it's a "fresh" connection
+        if (event.getPreviousServer() != null)
+            return;
+
+        // Check if player is connecting to the queue server
+        if (getSize() == 0 && event.getOriginalServer().getServerInfo().getName().equals(Config.queue)) {
+            // If queue is empty, attempt passthrough
+            try {
+                // Check target server reachability
+                RegisteredServer serverTarget = getServer(Config.target);
+                int currentPlayers = serverTarget.getPlayersConnected().size();
+
+                // Check if target server is not full
+                if (currentPlayers < Config.maxPlayers) {
+                    // Allow direct connection to target server
+                    event.setResult(ServerPreConnectEvent.ServerResult.allowed(serverTarget));
+                    log.info(mm("<white>" + event.getPlayer().getUsername() + "<dark_aqua> was directly connected to server <aqua>" + Config.target + "<dark_aqua>. Main count is " + (getSize() + 1) + " of " + Config.maxPlayers + "."));
+                } else {
+                    // Notify player that server is full
+                    event.getPlayer().sendMessage(mm(Config.messageFull));
+                }
+            } catch (ServerNotReachableException e) {
+                // Target server offline or unreachable, proceed with queue and notify the player
+                event.getPlayer().sendMessage(mm(Config.messageOffline));
+            }
+        }
+    }
+
     /**
      * This event is fired once the player has successfully connected to the
      * target server and the connection to the previous server has been de-established.
@@ -109,7 +143,6 @@ public void onKickedFromServer(KickedFromServerEvent event) {
             try {
                 Player player = event.getPlayer();
                 Component reason = event.getServerKickReason().isPresent() ? event.getServerKickReason().get() : mm("Kicked without a reason.");
-
                 KickOrRequeue(player, reason);
             } catch (Exception e) {
                 log.error(e.getMessage());
@@ -183,13 +216,13 @@ public void flushQueue() {
         try {
             serverMain = getServer(Config.target);
         } catch (ServerNotReachableException e) {
-            // TODO: offline notification
+            // offline notification handled by onServerPreConnect
             return;
         }
 
         // check main server full
         if (serverMain.getPlayersConnected().size() >= Config.maxPlayers)
-            // TODO: full notification
+            // full notification handled by onServerPreConnect
             return;
 
         lock.lock();
@@ -300,12 +333,16 @@ private RegisteredServer getServer(String name) throws ServerNotReachableExcepti
      */
     public void sendTitle(Player player, Component title, Component subtitle, int fadeIn, int stay, int fadeOut) {
         try {
+            // Convert ticks to milliseconds (1 tick = 50 ms)
             Title bungeeTitle = Title.title(
                     title,
                     subtitle,
-                    Title.Times.times(Duration.ofMillis(fadeIn * 20L),
-                            Duration.ofMillis(stay * 20L),
-                            Duration.ofMillis(fadeOut * 20L)));
+                    Title.Times.times(
+                            Duration.ofMillis(fadeIn * 50L),
+                            Duration.ofMillis(stay * 50L),
+                            Duration.ofMillis(fadeOut * 50L)
+                    )
+            );
             player.showTitle(bungeeTitle);
         } catch (Exception e) {
             log.error(mm("<red>Could not send title to <white>" + player.getUsername() + "<red>: " + e.getMessage()));