Merge remote-tracking branch 'upstream/dev/3.0.0'

# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java

.github/workflows/gradle.yml

@@ -6,16 +6,16 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         persist-credentials: false
     - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@v4
+      uses: gradle/actions/setup-gradle@v5
     - name: Set up JDK 21
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: 21
         distribution: 'zulu'

README.md

@@ -34,3 +34,9 @@ and you can configure it from there.
 
 Alternatively, you can get the proxy JAR from the [downloads](https://papermc.io/downloads/velocity)
 page.
+
+# Localisation
+
+Translations are handled using [Crowdin](https://papermc-io.crowdin.com/velocity).
+If you want to translate a language not available on Crowdin,
+you might want to ask in the [Discord](https://discord.gg/papermc) about it.

api/build.gradle.kts

@@ -59,11 +59,11 @@ tasks {
 
         val o = options as StandardJavadocDocletOptions
         o.encoding = "UTF-8"
-        o.source = "17"
+        o.source = "21"
 
         o.use()
         o.links(
-            "https://www.slf4j.org/apidocs/",
+            "https://www.javadocs.dev/org.slf4j/slf4j-api/${libs.slf4j.get().version}/",
             "https://guava.dev/releases/${libs.guava.get().version}/api/docs/",
             "https://google.github.io/guice/api-docs/${libs.guice.get().version}/javadoc/",
             "https://docs.oracle.com/en/java/javase/17/docs/api/",

api/src/ap/java/com/velocitypowered/api/plugin/ap/SerializedPluginDescription.java

@@ -24,7 +24,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  */
 public final class SerializedPluginDescription {
 
-  public static final Pattern ID_PATTERN = Pattern.compile("[a-z][a-z0-9-_]{0,63}");
+  public static final String ID_PATTERN_STRING = "[a-z][a-z0-9-_]{0,63}";
+  public static final Pattern ID_PATTERN = Pattern.compile(ID_PATTERN_STRING);
 
   // @Nullable is used here to make GSON skip these in the serialized file
   private final String id;

api/src/main/java/com/velocitypowered/api/command/CommandSource.java

@@ -23,7 +23,7 @@ public interface CommandSource extends Audience, PermissionSubject {
    * Sends a message with the MiniMessage format to this source.
    *
    * @param message MiniMessage content
-   * @see <a href="https://docs.advntr.dev/minimessage/format.html">MiniMessage docs</a>
+   * @see <a href="https://docs.papermc.io/adventure/minimessage/format/">MiniMessage docs</a>
    *      for more information on the format.
    **/
   default void sendRichMessage(final @NotNull String message) {
@@ -31,14 +31,14 @@ public interface CommandSource extends Audience, PermissionSubject {
   }
 
   /**
-  * Sends a message with the MiniMessage format to this source.
-  *
-  * @param message MiniMessage content
-  * @param resolvers resolvers to use
-  * @see <a href="https://docs.advntr.dev/minimessage/">MiniMessage docs</a>
-  *     and <a href="https://docs.advntr.dev/minimessage/dynamic-replacements">MiniMessage Placeholders docs</a>
-  *     for more information on the format.
-  **/
+   * Sends a message with the MiniMessage format to this source.
+   *
+   * @param message MiniMessage content
+   * @param resolvers resolvers to use
+   * @see <a href="https://docs.papermc.io/adventure/minimessage/">MiniMessage docs</a>
+   *     and <a href="https://docs.papermc.io/adventure/minimessage/dynamic-replacements">MiniMessage Placeholders docs</a>
+   *     for more information on the format.
+   */
   default void sendRichMessage(
           final @NotNull String message,
           final @NotNull TagResolver @NotNull... resolvers

api/src/main/java/com/velocitypowered/api/event/connection/LoginEvent.java

@@ -11,6 +11,7 @@ import com.google.common.base.Preconditions;
 import com.velocitypowered.api.event.ResultedEvent;
 import com.velocitypowered.api.event.annotation.AwaitingEvent;
 import com.velocitypowered.api.proxy.Player;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * This event is fired once the player has been authenticated, but before they connect to a server.
@@ -22,10 +23,24 @@ import com.velocitypowered.api.proxy.Player;
 public final class LoginEvent implements ResultedEvent<ResultedEvent.ComponentResult> {
 
   private final Player player;
+  private final String serverIdHash;
   private ComponentResult result;
 
+  @Deprecated(forRemoval = true)
   public LoginEvent(Player player) {
+    this(player, null);
+  }
+
+  /**
+   * Constructs a new {@link LoginEvent}.
+   *
+   * @param player the player who has completed authentication
+   * @param serverIdHash the server ID hash sent to Mojang for authentication,
+   *                     or {@code null} if the connection is in offline-mode
+   */
+  public LoginEvent(Player player, @Nullable String serverIdHash) {
     this.player = Preconditions.checkNotNull(player, "player");
+    this.serverIdHash = serverIdHash;
     this.result = ComponentResult.allowed();
   }
 
@@ -33,6 +48,16 @@ public final class LoginEvent implements ResultedEvent<ResultedEvent.ComponentRe
     return player;
   }
 
+  /**
+   * Returns the server ID hash that was sent to Mojang to authenticate the player.
+   * If the connection was in offline-mode, this returns {@code null}.
+   *
+   * @return the server ID hash that was sent to Mojang to authenticate the player
+   */
+  public @Nullable String getServerIdHash() {
+    return serverIdHash;
+  }
+
   @Override
   public ComponentResult getResult() {
     return result;

api/src/main/java/com/velocitypowered/api/event/player/PlayerChannelUnregisterEvent.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2025 Velocity Contributors
+ *
+ * The Velocity API is licensed under the terms of the MIT License. For more details,
+ * reference the LICENSE file in the api top-level directory.
+ */
+
+package com.velocitypowered.api.event.player;
+
+import com.google.common.base.Preconditions;
+import com.velocitypowered.api.proxy.Player;
+import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
+import java.util.List;
+
+/**
+ * This event is fired when a client ({@link Player}) sends a plugin message through the
+ * unregister channel. Velocity will not wait on this event to finish firing.
+ */
+public final class PlayerChannelUnregisterEvent {
+
+  private final Player player;
+  private final List<ChannelIdentifier> channels;
+
+  public PlayerChannelUnregisterEvent(Player player, List<ChannelIdentifier> channels) {
+    this.player = Preconditions.checkNotNull(player, "player");
+    this.channels = Preconditions.checkNotNull(channels, "channels");
+  }
+
+  public Player getPlayer() {
+    return player;
+  }
+
+  public List<ChannelIdentifier> getChannels() {
+    return channels;
+  }
+
+  @Override
+  public String toString() {
+    return "PlayerChannelUnregisterEvent{"
+            + "player=" + player
+            + ", channels=" + channels
+            + '}';
+  }
+}

api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java

@@ -143,7 +143,7 @@ public final class ServerPreConnectEvent implements
      * is used, then {@link ConnectionRequestBuilder#connect()}'s result will have the status
      * {@link Status#CONNECTION_CANCELLED}.
      *
-     * @return a result to deny conneections
+     * @return a result to deny connections
      */
     public static ServerResult denied() {
       return DENIED;

api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java

@@ -93,7 +93,9 @@ public enum ProtocolVersion implements Ordered<ProtocolVersion> {
   MINECRAFT_1_21_5(770, "1.21.5"),
   MINECRAFT_1_21_6(771, "1.21.6"),
   MINECRAFT_1_21_7(772, "1.21.7", "1.21.8"),
-  MINECRAFT_1_21_9(773, "1.21.9", "1.21.10");
+  MINECRAFT_1_21_9(773, "1.21.9", "1.21.10"),
+  MINECRAFT_1_21_11(774, "1.21.11"),
+  MINECRAFT_26_1(775, "26.1", "26.1.1", "26.1.2");
 
   private static final int SNAPSHOT_BIT = 30;
 

api/src/main/java/com/velocitypowered/api/plugin/Dependency.java

@@ -7,9 +7,11 @@
 
 package com.velocitypowered.api.plugin;
 
+import com.velocitypowered.api.plugin.ap.SerializedPluginDescription;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.intellij.lang.annotations.Pattern;
 
 /**
  * Indicates that the {@link Plugin} depends on another plugin in order to enable.
@@ -24,6 +26,7 @@ public @interface Dependency {
    * @return The dependency plugin ID
    * @see Plugin#id()
    */
+  @Pattern(SerializedPluginDescription.ID_PATTERN_STRING)
   String id();
 
   /**

api/src/main/java/com/velocitypowered/api/plugin/Plugin.java

@@ -7,10 +7,12 @@
 
 package com.velocitypowered.api.plugin;
 
+import com.velocitypowered.api.plugin.ap.SerializedPluginDescription;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import org.intellij.lang.annotations.Pattern;
 
 /**
  * Annotation used to describe a Velocity plugin.
@@ -26,6 +28,7 @@ public @interface Plugin {
    *
    * @return the ID for this plugin
    */
+  @Pattern(SerializedPluginDescription.ID_PATTERN_STRING)
   String id();
 
   /**

api/src/main/java/com/velocitypowered/api/proxy/Player.java

@@ -39,6 +39,7 @@ import net.kyori.adventure.sound.SoundStop;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.event.HoverEventSource;
+import net.kyori.adventure.text.object.PlayerHeadObjectContents;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.jetbrains.annotations.NotNull;
 
@@ -49,7 +50,8 @@ public interface Player extends
     /* Fundamental Velocity interfaces */
     CommandSource, InboundConnection, ChannelMessageSource, ChannelMessageSink,
     /* Adventure-specific interfaces */
-    Identified, HoverEventSource<HoverEvent.ShowEntity>, Keyed, KeyIdentifiable, Sound.Emitter {
+    Identified, HoverEventSource<HoverEvent.ShowEntity>, Keyed, KeyIdentifiable, Sound.Emitter,
+    PlayerHeadObjectContents.SkinSource {
 
   /**
    * Returns the player's current username.
@@ -336,6 +338,15 @@ public interface Player extends
             Component.text(getUsername()))));
   }
 
+  @SuppressWarnings("UnstableApiUsage") // permitted implementation
+  @Override
+  default void applySkinToPlayerHeadContents(
+      final PlayerHeadObjectContents.@NotNull Builder builder) {
+    builder.skin(this.getGameProfile());
+    if (this.hasSentPlayerSettings()) {
+      builder.hat(this.getPlayerSettings().getSkinParts().hasHat());
+    }
+  }
 
   /**
    * Gets the player's client brand.

api/src/main/java/com/velocitypowered/api/util/GameProfile.java

@@ -11,11 +11,14 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
+import net.kyori.adventure.text.object.PlayerHeadObjectContents;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Represents a Mojang game profile. This class is immutable.
  */
-public final class GameProfile {
+public final class GameProfile implements PlayerHeadObjectContents.SkinSource {
 
   private final UUID id;
   private final String undashedId;
@@ -169,6 +172,23 @@ public final class GameProfile {
         ImmutableList.of());
   }
 
+  @SuppressWarnings("UnstableApiUsage") // permitted implementation
+  @Override
+  public void applySkinToPlayerHeadContents(
+      final PlayerHeadObjectContents.@NotNull Builder builder) {
+    if (this.properties.isEmpty()) {
+      builder.id(this.id);
+      return;
+    }
+
+    builder.id(this.id)
+        .name(this.name)
+        .profileProperties(this.properties.stream()
+            .map(property -> PlayerHeadObjectContents.property(property.getName(),
+                property.getValue(), property.getSignature()))
+            .collect(Collectors.toList()));
+  }
+
   @Override
   public String toString() {
     return "GameProfile{"

build.gradle.kts

@@ -12,7 +12,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
 

gradle.properties

@@ -1,2 +1,2 @@
 group=com.velocitypowered
-version=3.4.0-SNAPSHOT
+version=3.5.0-SNAPSHOT

gradle/libs.versions.toml

@@ -1,27 +1,26 @@
 [versions]
 configurate3 = "3.7.3"
-configurate4 = "4.1.2"
+configurate4 = "4.2.0"
 flare = "2.0.1"
-log4j = "2.24.3"
-netty = "4.2.7.Final"
+log4j = "2.25.3"
+netty = "4.2.10.Final"
 
 [plugins]
-fill = "io.papermc.fill.gradle:1.0.3"
-indra-publishing = "net.kyori.indra.publishing:2.0.6"
-shadow = "com.gradleup.shadow:8.3.6"
-spotless = "com.diffplug.spotless:6.25.0"
+fill = "io.papermc.fill.gradle:1.0.10"
+shadow = "com.gradleup.shadow:9.3.1"
+spotless = "com.diffplug.spotless:8.2.0"
 
 [libraries]
-adventure-bom = "net.kyori:adventure-bom:4.25.0"
-adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:4.25.0"
-adventure-facet = "net.kyori:adventure-platform-facet:4.3.4"
-asm = "org.ow2.asm:asm:9.8"
-auto-service = "com.google.auto.service:auto-service:1.0.1"
-auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.0.1"
+adventure-bom = "net.kyori:adventure-bom:4.26.1"
+adventure-text-serializer-json-legacy-impl = "net.kyori:adventure-text-serializer-json-legacy-impl:4.26.1"
+adventure-facet = "net.kyori:adventure-platform-facet:4.4.1"
+asm = "org.ow2.asm:asm:9.9.1"
+auto-service = "com.google.auto.service:auto-service:1.1.1"
+auto-service-annotations = "com.google.auto.service:auto-service-annotations:1.1.1"
 brigadier = "com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT"
-bstats = "org.bstats:bstats-base:3.0.3"
-caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.8"
-checker-qual = "org.checkerframework:checker-qual:3.42.0"
+bstats = "org.bstats:bstats-base:3.1.0"
+caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.3"
+checker-qual = "org.checkerframework:checker-qual:3.53.0"
 checkstyle = "com.puppycrawl.tools:checkstyle:10.9.3"
 completablefutures = "com.spotify:completable-futures:0.3.6"
 configurate3-hocon = { module = "org.spongepowered:configurate-hocon", version.ref = "configurate3" }
@@ -34,21 +33,21 @@ disruptor = "com.lmax:disruptor:4.0.0"
 fastutil = "it.unimi.dsi:fastutil:8.5.15"
 flare-core = { module = "space.vectrix.flare:flare", version.ref = "flare" }
 flare-fastutil = { module = "space.vectrix.flare:flare-fastutil", version.ref = "flare" }
-jline = "org.jline:jline-terminal-jansi:3.30.2"
+jline = "org.jline:jline-terminal-jansi:3.30.6"
 jopt = "net.sf.jopt-simple:jopt-simple:5.0.4"
-junit = "org.junit.jupiter:junit-jupiter:5.10.2"
-jspecify = "org.jspecify:jspecify:0.3.0"
+junit = "org.junit.jupiter:junit-jupiter:5.14.2"
+jspecify = "org.jspecify:jspecify:1.0.0"
 kyori-ansi = "net.kyori:ansi:1.1.1"
-guava = "com.google.guava:guava:25.1-jre"
-gson = "com.google.code.gson:gson:2.10.1"
-guice = "com.google.inject:guice:6.0.0"
+guava = "com.google.guava:guava:33.5.0-jre"
+gson = "com.google.code.gson:gson:2.13.2"
+guice = "com.google.inject:guice:7.0.0"
 lmbda = "org.lanternpowered:lmbda:2.0.0"
 log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4j-slf4j-impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version.ref = "log4j" }
 log4j-iostreams = { module = "org.apache.logging.log4j:log4j-iostreams", version.ref = "log4j" }
 log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4j" }
-mockito = "org.mockito:mockito-core:5.10.0"
+mockito = "org.mockito:mockito-core:5.21.0"
 netty-codec = { module = "io.netty:netty-codec", version.ref = "netty" }
 netty-codec-haproxy = { module = "io.netty:netty-codec-haproxy", version.ref = "netty" }
 netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "netty" }
@@ -56,10 +55,10 @@ netty-handler = { module = "io.netty:netty-handler", version.ref = "netty" }
 netty-transport-native-epoll = { module = "io.netty:netty-transport-native-epoll", version.ref = "netty" }
 netty-transport-native-kqueue = { module = "io.netty:netty-transport-native-kqueue", version.ref = "netty" }
 netty-transport-native-iouring = { module = "io.netty:netty-transport-native-io_uring", version.ref = "netty" }
-nightconfig = "com.electronwill.night-config:toml:3.6.7"
+nightconfig = "com.electronwill.night-config:toml:3.8.3"
 slf4j = "org.slf4j:slf4j-api:2.0.17"
-snakeyaml = "org.yaml:snakeyaml:1.33"
-spotbugs-annotations = "com.github.spotbugs:spotbugs-annotations:4.7.3"
+snakeyaml = "org.yaml:snakeyaml:2.5"
+spotbugs-annotations = "com.github.spotbugs:spotbugs-annotations:4.9.8"
 terminalconsoleappender = "net.minecrell:terminalconsoleappender:1.3.0"
 
 [bundles]

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,18 +200,17 @@ fi
 
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME%
 for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -70,11 +70,10 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

proxy/build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 
 application {
     mainClass.set("com.velocitypowered.proxy.Velocity")
-    applicationDefaultJvmArgs += listOf("-Dvelocity.packet-decode-logging=true");
+    applicationDefaultJvmArgs += listOf("-Dvelocity.packet-decode-logging=true")
 }
 
 tasks {
@@ -27,6 +27,10 @@ tasks {
     }
 
     shadowJar {
+        filesMatching("META-INF/org/apache/logging/log4j/core/config/plugins/**") {
+            duplicatesStrategy = DuplicatesStrategy.INCLUDE
+        }
+
         transform(Log4j2PluginsCacheFileTransformer::class.java)
 
         // Exclude all the collection types we don"t intend to use
@@ -131,7 +135,6 @@ fill {
 dependencies {
     implementation(project(":velocity-api"))
     implementation(project(":velocity-native"))
-    implementation(project(":velocity-proxy-log4j2-plugin"))
 
     implementation(libs.bundles.log4j)
     implementation(libs.kyori.ansi)
@@ -168,4 +171,5 @@ dependencies {
     testImplementation(libs.mockito)
 
     annotationProcessor(libs.auto.service)
+    annotationProcessor(libs.log4j.core)
 }

proxy/log4j2-plugin/build.gradle.kts

@@ -1,4 +0,0 @@
-dependencies {
-    implementation(libs.bundles.log4j)
-    annotationProcessor(libs.log4j.core)
-}

proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java

@@ -82,7 +82,6 @@ import java.net.http.HttpClient;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.KeyPair;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -105,8 +104,8 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.audience.ForwardingAudience;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.translation.MiniMessageTranslationStore;
 import net.kyori.adventure.translation.GlobalTranslator;
-import net.kyori.adventure.translation.TranslationStore;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bstats.MetricsBase;
@@ -242,8 +241,6 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
     console.setupStreams();
     pluginManager.registerPlugin(this.createVirtualPlugin());
 
-    registerTranslations();
-
     // Yes, you're reading that correctly. We're generating a 1024-bit RSA keypair. Sounds
     // dangerous, right? We're well within the realm of factoring such a key...
     //
@@ -292,6 +289,8 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
 
     this.doStartupConfigLoad();
 
+    registerTranslations();
+
     for (ServerInfo cliServer : options.getServers()) {
       servers.register(cliServer);
     }
@@ -342,8 +341,8 @@ public class VelocityServer implements ProxyServer, ForwardingAudience {
   }
 
   private void registerTranslations() {
-    final TranslationStore.StringBased<MessageFormat> translationRegistry =
-            TranslationStore.messageFormat(Key.key("velocity", "translations"));
+    final MiniMessageTranslationStore translationRegistry =
+            MiniMessageTranslationStore.create(Key.key("velocity", "translations"));
     translationRegistry.defaultLocale(Locale.US);
     try {
       ResourceUtils.visitResources(VelocityServer.class, path -> {

proxy/src/main/java/com/velocitypowered/proxy/command/SuggestionsProvider.java

@@ -344,7 +344,7 @@ final class SuggestionsProvider<S> {
           return 0;
         });
       }
-      return potentials.get(0);
+      return potentials.getFirst();
     }
     return new ParseResults<>(contextSoFar, originalReader, Collections.emptyMap());
   }

proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommandManager.java

@@ -140,7 +140,7 @@ public class VelocityCommandManager implements CommandManager {
               command + " implements multiple registrable Command subinterfaces: "
                       + implementedInterfaces);
     } else {
-      this.internalRegister(commandRegistrars.get(0), command, meta);
+      this.internalRegister(commandRegistrars.getFirst(), command, meta);
     }
   }
 
@@ -256,7 +256,7 @@ public class VelocityCommandManager implements CommandManager {
       }
     } catch (final Throwable e) {
       // Ugly, ugly swallowing of everything Throwable, because plugins are naughty.
-      throw new RuntimeException("Unable to invoke command  " + parsed.getReader().getString() + "for " + source, e);
+      throw new RuntimeException("Unable to invoke command " + parsed.getReader().getString() + " for " + source, e);
     } finally {
       eventManager.fireAndForget(new PostCommandInvocationEvent(source, parsed.getReader().getString(), result));
     }

proxy/src/main/java/com/velocitypowered/proxy/command/VelocityCommands.java

@@ -70,33 +70,34 @@ public final class VelocityCommands {
       maybeCommand = VelocityBrigadierCommandWrapper.wrap(delegate.getCommand(), registrant);
     }
 
-    if (delegate instanceof LiteralCommandNode<CommandSource> lcn) {
-      var literalBuilder = shallowCopyAsBuilder(lcn, delegate.getName(), true);
-      literalBuilder.executes(maybeCommand);
-      // we also need to wrap any children
-      for (final CommandNode<CommandSource> child : delegate.getChildren()) {
-        literalBuilder.then(wrap(child, registrant));
+    return switch (delegate) {
+      case LiteralCommandNode<CommandSource> lcn -> {
+        var literalBuilder = shallowCopyAsBuilder(lcn, delegate.getName(), true);
+        literalBuilder.executes(maybeCommand);
+        // we also need to wrap any children
+        for (final CommandNode<CommandSource> child : delegate.getChildren()) {
+          literalBuilder.then(wrap(child, registrant));
+        }
+        if (delegate.getRedirect() != null) {
+          literalBuilder.redirect(wrap(delegate.getRedirect(), registrant));
+        }
+        yield literalBuilder.build();
       }
-      if (delegate.getRedirect() != null) {
-        literalBuilder.redirect(wrap(delegate.getRedirect(), registrant));
+      case VelocityArgumentCommandNode<CommandSource, ?> vacn -> vacn.withCommand(maybeCommand)
+              .withRedirect(delegate.getRedirect() != null ? wrap(delegate.getRedirect(), registrant) : null);
+      case ArgumentCommandNode<CommandSource, ?> node -> {
+        var argBuilder = node.createBuilder().executes(maybeCommand);
+        // we also need to wrap any children
+        for (final CommandNode<CommandSource> child : delegate.getChildren()) {
+          argBuilder.then(wrap(child, registrant));
+        }
+        if (delegate.getRedirect() != null) {
+          argBuilder.redirect(wrap(delegate.getRedirect(), registrant));
+        }
+        yield argBuilder.build();
       }
-      return literalBuilder.build();
-    } else if (delegate instanceof VelocityArgumentCommandNode<CommandSource, ?> vacn) {
-      return vacn.withCommand(maybeCommand)
-          .withRedirect(delegate.getRedirect() != null ? wrap(delegate.getRedirect(), registrant) : null);
-    } else if (delegate instanceof ArgumentCommandNode) {
-      var argBuilder = delegate.createBuilder().executes(maybeCommand);
-      // we also need to wrap any children
-      for (final CommandNode<CommandSource> child : delegate.getChildren()) {
-        argBuilder.then(wrap(child, registrant));
-      }
-      if (delegate.getRedirect() != null) {
-        argBuilder.redirect(wrap(delegate.getRedirect(), registrant));
-      }
-      return argBuilder.build();
-    } else {
-      throw new IllegalArgumentException("Unsupported node type: " + delegate.getClass());
-    }
+      default -> throw new IllegalArgumentException("Unsupported node type: " + delegate.getClass());
+    };
   }
 
   // Normalization
@@ -133,7 +134,7 @@ public final class VelocityCommands {
     if (nodes.isEmpty()) {
       throw new IllegalArgumentException("Cannot read alias from empty node list");
     }
-    return nodes.get(0).getNode().getName();
+    return nodes.getFirst().getNode().getName();
   }
 
   public static final String ARGS_NODE_NAME = "arguments";

proxy/src/main/java/com/velocitypowered/proxy/command/brigadier/VelocityArgumentCommandNode.java

@@ -118,14 +118,12 @@ public class VelocityArgumentCommandNode<S, T> extends ArgumentCommandNode<S, St
     if (this == o) {
       return true;
     }
-    if (!(o instanceof VelocityArgumentCommandNode)) {
+    if (!(o instanceof VelocityArgumentCommandNode that)) {
       return false;
     }
-    if (!super.equals(o)) {
+    if (!super.equals(that)) {
       return false;
     }
-
-    final VelocityArgumentCommandNode<?, ?> that = (VelocityArgumentCommandNode<?, ?>) o;
     return this.type.equals(that.type);
   }
 

proxy/src/main/java/com/velocitypowered/proxy/command/builtin/GlistCommand.java

@@ -38,6 +38,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.minimessage.translation.Argument;
 
 /**
  * Implements the Velocity default {@code /glist} command.
@@ -111,7 +112,7 @@ public class GlistCommand {
       if (registeredServer.isEmpty()) {
         source.sendMessage(
             CommandMessages.SERVER_DOES_NOT_EXIST
-                    .arguments(Component.text(serverName)));
+                    .arguments(Argument.string("server", serverName)));
         return -1;
       }
       sendServerPlayers(source, registeredServer.get(), false);
@@ -126,7 +127,8 @@ public class GlistCommand {
                   ? "velocity.command.glist-player-singular"
                   : "velocity.command.glist-player-plural"
             ).color(NamedTextColor.YELLOW)
-            .arguments(Component.text(Integer.toString(online), NamedTextColor.GREEN));
+            .arguments(Argument.component(
+                    "players", Component.text(Integer.toString(online), NamedTextColor.GREEN)));
     target.sendMessage(msg.build());
   }
 

proxy/src/main/java/com/velocitypowered/proxy/command/builtin/SendCommand.java

@@ -35,6 +35,7 @@ import java.util.Objects;
 import java.util.Optional;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.minimessage.translation.Argument;
 
 /**
  * Implements the Velocity default {@code /send} command.
@@ -121,7 +122,7 @@ public class SendCommand {
 
     if (maybeServer.isEmpty()) {
       context.getSource().sendMessage(
-          CommandMessages.SERVER_DOES_NOT_EXIST.arguments(Component.text(serverName))
+          CommandMessages.SERVER_DOES_NOT_EXIST.arguments(Argument.string("server", serverName))
       );
       return 0;
     }
@@ -133,7 +134,7 @@ public class SendCommand {
         && !Objects.equals(player, "all")
         && !Objects.equals(player, "current")) {
       context.getSource().sendMessage(
-          CommandMessages.PLAYER_NOT_FOUND.arguments(Component.text(player))
+          CommandMessages.PLAYER_NOT_FOUND.arguments(Argument.string("player", player))
       );
       return 0;
     }

proxy/src/main/java/com/velocitypowered/proxy/command/builtin/ServerCommand.java

@@ -37,6 +37,7 @@ import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TranslatableComponent;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.minimessage.translation.Argument;
 
 /**
  * Implements Velocity's {@code /server} command.
@@ -76,7 +77,7 @@ public final class ServerCommand {
               final Optional<RegisteredServer> toConnect = server.getServer(serverName);
               if (toConnect.isEmpty()) {
                 player.sendMessage(CommandMessages.SERVER_DOES_NOT_EXIST
-                        .arguments(Component.text(serverName)));
+                        .arguments(Argument.string("server", serverName)));
                 return -1;
               }
 
@@ -135,7 +136,7 @@ public final class ServerCommand {
     } else {
       playersTextComponent.key("velocity.command.server-tooltip-players-online");
     }
-    playersTextComponent.arguments(Component.text(connectedPlayers));
+    playersTextComponent.arguments(Argument.component("players", Component.text(connectedPlayers)));
     if (serverInfo.getName().equals(currentPlayerServer)) {
       serverTextComponent.color(NamedTextColor.GREEN)
           .hoverEvent(

proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java

@@ -62,6 +62,7 @@ import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.translation.Argument;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -165,9 +166,9 @@ public final class VelocityCommand {
           .build();
       final Component copyright = Component
           .translatable("velocity.command.version-copyright",
-              Component.text(version.getVendor()),
-                  Component.text(version.getName()),
-                  Component.text(LocalDate.now().getYear()));
+              Argument.string("vendor", version.getVendor()),
+                  Argument.string("name", version.getName()),
+                  Argument.component("year", Component.text(LocalDate.now().getYear())));
       source.sendMessage(velocity);
       source.sendMessage(copyright);
 
@@ -220,7 +221,7 @@ public final class VelocityCommand {
       final TranslatableComponent output = Component.translatable()
           .key("velocity.command.plugins-list")
           .color(NamedTextColor.YELLOW)
-          .arguments(listBuilder.build())
+          .arguments(Argument.component("plugins", listBuilder.build()))
           .build();
       source.sendMessage(output);
       return Command.SINGLE_SUCCESS;
@@ -236,17 +237,17 @@ public final class VelocityCommand {
         hoverText.append(Component.newline());
         hoverText.append(Component.translatable(
             "velocity.command.plugin-tooltip-website",
-            Component.text(url)));
+            Argument.component("url", Component.text(url))));
       });
       if (!description.getAuthors().isEmpty()) {
         hoverText.append(Component.newline());
         if (description.getAuthors().size() == 1) {
           hoverText.append(Component.translatable("velocity.command.plugin-tooltip-author",
-              Component.text(description.getAuthors().get(0))));
+              Component.text(description.getAuthors().getFirst())));
         } else {
           hoverText.append(
               Component.translatable("velocity.command.plugin-tooltip-author",
-                  Component.text(String.join(", ", description.getAuthors()))
+                  Argument.string("authors", String.join(", ", description.getAuthors()))
               )
           );
         }

proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java

@@ -29,6 +29,7 @@ import com.velocitypowered.api.util.Favicon;
 import com.velocitypowered.proxy.config.migration.ConfigurationMigration;
 import com.velocitypowered.proxy.config.migration.ForwardingMigration;
 import com.velocitypowered.proxy.config.migration.KeyAuthenticationMigration;
+import com.velocitypowered.proxy.config.migration.MiniMessageTranslationsMigration;
 import com.velocitypowered.proxy.config.migration.MotdMigration;
 import com.velocitypowered.proxy.config.migration.TransferIntegrationMigration;
 import com.velocitypowered.proxy.util.AddressUtil;
@@ -93,6 +94,8 @@ public class VelocityConfiguration implements ProxyConfig {
   private @Nullable Favicon favicon;
   @Expose
   private boolean forceKeyAuthentication = true; // Added in 1.19
+  @Expose
+  private PacketLimiterConfig packetLimiterConfig = PacketLimiterConfig.DEFAULT;
 
   private VelocityConfiguration(Servers servers, ForcedHosts forcedHosts, Advanced advanced,
       Query query, Metrics metrics) {
@@ -109,7 +112,7 @@ public class VelocityConfiguration implements ProxyConfig {
       boolean onlineModeKickExistingPlayers, PingPassthroughMode pingPassthrough,
       boolean samplePlayersInPing, boolean enablePlayerAddressLogging, Servers servers,
       ForcedHosts forcedHosts, Advanced advanced, Query query, Metrics metrics,
-      boolean forceKeyAuthentication) {
+      boolean forceKeyAuthentication, PacketLimiterConfig packetLimiterConfig) {
     this.bind = bind;
     this.motd = motd;
     this.showMaxPlayers = showMaxPlayers;
@@ -128,6 +131,7 @@ public class VelocityConfiguration implements ProxyConfig {
     this.query = query;
     this.metrics = metrics;
     this.forceKeyAuthentication = forceKeyAuthentication;
+    this.packetLimiterConfig = packetLimiterConfig;
   }
 
   /**
@@ -156,19 +160,16 @@ public class VelocityConfiguration implements ProxyConfig {
     }
 
     switch (playerInfoForwardingMode) {
-      case NONE:
-        logger.warn("Player info forwarding is disabled! All players will appear to be connecting "
+      case NONE -> logger.warn("Player info forwarding is disabled! All players will appear to be connecting "
             + "from the proxy and will have offline-mode UUIDs.");
-        break;
-      case MODERN:
-      case BUNGEEGUARD:
+      case MODERN, BUNGEEGUARD -> {
         if (forwardingSecret == null || forwardingSecret.length == 0) {
           logger.error("You don't have a forwarding secret set. This is required for security.");
           valid = false;
         }
-        break;
-      default:
-        break;
+      }
+      default -> {
+      }
     }
 
     if (servers.getServers().isEmpty()) {
@@ -449,6 +450,10 @@ public class VelocityConfiguration implements ProxyConfig {
     return advanced.isEnableReusePort();
   }
 
+  public PacketLimiterConfig getPacketLimiterConfig() {
+    return packetLimiterConfig;
+  }
+
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
@@ -466,6 +471,7 @@ public class VelocityConfiguration implements ProxyConfig {
         .add("favicon", favicon)
         .add("enablePlayerAddressLogging", enablePlayerAddressLogging)
         .add("forceKeyAuthentication", forceKeyAuthentication)
+        .add("packetLimiterConfig", packetLimiterConfig)
         .toString();
   }
 
@@ -504,6 +510,7 @@ public class VelocityConfiguration implements ProxyConfig {
           new ForwardingMigration(),
           new KeyAuthenticationMigration(),
           new MotdMigration(),
+          new MiniMessageTranslationsMigration(),
           new TransferIntegrationMigration()
       };
 
@@ -561,6 +568,7 @@ public class VelocityConfiguration implements ProxyConfig {
       final boolean kickExisting = config.getOrElse("kick-existing-players", false);
       final boolean enablePlayerAddressLogging = config.getOrElse(
               "enable-player-address-logging", true);
+      final PacketLimiterConfig packetLimiterConfig = PacketLimiterConfig.fromConfig(config.get("packet-limiter"));
 
       // Throw an exception if the forwarding-secret file is empty and the proxy is using a
       // forwarding mode that requires it.
@@ -588,7 +596,8 @@ public class VelocityConfiguration implements ProxyConfig {
               new Advanced(advancedConfig),
               new Query(queryConfig),
               new Metrics(metricsConfig),
-              forceKeyAuthentication
+              forceKeyAuthentication,
+              packetLimiterConfig
       );
     }
   }
@@ -991,4 +1000,33 @@ public class VelocityConfiguration implements ProxyConfig {
       return enabled;
     }
   }
+
+  /**
+   * Configuration for packet limiting.
+   *
+   * @param interval the interval in seconds to measure packets over
+   * @param pps      the maximum number of packets per second allowed
+   * @param bytes    the maximum number of bytes per second allowed
+   */
+  public record PacketLimiterConfig(int interval, int pps, int bytes) {
+    public static PacketLimiterConfig DEFAULT = new PacketLimiterConfig(7, 500, -1);
+
+    /**
+     * returns a PacketLimiterConfig from a config section, or the default if the section is null.
+     *
+     * @param config the configuration object to parse
+     * @return the packet limiter config, or the default if {@code config} is null
+     */
+    public static PacketLimiterConfig fromConfig(CommentedConfig config) {
+      if (config != null) {
+        return new PacketLimiterConfig(
+            config.getIntOrElse("interval", DEFAULT.interval()),
+            config.getIntOrElse("packets-per-second", DEFAULT.pps()),
+            config.getIntOrElse("bytes-per-second", DEFAULT.bytes())
+        );
+      } else {
+        return DEFAULT;
+      }
+    }
+  }
 }

proxy/src/main/java/com/velocitypowered/proxy/config/migration/ConfigurationMigration.java

@@ -28,6 +28,7 @@ public sealed interface ConfigurationMigration
         permits ForwardingMigration,
                 KeyAuthenticationMigration,
                 MotdMigration,
+                MiniMessageTranslationsMigration,
                 TransferIntegrationMigration {
   boolean shouldMigrate(CommentedFileConfig config);
 

proxy/src/main/java/com/velocitypowered/proxy/config/migration/MiniMessageTranslationsMigration.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2024 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.velocitypowered.proxy.config.migration;
+
+import com.electronwill.nightconfig.core.file.CommentedFileConfig;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.regex.Pattern;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * Migration from old to modern language argument format with MiniMessage.
+ * Also migrates possible use of legacy colors to MiniMessage format.
+ */
+public final class MiniMessageTranslationsMigration implements ConfigurationMigration {
+  @Override
+  public boolean shouldMigrate(final CommentedFileConfig config) {
+    // Checking whether translations should be migrated would be just as costly as attempting to migrate them directly.
+    return true;
+  }
+
+  @Override
+  public void migrate(final CommentedFileConfig config, final Logger logger) throws IOException {
+    final Path langFolder = Path.of("lang");
+    if (Files.notExists(langFolder)) {
+      return;
+    }
+    final Pattern oldPlaceholderPattern = Pattern.compile("\\{(\\d+)}");
+    try (final DirectoryStream<Path> stream
+                 = Files.newDirectoryStream(langFolder, Files::isRegularFile)) {
+      for (final Path path : stream) {
+        String content = Files.readString(path, StandardCharsets.UTF_8);
+        if (content.indexOf('{') == -1) {
+          continue;
+        }
+        // Migrate old arguments
+        content = oldPlaceholderPattern.matcher(content).replaceAll("<arg:$1>");
+        // Some setups use legacy color codes, this format is migrated to MiniMessage
+        content = MiniMessage.miniMessage().serialize(
+                LegacyComponentSerializer.legacySection().deserialize(content));
+        Files.writeString(path, content, StandardCharsets.UTF_8);
+      }
+    }
+  }
+}

proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java

@@ -33,6 +33,7 @@ import com.velocitypowered.natives.encryption.VelocityCipher;
 import com.velocitypowered.natives.encryption.VelocityCipherFactory;
 import com.velocitypowered.natives.util.Natives;
 import com.velocitypowered.proxy.VelocityServer;
+import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import com.velocitypowered.proxy.connection.client.HandshakeSessionHandler;
 import com.velocitypowered.proxy.connection.client.InitialLoginSessionHandler;
 import com.velocitypowered.proxy.connection.client.StatusSessionHandler;
@@ -66,7 +67,7 @@ import io.netty.util.ReferenceCountUtil;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.security.GeneralSecurityException;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -108,7 +109,7 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
     this.server = server;
     this.state = StateRegistry.HANDSHAKE;
 
-    this.sessionHandlers = new HashMap<>();
+    this.sessionHandlers = new EnumMap<>(StateRegistry.class);
   }
 
   @Override
@@ -153,13 +154,13 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
 
       if (msg instanceof MinecraftPacket pkt) {
         if (!pkt.handle(activeSessionHandler)) {
-          activeSessionHandler.handleGeneric((MinecraftPacket) msg);
+          activeSessionHandler.handleGeneric(pkt);
         }
       } else if (msg instanceof HAProxyMessage proxyMessage) {
         this.remoteAddress = new InetSocketAddress(proxyMessage.sourceAddress(),
             proxyMessage.sourcePort());
-      } else if (msg instanceof ByteBuf) {
-        activeSessionHandler.handleUnknown((ByteBuf) msg);
+      } else if (msg instanceof ByteBuf buf) {
+        activeSessionHandler.handleUnknown(buf);
       }
     } finally {
       ReferenceCountUtil.release(msg);
@@ -368,6 +369,7 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
   public void setState(StateRegistry state) {
     ensureInEventLoop();
 
+    final StateRegistry previousState = this.state;
     this.state = state;
     final MinecraftVarintFrameDecoder frameDecoder = this.channel.pipeline()
         .get(MinecraftVarintFrameDecoder.class);
@@ -388,7 +390,13 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
 
     if (state == StateRegistry.CONFIG) {
       // Activate the play packet queue
-      addPlayPacketQueueHandler();
+      if (previousState == StateRegistry.PLAY
+          && this.pendingConfigurationSwitch
+          && this.association instanceof ConnectedPlayer) {
+        addPlayPacketQueueOutboundHandler();
+      } else {
+        addPlayPacketQueueHandler();
+      }
     } else {
       // Remove the queue
       if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE_OUTBOUND) != null) {
@@ -404,13 +412,23 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
    * Adds the play packet queue handler.
    */
   public void addPlayPacketQueueHandler() {
-    if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE_OUTBOUND) == null) {
-      this.channel.pipeline().addAfter(Connections.MINECRAFT_ENCODER, Connections.PLAY_PACKET_QUEUE_OUTBOUND,
-           new PlayPacketQueueOutboundHandler(this.protocolVersion, channel.pipeline().get(MinecraftEncoder.class).getDirection()));
-    }
+    addPlayPacketQueueOutboundHandler();
+
     if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE_INBOUND) == null) {
       this.channel.pipeline().addAfter(Connections.MINECRAFT_DECODER, Connections.PLAY_PACKET_QUEUE_INBOUND,
-           new PlayPacketQueueInboundHandler(this.protocolVersion, channel.pipeline().get(MinecraftDecoder.class).getDirection()));
+           new PlayPacketQueueInboundHandler(this.protocolVersion,
+               channel.pipeline().get(MinecraftDecoder.class).getDirection()));
+    }
+  }
+
+  /**
+   * Adds only the outbound play packet queue handler.
+   */
+  public void addPlayPacketQueueOutboundHandler() {
+    if (this.channel.pipeline().get(Connections.PLAY_PACKET_QUEUE_OUTBOUND) == null) {
+      this.channel.pipeline().addAfter(Connections.MINECRAFT_ENCODER, Connections.PLAY_PACKET_QUEUE_OUTBOUND,
+           new PlayPacketQueueOutboundHandler(this.protocolVersion,
+               channel.pipeline().get(MinecraftEncoder.class).getDirection()));
     }
   }
 
@@ -544,9 +562,10 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
       } else {
         int level = server.getConfiguration().getCompressionLevel();
         VelocityCompressor compressor = Natives.compress.get().create(level);
+        final MinecraftDecoder minecraftDecoder = (MinecraftDecoder) channel.pipeline().get(MINECRAFT_DECODER);
 
         encoder = new MinecraftCompressorAndLengthEncoder(threshold, compressor);
-        decoder = new MinecraftCompressDecoder(threshold, compressor);
+        decoder = new MinecraftCompressDecoder(threshold, compressor, minecraftDecoder.getDirection());
 
         channel.pipeline().remove(FRAME_ENCODER);
         channel.pipeline().addBefore(MINECRAFT_DECODER, COMPRESSION_DECODER, decoder);

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java

@@ -70,6 +70,7 @@ import com.velocitypowered.proxy.protocol.packet.TransferPacket;
 import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket;
 import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
 import com.velocitypowered.proxy.protocol.packet.config.StartUpdatePacket;
+import com.velocitypowered.proxy.protocol.util.DeferredByteBufHolder;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
@@ -93,6 +94,7 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler {
       Boolean.getBoolean("velocity.log-server-backpressure");
   private static final int MAXIMUM_PACKETS_TO_FLUSH =
       Integer.getInteger("velocity.max-packets-per-flush", 8192);
+  private static final int LARGE_PACKET_THRESHOLD = 1024 * 128;
 
   private final VelocityServer server;
   private final VelocityServerConnection serverConn;
@@ -437,11 +439,12 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void handleGeneric(MinecraftPacket packet) {
-    if (packet instanceof PluginMessagePacket) {
-      ((PluginMessagePacket) packet).retain();
+    if (packet instanceof PluginMessagePacket pluginMessage) {
+      pluginMessage.retain();
     }
+    boolean huge = packet instanceof DeferredByteBufHolder def && def.content().readableBytes() > LARGE_PACKET_THRESHOLD;
     playerConnection.delayedWrite(packet);
-    if (++packetsFlushed >= MAXIMUM_PACKETS_TO_FLUSH) {
+    if (huge || ++packetsFlushed >= MAXIMUM_PACKETS_TO_FLUSH) {
       playerConnection.flush();
       packetsFlushed = 0;
     }
@@ -449,8 +452,9 @@ public class BackendPlaySessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void handleUnknown(ByteBuf buf) {
+    boolean huge = buf.readableBytes() > LARGE_PACKET_THRESHOLD;
     playerConnection.delayedWrite(buf.retain());
-    if (++packetsFlushed >= MAXIMUM_PACKETS_TO_FLUSH) {
+    if (huge || ++packetsFlushed >= MAXIMUM_PACKETS_TO_FLUSH) {
       playerConnection.flush();
       packetsFlushed = 0;
     }

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BungeeCordMessageResponder.java

@@ -344,66 +344,30 @@ public class BungeeCordMessageResponder {
       return false;
     }
 
-    ByteBufDataInput in = new ByteBufDataInput(message.content());
-    String subChannel = in.readUTF();
+    final ByteBufDataInput in = new ByteBufDataInput(message.content());
+    final String subChannel = in.readUTF();
     switch (subChannel) {
-      case "GetPlayerServer":
-        this.processGetPlayerServer(in);
-        break;
-      case "ForwardToPlayer":
-        this.processForwardToPlayer(in);
-        break;
-      case "Forward":
-        this.processForwardToServer(in);
-        break;
-      case "Connect":
-        this.processConnect(in);
-        break;
-      case "ConnectOther":
-        this.processConnectOther(in);
-        break;
-      case "IP":
-        this.processIp(in);
-        break;
-      case "PlayerCount":
-        this.processPlayerCount(in);
-        break;
-      case "PlayerList":
-        this.processPlayerList(in);
-        break;
-      case "GetServers":
-        this.processGetServers();
-        break;
-      case "Message":
-        this.processMessage(in);
-        break;
-      case "MessageRaw":
-        this.processMessageRaw(in);
-        break;
-      case "GetServer":
-        this.processGetServer();
-        break;
-      case "UUID":
-        this.processUuid();
-        break;
-      case "UUIDOther":
-        this.processUuidOther(in);
-        break;
-      case "IPOther":
-        this.processIpOther(in);
-        break;
-      case "ServerIP":
-        this.processServerIp(in);
-        break;
-      case "KickPlayer":
-        this.processKick(in);
-        break;
-      case "KickPlayerRaw":
-        this.processKickRaw(in);
-        break;
-      default:
-        // Do nothing, unknown command
-        break;
+      case "GetPlayerServer" -> this.processGetPlayerServer(in);
+      case "ForwardToPlayer" -> this.processForwardToPlayer(in);
+      case "Forward" -> this.processForwardToServer(in);
+      case "Connect" -> this.processConnect(in);
+      case "ConnectOther" -> this.processConnectOther(in);
+      case "IP" -> this.processIp(in);
+      case "PlayerCount" -> this.processPlayerCount(in);
+      case "PlayerList" -> this.processPlayerList(in);
+      case "GetServers" -> this.processGetServers();
+      case "Message" -> this.processMessage(in);
+      case "MessageRaw" -> this.processMessageRaw(in);
+      case "GetServer" -> this.processGetServer();
+      case "UUID" -> this.processUuid();
+      case "UUIDOther" -> this.processUuidOther(in);
+      case "IPOther" -> this.processIpOther(in);
+      case "ServerIP" -> this.processServerIp(in);
+      case "KickPlayer" -> this.processKick(in);
+      case "KickPlayerRaw" -> this.processKickRaw(in);
+      default -> {
+          // Do nothing, unknown command
+      }
     }
 
     return true;

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/ConfigSessionHandler.java

@@ -60,7 +60,7 @@ import com.velocitypowered.proxy.protocol.packet.config.TagsUpdatePacket;
 import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
-import java.io.IOException;
+import io.netty.channel.Channel;
 import java.net.InetSocketAddress;
 import java.util.concurrent.CompletableFuture;
 import net.kyori.adventure.key.Key;
@@ -72,6 +72,9 @@ import org.apache.logging.log4j.Logger;
  * 1.20.2+ switching. Yes, some of this is exceptionally stupid.
  */
 public class ConfigSessionHandler implements MinecraftSessionHandler {
+  private static final boolean BACKPRESSURE_LOG =
+      Boolean.getBoolean("velocity.log-server-backpressure");
+
   private static final Logger logger = LogManager.getLogger(ConfigSessionHandler.class);
   private final VelocityServer server;
   private final VelocityServerConnection serverConn;
@@ -373,8 +376,8 @@ public class ConfigSessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void disconnected() {
-    resultFuture.completeExceptionally(
-        new IOException("Unexpectedly disconnected from remote server"));
+    resultFuture.complete(ConnectionRequestResults.forDisconnect(
+        ConnectionMessages.INTERNAL_SERVER_CONNECTION_ERROR, serverConn.getServer()));
   }
 
   @Override
@@ -382,6 +385,22 @@ public class ConfigSessionHandler implements MinecraftSessionHandler {
     serverConn.getPlayer().getConnection().write(packet);
   }
 
+  @Override
+  public void writabilityChanged() {
+    Channel serverChan = serverConn.ensureConnected().getChannel();
+    boolean writable = serverChan.isWritable();
+
+    if (BACKPRESSURE_LOG) {
+      if (writable) {
+        logger.info("{} is writable, will auto-read player connection data", this.serverConn);
+      } else {
+        logger.info("{} is not writable, not auto-reading player connection data", this.serverConn);
+      }
+    }
+
+    serverConn.getPlayer().getConnection().setAutoReading(writable);
+  }
+
   private void switchFailure(Throwable cause) {
     logger.error("Unable to switch to new server {} for {}", serverConn.getServerInfo().getName(),
         serverConn.getPlayer().getUsername(), cause);

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java

@@ -38,7 +38,6 @@ import com.velocitypowered.proxy.protocol.packet.DisconnectPacket;
 import com.velocitypowered.proxy.protocol.packet.JoinGamePacket;
 import com.velocitypowered.proxy.protocol.packet.KeepAlivePacket;
 import com.velocitypowered.proxy.protocol.packet.PluginMessagePacket;
-import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -122,9 +121,8 @@ public class TransitionSessionHandler implements MinecraftSessionHandler {
           // Change the client to use the ClientPlaySessionHandler if required.
           ClientPlaySessionHandler playHandler;
           if (player.getConnection()
-              .getActiveSessionHandler() instanceof ClientPlaySessionHandler) {
-            playHandler =
-                (ClientPlaySessionHandler) player.getConnection().getActiveSessionHandler();
+              .getActiveSessionHandler() instanceof ClientPlaySessionHandler sessionHandler) {
+            playHandler = sessionHandler;
           } else {
             playHandler = new ClientPlaySessionHandler(server, player);
             player.getConnection().setActiveSessionHandler(StateRegistry.PLAY, playHandler);
@@ -214,7 +212,7 @@ public class TransitionSessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void disconnected() {
-    resultFuture
-        .completeExceptionally(new IOException("Unexpectedly disconnected from remote server"));
+    resultFuture.complete(ConnectionRequestResults.forDisconnect(
+        ConnectionMessages.INTERNAL_SERVER_CONNECTION_ERROR, serverConn.getServer()));
   }
 }

proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java

@@ -180,9 +180,8 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
       handshake.setServerAddress(createBungeeGuardForwardingAddress(secret));
     } else if (proxyPlayer.getConnection().getType() == ConnectionTypes.LEGACY_FORGE) {
       handshake.setServerAddress(playerVhost + HANDSHAKE_HOSTNAME_TOKEN);
-    } else if (proxyPlayer.getConnection().getType() instanceof ModernForgeConnectionType) {
-      handshake.setServerAddress(playerVhost + ((ModernForgeConnectionType) proxyPlayer
-              .getConnection().getType()).getModernToken());
+    } else if (proxyPlayer.getConnection().getType() instanceof ModernForgeConnectionType forgeConnection) {
+      handshake.setServerAddress(playerVhost + forgeConnection.getModernToken());
     } else {
       handshake.setServerAddress(playerVhost);
     }

proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java

@@ -69,14 +69,16 @@ public class AuthSessionHandler implements MinecraftSessionHandler {
   private @MonotonicNonNull ConnectedPlayer connectedPlayer;
   private final boolean onlineMode;
   private State loginState = State.START; // 1.20.2+
+  private final String serverIdHash;
 
   AuthSessionHandler(VelocityServer server, LoginInboundConnection inbound,
-      GameProfile profile, boolean onlineMode) {
+      GameProfile profile, boolean onlineMode, String serverIdHash) {
     this.server = Preconditions.checkNotNull(server, "server");
     this.inbound = Preconditions.checkNotNull(inbound, "inbound");
     this.profile = Preconditions.checkNotNull(profile, "profile");
     this.onlineMode = onlineMode;
     this.mcConnection = inbound.delegatedConnection();
+    this.serverIdHash = serverIdHash;
   }
 
   @Override
@@ -213,7 +215,7 @@ public class AuthSessionHandler implements MinecraftSessionHandler {
   private void completeLoginProtocolPhaseAndInitialize(ConnectedPlayer player) {
     mcConnection.setAssociation(player);
 
-    server.getEventManager().fire(new LoginEvent(player)).thenAcceptAsync(event -> {
+    server.getEventManager().fire(new LoginEvent(player, serverIdHash)).thenAcceptAsync(event -> {
       if (mcConnection.isClosed()) {
         // The player was disconnected
         server.getEventManager().fireAndForget(new DisconnectEvent(player,

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java

@@ -33,6 +33,7 @@ import com.velocitypowered.proxy.connection.player.resourcepack.ResourcePackResp
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.protocol.StateRegistry;
+import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder;
 import com.velocitypowered.proxy.protocol.netty.MinecraftEncoder;
 import com.velocitypowered.proxy.protocol.packet.ClientSettingsPacket;
 import com.velocitypowered.proxy.protocol.packet.KeepAlivePacket;
@@ -60,6 +61,8 @@ import org.apache.logging.log4j.Logger;
  * Handles the client config stage.
  */
 public class ClientConfigSessionHandler implements MinecraftSessionHandler {
+  private static final boolean BACKPRESSURE_LOG =
+      Boolean.getBoolean("velocity.log-server-backpressure");
 
   private static final Logger logger = LogManager.getLogger(ClientConfigSessionHandler.class);
   private final VelocityServer server;
@@ -266,6 +269,36 @@ public class ClientConfigSessionHandler implements MinecraftSessionHandler {
   @Override
   public void exception(Throwable throwable) {
     player.disconnect(Component.translatable("velocity.error.player-connection-error", NamedTextColor.RED));
+    if (MinecraftDecoder.DEBUG) {
+      logger.info("Exception while handling packet for {}", player, throwable);
+    }
+  }
+
+  @Override
+  public void writabilityChanged() {
+    final boolean writable = player.getConnection().getChannel().isWritable();
+
+    if (BACKPRESSURE_LOG) {
+      if (writable) {
+        logger.info("{} is writable, will auto-read backend connection data", player);
+      } else {
+        logger.info("{} is not writable, not auto-reading backend connection data", player);
+      }
+    }
+
+    if (!writable) {
+      // Flush pending packets to free up memory. Schedule on a future event loop invocation
+      // to avoid disabling auto-read while the flush resolves backpressure.
+      player.getConnection().eventLoop().execute(() -> player.getConnection().flush());
+    }
+
+    final VelocityServerConnection serverConn = player.getConnectionInFlightOrConnectedServer();
+    if (serverConn != null) {
+      final MinecraftConnection smc = serverConn.getConnection();
+      if (smc != null) {
+        smc.setAutoReading(writable);
+      }
+    }
   }
 
   /**

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java

@@ -24,6 +24,7 @@ import com.mojang.brigadier.suggestion.Suggestion;
 import com.velocitypowered.api.event.connection.PluginMessageEvent;
 import com.velocitypowered.api.event.player.CookieReceiveEvent;
 import com.velocitypowered.api.event.player.PlayerChannelRegisterEvent;
+import com.velocitypowered.api.event.player.PlayerChannelUnregisterEvent;
 import com.velocitypowered.api.event.player.PlayerClientBrandEvent;
 import com.velocitypowered.api.event.player.TabCompleteEvent;
 import com.velocitypowered.api.event.player.configuration.PlayerEnteredConfigurationEvent;
@@ -42,6 +43,7 @@ import com.velocitypowered.proxy.connection.forge.legacy.LegacyForgeConstants;
 import com.velocitypowered.proxy.connection.player.resourcepack.ResourcePackResponseBundle;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.StateRegistry;
+import com.velocitypowered.proxy.protocol.netty.MinecraftDecoder;
 import com.velocitypowered.proxy.protocol.packet.BossBarPacket;
 import com.velocitypowered.proxy.protocol.packet.ClientSettingsPacket;
 import com.velocitypowered.proxy.protocol.packet.JoinGamePacket;
@@ -99,6 +101,8 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * center that joins backend servers with players.
  */
 public class ClientPlaySessionHandler implements MinecraftSessionHandler {
+  private static final boolean BACKPRESSURE_LOG =
+      Boolean.getBoolean("velocity.log-server-backpressure");
 
   private static final Logger logger = LogManager.getLogger(ClientPlaySessionHandler.class);
 
@@ -320,8 +324,12 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
                 new PlayerChannelRegisterEvent(player, ImmutableList.copyOf(channels)));
         backendConn.write(packet.retain());
       } else if (PluginMessageUtil.isUnregister(packet)) {
-        player.getClientsideChannels()
-            .removeAll(PluginMessageUtil.getChannels(0, packet, this.player.getProtocolVersion()));
+        List<ChannelIdentifier> channels =
+            PluginMessageUtil.getChannels(0, packet, this.player.getProtocolVersion());
+        player.getClientsideChannels().removeAll(channels);
+        server.getEventManager()
+            .fireAndForget(
+                new PlayerChannelUnregisterEvent(player, ImmutableList.copyOf(channels)));
         backendConn.write(packet.retain());
       } else if (PluginMessageUtil.isMcBrand(packet)) {
         String brand = PluginMessageUtil.readBrandMessage(packet.content());
@@ -447,7 +455,11 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
     }
 
     MinecraftConnection smc = serverConnection.getConnection();
-    if (smc != null && serverConnection.getPhase().consideredComplete()) {
+    final boolean stateAllowsForward = smc != null
+        && !smc.isClosed()
+        && serverConnection.getPhase().consideredComplete()
+        && smc.getState() == StateRegistry.PLAY;
+    if (stateAllowsForward) {
       if (packet instanceof PluginMessagePacket) {
         ((PluginMessagePacket) packet).retain();
       }
@@ -464,7 +476,11 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
     }
 
     MinecraftConnection smc = serverConnection.getConnection();
-    if (smc != null && !smc.isClosed() && serverConnection.getPhase().consideredComplete()) {
+    final boolean stateAllowsForward = smc != null
+        && !smc.isClosed()
+        && serverConnection.getPhase().consideredComplete()
+        && smc.getState() == StateRegistry.PLAY;
+    if (stateAllowsForward) {
       smc.write(buf.retain());
     }
   }
@@ -476,14 +492,24 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
 
   @Override
   public void exception(Throwable throwable) {
-    player.disconnect(
-        Component.translatable("velocity.error.player-connection-error", NamedTextColor.RED));
+    player.disconnect(Component.translatable("velocity.error.player-connection-error", NamedTextColor.RED));
+    if (MinecraftDecoder.DEBUG) {
+      logger.info("Exception while handling packet for {}", player, throwable);
+    }
   }
 
   @Override
   public void writabilityChanged() {
     boolean writable = player.getConnection().getChannel().isWritable();
 
+    if (BACKPRESSURE_LOG) {
+      if (writable) {
+        logger.info("{} is writable, will auto-read backend connection data", player);
+      } else {
+        logger.info("{} is not writable, not auto-reading backend connection data", player);
+      }
+    }
+
     if (!writable) {
       // We might have packets queued from the server, so flush them now to free up memory. Make
       // sure to do it on a future invocation of the event loop, otherwise while the issue will

proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java

@@ -135,6 +135,7 @@ import net.kyori.adventure.sound.SoundStop;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import net.kyori.adventure.text.minimessage.translation.Argument;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.kyori.adventure.title.Title.Times;
@@ -713,12 +714,12 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
     Component friendlyError;
     if (connectedServer != null && connectedServer.getServerInfo().equals(server.getServerInfo())) {
       friendlyError = Component.translatable("velocity.error.connected-server-error",
-          Component.text(server.getServerInfo().getName()));
+              Argument.string("server", server.getServerInfo().getName()));
     } else {
       logger.error("{}: unable to connect to server {}", this, server.getServerInfo().getName(),
           wrapped);
       friendlyError = Component.translatable("velocity.error.connecting-server-error",
-          Component.text(server.getServerInfo().getName()));
+              Argument.string("server", server.getServerInfo().getName()));
     }
     handleConnectionException(server, null, friendlyError.color(NamedTextColor.RED), safe);
   }
@@ -746,7 +747,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
       }
       handleConnectionException(server, disconnectReason,
           Component.translatable("velocity.error.moved-to-new-server", NamedTextColor.RED,
-              Component.text(server.getServerInfo().getName()),
+              Argument.string("server", server.getServerInfo().getName()),
               disconnectReason), safe);
     } else {
       if (this.server.getConfiguration().isLogPlayerConnections()) {
@@ -755,7 +756,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
       }
       handleConnectionException(server, disconnectReason,
           Component.translatable("velocity.error.cant-connect", NamedTextColor.RED,
-              Component.text(server.getServerInfo().getName()),
+              Argument.string("server", server.getServerInfo().getName()),
               disconnectReason), safe);
     }
   }
@@ -811,61 +812,56 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
         return;
       }
 
-      if (event.getResult() instanceof final DisconnectPlayer res) {
-        disconnect(res.getReasonComponent());
-      } else if (event.getResult() instanceof final RedirectPlayer res) {
-        createConnectionRequest(res.getServer(), previousConnection).connect()
-            .whenCompleteAsync((status, throwable) -> {
-              if (throwable != null) {
-                handleConnectionException(res.getServer(), throwable, true);
-                return;
-              }
+      switch (event.getResult()) {
+        case DisconnectPlayer res -> disconnect(res.getReasonComponent());
+        case RedirectPlayer res -> createConnectionRequest(res.getServer(), previousConnection).connect()
+                .whenCompleteAsync((status, throwable) -> {
+                  if (throwable != null) {
+                    handleConnectionException(res.getServer(), throwable, true);
+                    return;
+                  }
 
-              switch (status.getStatus()) {
-                // Impossible/nonsensical cases
-                case ALREADY_CONNECTED:
-                  logger.error("{}: already connected to {}", this,
-                      status.getAttemptedConnection().getServerInfo().getName());
-                  break;
-                case CONNECTION_IN_PROGRESS:
-                  // Fatal case
-                case CONNECTION_CANCELLED:
-                  Component fallbackMsg = res.getMessageComponent();
-                  if (fallbackMsg == null) {
-                    fallbackMsg = friendlyReason;
+                  switch (status.getStatus()) {
+                    // Impossible/nonsensical cases
+                    case ALREADY_CONNECTED -> logger.error("{}: already connected to {}", this,
+                            status.getAttemptedConnection().getServerInfo().getName());
+                    case CONNECTION_IN_PROGRESS, CONNECTION_CANCELLED -> {
+                      Component fallbackMsg = res.getMessageComponent();
+                      if (fallbackMsg == null) {
+                        fallbackMsg = friendlyReason;
+                      }
+                      disconnect(status.getReasonComponent().orElse(fallbackMsg));
+                    }
+                    case SERVER_DISCONNECTED -> {
+                      Component reason = status.getReasonComponent()
+                            .orElse(ConnectionMessages.INTERNAL_SERVER_CONNECTION_ERROR);
+                      handleConnectionException(res.getServer(),
+                            DisconnectPacket.create(reason, getProtocolVersion(), connection.getState()),
+                            ((Impl) status).isSafe());
+                    }
+                    case SUCCESS -> {
+                      Component requestedMessage = res.getMessageComponent();
+                      if (requestedMessage == null) {
+                        requestedMessage = friendlyReason;
+                      }
+                      if (requestedMessage != Component.empty()) {
+                        sendMessage(requestedMessage);
+                      }
+                    }
+                    default -> {
+                      // The only remaining value is successful (no need to do anything!)
+                    }
                   }
-                  disconnect(status.getReasonComponent().orElse(fallbackMsg));
-                  break;
-                case SERVER_DISCONNECTED:
-                  Component reason = status.getReasonComponent()
-                      .orElse(ConnectionMessages.INTERNAL_SERVER_CONNECTION_ERROR);
-                  handleConnectionException(res.getServer(),
-                      DisconnectPacket.create(reason, getProtocolVersion(), connection.getState()),
-                      ((Impl) status).isSafe());
-                  break;
-                case SUCCESS:
-                  Component requestedMessage = res.getMessageComponent();
-                  if (requestedMessage == null) {
-                    requestedMessage = friendlyReason;
-                  }
-                  if (requestedMessage != Component.empty()) {
-                    sendMessage(requestedMessage);
-                  }
-                  break;
-                default:
-                  // The only remaining value is successful (no need to do anything!)
-                  break;
-              }
-            }, connection.eventLoop());
-      } else if (event.getResult() instanceof final Notify res) {
-        if (event.kickedDuringServerConnect() && previousConnection != null) {
-          sendMessage(res.getMessageComponent());
-        } else {
-          disconnect(res.getMessageComponent());
+                }, connection.eventLoop());
+        case Notify res -> {
+          if (event.kickedDuringServerConnect() && previousConnection != null) {
+            sendMessage(res.getMessageComponent());
+          } else {
+            disconnect(res.getMessageComponent());
+          }
         }
-      } else {
         // In case someone gets creative, assume we want to disconnect the player.
-        disconnect(friendlyReason);
+        default -> disconnect(friendlyReason);
       }
     }, connection.eventLoop());
   }
@@ -1353,11 +1349,17 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
       final Long sentTime = serverConnection.getPendingPings().remove(packet.getRandomId());
       if (sentTime != null) {
         final MinecraftConnection smc = serverConnection.getConnection();
-        if (smc != null) {
+        final StateRegistry clientState = connection.getState();
+        final boolean stateAllowsForward = smc != null
+            && !smc.isClosed()
+            && clientState == smc.getState()
+            && (clientState == StateRegistry.CONFIG || clientState == StateRegistry.PLAY);
+        if (stateAllowsForward) {
           setPing(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - sentTime));
           smc.write(packet);
-          return true;
         }
+        // We removed this, and so this is ours
+        return true;
       }
     }
     return false;
@@ -1367,7 +1369,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
    * Switches the connection to the client into config state.
    */
   public void switchToConfigState() {
-    server.getEventManager().fire(new PlayerEnterConfigurationEvent(this, getConnectionInFlightOrConnectedServer()))
+    final VelocityServerConnection targetServer = getConnectionInFlightOrConnectedServer();
+    server.getEventManager().fire(new PlayerEnterConfigurationEvent(this, targetServer))
         .completeOnTimeout(null, 5, TimeUnit.SECONDS).thenRunAsync(() -> {
           // if the connection was closed earlier, there is a risk that the player is no longer connected
           if (!connection.getChannel().isActive()) {
@@ -1382,7 +1385,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player,
           connection.pendingConfigurationSwitch = true;
           connection.getChannel().pipeline().get(MinecraftEncoder.class).setState(StateRegistry.CONFIG);
           // Make sure we don't send any play packets to the player after update start
-          connection.addPlayPacketQueueHandler();
+          connection.addPlayPacketQueueOutboundHandler();
         }, connection.eventLoop()).exceptionally((ex) -> {
           logger.error("Error switching player connection to config state", ex);
           return null;

proxy/src/main/java/com/velocitypowered/proxy/connection/client/HandshakeSessionHandler.java

@@ -127,10 +127,10 @@ public class HandshakeSessionHandler implements MinecraftSessionHandler {
     if (!handshake.getProtocolVersion().isSupported()) {
       // Bump connection into correct protocol state so that we can send the disconnect packet.
       connection.setState(StateRegistry.LOGIN);
-      ic.disconnectQuietly(Component.translatable()
-              .key("multiplayer.disconnect.outdated_client")
-              .arguments(Component.text(ProtocolVersion.SUPPORTED_VERSION_STRING))
-              .build());
+      ic.disconnectQuietly(Component.translatable(
+          "multiplayer.disconnect.outdated_client",
+          Component.text(ProtocolVersion.SUPPORTED_VERSION_STRING)
+      ));
       return;
     }
 

proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java

@@ -152,7 +152,7 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
           } else {
             mcConnection.setActiveSessionHandler(StateRegistry.LOGIN,
                 new AuthSessionHandler(server, inbound,
-                    GameProfile.forOfflinePlayer(login.getUsername()), false));
+                    GameProfile.forOfflinePlayer(login.getUsername()), false, null));
           }
         });
       });
@@ -214,6 +214,7 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
                       server.getVersion().getName() + "/" + server.getVersion().getVersion())
               .uri(URI.create(url))
               .build();
+      //noinspection resource
       final HttpClient httpClient = server.createHttpClient();
       httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString())
           .whenCompleteAsync((response, throwable) -> {
@@ -254,7 +255,7 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
               }
               // All went well, initialize the session.
               mcConnection.setActiveSessionHandler(StateRegistry.LOGIN,
-                  new AuthSessionHandler(server, inbound, profile, true));
+                  new AuthSessionHandler(server, inbound, profile, true, serverId));
             } else if (response.statusCode() == 204) {
               // Apparently an offline-mode user logged onto this online-mode proxy.
               inbound.disconnect(
@@ -268,14 +269,12 @@ public class InitialLoginSessionHandler implements MinecraftSessionHandler {
             }
           }, mcConnection.eventLoop())
           .thenRun(() -> {
-            if (httpClient instanceof final AutoCloseable closeable) {
-              try {
-                closeable.close();
-              } catch (Exception e) {
-                // In Java 21, the HttpClient does not throw any Exception
-                // when trying to clean its resources, so this should not happen
-                logger.error("An unknown error occurred while trying to close an HttpClient", e);
-              }
+            try {
+              httpClient.close();
+            } catch (Exception e) {
+              // In Java 21, the HttpClient does not throw any Exception
+              // when trying to clean its resources, so this should not happen
+              logger.error("An unknown error occurred while trying to close an HttpClient", e);
             }
           });
     } catch (GeneralSecurityException e) {

proxy/src/main/java/com/velocitypowered/proxy/connection/player/resourcepack/handler/ModernResourcePackHandler.java

@@ -94,7 +94,7 @@ public final class ModernResourcePackHandler extends ResourcePackHandler {
         this.outstandingResourcePacks.get(info.getId());
     outstandingResourcePacks.add(info);
     if (outstandingResourcePacks.size() == 1) {
-      tickResourcePackQueue(outstandingResourcePacks.get(0).getId());
+      tickResourcePackQueue(outstandingResourcePacks.getFirst().getId());
     }
   }
 
@@ -111,7 +111,7 @@ public final class ModernResourcePackHandler extends ResourcePackHandler {
     final List<ResourcePackInfo> outstandingResourcePacks =
         this.outstandingResourcePacks.get(uuid);
     if (!outstandingResourcePacks.isEmpty()) {
-      sendResourcePackRequestPacket(outstandingResourcePacks.get(0));
+      sendResourcePackRequestPacket(outstandingResourcePacks.getFirst());
     }
   }
 
@@ -124,7 +124,7 @@ public final class ModernResourcePackHandler extends ResourcePackHandler {
         this.outstandingResourcePacks.get(uuid);
     final boolean peek = bundle.status().isIntermediate();
     final ResourcePackInfo queued = outstandingResourcePacks.isEmpty() ? null :
-        peek ? outstandingResourcePacks.get(0) : outstandingResourcePacks.remove(0);
+        peek ? outstandingResourcePacks.getFirst() : outstandingResourcePacks.removeFirst();
 
     server.getEventManager()
             .fire(new PlayerResourcePackStatusEvent(this.player, uuid, bundle.status(), queued))

proxy/src/main/java/com/velocitypowered/proxy/connection/util/ServerListPingHandler.java

@@ -100,65 +100,60 @@ public class ServerListPingHandler {
 
     CompletableFuture<List<ServerPing>> pingResponses = CompletableFutures.successfulAsList(pings,
         (ex) -> fallback);
-    switch (mode) {
-      case ALL:
-        return pingResponses.thenApply(responses -> {
-          // Find the first non-fallback
-          for (ServerPing response : responses) {
-            if (response == fallback) {
-              continue;
-            }
-
-            if (response.getDescriptionComponent() == null) {
-              return response.asBuilder()
-                  .description(Component.empty())
-                  .build();
-            }
-
-            return response;
+    return switch (mode) {
+      case ALL -> pingResponses.thenApply(responses -> {
+        // Find the first non-fallback
+        for (ServerPing response : responses) {
+          if (response == fallback) {
+            continue;
           }
-          return fallback;
-        });
-      case MODS:
-        return pingResponses.thenApply(responses -> {
-          // Find the first non-fallback that contains a mod list
-          for (ServerPing response : responses) {
-            if (response == fallback) {
-              continue;
-            }
-            Optional<ModInfo> modInfo = response.getModinfo();
-            if (modInfo.isPresent()) {
-              return fallback.asBuilder().mods(modInfo.get()).build();
-            }
-          }
-          return fallback;
-        });
-      case DESCRIPTION:
-        return pingResponses.thenApply(responses -> {
-          // Find the first non-fallback. If it includes a modlist, add it too.
-          for (ServerPing response : responses) {
-            if (response == fallback) {
-              continue;
-            }
 
-            if (response.getDescriptionComponent() == null) {
-              continue;
-            }
-
-            return new ServerPing(
-                fallback.getVersion(),
-                fallback.getPlayers().orElse(null),
-                response.getDescriptionComponent(),
-                fallback.getFavicon().orElse(null),
-                response.getModinfo().orElse(null)
-            );
+          if (response.getDescriptionComponent() == null) {
+            return response.asBuilder()
+                .description(Component.empty())
+                .build();
           }
-          return fallback;
-        });
+
+          return response;
+        }
+        return fallback;
+      });
+      case MODS -> pingResponses.thenApply(responses -> {
+        // Find the first non-fallback that contains a mod list
+        for (ServerPing response : responses) {
+          if (response == fallback) {
+            continue;
+          }
+          Optional<ModInfo> modInfo = response.getModinfo();
+          if (modInfo.isPresent()) {
+            return fallback.asBuilder().mods(modInfo.get()).build();
+          }
+        }
+        return fallback;
+      });
+      case DESCRIPTION -> pingResponses.thenApply(responses -> {
+        // Find the first non-fallback. If it includes a modlist, add it too.
+        for (ServerPing response : responses) {
+          if (response == fallback) {
+            continue;
+          }
+          if (response.getDescriptionComponent() == null) {
+            continue;
+          }
+
+          return new ServerPing(
+              fallback.getVersion(),
+              fallback.getPlayers().orElse(null),
+              response.getDescriptionComponent(),
+              fallback.getFavicon().orElse(null),
+              response.getModinfo().orElse(null)
+          );
+        }
+        return fallback;
+      });
       // Not possible, but covered for completeness.
-      default:
-        return CompletableFuture.completedFuture(fallback);
-    }
+      default -> CompletableFuture.completedFuture(fallback);
+    };
   }
 
   /**

proxy/src/main/java/com/velocitypowered/proxy/console/VelocityConsole.java

@@ -33,6 +33,7 @@ import net.kyori.adventure.permission.PermissionChecker;
 import net.kyori.adventure.platform.facet.FacetPointers;
 import net.kyori.adventure.platform.facet.FacetPointers.Type;
 import net.kyori.adventure.pointer.Pointers;
+import net.kyori.adventure.pointer.PointersSupplier;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
@@ -59,11 +60,11 @@ public final class VelocityConsole extends SimpleTerminalConsole implements Cons
 
   private final VelocityServer server;
   private PermissionFunction permissionFunction = ALWAYS_TRUE;
-  private final @NotNull Pointers pointers = ConsoleCommandSource.super.pointers().toBuilder()
-      .withDynamic(PermissionChecker.POINTER, this::getPermissionChecker)
-      .withDynamic(Identity.LOCALE, () -> ClosestLocaleMatcher.INSTANCE
+  private static final @NotNull PointersSupplier<VelocityConsole> POINTERS = PointersSupplier.<VelocityConsole>builder()
+      .resolving(PermissionChecker.POINTER, VelocityConsole::getPermissionChecker)
+      .resolving(Identity.LOCALE, (console) -> ClosestLocaleMatcher.INSTANCE
           .lookupClosest(Locale.getDefault()))
-      .withStatic(FacetPointers.TYPE, Type.CONSOLE)
+      .resolving(FacetPointers.TYPE, (console) -> Type.CONSOLE)
       .build();
 
   public VelocityConsole(VelocityServer server) {
@@ -153,6 +154,6 @@ public final class VelocityConsole extends SimpleTerminalConsole implements Cons
 
   @Override
   public @NotNull Pointers pointers() {
-    return pointers;
+    return POINTERS.view(this);
   }
 }

proxy/src/main/java/com/velocitypowered/proxy/network/ServerChannelInitializer.java

@@ -26,8 +26,10 @@ import static com.velocitypowered.proxy.network.Connections.MINECRAFT_ENCODER;
 import static com.velocitypowered.proxy.network.Connections.READ_TIMEOUT;
 
 import com.velocitypowered.proxy.VelocityServer;
+import com.velocitypowered.proxy.config.VelocityConfiguration;
 import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.client.HandshakeSessionHandler;
+import com.velocitypowered.proxy.network.limiter.SimpleBytesPerSecondLimiter;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.protocol.StateRegistry;
 import com.velocitypowered.proxy.protocol.netty.LegacyPingDecoder;
@@ -72,6 +74,17 @@ public class ServerChannelInitializer extends ChannelInitializer<Channel> {
         new HandshakeSessionHandler(connection, this.server));
     ch.pipeline().addLast(Connections.HANDLER, connection);
 
+    VelocityConfiguration.PacketLimiterConfig packetLimiterConfig =
+        server.getConfiguration().getPacketLimiterConfig();
+    int configuredInterval = packetLimiterConfig.interval();
+    int configuredPacketsPerSecond = packetLimiterConfig.pps();
+    int configuredBytes = packetLimiterConfig.bytes();
+
+    if (configuredInterval > 0 && (configuredBytes > 0 ||  configuredPacketsPerSecond > 0)) {
+      ch.pipeline().get(MinecraftVarintFrameDecoder.class).setPacketLimiter(
+          new SimpleBytesPerSecondLimiter(configuredPacketsPerSecond, configuredBytes, configuredInterval)
+      );
+    }
     if (this.server.getConfiguration().isProxyProtocol()) {
       ch.pipeline().addFirst(new HAProxyMessageDecoder());
     }

proxy/src/main/java/com/velocitypowered/proxy/network/limiter/PacketLimiter.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2025 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.velocitypowered.proxy.network.limiter;
+
+/**
+ * PacketLimiter enforces a limit on the number of bytes processed over a time window.
+ * Implementations should be thread-safe.
+ */
+public interface PacketLimiter {
+  /**
+   * Attempts to record the specified number of bytes within the current window.
+   *
+   * @param bytes the number of bytes to record
+   * @return true if the bytes are allowed and recorded; false if the limit would be exceeded
+   */
+  boolean account(int bytes);
+}

proxy/src/main/java/com/velocitypowered/proxy/network/limiter/SimpleBytesPerSecondLimiter.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2025 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.velocitypowered.proxy.network.limiter;
+
+import com.velocitypowered.proxy.util.IntervalledCounter;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * A moving-window limiter over a configurable number of seconds.
+ * It enforces both packets-per-second and average bytes-per-second limits.
+ * The effective cap over the full window equals limitPerSecond * windowSeconds.
+ */
+public final class SimpleBytesPerSecondLimiter implements PacketLimiter {
+  @Nullable
+  private final IntervalledCounter bytesCounter;
+  @Nullable
+  private final IntervalledCounter packetsCounter;
+  private final int packetsPerSecond;
+  private final int bytesPerSecond;
+
+  /**
+   * Creates a new SimpleBytesPerSecondLimiter.
+   *
+   * @param packetsPerSecond maximum average packets per second allowed (> 0)
+   * @param bytesPerSecond maximum average bytes per second allowed (> 0)
+   * @param windowSeconds number of seconds in the moving window (> 0)
+   */
+  public SimpleBytesPerSecondLimiter(int packetsPerSecond, int bytesPerSecond, int windowSeconds) {
+    this.packetsPerSecond = packetsPerSecond;
+    if (windowSeconds <= 0) {
+      throw new IllegalArgumentException("windowSeconds must be > 0");
+    }
+    this.bytesPerSecond = bytesPerSecond;
+    this.packetsCounter = packetsPerSecond > 0 ? new IntervalledCounter((long) (windowSeconds * 1.0e9)) : null;
+    this.bytesCounter = bytesPerSecond > 0 ? new IntervalledCounter((long) (windowSeconds * 1.0e9)) : null;
+
+  }
+
+  /**
+   * Records the given payload length as one packet and returns whether it is allowed.
+   */
+  @SuppressWarnings("RedundantIfStatement")
+  @Override
+  public boolean account(int bytes) {
+    long currTime = System.nanoTime();
+    if (packetsCounter != null) {
+      packetsCounter.updateAndAdd(1, currTime);
+      if (packetsCounter.getRate() > packetsPerSecond) {
+        return false;
+      }
+    }
+
+    if (bytesCounter != null) {
+      bytesCounter.updateAndAdd(bytes, currTime);
+      if (bytesCounter.getRate() > bytesPerSecond) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+}

proxy/src/main/java/com/velocitypowered/proxy/network/netty/SeparatePoolInetNameResolver.java

@@ -71,7 +71,7 @@ public final class SeparatePoolInetNameResolver extends InetNameResolver {
   protected void doResolve(String inetHost, Promise<InetAddress> promise) throws Exception {
     List<InetAddress> addresses = cache.getIfPresent(inetHost);
     if (addresses != null) {
-      promise.trySuccess(addresses.get(0));
+      promise.trySuccess(addresses.getFirst());
       return;
     }
 

proxy/src/main/java/com/velocitypowered/proxy/plugin/loader/java/JavaPluginLoader.java

@@ -83,7 +83,7 @@ public class JavaPluginLoader implements PluginLoader {
 
   @Override
   public PluginDescription createPluginFromCandidate(PluginDescription candidate) throws Exception {
-    if (!(candidate instanceof JavaVelocityPluginDescriptionCandidate)) {
+    if (!(candidate instanceof JavaVelocityPluginDescriptionCandidate candidateInst)) {
       throw new IllegalArgumentException("Description provided isn't of the Java plugin loader");
     }
 
@@ -93,8 +93,6 @@ public class JavaPluginLoader implements PluginLoader {
     PluginClassLoader loader = new PluginClassLoader(new URL[]{pluginJarUrl});
     loader.addToClassloaders();
 
-    JavaVelocityPluginDescriptionCandidate candidateInst =
-        (JavaVelocityPluginDescriptionCandidate) candidate;
     Class<?> mainClass = loader.loadClass(candidateInst.getMainClass());
     return createDescription(candidateInst, mainClass);
   }
@@ -102,11 +100,10 @@ public class JavaPluginLoader implements PluginLoader {
   @Override
   public Module createModule(PluginContainer container) {
     PluginDescription description = container.getDescription();
-    if (!(description instanceof JavaVelocityPluginDescription)) {
+    if (!(description instanceof JavaVelocityPluginDescription javaDescription)) {
       throw new IllegalArgumentException("Description provided isn't of the Java plugin loader");
     }
 
-    JavaVelocityPluginDescription javaDescription = (JavaVelocityPluginDescription) description;
     Optional<Path> source = javaDescription.getSource();
 
     if (source.isEmpty()) {
@@ -118,24 +115,23 @@ public class JavaPluginLoader implements PluginLoader {
 
   @Override
   public void createPlugin(PluginContainer container, Module... modules) {
-    if (!(container instanceof VelocityPluginContainer)) {
+    if (!(container instanceof VelocityPluginContainer pluginContainer)) {
       throw new IllegalArgumentException("Container provided isn't of the Java plugin loader");
     }
-    PluginDescription description = container.getDescription();
-    if (!(description instanceof JavaVelocityPluginDescription)) {
+    PluginDescription description = pluginContainer.getDescription();
+    if (!(description instanceof JavaVelocityPluginDescription javaPluginDescription)) {
       throw new IllegalArgumentException("Description provided isn't of the Java plugin loader");
     }
 
     Injector injector = Guice.createInjector(modules);
-    Object instance = injector
-        .getInstance(((JavaVelocityPluginDescription) description).getMainClass());
+    Object instance = injector.getInstance(javaPluginDescription.getMainClass());
 
     if (instance == null) {
       throw new IllegalStateException(
           "Got nothing from injector for plugin " + description.getId());
     }
 
-    ((VelocityPluginContainer) container).setInstance(instance);
+    pluginContainer.setInstance(instance);
   }
 
   private Optional<SerializedPluginDescription> getSerializedPluginInfo(Path source)
@@ -145,22 +141,23 @@ public class JavaPluginLoader implements PluginLoader {
         new BufferedInputStream(Files.newInputStream(source)))) {
       JarEntry entry;
       while ((entry = in.getNextJarEntry()) != null) {
-        if (entry.getName().equals("velocity-plugin.json")) {
-          try (Reader pluginInfoReader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
-            return Optional.of(VelocityServer.GENERAL_GSON.fromJson(pluginInfoReader,
-                SerializedPluginDescription.class));
+        switch (entry.getName()) {
+          case "velocity-plugin.json" -> {
+            try (Reader pluginInfoReader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
+              return Optional.of(VelocityServer.GENERAL_GSON.fromJson(pluginInfoReader,
+                  SerializedPluginDescription.class));
+            }
+          }
+          case "paper-plugin.yml", "plugin.yml", "bungee.yml" -> foundBungeeBukkitPluginFile = true;
+          default -> {
           }
-        }
-
-        if (entry.getName().equals("plugin.yml") || entry.getName().equals("bungee.yml")) {
-          foundBungeeBukkitPluginFile = true;
         }
       }
 
       if (foundBungeeBukkitPluginFile) {
         throw new InvalidPluginException("The plugin file " + source.getFileName() + " appears to "
-            + "be a Bukkit or BungeeCord plugin. Velocity does not support Bukkit or BungeeCord "
-            + "plugins.");
+            + "be a Paper, Bukkit or BungeeCord plugin. Velocity does not support plugins from these "
+            + "platforms.");
       }
 
       return Optional.empty();

proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java

@@ -36,7 +36,9 @@ import io.netty.handler.codec.EncoderException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.nbt.BinaryTag;
@@ -159,6 +161,9 @@ public enum ProtocolUtils {
     VAR_INT_LENGTHS[32] = 1; // Special case for the number 0.
   }
 
+  public static final int DEFAULT_MAX_STRING_BYTES = varIntBytes(ByteBufUtil.utf8MaxBytes(DEFAULT_MAX_STRING_SIZE))
+          + ByteBufUtil.utf8MaxBytes(DEFAULT_MAX_STRING_SIZE);
+
   private static DecoderException badVarint() {
     return MinecraftDecoder.DEBUG ? new CorruptedFrameException("Bad VarInt decoded")
         : BAD_VARINT_CACHED;
@@ -415,7 +420,10 @@ public enum ProtocolUtils {
    */
   public static int[] readIntegerArray(ByteBuf buf) {
     int len = readVarInt(buf);
-    checkArgument(len >= 0, "Got a negative-length integer array (%s)", len);
+    checkFrame(len >= 0, "Got a negative-length integer array (%s)", len);
+    checkFrame(buf.isReadable(len),
+        "Trying to read an array that is too long (wanted %s, only have %s)", len,
+        buf.readableBytes());
     int[] array = new int[len];
     for (int i = 0; i < len; i++) {
       array[i] = readVarInt(buf);
@@ -535,6 +543,10 @@ public enum ProtocolUtils {
    */
   public static String[] readStringArray(ByteBuf buf) {
     int length = readVarInt(buf);
+    checkFrame(length >= 0, "Got a negative-length array (%s)", length);
+    checkFrame(buf.isReadable(length),
+        "Trying to read an array that is too long (wanted %s, only have %s)", length,
+        buf.readableBytes());
     String[] ret = new String[length];
     for (int i = 0; i < length; i++) {
       ret[i] = readString(buf);
@@ -646,6 +658,9 @@ public enum ProtocolUtils {
 
     checkArgument(len <= FORGE_MAX_ARRAY_LENGTH,
         "Cannot receive array longer than %s (got %s bytes)", FORGE_MAX_ARRAY_LENGTH, len);
+    checkFrame(buf.isReadable(len),
+        "Trying to read an array that is too long (wanted %s, only have %s)", len,
+        buf.readableBytes());
 
     byte[] ret = new byte[len];
     buf.readBytes(ret);
@@ -844,6 +859,29 @@ public enum ProtocolUtils {
     writeVarInt(buf, source.ordinal());
   }
 
+  /**
+   * Returns a pre-sized list with a max initial size of {@code Short.MAX_VALUE}.
+   *
+   * @param initialCapacity expected initial capacity
+   * @param <T> entry type
+   * @return pre-sized list
+   */
+  public static <T> List<T> newList(int initialCapacity) {
+    return new ArrayList<>(Math.min(initialCapacity, Short.MAX_VALUE));
+  }
+
+  /**
+   * Returns a pre-sized map with a max initial size of {@code Short.MAX_VALUE}.
+   *
+   * @param initialCapacity expected initial capacity
+   * @param <K> key type
+   * @param <V> value type
+   * @return pre-sized map
+   */
+  public static <K, V> Map<K, V> newMap(int initialCapacity) {
+    return new HashMap<>(Math.min(initialCapacity, Short.MAX_VALUE));
+  }
+
   /**
    * Represents the direction in which a packet flows.
    */

proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java

@@ -46,6 +46,7 @@ import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_7_2;
 import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_8;
 import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9;
 import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_1_9_4;
+import static com.velocitypowered.api.network.ProtocolVersion.MINECRAFT_26_1;
 import static com.velocitypowered.api.network.ProtocolVersion.MINIMUM_VERSION;
 import static com.velocitypowered.api.network.ProtocolVersion.SUPPORTED_VERSIONS;
 import static com.velocitypowered.proxy.protocol.ProtocolUtils.Direction;
@@ -279,7 +280,8 @@ public enum StateRegistry {
           map(0x0A, MINECRAFT_1_20_2, false),
           map(0x0B, MINECRAFT_1_20_5, false),
           map(0x0D, MINECRAFT_1_21_2, false),
-          map(0x0E, MINECRAFT_1_21_6, false));
+          map(0x0E, MINECRAFT_1_21_6, false),
+          map(0x0F, MINECRAFT_26_1, false));
       serverbound.register(
           LegacyChatPacket.class,
           LegacyChatPacket::new,
@@ -293,7 +295,8 @@ public enum StateRegistry {
           ChatAcknowledgementPacket::new,
           map(0x03, MINECRAFT_1_19_3, false),
           map(0x04, MINECRAFT_1_21_2, false),
-          map(0x05, MINECRAFT_1_21_6, false));
+          map(0x05, MINECRAFT_1_21_6, false),
+          map(0x06, MINECRAFT_26_1, false));
       serverbound.register(KeyedPlayerCommandPacket.class, KeyedPlayerCommandPacket::new,
           map(0x03, MINECRAFT_1_19, false),
           map(0x04, MINECRAFT_1_19_1, MINECRAFT_1_19_1, false));
@@ -304,18 +307,21 @@ public enum StateRegistry {
           map(0x04, MINECRAFT_1_19_3, false),
           map(0x05, MINECRAFT_1_20_5, false),
           map(0x06, MINECRAFT_1_21_2, false),
-          map(0x07, MINECRAFT_1_21_6, false));
+          map(0x07, MINECRAFT_1_21_6, false),
+          map(0x08, MINECRAFT_26_1, false));
       serverbound.register(UnsignedPlayerCommandPacket.class, UnsignedPlayerCommandPacket::new,
           map(0x04, MINECRAFT_1_20_5, false),
           map(0x05, MINECRAFT_1_21_2, false),
-          map(0x06, MINECRAFT_1_21_6, false));
+          map(0x06, MINECRAFT_1_21_6, false),
+          map(0x07, MINECRAFT_26_1, false));
       serverbound.register(
           SessionPlayerChatPacket.class,
           SessionPlayerChatPacket::new,
           map(0x05, MINECRAFT_1_19_3, false),
           map(0x06, MINECRAFT_1_20_5, false),
           map(0x07, MINECRAFT_1_21_2, false),
-          map(0x08, MINECRAFT_1_21_6, false));
+          map(0x08, MINECRAFT_1_21_6, false),
+          map(0x09, MINECRAFT_26_1, false));
       serverbound.register(
           ClientSettingsPacket.class,
           ClientSettingsPacket::new,
@@ -331,12 +337,14 @@ public enum StateRegistry {
           map(0x09, MINECRAFT_1_20_2, false),
           map(0x0A, MINECRAFT_1_20_5, false),
           map(0x0C, MINECRAFT_1_21_2, false),
-          map(0x0D, MINECRAFT_1_21_6, false));
+          map(0x0D, MINECRAFT_1_21_6, false),
+          map(0x0E, MINECRAFT_26_1, false));
       serverbound.register(
           ServerboundCookieResponsePacket.class, ServerboundCookieResponsePacket::new,
           map(0x11, MINECRAFT_1_20_5, false),
           map(0x13, MINECRAFT_1_21_2, false),
-          map(0x14, MINECRAFT_1_21_6, false));
+          map(0x14, MINECRAFT_1_21_6, false),
+          map(0x15, MINECRAFT_26_1, false));
       serverbound.register(
           PluginMessagePacket.class,
           PluginMessagePacket::new,
@@ -355,7 +363,8 @@ public enum StateRegistry {
           map(0x10, MINECRAFT_1_20_3, false),
           map(0x12, MINECRAFT_1_20_5, false),
           map(0x14, MINECRAFT_1_21_2, false),
-          map(0x15, MINECRAFT_1_21_6, false));
+          map(0x15, MINECRAFT_1_21_6, false),
+          map(0x16, MINECRAFT_26_1, false));
       serverbound.register(
           KeepAlivePacket.class,
           KeepAlivePacket::new,
@@ -375,7 +384,8 @@ public enum StateRegistry {
           map(0x15, MINECRAFT_1_20_3, false),
           map(0x18, MINECRAFT_1_20_5, false),
           map(0x1A, MINECRAFT_1_21_2, false),
-          map(0x1B, MINECRAFT_1_21_6, false));
+          map(0x1B, MINECRAFT_1_21_6, false),
+          map(0x1C, MINECRAFT_26_1, false));
       serverbound.register(
           ResourcePackResponsePacket.class,
           ResourcePackResponsePacket::new,
@@ -393,13 +403,15 @@ public enum StateRegistry {
           map(0x2B, MINECRAFT_1_20_5, false),
           map(0x2D, MINECRAFT_1_21_2, false),
           map(0x2F, MINECRAFT_1_21_4, false),
-          map(0x30, MINECRAFT_1_21_6, false));
+          map(0x30, MINECRAFT_1_21_6, false),
+          map(0x31, MINECRAFT_26_1, false));
       serverbound.register(
           FinishedUpdatePacket.class, () -> FinishedUpdatePacket.INSTANCE,
           map(0x0B, MINECRAFT_1_20_2, false),
           map(0x0C, MINECRAFT_1_20_5, false),
           map(0x0E, MINECRAFT_1_21_2, false),
-          map(0x0F, MINECRAFT_1_21_6, false));
+          map(0x0F, MINECRAFT_1_21_6, false),
+          map(0x10, MINECRAFT_26_1, false));
 
       clientbound.register(
           BossBarPacket.class,
@@ -460,7 +472,8 @@ public enum StateRegistry {
           map(0x67, MINECRAFT_1_20_5, true),
           map(0x6E, MINECRAFT_1_21_2, true),
           map(0x6D, MINECRAFT_1_21_5, true),
-          map(0x72, MINECRAFT_1_21_9, true));
+          map(0x72, MINECRAFT_1_21_9, true),
+          map(0x74, MINECRAFT_26_1, true));
       clientbound.register(
           ClientboundStopSoundPacket.class, ClientboundStopSoundPacket::new,
           map(0x5F, MINECRAFT_1_19_3, true),
@@ -470,7 +483,8 @@ public enum StateRegistry {
           map(0x6A, MINECRAFT_1_20_5, true),
           map(0x71, MINECRAFT_1_21_2, true),
           map(0x70, MINECRAFT_1_21_5, true),
-          map(0x75, MINECRAFT_1_21_9, true));
+          map(0x75, MINECRAFT_1_21_9, true),
+          map(0x77, MINECRAFT_26_1, true));
       clientbound.register(
           PluginMessagePacket.class,
           PluginMessagePacket::new,
@@ -527,7 +541,8 @@ public enum StateRegistry {
           map(0x26, MINECRAFT_1_20_5, false),
           map(0x27, MINECRAFT_1_21_2, false),
           map(0x26, MINECRAFT_1_21_5, false),
-          map(0x2B, MINECRAFT_1_21_9, false));
+          map(0x2B, MINECRAFT_1_21_9, false),
+          map(0x2C, MINECRAFT_26_1, false));
       clientbound.register(
           JoinGamePacket.class,
           JoinGamePacket::new,
@@ -547,7 +562,8 @@ public enum StateRegistry {
           map(0x2B, MINECRAFT_1_20_5, false),
           map(0x2C, MINECRAFT_1_21_2, false),
           map(0x2B, MINECRAFT_1_21_5, false),
-          map(0x30, MINECRAFT_1_21_9, false));
+          map(0x30, MINECRAFT_1_21_9, false),
+          map(0x31, MINECRAFT_26_1, false));
       clientbound.register(
           RespawnPacket.class,
           RespawnPacket::new,
@@ -570,7 +586,8 @@ public enum StateRegistry {
           map(0x47, MINECRAFT_1_20_5, true),
           map(0x4C, MINECRAFT_1_21_2, true),
           map(0x4B, MINECRAFT_1_21_5, true),
-          map(0x50, MINECRAFT_1_21_9, true));
+          map(0x50, MINECRAFT_1_21_9, true),
+          map(0x52, MINECRAFT_26_1, true));
       clientbound.register(
           RemoveResourcePackPacket.class,
           RemoveResourcePackPacket::new,
@@ -578,7 +595,8 @@ public enum StateRegistry {
           map(0x45, MINECRAFT_1_20_5, false),
           map(0x4A, MINECRAFT_1_21_2, false),
           map(0x49, MINECRAFT_1_21_5, false),
-          map(0x4E, MINECRAFT_1_21_9, false));
+          map(0x4E, MINECRAFT_1_21_9, false),
+          map(0x50, MINECRAFT_26_1, false));
       clientbound.register(
           ResourcePackRequestPacket.class,
           ResourcePackRequestPacket::new,
@@ -601,7 +619,8 @@ public enum StateRegistry {
           map(0x46, MINECRAFT_1_20_5, false),
           map(0x4B, MINECRAFT_1_21_2, false),
           map(0x4A, MINECRAFT_1_21_5, false),
-          map(0x4F, MINECRAFT_1_21_9, false));
+          map(0x4F, MINECRAFT_1_21_9, false),
+          map(0x51, MINECRAFT_26_1, false));
       clientbound.register(
           HeaderAndFooterPacket.class,
           HeaderAndFooterPacket::new,
@@ -625,7 +644,8 @@ public enum StateRegistry {
           map(0x6D, MINECRAFT_1_20_5, true),
           map(0x74, MINECRAFT_1_21_2, true),
           map(0x73, MINECRAFT_1_21_5, true),
-          map(0x78, MINECRAFT_1_21_9, true));
+          map(0x78, MINECRAFT_1_21_9, true),
+          map(0x7A, MINECRAFT_26_1, true));
       clientbound.register(
           LegacyTitlePacket.class,
           LegacyTitlePacket::new,
@@ -648,7 +668,8 @@ public enum StateRegistry {
           map(0x63, MINECRAFT_1_20_5, true),
           map(0x6A, MINECRAFT_1_21_2, true),
           map(0x69, MINECRAFT_1_21_5, true),
-          map(0x6E, MINECRAFT_1_21_9, true));
+          map(0x6E, MINECRAFT_1_21_9, true),
+          map(0x70, MINECRAFT_26_1, true));
       clientbound.register(
           TitleTextPacket.class,
           TitleTextPacket::new,
@@ -662,7 +683,8 @@ public enum StateRegistry {
           map(0x65, MINECRAFT_1_20_5, true),
           map(0x6C, MINECRAFT_1_21_2, true),
           map(0x6B, MINECRAFT_1_21_5, true),
-          map(0x70, MINECRAFT_1_21_9, true));
+          map(0x70, MINECRAFT_1_21_9, true),
+          map(0x72, MINECRAFT_26_1, true));
       clientbound.register(
           TitleActionbarPacket.class,
           TitleActionbarPacket::new,
@@ -676,7 +698,8 @@ public enum StateRegistry {
           map(0x4C, MINECRAFT_1_20_5, true),
           map(0x51, MINECRAFT_1_21_2, true),
           map(0x50, MINECRAFT_1_21_5, true),
-          map(0x55, MINECRAFT_1_21_9, true));
+          map(0x55, MINECRAFT_1_21_9, true),
+          map(0x57, MINECRAFT_26_1, true));
       clientbound.register(
           TitleTimesPacket.class,
           TitleTimesPacket::new,
@@ -690,7 +713,8 @@ public enum StateRegistry {
           map(0x66, MINECRAFT_1_20_5, true),
           map(0x6D, MINECRAFT_1_21_2, true),
           map(0x6C, MINECRAFT_1_21_5, true),
-          map(0x71, MINECRAFT_1_21_9, true));
+          map(0x71, MINECRAFT_1_21_9, true),
+          map(0x73, MINECRAFT_26_1, true));
       clientbound.register(
           TitleClearPacket.class,
           TitleClearPacket::new,
@@ -721,7 +745,8 @@ public enum StateRegistry {
           map(0x3D, MINECRAFT_1_20_5, false),
           map(0x3F, MINECRAFT_1_21_2, false),
           map(0x3E, MINECRAFT_1_21_5, false),
-          map(0x43, MINECRAFT_1_21_9, false));
+          map(0x43, MINECRAFT_1_21_9, false),
+          map(0x45, MINECRAFT_26_1, false));
       clientbound.register(
           UpsertPlayerInfoPacket.class,
           UpsertPlayerInfoPacket::new,
@@ -731,13 +756,15 @@ public enum StateRegistry {
           map(0x3E, MINECRAFT_1_20_5, false),
           map(0x40, MINECRAFT_1_21_2, false),
           map(0x3F, MINECRAFT_1_21_5, false),
-          map(0x44, MINECRAFT_1_21_9, false));
+          map(0x44, MINECRAFT_1_21_9, false),
+          map(0x46, MINECRAFT_26_1, false));
       clientbound.register(
           ClientboundStoreCookiePacket.class, ClientboundStoreCookiePacket::new,
           map(0x6B, MINECRAFT_1_20_5, false),
           map(0x72, MINECRAFT_1_21_2, false),
           map(0x71, MINECRAFT_1_21_5, false),
-          map(0x76, MINECRAFT_1_21_9, false));
+          map(0x76, MINECRAFT_1_21_9, false),
+          map(0x78, MINECRAFT_26_1, false));
       clientbound.register(
           SystemChatPacket.class,
           SystemChatPacket::new,
@@ -750,7 +777,8 @@ public enum StateRegistry {
           map(0x6C, MINECRAFT_1_20_5, true),
           map(0x73, MINECRAFT_1_21_2, true),
           map(0x72, MINECRAFT_1_21_5, true),
-          map(0x77, MINECRAFT_1_21_9, true));
+          map(0x77, MINECRAFT_1_21_9, true),
+          map(0x79, MINECRAFT_26_1, true));
       clientbound.register(
           PlayerChatCompletionPacket.class,
           PlayerChatCompletionPacket::new,
@@ -772,7 +800,8 @@ public enum StateRegistry {
           map(0x4B, MINECRAFT_1_20_5, false),
           map(0x50, MINECRAFT_1_21_2, false),
           map(0x4F, MINECRAFT_1_21_5, false),
-          map(0x54, MINECRAFT_1_21_9, false));
+          map(0x54, MINECRAFT_1_21_9, false),
+          map(0x56, MINECRAFT_26_1, false));
       clientbound.register(
           StartUpdatePacket.class,
           () -> StartUpdatePacket.INSTANCE,
@@ -781,7 +810,8 @@ public enum StateRegistry {
           map(0x69, MINECRAFT_1_20_5, false),
           map(0x70, MINECRAFT_1_21_2, false),
           map(0x6F, MINECRAFT_1_21_5, false),
-          map(0x74, MINECRAFT_1_21_9, false));
+          map(0x74, MINECRAFT_1_21_9, false),
+          map(0x76, MINECRAFT_26_1, false));
       clientbound.register(
           BundleDelimiterPacket.class,
           () -> BundleDelimiterPacket.INSTANCE,
@@ -791,13 +821,15 @@ public enum StateRegistry {
           TransferPacket::new,
           map(0x73, MINECRAFT_1_20_5, false),
           map(0x7A, MINECRAFT_1_21_2, false),
-          map(0x7F, MINECRAFT_1_21_9, false));
+          map(0x7F, MINECRAFT_1_21_9, false),
+          map(0x81, MINECRAFT_26_1, false));
       clientbound.register(
           ClientboundCustomReportDetailsPacket.class,
           ClientboundCustomReportDetailsPacket::new,
           map(0x7A, MINECRAFT_1_21, false),
           map(0x81, MINECRAFT_1_21_2, false),
-          map(0x86, MINECRAFT_1_21_9, false));
+          map(0x86, MINECRAFT_1_21_9, false),
+          map(0x88, MINECRAFT_26_1, false));
       clientbound.register(
           ClientboundServerLinksPacket.class,
           ClientboundServerLinksPacket::new,
@@ -819,7 +851,8 @@ public enum StateRegistry {
               map(0x5E, ProtocolVersion.MINECRAFT_1_20_3, true),
               map(0x60, ProtocolVersion.MINECRAFT_1_20_5, true),
               map(0x67, ProtocolVersion.MINECRAFT_1_21_2, true)
-      );
+          map(0x87, MINECRAFT_1_21_9, false),
+          map(0x89, MINECRAFT_26_1, false));
     }
   },
   LOGIN {
@@ -848,7 +881,7 @@ public enum StateRegistry {
           map(0x01, MINECRAFT_1_7_2, false));
       clientbound.register(
           ServerLoginSuccessPacket.class, ServerLoginSuccessPacket::new,
-              map(0x02, MINECRAFT_1_7_2, false));
+          map(0x02, MINECRAFT_1_7_2, false));
       clientbound.register(
           SetCompressionPacket.class, SetCompressionPacket::new,
           map(0x03, MINECRAFT_1_8, false));

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/GameSpyQueryHandler.java

@@ -119,7 +119,7 @@ public class GameSpyQueryHandler extends SimpleChannelInboundHandler<DatagramPac
     int sessionId = queryMessage.readInt();
 
     switch (type) {
-      case QUERY_TYPE_HANDSHAKE: {
+      case QUERY_TYPE_HANDSHAKE -> {
         // Generate new challenge token and put it into the sessions cache
         int challengeToken = random.nextInt();
         sessions.put(senderAddress, challengeToken);
@@ -132,10 +132,9 @@ public class GameSpyQueryHandler extends SimpleChannelInboundHandler<DatagramPac
 
         DatagramPacket responsePacket = new DatagramPacket(queryResponse, msg.sender());
         ctx.writeAndFlush(responsePacket, ctx.voidPromise());
-        break;
       }
 
-      case QUERY_TYPE_STAT: {
+      case QUERY_TYPE_STAT -> {
         // Check if query was done with session previously generated using a handshake packet
         int challengeToken = queryMessage.readInt();
         Integer session = sessions.getIfPresent(senderAddress);
@@ -190,10 +189,10 @@ public class GameSpyQueryHandler extends SimpleChannelInboundHandler<DatagramPac
                   "Exception while writing GS4 response for query from {}", senderAddress, ex);
               return null;
             });
-        break;
       }
-      default:
-        // Invalid query type - just don't respond
+      default -> {
+          // Invalid query type - just don't respond
+      }
     }
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftCompressDecoder.java

@@ -33,20 +33,34 @@ import java.util.List;
  */
 public class MinecraftCompressDecoder extends MessageToMessageDecoder<ByteBuf> {
 
+  private static final int SERVERBOUND_MAXIMUM_UNCOMPRESSED_SIZE = 2 * 1024 * 1024; // 2MiB
   private static final int VANILLA_MAXIMUM_UNCOMPRESSED_SIZE = 8 * 1024 * 1024; // 8MiB
   private static final int HARD_MAXIMUM_UNCOMPRESSED_SIZE = 128 * 1024 * 1024; // 128MiB
 
-  private static final int UNCOMPRESSED_CAP =
+  private static final int CLIENTBOUND_UNCOMPRESSED_CAP =
       Boolean.getBoolean("velocity.increased-compression-cap")
           ? HARD_MAXIMUM_UNCOMPRESSED_SIZE : VANILLA_MAXIMUM_UNCOMPRESSED_SIZE;
+  private static final int SERVERBOUND_UNCOMPRESSED_CAP =
+          Boolean.getBoolean("velocity.increased-compression-cap")
+                  ? HARD_MAXIMUM_UNCOMPRESSED_SIZE : SERVERBOUND_MAXIMUM_UNCOMPRESSED_SIZE;
   private static final boolean SKIP_COMPRESSION_VALIDATION = Boolean.getBoolean("velocity.skip-uncompressed-packet-size-validation");
+  private static final double MAX_COMPRESSION_RATIO = Double.parseDouble(System.getProperty("velocity.max-compression-ratio", "64"));
+  private final ProtocolUtils.Direction direction;
 
   private int threshold;
   private final VelocityCompressor compressor;
 
-  public MinecraftCompressDecoder(int threshold, VelocityCompressor compressor) {
+  /**
+   * Creates a new {@code MinecraftCompressDecoder} with the specified compression {@code threshold}.
+   *
+   * @param threshold the threshold for compression. Packets with uncompressed size below this threshold will not be compressed.
+   * @param compressor the compressor instance to use
+   * @param direction the direction of the packets being decoded
+   */
+  public MinecraftCompressDecoder(int threshold, VelocityCompressor compressor, ProtocolUtils.Direction direction) {
     this.threshold = threshold;
     this.compressor = compressor;
+    this.direction = direction;
   }
 
   @Override
@@ -62,17 +76,29 @@ public class MinecraftCompressDecoder extends MessageToMessageDecoder<ByteBuf> {
       out.add(in.retain());
       return;
     }
+    int length = in.readableBytes();
 
     checkFrame(claimedUncompressedSize >= threshold, "Uncompressed size %s is less than"
         + " threshold %s", claimedUncompressedSize, threshold);
-    checkFrame(claimedUncompressedSize <= UNCOMPRESSED_CAP,
-        "Uncompressed size %s exceeds hard threshold of %s", claimedUncompressedSize,
-        UNCOMPRESSED_CAP);
-
+    if (direction == ProtocolUtils.Direction.CLIENTBOUND) {
+      checkFrame(claimedUncompressedSize <= CLIENTBOUND_UNCOMPRESSED_CAP,
+              "Uncompressed size %s exceeds hard threshold of %s", claimedUncompressedSize,
+              CLIENTBOUND_UNCOMPRESSED_CAP);
+    } else {
+      checkFrame(claimedUncompressedSize <= SERVERBOUND_UNCOMPRESSED_CAP,
+              "Uncompressed size %s exceeds hard threshold of %s", claimedUncompressedSize,
+              SERVERBOUND_UNCOMPRESSED_CAP);
+      double maxCompressedAllowed = length * MAX_COMPRESSION_RATIO;
+      checkFrame(claimedUncompressedSize <= maxCompressedAllowed,
+              "Uncompressed size %s exceeds ratio threshold of %s for compressed sized %s", claimedUncompressedSize,
+              maxCompressedAllowed, length);
+    }
     ByteBuf compatibleIn = ensureCompatible(ctx.alloc(), compressor, in);
     ByteBuf uncompressed = preferredBuffer(ctx.alloc(), compressor, claimedUncompressedSize);
     try {
       compressor.inflate(compatibleIn, uncompressed, claimedUncompressedSize);
+      checkFrame(uncompressed.writerIndex() == claimedUncompressedSize,
+              "Decompressed size %s does not match claimed uncompressed size %s", uncompressed.writerIndex(), claimedUncompressedSize);
       out.add(uncompressed);
     } catch (Exception e) {
       uncompressed.release();

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftDecoder.java

@@ -57,7 +57,11 @@ public class MinecraftDecoder extends ChannelInboundHandlerAdapter {
   @Override
   public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
     if (msg instanceof ByteBuf buf) {
-      tryDecode(ctx, buf);
+      try {
+        tryDecode(ctx, buf);
+      } finally {
+        buf.release();
+      }
     } else {
       ctx.fireChannelRead(msg);
     }
@@ -65,7 +69,6 @@ public class MinecraftDecoder extends ChannelInboundHandlerAdapter {
 
   private void tryDecode(ChannelHandlerContext ctx, ByteBuf buf) throws Exception {
     if (!ctx.channel().isActive() || !buf.isReadable()) {
-      buf.release();
       return;
     }
 
@@ -74,24 +77,23 @@ public class MinecraftDecoder extends ChannelInboundHandlerAdapter {
     MinecraftPacket packet = this.registry.createPacket(packetId);
     if (packet == null) {
       buf.readerIndex(originalReaderIndex);
-      ctx.fireChannelRead(buf);
-    } else {
-      try {
-        doLengthSanityChecks(buf, packet);
-
-        try {
-          packet.decode(buf, direction, registry.version);
-        } catch (Exception e) {
-          throw handleDecodeFailure(e, packet, packetId);
-        }
-
-        if (buf.isReadable()) {
-          throw handleOverflow(packet, buf.readerIndex(), buf.writerIndex());
-        }
-        ctx.fireChannelRead(packet);
-      } finally {
-        buf.release();
+      if (this.direction == ProtocolUtils.Direction.SERVERBOUND && this.state != StateRegistry.PLAY) {
+        throw this.handleInvalidPacketId(packetId);
       }
+      ctx.fireChannelRead(buf.retain());
+    } else {
+      doLengthSanityChecks(buf, packet);
+
+      try {
+        packet.decode(buf, direction, registry.version);
+      } catch (Exception e) {
+        throw handleDecodeFailure(e, packet, packetId);
+      }
+
+      if (buf.isReadable()) {
+        throw handleOverflow(packet, buf.readerIndex(), buf.writerIndex());
+      }
+      ctx.fireChannelRead(packet);
     }
   }
 
@@ -133,6 +135,14 @@ public class MinecraftDecoder extends ChannelInboundHandlerAdapter {
     }
   }
 
+  private Exception handleInvalidPacketId(int packetId) {
+    if (DEBUG) {
+      return new CorruptedFrameException("Invalid packet " + getExtraConnectionDetail(packetId));
+    } else {
+      return DECODE_FAILED;
+    }
+  }
+
   private String getExtraConnectionDetail(int packetId) {
     return "Direction " + direction + " Protocol " + registry.version + " State " + state
         + " ID 0x" + Integer.toHexString(packetId);

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java

@@ -20,6 +20,7 @@ package com.velocitypowered.proxy.protocol.netty;
 import static io.netty.util.ByteProcessor.FIND_NON_NUL;
 
 import com.velocitypowered.api.network.ProtocolVersion;
+import com.velocitypowered.proxy.network.limiter.PacketLimiter;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.protocol.StateRegistry;
@@ -32,6 +33,7 @@ import io.netty.handler.codec.CorruptedFrameException;
 import java.util.List;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Frames Minecraft server packets which are prefixed by a 21-bit VarInt encoding.
@@ -44,6 +46,8 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
           + "Velocity with -Dvelocity.packet-decode-logging=true to see more.");
   private static final QuietDecoderException BAD_PACKET_LENGTH =
       new QuietDecoderException("Bad packet length");
+  private static final QuietDecoderException INVALID_PREAMBLE =
+          new QuietDecoderException("Invalid packet preamble");
   private static final QuietDecoderException VARINT_TOO_BIG =
       new QuietDecoderException("VarInt too big");
   private static final QuietDecoderException UNKNOWN_PACKET =
@@ -52,6 +56,8 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
   private final ProtocolUtils.Direction direction;
   private final StateRegistry.PacketRegistry.ProtocolRegistry registry;
   private StateRegistry state;
+  @Nullable
+  private PacketLimiter packetLimiter;
 
   /**
    * Creates a new {@code MinecraftVarintFrameDecoder} decoding packets from the specified {@code Direction}.
@@ -74,38 +80,58 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
     }
 
     // skip any runs of 0x00 we might find
+    int wlen = in.readableBytes();
     int packetStart = in.forEachByte(FIND_NON_NUL);
     if (packetStart == -1) {
       in.clear();
+      // Apply a more strict check in serverbound direction, we really shouldn't be seeing this many 0x00s
+      // even from the server, the only reason we even allow these is due to bugged servers
+      if (direction == ProtocolUtils.Direction.SERVERBOUND && wlen > 16) {
+        throw INVALID_PREAMBLE;
+      }
       return;
     }
     in.readerIndex(packetStart);
 
     // try to read the length of the packet
-    in.markReaderIndex();
-    int length = readRawVarInt21(in);
-    if (packetStart == in.readerIndex()) {
-      return;
-    }
-    if (length < 0) {
-      throw BAD_PACKET_LENGTH;
-    }
+    try {
+      int length = readRawVarInt21(in);
+      if (packetStart == in.readerIndex()) {
+        return;
+      }
+      if (length < 0) {
+        throw BAD_PACKET_LENGTH;
+      }
 
-    if (length > 0) {
-      if (state == StateRegistry.HANDSHAKE && direction == ProtocolUtils.Direction.SERVERBOUND) {
-        if (validateServerboundHandshakePacket(in, length)) {
-          return;
+      if (length > 0) {
+        if (state == StateRegistry.HANDSHAKE && direction == ProtocolUtils.Direction.SERVERBOUND) {
+          if (validateServerboundHandshakePacket(in, length)) {
+            in.readerIndex(packetStart);
+            return;
+          }
         }
       }
-    }
 
-    // note that zero-length packets are ignored
-    if (length > 0) {
-      if (in.readableBytes() < length) {
-        in.resetReaderIndex();
-      } else {
-        out.add(in.readRetainedSlice(length));
+      // note that zero-length packets are ignored
+      if (length > 0) {
+        if (in.readableBytes() < length) {
+          in.readerIndex(packetStart);
+        } else {
+          // If enabled, rate-limit serverbound payload bytes based on frame length
+          if (packetLimiter != null) {
+            if (!packetLimiter.account(length)) {
+              throw new QuietDecoderException(
+                      "Rate limit exceeded while processing packets for %s".formatted(
+                              ctx.channel().remoteAddress()));
+            }
+          }
+          out.add(in.readRetainedSlice(length));
+        }
       }
+    } catch (Exception e) {
+      // Reset buffer to consistent state before propagating exception to prevent memory leaks
+      in.readerIndex(packetStart);
+      throw e;
     }
   }
 
@@ -117,7 +143,6 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
     final int packetId = readRawVarInt21(in);
     // Index hasn't changed, we've read nothing
     if (index == in.readerIndex()) {
-      in.resetReaderIndex();
       return true;
     }
     final int payloadLength = length - ProtocolUtils.varIntBytes(packetId);
@@ -245,4 +270,8 @@ public class MinecraftVarintFrameDecoder extends ByteToMessageDecoder {
   public void setState(StateRegistry stateRegistry) {
     this.state = stateRegistry;
   }
+
+  public void setPacketLimiter(@Nullable PacketLimiter packetLimiter) {
+    this.packetLimiter = packetLimiter;
+  }
 }

proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/PlayPacketQueueInboundHandler.java

@@ -21,6 +21,9 @@ import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.protocol.StateRegistry;
+import com.velocitypowered.proxy.util.except.QuietDecoderException;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufHolder;
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.ReferenceCountUtil;
@@ -41,8 +44,13 @@ import org.jetbrains.annotations.NotNull;
  */
 public class PlayPacketQueueInboundHandler extends ChannelDuplexHandler {
 
+  private static final int MAXIMUM_SIZE = Integer.getInteger("velocity.maximum-play-queue-size", 128 * 1024 * 1024); // 128MiB by default
+  private static final QuietDecoderException QUEUE_LIMIT_FAILED = new QuietDecoderException(
+      "Queue too big (greater than " + MAXIMUM_SIZE + " bytes)");
+
   private final StateRegistry.PacketRegistry.ProtocolRegistry registry;
   private final Queue<Object> queue = new ArrayDeque<>();
+  private int queueSize = 0;
 
   /**
    * Provides registries for client &amp; server bound packets.
@@ -64,6 +72,20 @@ public class PlayPacketQueueInboundHandler extends ChannelDuplexHandler {
       }
     }
 
+    int length = 0;
+    if (msg instanceof ByteBuf) {
+      // keep track of raw packets
+      length = ((ByteBuf) msg).readableBytes();
+    } else if (msg instanceof ByteBufHolder) {
+      // keep track of bytebufs wrapped inside packets
+      length = ((ByteBufHolder) msg).content().readableBytes();
+    }
+    if (this.queueSize + length > MAXIMUM_SIZE) {
+      ReferenceCountUtil.release(msg);
+      throw QUEUE_LIMIT_FAILED;
+    }
+    this.queueSize += length;
+
     // Otherwise, queue the packet
     this.queue.offer(msg);
   }
@@ -90,5 +112,6 @@ public class PlayPacketQueueInboundHandler extends ChannelDuplexHandler {
         ReferenceCountUtil.release(msg);
       }
     }
+    this.queueSize = 0;
   }
 }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/AvailableCommandsPacket.java

@@ -25,7 +25,6 @@ import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
@@ -45,9 +44,9 @@ import io.netty.buffer.ByteBuf;
 import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenCustomHashMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import java.util.ArrayDeque;
-import java.util.Arrays;
 import java.util.Deque;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
@@ -86,14 +85,14 @@ public class AvailableCommandsPacket implements MinecraftPacket {
   @Override
   public void decode(ByteBuf buf, Direction direction, ProtocolVersion protocolVersion) {
     int commands = ProtocolUtils.readVarInt(buf);
-    WireNode[] wireNodes = new WireNode[commands];
+    List<WireNode> wireNodes = ProtocolUtils.newList(commands);
     for (int i = 0; i < commands; i++) {
-      wireNodes[i] = deserializeNode(buf, i, protocolVersion);
+      wireNodes.add(deserializeNode(buf, i, protocolVersion));
     }
 
     // Iterate over the deserialized nodes and attempt to form a graph. We also resolve any cycles
     // that exist.
-    Queue<WireNode> nodeQueue = new ArrayDeque<>(Arrays.asList(wireNodes));
+    Queue<WireNode> nodeQueue = new ArrayDeque<>(wireNodes);
     while (!nodeQueue.isEmpty()) {
       boolean cycling = false;
 
@@ -112,7 +111,7 @@ public class AvailableCommandsPacket implements MinecraftPacket {
     }
 
     int rootIdx = ProtocolUtils.readVarInt(buf);
-    rootNode = (RootCommandNode<CommandSource>) wireNodes[rootIdx].built;
+    rootNode = (RootCommandNode<CommandSource>) wireNodes.get(rootIdx).built;
   }
 
   @Override
@@ -246,17 +245,17 @@ public class AvailableCommandsPacket implements MinecraftPacket {
       this.validated = false;
     }
 
-    void validate(WireNode[] wireNodes) {
+    void validate(List<WireNode> wireNodes) {
       // Ensure all children exist. Note that we delay checking if the node has been built yet;
       // that needs to come after this node is built.
       for (int child : children) {
-        if (child < 0 || child >= wireNodes.length) {
+        if (child < 0 || child >= wireNodes.size()) {
           throw new IllegalStateException("Node points to non-existent index " + child);
         }
       }
 
       if (redirectTo != -1) {
-        if (redirectTo < 0 || redirectTo >= wireNodes.length) {
+        if (redirectTo < 0 || redirectTo >= wireNodes.size()) {
           throw new IllegalStateException("Redirect node points to non-existent index "
               + redirectTo);
         }
@@ -265,7 +264,7 @@ public class AvailableCommandsPacket implements MinecraftPacket {
       this.validated = true;
     }
 
-    boolean toNode(WireNode[] wireNodes) {
+    boolean toNode(List<WireNode> wireNodes) {
       if (!this.validated) {
         this.validate(wireNodes);
       }
@@ -281,7 +280,7 @@ public class AvailableCommandsPacket implements MinecraftPacket {
 
           // Add any redirects
           if (redirectTo != -1) {
-            WireNode redirect = wireNodes[redirectTo];
+            WireNode redirect = wireNodes.get(redirectTo);
             if (redirect.built != null) {
               args.redirect(redirect.built);
             } else {
@@ -305,7 +304,7 @@ public class AvailableCommandsPacket implements MinecraftPacket {
       }
 
       for (int child : children) {
-        if (wireNodes[child].built == null) {
+        if (wireNodes.get(child).built == null) {
           // The child is not yet deserialized. The node can't be built now.
           return false;
         }
@@ -313,7 +312,7 @@ public class AvailableCommandsPacket implements MinecraftPacket {
 
       // Associate children with nodes
       for (int child : children) {
-        CommandNode<CommandSource> childNode = wireNodes[child].built;
+        CommandNode<CommandSource> childNode = wireNodes.get(child).built;
         if (!(childNode instanceof RootCommandNode)) {
           built.addChild(childNode);
         }
@@ -331,12 +330,10 @@ public class AvailableCommandsPacket implements MinecraftPacket {
           .add("redirectTo", redirectTo);
 
       if (args != null) {
-        if (args instanceof LiteralArgumentBuilder) {
-          helper.add("argsLabel",
-              ((LiteralArgumentBuilder<CommandSource>) args).getLiteral());
-        } else if (args instanceof RequiredArgumentBuilder) {
-          helper.add("argsName",
-              ((RequiredArgumentBuilder<CommandSource, ?>) args).getName());
+        if (args instanceof LiteralArgumentBuilder literal) {
+          helper.add("argsLabel", literal.getLiteral());
+        } else if (args instanceof RequiredArgumentBuilder required) {
+          helper.add("argsName", required.getName());
         }
       }
 
@@ -348,17 +345,11 @@ public class AvailableCommandsPacket implements MinecraftPacket {
    * A placeholder {@link SuggestionProvider} used internally to preserve the suggestion provider
    * name.
    */
-  public static class ProtocolSuggestionProvider implements SuggestionProvider<CommandSource> {
-
-    private final String name;
-
-    public ProtocolSuggestionProvider(String name) {
-      this.name = name;
-    }
+  public record ProtocolSuggestionProvider(String name) implements SuggestionProvider<CommandSource> {
 
     @Override
     public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSource> context,
-        SuggestionsBuilder builder) throws CommandSyntaxException {
+        SuggestionsBuilder builder) {
       return builder.buildFuture();
     }
   }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/BossBarPacket.java

@@ -207,30 +207,22 @@ public class BossBarPacket implements MinecraftPacket {
     this.uuid = ProtocolUtils.readUuid(buf);
     this.action = ProtocolUtils.readVarInt(buf);
     switch (action) {
-      case ADD:
+      case ADD -> {
         this.name = ComponentHolder.read(buf, version);
         this.percent = buf.readFloat();
         this.color = ProtocolUtils.readVarInt(buf);
         this.overlay = ProtocolUtils.readVarInt(buf);
         this.flags = buf.readUnsignedByte();
-        break;
-      case REMOVE:
-        break;
-      case UPDATE_PERCENT:
-        this.percent = buf.readFloat();
-        break;
-      case UPDATE_NAME:
-        this.name = ComponentHolder.read(buf, version);
-        break;
-      case UPDATE_STYLE:
+      }
+      case REMOVE -> {}
+      case UPDATE_PERCENT -> this.percent = buf.readFloat();
+      case UPDATE_NAME -> this.name = ComponentHolder.read(buf, version);
+      case UPDATE_STYLE -> {
         this.color = ProtocolUtils.readVarInt(buf);
         this.overlay = ProtocolUtils.readVarInt(buf);
-        break;
-      case UPDATE_PROPERTIES:
-        this.flags = buf.readUnsignedByte();
-        break;
-      default:
-        throw new UnsupportedOperationException("Unknown action " + action);
+      }
+      case UPDATE_PROPERTIES -> this.flags = buf.readUnsignedByte();
+      default -> throw new UnsupportedOperationException("Unknown action " + action);
     }
   }
 
@@ -242,36 +234,30 @@ public class BossBarPacket implements MinecraftPacket {
     ProtocolUtils.writeUuid(buf, uuid);
     ProtocolUtils.writeVarInt(buf, action);
     switch (action) {
-      case ADD:
-        if (name == null) {
-          throw new IllegalStateException("No name specified!");
-        }
-        name.write(buf);
-        buf.writeFloat(percent);
+      case ADD -> {
+          if (name == null) {
+              throw new IllegalStateException("No name specified!");
+          }
+          name.write(buf);
+          buf.writeFloat(percent);
+          ProtocolUtils.writeVarInt(buf, color);
+          ProtocolUtils.writeVarInt(buf, overlay);
+          buf.writeByte(flags);
+      }
+      case REMOVE -> {}
+      case UPDATE_PERCENT -> buf.writeFloat(percent);
+      case UPDATE_NAME -> {
+          if (name == null) {
+              throw new IllegalStateException("No name specified!");
+          }
+          name.write(buf);
+      }
+      case UPDATE_STYLE -> {
         ProtocolUtils.writeVarInt(buf, color);
         ProtocolUtils.writeVarInt(buf, overlay);
-        buf.writeByte(flags);
-        break;
-      case REMOVE:
-        break;
-      case UPDATE_PERCENT:
-        buf.writeFloat(percent);
-        break;
-      case UPDATE_NAME:
-        if (name == null) {
-          throw new IllegalStateException("No name specified!");
-        }
-        name.write(buf);
-        break;
-      case UPDATE_STYLE:
-        ProtocolUtils.writeVarInt(buf, color);
-        ProtocolUtils.writeVarInt(buf, overlay);
-        break;
-      case UPDATE_PROPERTIES:
-        buf.writeByte(flags);
-        break;
-      default:
-        throw new UnsupportedOperationException("Unknown action " + action);
+      }
+      case UPDATE_PROPERTIES -> buf.writeByte(flags);
+      default -> throw new UnsupportedOperationException("Unknown action " + action);
     }
   }
 

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ClientSettingsPacket.java

@@ -22,8 +22,8 @@ import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
 import java.util.Objects;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class ClientSettingsPacket implements MinecraftPacket {
@@ -135,7 +135,7 @@ public class ClientSettingsPacket implements MinecraftPacket {
     return "ClientSettings{" + "locale='" + locale + '\'' + ", viewDistance=" + viewDistance +
         ", chatVisibility=" + chatVisibility + ", chatColors=" + chatColors + ", skinParts=" +
         skinParts + ", mainHand=" + mainHand + ", chatFilteringEnabled=" + textFilteringEnabled +
-        ", clientListingAllowed=" + clientListingAllowed +  ", particleStatus=" + particleStatus + '}';
+        ", clientListingAllowed=" + clientListingAllowed + ", particleStatus=" + particleStatus + '}';
   }
 
   @Override
@@ -206,6 +206,16 @@ public class ClientSettingsPacket implements MinecraftPacket {
     return handler.handle(this);
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+    return 1 + ByteBufUtil.utf8MaxBytes(16) + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1;
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+    return 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1;
+  }
+
   @Override
   public boolean equals(@Nullable final Object o) {
     if (this == o) {
@@ -237,7 +247,7 @@ public class ClientSettingsPacket implements MinecraftPacket {
         difficulty,
         skinParts,
         mainHand,
-            textFilteringEnabled,
+        textFilteringEnabled,
         clientListingAllowed,
         particleStatus);
   }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/KeepAlivePacket.java

@@ -64,6 +64,28 @@ public class KeepAlivePacket implements MinecraftPacket {
     }
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_12_2)) {
+      return Long.BYTES;
+    } else if (version.noLessThan(ProtocolVersion.MINECRAFT_1_8)) {
+      return 5;
+    } else {
+      return Integer.BYTES;
+    }
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_12_2)) {
+      return Long.BYTES;
+    } else if (version.noLessThan(ProtocolVersion.MINECRAFT_1_8)) {
+      return 1;
+    } else {
+      return Integer.BYTES;
+    }
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/LegacyPlayerListItemPacket.java

@@ -69,33 +69,25 @@ public class LegacyPlayerListItemPacket implements MinecraftPacket {
         Item item = new Item(ProtocolUtils.readUuid(buf));
         items.add(item);
         switch (action) {
-          case ADD_PLAYER:
+          case ADD_PLAYER -> {
             item.setName(ProtocolUtils.readString(buf));
             item.setProperties(ProtocolUtils.readProperties(buf));
             item.setGameMode(ProtocolUtils.readVarInt(buf));
             item.setLatency(ProtocolUtils.readVarInt(buf));
             item.setDisplayName(readOptionalComponent(buf, version));
-
             if (version.noLessThan(ProtocolVersion.MINECRAFT_1_19)) {
-              if (buf.readBoolean()) {
-                item.setPlayerKey(ProtocolUtils.readPlayerKey(version, buf));
-              }
+                if (buf.readBoolean()) {
+                    item.setPlayerKey(ProtocolUtils.readPlayerKey(version, buf));
+                }
             }
-            break;
-          case UPDATE_GAMEMODE:
-            item.setGameMode(ProtocolUtils.readVarInt(buf));
-            break;
-          case UPDATE_LATENCY:
-            item.setLatency(ProtocolUtils.readVarInt(buf));
-            break;
-          case UPDATE_DISPLAY_NAME:
-            item.setDisplayName(readOptionalComponent(buf, version));
-            break;
-          case REMOVE_PLAYER:
-            //Do nothing, all that is needed is the uuid
-            break;
-          default:
-            throw new UnsupportedOperationException("Unknown action " + action);
+          }
+          case UPDATE_GAMEMODE -> item.setGameMode(ProtocolUtils.readVarInt(buf));
+          case UPDATE_LATENCY -> item.setLatency(ProtocolUtils.readVarInt(buf));
+          case UPDATE_DISPLAY_NAME -> item.setDisplayName(readOptionalComponent(buf, version));
+          case REMOVE_PLAYER -> {
+              //Do nothing, all that is needed is the uuid
+          }
+          default -> throw new UnsupportedOperationException("Unknown action " + action);
         }
       }
     } else {
@@ -126,39 +118,32 @@ public class LegacyPlayerListItemPacket implements MinecraftPacket {
 
         ProtocolUtils.writeUuid(buf, uuid);
         switch (action) {
-          case ADD_PLAYER:
+          case ADD_PLAYER -> {
             ProtocolUtils.writeString(buf, item.getName());
             ProtocolUtils.writeProperties(buf, item.getProperties());
             ProtocolUtils.writeVarInt(buf, item.getGameMode());
             ProtocolUtils.writeVarInt(buf, item.getLatency());
             writeDisplayName(buf, item.getDisplayName(), version);
             if (version.noLessThan(ProtocolVersion.MINECRAFT_1_19)) {
-              if (item.getPlayerKey() != null) {
-                buf.writeBoolean(true);
-                ProtocolUtils.writePlayerKey(buf, item.getPlayerKey());
-              } else {
-                buf.writeBoolean(false);
-              }
+                if (item.getPlayerKey() != null) {
+                    buf.writeBoolean(true);
+                    ProtocolUtils.writePlayerKey(buf, item.getPlayerKey());
+                } else {
+                    buf.writeBoolean(false);
+                }
             }
-            break;
-          case UPDATE_GAMEMODE:
-            ProtocolUtils.writeVarInt(buf, item.getGameMode());
-            break;
-          case UPDATE_LATENCY:
-            ProtocolUtils.writeVarInt(buf, item.getLatency());
-            break;
-          case UPDATE_DISPLAY_NAME:
-            writeDisplayName(buf, item.getDisplayName(), version);
-            break;
-          case REMOVE_PLAYER:
+          }
+          case UPDATE_GAMEMODE -> ProtocolUtils.writeVarInt(buf, item.getGameMode());
+          case UPDATE_LATENCY -> ProtocolUtils.writeVarInt(buf, item.getLatency());
+          case UPDATE_DISPLAY_NAME -> writeDisplayName(buf, item.getDisplayName(), version);
+          case REMOVE_PLAYER -> {
             // Do nothing, all that is needed is the uuid
-            break;
-          default:
-            throw new UnsupportedOperationException("Unknown action " + action);
+          }
+          default -> throw new UnsupportedOperationException("Unknown action " + action);
         }
       }
     } else {
-      Item item = items.get(0);
+      Item item = items.getFirst();
       Component displayNameComponent = item.getDisplayName();
       if (displayNameComponent != null) {
         String displayName = LegacyComponentSerializer.legacySection()
@@ -269,7 +254,7 @@ public class LegacyPlayerListItemPacket implements MinecraftPacket {
       return this;
     }
 
-    public IdentifiedKey getPlayerKey() {
+    public @Nullable IdentifiedKey getPlayerKey() {
       return playerKey;
     }
   }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PingIdentifyPacket.java

@@ -42,6 +42,16 @@ public class PingIdentifyPacket implements MinecraftPacket {
     buf.writeInt(id);
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+    return Integer.BYTES;
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+    return Integer.BYTES;
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PluginMessagePacket.java

@@ -31,6 +31,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class PluginMessagePacket extends DeferredByteBufHolder implements MinecraftPacket {
 
+  private static final int MAX_PAYLOAD_SIZE_CLIENTBOUND = getPayloadLimit(Direction.CLIENTBOUND);
+  private static final int MAX_PAYLOAD_SIZE_SERVERBOUND = getPayloadLimit(Direction.SERVERBOUND);
+
   private @Nullable String channel;
 
   public PluginMessagePacket() {
@@ -50,6 +53,19 @@ public class PluginMessagePacket extends DeferredByteBufHolder implements Minecr
     return channel;
   }
 
+  private static int getPayloadLimit(Direction direction) {
+    if (System.getProperty("velocity.max-plugin-message-payload-size") != null) {
+      return Integer.getInteger("velocity.max-plugin-message-payload-size");
+    }
+    if (direction == Direction.SERVERBOUND) {
+      return Integer.getInteger("velocity.max-plugin-message-payload-size.serverbound", 32767);
+    } else {
+      // This is the vanilla expected limit, a payload this large feels like a nightmare given the trust
+      // we give to servers...
+      return Integer.getInteger("velocity.max-plugin-message-payload-size.clientbound", 1048576);
+    }
+  }
+
   public void setChannel(String channel) {
     this.channel = channel;
   }
@@ -100,6 +116,17 @@ public class PluginMessagePacket extends DeferredByteBufHolder implements Minecr
 
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return ProtocolUtils.DEFAULT_MAX_STRING_BYTES +
+        (direction == Direction.CLIENTBOUND ? MAX_PAYLOAD_SIZE_CLIENTBOUND : MAX_PAYLOAD_SIZE_SERVERBOUND);
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return 1 + 0 + 0;
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/RemovePlayerInfoPacket.java

@@ -17,7 +17,6 @@
 
 package com.velocitypowered.proxy.protocol.packet;
 
-import com.google.common.collect.Lists;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
@@ -51,7 +50,7 @@ public class RemovePlayerInfoPacket implements MinecraftPacket {
   public void decode(ByteBuf buf, ProtocolUtils.Direction direction,
       ProtocolVersion protocolVersion) {
     int length = ProtocolUtils.readVarInt(buf);
-    Collection<UUID> profilesToRemove = Lists.newArrayListWithCapacity(length);
+    Collection<UUID> profilesToRemove = ProtocolUtils.newList(length);
     for (int idx = 0; idx < length; idx++) {
       profilesToRemove.add(ProtocolUtils.readUuid(buf));
     }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ResourcePackResponsePacket.java

@@ -80,6 +80,26 @@ public class ResourcePackResponsePacket implements MinecraftPacket {
     ProtocolUtils.writeVarInt(buf, status.ordinal());
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20_3)) {
+      return Long.BYTES * 2 + 1;
+    } else if (version.noGreaterThan(ProtocolVersion.MINECRAFT_1_9_4)) {
+      return ProtocolUtils.DEFAULT_MAX_STRING_BYTES + 1;
+    }
+    return 1;
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20_3)) {
+      return Long.BYTES * 2 + 1;
+    } else if (version.noGreaterThan(ProtocolVersion.MINECRAFT_1_9_4)) {
+      return 1 + 0 + 1;
+    }
+    return 1;
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerboundCookieResponsePacket.java

@@ -65,6 +65,16 @@ public class ServerboundCookieResponsePacket implements MinecraftPacket {
     }
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return ProtocolUtils.DEFAULT_MAX_STRING_BYTES + 1 + 2 + 5120;
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return 1 + 0 + 0;
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/ServerboundCustomClickActionPacket.java

@@ -27,6 +27,8 @@ import io.netty.buffer.ByteBuf;
 
 public class ServerboundCustomClickActionPacket extends DeferredByteBufHolder implements MinecraftPacket {
 
+  private static final int MAX_TAG_SIZE = 65536;
+
   public ServerboundCustomClickActionPacket() {
     super(null);
   }
@@ -41,6 +43,16 @@ public class ServerboundCustomClickActionPacket extends DeferredByteBufHolder im
     buf.writeBytes(content());
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return ProtocolUtils.DEFAULT_MAX_STRING_BYTES + ProtocolUtils.varIntBytes(MAX_TAG_SIZE) + MAX_TAG_SIZE;
+  }
+
+  @Override
+  public int decodeExpectedMinLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return 1 + 0 + 1 + 0;
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/brigadier/StringArgumentPropertySerializer.java

@@ -37,32 +37,21 @@ class StringArgumentPropertySerializer implements ArgumentPropertySerializer<Str
   @Override
   public StringArgumentType deserialize(ByteBuf buf, ProtocolVersion protocolVersion) {
     int type = ProtocolUtils.readVarInt(buf);
-    switch (type) {
-      case 0:
-        return StringArgumentType.word();
-      case 1:
-        return StringArgumentType.string();
-      case 2:
-        return StringArgumentType.greedyString();
-      default:
-        throw new IllegalArgumentException("Invalid string argument type " + type);
-    }
+    return switch (type) {
+      case 0 -> StringArgumentType.word();
+      case 1 -> StringArgumentType.string();
+      case 2 -> StringArgumentType.greedyString();
+      default -> throw new IllegalArgumentException("Invalid string argument type " + type);
+    };
   }
 
   @Override
   public void serialize(StringArgumentType object, ByteBuf buf, ProtocolVersion protocolVersion) {
     switch (object.getType()) {
-      case SINGLE_WORD:
-        ProtocolUtils.writeVarInt(buf, 0);
-        break;
-      case QUOTABLE_PHRASE:
-        ProtocolUtils.writeVarInt(buf, 1);
-        break;
-      case GREEDY_PHRASE:
-        ProtocolUtils.writeVarInt(buf, 2);
-        break;
-      default:
-        throw new IllegalArgumentException("Invalid string argument type " + object.getType());
+      case SINGLE_WORD -> ProtocolUtils.writeVarInt(buf, 0);
+      case QUOTABLE_PHRASE -> ProtocolUtils.writeVarInt(buf, 1);
+      case GREEDY_PHRASE -> ProtocolUtils.writeVarInt(buf, 2);
+      default -> throw new IllegalArgumentException("Invalid string argument type " + object.getType());
     }
   }
 }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/ComponentHolder.java

@@ -113,23 +113,18 @@ public class ComponentHolder {
   public static BinaryTag serialize(JsonElement json) {
     if (json instanceof JsonPrimitive jsonPrimitive) {
       if (jsonPrimitive.isNumber()) {
-        Number number = json.getAsNumber();
+        final Number number = json.getAsNumber();
 
-        if (number instanceof Byte) {
-          return ByteBinaryTag.byteBinaryTag((Byte) number);
-        } else if (number instanceof Short) {
-          return ShortBinaryTag.shortBinaryTag((Short) number);
-        } else if (number instanceof Integer) {
-          return IntBinaryTag.intBinaryTag((Integer) number);
-        } else if (number instanceof Long) {
-          return LongBinaryTag.longBinaryTag((Long) number);
-        } else if (number instanceof Float) {
-          return FloatBinaryTag.floatBinaryTag((Float) number);
-        } else if (number instanceof Double) {
-          return DoubleBinaryTag.doubleBinaryTag((Double) number);
-        } else if (number instanceof LazilyParsedNumber) {
-          return IntBinaryTag.intBinaryTag(number.intValue());
-        }
+        return switch (number) {
+          case Byte b -> ByteBinaryTag.byteBinaryTag(b);
+          case Short s -> ShortBinaryTag.shortBinaryTag(s);
+          case Integer i -> IntBinaryTag.intBinaryTag(i);
+          case Long l -> LongBinaryTag.longBinaryTag(l);
+          case Float f -> FloatBinaryTag.floatBinaryTag(f);
+          case Double d -> DoubleBinaryTag.doubleBinaryTag(d);
+          case LazilyParsedNumber l -> IntBinaryTag.intBinaryTag(l.intValue());
+          default -> throw new IllegalArgumentException("Unknown number type: " + number);
+        };
       } else if (jsonPrimitive.isString()) {
         return StringBinaryTag.stringBinaryTag(jsonPrimitive.getAsString());
       } else if (jsonPrimitive.isBoolean()) {
@@ -137,16 +132,16 @@ public class ComponentHolder {
       } else {
         throw new IllegalArgumentException("Unknown JSON primitive: " + jsonPrimitive);
       }
-    } else if (json instanceof JsonObject) {
+    } else if (json instanceof JsonObject object) {
       CompoundBinaryTag.Builder compound = CompoundBinaryTag.builder();
 
-      for (Map.Entry<String, JsonElement> property : ((JsonObject) json).entrySet()) {
+      for (Map.Entry<String, JsonElement> property : object.entrySet()) {
         compound.put(property.getKey(), serialize(property.getValue()));
       }
 
       return compound.build();
-    } else if (json instanceof JsonArray) {
-      List<JsonElement> jsonArray = ((JsonArray) json).asList();
+    } else if (json instanceof JsonArray array) {
+      List<JsonElement> jsonArray = array.asList();
 
       if (jsonArray.isEmpty()) {
         return ListBinaryTag.empty();
@@ -206,20 +201,21 @@ public class ComponentHolder {
   }
 
   public static JsonElement deserialize(BinaryTag tag) {
-    switch (tag.type().id()) {
-      case 1://BinaryTagTypes.BYTE:
-        return new JsonPrimitive(((ByteBinaryTag) tag).value());
-      case 2://BinaryTagTypes.SHORT:
-        return new JsonPrimitive(((ShortBinaryTag) tag).value());
-      case 3://BinaryTagTypes.INT:
-        return new JsonPrimitive(((IntBinaryTag) tag).value());
-      case 4://BinaryTagTypes.LONG:
-        return new JsonPrimitive(((LongBinaryTag) tag).value());
-      case 5://BinaryTagTypes.FLOAT:
-        return new JsonPrimitive(((FloatBinaryTag) tag).value());
-      case 6://BinaryTagTypes.DOUBLE:
-        return new JsonPrimitive(((DoubleBinaryTag) tag).value());
-      case 7://BinaryTagTypes.BYTE_ARRAY:
+    return switch (tag.type().id()) {
+      //BinaryTagTypes.BYTE
+      case 1 -> new JsonPrimitive(((ByteBinaryTag) tag).value());
+      //BinaryTagTypes.SHORT
+      case 2 -> new JsonPrimitive(((ShortBinaryTag) tag).value());
+      //BinaryTagTypes.INT:
+      case 3 -> new JsonPrimitive(((IntBinaryTag) tag).value());
+      //BinaryTagTypes.LONG:
+      case 4 -> new JsonPrimitive(((LongBinaryTag) tag).value());
+      //BinaryTagTypes.FLOAT:
+      case 5 -> new JsonPrimitive(((FloatBinaryTag) tag).value());
+      //BinaryTagTypes.DOUBLE:
+      case 6 -> new JsonPrimitive(((DoubleBinaryTag) tag).value());
+      //BinaryTagTypes.BYTE_ARRAY:
+      case 7 -> {
         byte[] byteArray = ((ByteArrayBinaryTag) tag).value();
 
         JsonArray jsonByteArray = new JsonArray(byteArray.length);
@@ -227,10 +223,12 @@ public class ComponentHolder {
           jsonByteArray.add(new JsonPrimitive(b));
         }
 
-        return jsonByteArray;
-      case 8://BinaryTagTypes.STRING:
-        return new JsonPrimitive(((StringBinaryTag) tag).value());
-      case 9://BinaryTagTypes.LIST:
+        yield jsonByteArray;
+      }
+      //BinaryTagTypes.STRING:
+      case 8 -> new JsonPrimitive(((StringBinaryTag) tag).value());
+      //BinaryTagTypes.LIST:
+      case 9 -> {
         ListBinaryTag items = (ListBinaryTag) tag;
         JsonArray jsonList = new JsonArray(items.size());
 
@@ -238,8 +236,10 @@ public class ComponentHolder {
           jsonList.add(deserialize(subTag));
         }
 
-        return jsonList;
-      case 10://BinaryTagTypes.COMPOUND:
+        yield jsonList;
+      }
+      //BinaryTagTypes.COMPOUND:
+      case 10 -> {
         CompoundBinaryTag compound = (CompoundBinaryTag) tag;
         JsonObject jsonObject = new JsonObject();
 
@@ -252,8 +252,10 @@ public class ComponentHolder {
           jsonObject.add(key.isEmpty() ? "text" : key, deserialize(compound.get(key)));
         });
 
-        return jsonObject;
-      case 11://BinaryTagTypes.INT_ARRAY:
+        yield jsonObject;
+      }
+      //BinaryTagTypes.INT_ARRAY:
+      case 11 -> {
         int[] intArray = ((IntArrayBinaryTag) tag).value();
 
         JsonArray jsonIntArray = new JsonArray(intArray.length);
@@ -261,8 +263,10 @@ public class ComponentHolder {
           jsonIntArray.add(new JsonPrimitive(i));
         }
 
-        return jsonIntArray;
-      case 12://BinaryTagTypes.LONG_ARRAY:
+        yield jsonIntArray;
+      }
+      //BinaryTagTypes.LONG_ARRAY:
+      case 12 -> {
         long[] longArray = ((LongArrayBinaryTag) tag).value();
 
         JsonArray jsonLongArray = new JsonArray(longArray.length);
@@ -270,10 +274,10 @@ public class ComponentHolder {
           jsonLongArray.add(new JsonPrimitive(l));
         }
 
-        return jsonLongArray;
-      default:
-        throw new IllegalArgumentException("Unknown NBT tag: " + tag);
-    }
+        yield jsonLongArray;
+      }
+      default -> throw new IllegalArgumentException("Unknown NBT tag: " + tag);
+    };
   }
 
   public static ComponentHolder read(ByteBuf buf, ProtocolVersion version) {

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/SystemChatPacket.java

@@ -59,14 +59,9 @@ public class SystemChatPacket implements MinecraftPacket {
     component.write(buf);
     if (version.noLessThan(ProtocolVersion.MINECRAFT_1_19_1)) {
       switch (type) {
-        case SYSTEM:
-          buf.writeBoolean(false);
-          break;
-        case GAME_INFO:
-          buf.writeBoolean(true);
-          break;
-        default:
-          throw new IllegalArgumentException("Invalid chat type");
+        case SYSTEM -> buf.writeBoolean(false);
+        case GAME_INFO -> buf.writeBoolean(true);
+        default -> throw new IllegalArgumentException("Invalid chat type");
       }
     } else {
       ProtocolUtils.writeVarInt(buf, type.getId());

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/legacy/LegacyChatPacket.java

@@ -32,12 +32,24 @@ public class LegacyChatPacket implements MinecraftPacket {
   public static final byte GAME_INFO_TYPE = (byte) 2;
 
   public static final int MAX_SERVERBOUND_MESSAGE_LENGTH = 256;
+  private static final int MAX_SERVERBOUND_MESSAGE_LENGTH_LEGACY = getMaxServerboundMessageLength();
   public static final UUID EMPTY_SENDER = new UUID(0, 0);
 
   private @Nullable String message;
   private byte type;
   private @Nullable UUID sender;
 
+  private static int getMaxServerboundMessageLength() {
+    final String value = System.getProperty("velocity.legacyChatMaxServerboundLength");
+    if (value != null) {
+      try {
+        return Integer.parseInt(value.trim());
+      } catch (final NumberFormatException e) {
+      }
+    }
+    return 100;
+  }
+
   public LegacyChatPacket() {
   }
 
@@ -92,7 +104,10 @@ public class LegacyChatPacket implements MinecraftPacket {
   @Override
   public void decode(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     message = ProtocolUtils.readString(buf, direction == ProtocolUtils.Direction.CLIENTBOUND
-        ? 262144 : version.noLessThan(ProtocolVersion.MINECRAFT_1_11) ? 256 : 100);
+        ? 262144
+        : version.noLessThan(ProtocolVersion.MINECRAFT_1_11)
+          ? MAX_SERVERBOUND_MESSAGE_LENGTH
+          : MAX_SERVERBOUND_MESSAGE_LENGTH_LEGACY);
     if (direction == ProtocolUtils.Direction.CLIENTBOUND
         && version.noLessThan(ProtocolVersion.MINECRAFT_1_8)) {
       type = buf.readByte();

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/config/ClientboundCustomReportDetailsPacket.java

@@ -22,7 +22,6 @@ import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import io.netty.buffer.ByteBuf;
-import java.util.HashMap;
 import java.util.Map;
 
 public class ClientboundCustomReportDetailsPacket implements MinecraftPacket {
@@ -40,7 +39,7 @@ public class ClientboundCustomReportDetailsPacket implements MinecraftPacket {
     public void decode(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion protocolVersion) {
         int detailsCount = ProtocolUtils.readVarInt(buf);
 
-        this.details = new HashMap<>(detailsCount);
+        this.details = ProtocolUtils.newMap(detailsCount);
         for (int i = 0; i < detailsCount; i++) {
             details.put(ProtocolUtils.readString(buf), ProtocolUtils.readString(buf));
         }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/config/ClientboundServerLinksPacket.java

@@ -18,13 +18,11 @@
 package com.velocitypowered.proxy.protocol.packet.config;
 
 import com.velocitypowered.api.network.ProtocolVersion;
-import com.velocitypowered.api.util.ServerLink;
 import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
 import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
 import io.netty.buffer.ByteBuf;
-import java.util.ArrayList;
 import java.util.List;
 
 public class ClientboundServerLinksPacket implements MinecraftPacket {
@@ -42,7 +40,7 @@ public class ClientboundServerLinksPacket implements MinecraftPacket {
     public void decode(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
         int linksCount = ProtocolUtils.readVarInt(buf);
 
-        this.serverLinks = new ArrayList<>(linksCount);
+        this.serverLinks = ProtocolUtils.newList(linksCount);
         for (int i = 0; i < linksCount; i++) {
             serverLinks.add(ServerLink.read(buf, version));
         }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/config/CodeOfConductAcceptPacket.java

@@ -38,6 +38,11 @@ public class CodeOfConductAcceptPacket implements MinecraftPacket {
   public void encode(ByteBuf buf, Direction direction, ProtocolVersion protocolVersion) {
   }
 
+  @Override
+  public int decodeExpectedMaxLength(ByteBuf buf, Direction direction, ProtocolVersion version) {
+    return 0;
+  }
+
   @Override
   public boolean handle(MinecraftSessionHandler handler) {
     return handler.handle(this);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/config/KnownPacksPacket.java

@@ -23,6 +23,7 @@ import com.velocitypowered.proxy.protocol.MinecraftPacket;
 import com.velocitypowered.proxy.protocol.ProtocolUtils;
 import com.velocitypowered.proxy.util.except.QuietDecoderException;
 import io.netty.buffer.ByteBuf;
+import java.util.List;
 
 public class KnownPacksPacket implements MinecraftPacket {
 
@@ -30,7 +31,7 @@ public class KnownPacksPacket implements MinecraftPacket {
     private static final QuietDecoderException TOO_MANY_PACKS =
         new QuietDecoderException("too many known packs");
 
-    private KnownPack[] packs;
+    private List<KnownPack> packs;
 
     @Override
     public void decode(ByteBuf buf, ProtocolUtils.Direction direction,
@@ -40,10 +41,10 @@ public class KnownPacksPacket implements MinecraftPacket {
           throw TOO_MANY_PACKS;
         }
 
-        final KnownPack[] packs = new KnownPack[packCount];
+        final List<KnownPack> packs = ProtocolUtils.newList(packCount);
 
         for (int i = 0; i < packCount; i++) {
-            packs[i] = KnownPack.read(buf);
+            packs.add(KnownPack.read(buf));
         }
 
         this.packs = packs;
@@ -52,7 +53,7 @@ public class KnownPacksPacket implements MinecraftPacket {
     @Override
     public void encode(ByteBuf buf, ProtocolUtils.Direction direction,
                        ProtocolVersion protocolVersion) {
-        ProtocolUtils.writeVarInt(buf, packs.length);
+        ProtocolUtils.writeVarInt(buf, packs.size());
 
         for (KnownPack pack : packs) {
             pack.write(buf);

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/GenericTitlePacket.java

@@ -105,26 +105,14 @@ public abstract class GenericTitlePacket implements MinecraftPacket {
   public static GenericTitlePacket constructTitlePacket(ActionType type, ProtocolVersion version) {
     GenericTitlePacket packet = null;
     if (version.noLessThan(ProtocolVersion.MINECRAFT_1_17)) {
-      switch (type) {
-        case SET_ACTION_BAR:
-          packet = new TitleActionbarPacket();
-          break;
-        case SET_SUBTITLE:
-          packet = new TitleSubtitlePacket();
-          break;
-        case SET_TIMES:
-          packet = new TitleTimesPacket();
-          break;
-        case SET_TITLE:
-          packet = new TitleTextPacket();
-          break;
-        case HIDE:
-        case RESET:
-          packet = new TitleClearPacket();
-          break;
-        default:
-          throw new IllegalArgumentException("Invalid ActionType");
-      }
+      packet = switch (type) {
+        case SET_ACTION_BAR -> new TitleActionbarPacket();
+        case SET_SUBTITLE -> new TitleSubtitlePacket();
+        case SET_TIMES -> new TitleTimesPacket();
+        case SET_TITLE -> new TitleTextPacket();
+        case HIDE, RESET -> new TitleClearPacket();
+        default -> throw new IllegalArgumentException("Invalid ActionType");
+      };
     } else {
       packet = new LegacyTitlePacket();
     }

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/LegacyTitlePacket.java

@@ -40,24 +40,19 @@ public class LegacyTitlePacket extends GenericTitlePacket {
     ProtocolUtils.writeVarInt(buf, getAction().getAction(version));
 
     switch (getAction()) {
-      case SET_TITLE:
-      case SET_SUBTITLE:
-      case SET_ACTION_BAR:
+      case SET_TITLE, SET_SUBTITLE, SET_ACTION_BAR -> {
         if (component == null) {
           throw new IllegalStateException("No component found for " + getAction());
         }
         component.write(buf);
-        break;
-      case SET_TIMES:
+      }
+      case SET_TIMES -> {
         buf.writeInt(fadeIn);
         buf.writeInt(stay);
         buf.writeInt(fadeOut);
-        break;
-      case HIDE:
-      case RESET:
-        break;
-      default:
-        throw new UnsupportedOperationException("Unknown action " + getAction());
+      }
+      case HIDE, RESET -> {}
+      default -> throw new UnsupportedOperationException("Unknown action " + getAction());
     }
 
   }

proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java

@@ -230,23 +230,20 @@ public final class PluginMessageUtil {
     }
 
     // Before falling into the fallback, explicitly rewrite certain messages.
-    switch (name) {
-      case REGISTER_CHANNEL_LEGACY:
-        return REGISTER_CHANNEL;
-      case UNREGISTER_CHANNEL_LEGACY:
-        return UNREGISTER_CHANNEL;
-      case BRAND_CHANNEL_LEGACY:
-        return BRAND_CHANNEL;
-      case "BungeeCord":
-        // This is a special historical case we are compelled to support for the benefit of
-        // BungeeQuack.
-        return "bungeecord:main";
-      default:
+    return switch (name) {
+      case REGISTER_CHANNEL_LEGACY -> REGISTER_CHANNEL;
+      case UNREGISTER_CHANNEL_LEGACY -> UNREGISTER_CHANNEL;
+      case BRAND_CHANNEL_LEGACY -> BRAND_CHANNEL;
+      // This is a special historical case we are compelled to support for the benefit of
+      // BungeeQuack.
+      case "BungeeCord" -> "bungeecord:main";
+      default -> {
         // This is very likely a legacy name, so transform it. Velocity uses the same scheme as
         // BungeeCord does to transform channels, but also removes clearly invalid characters as
         // well.
-        String lower = name.toLowerCase(Locale.ROOT);
-        return "legacy:" + INVALID_IDENTIFIER_REGEX.matcher(lower).replaceAll("");
-    }
+        final String lower = name.toLowerCase(Locale.ROOT);
+        yield "legacy:" + INVALID_IDENTIFIER_REGEX.matcher(lower).replaceAll("");
+      }
+    };
   }
 }

proxy/src/main/java/com/velocitypowered/proxy/scheduler/ExecutorSchedulerBackend.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018-2026 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.velocitypowered.proxy.scheduler;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A {@link SchedulerBackend} backed by a real {@link ScheduledExecutorService}.
+ */
+public class ExecutorSchedulerBackend implements SchedulerBackend {
+
+  private final ScheduledExecutorService executor;
+
+  /**
+   * Creates a ExecutorSchedulerBackend with a default executor.
+   */
+  public ExecutorSchedulerBackend() {
+    this(Executors.newSingleThreadScheduledExecutor(
+        new ThreadFactoryBuilder()
+            .setDaemon(true)
+            .setNameFormat("Velocity Task Scheduler Timer")
+            .build()
+    ));
+  }
+
+  /**
+   * Creates a ExecutorSchedulerBackend with a given executor.
+   *
+   * @param executor The executor to use.
+   */
+  public ExecutorSchedulerBackend(ScheduledExecutorService executor) {
+    this.executor = checkNotNull(executor, "executor");
+  }
+
+  @Override
+  public ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit) {
+    return executor.schedule(task, delay, unit);
+  }
+
+  @Override
+  public ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit) {
+    return executor.scheduleAtFixedRate(task, initialDelay, period, unit);
+  }
+
+  @Override
+  public void shutdown() {
+    executor.shutdown();
+  }
+}

proxy/src/main/java/com/velocitypowered/proxy/scheduler/SchedulerBackend.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2018-2026 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.velocitypowered.proxy.scheduler;
+
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Backend interface used by {@link VelocityScheduler} to schedule timer callbacks.
+ *
+ * <p>This is an internal abstraction that allows tests to replace the real-time scheduler
+ * with a deterministic implementation.
+ */
+interface SchedulerBackend {
+
+  /**
+   * Schedules a task to run once after the given delay.
+   *
+   * @param task the task to run
+   * @param delay the delay
+   * @param unit the delay unit
+   * @return a future representing the scheduled task
+   */
+  ScheduledFuture<?> schedule(Runnable task, long delay, TimeUnit unit);
+
+  /**
+   * Schedules a task to run at a fixed rate.
+   *
+   * @param task the task to run
+   * @param initialDelay the initial delay
+   * @param period the period between runs
+   * @param unit the time unit
+   * @return a future representing the scheduled task
+   */
+  ScheduledFuture<?> scheduleAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit);
+
+  /**
+   * Shuts down the backend.
+   */
+  void shutdown();
+}

proxy/src/main/java/com/velocitypowered/proxy/scheduler/VelocityScheduler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Velocity Contributors
+ * Copyright (C) 2018-2026 Velocity Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.PluginManager;
 import com.velocitypowered.api.scheduler.ScheduledTask;
@@ -40,7 +39,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
@@ -60,20 +58,23 @@ import org.jetbrains.annotations.VisibleForTesting;
 public class VelocityScheduler implements Scheduler {
 
   private final PluginManager pluginManager;
-  private final ScheduledExecutorService timerExecutionService;
+  private final SchedulerBackend backend;
   private final Multimap<Object, ScheduledTask> tasksByPlugin = Multimaps.synchronizedMultimap(
       Multimaps.newSetMultimap(new IdentityHashMap<>(), HashSet::new));
 
   /**
-   * Initalizes the scheduler.
+   * Initializes the scheduler.
    *
    * @param pluginManager the Velocity plugin manager
    */
   public VelocityScheduler(PluginManager pluginManager) {
+    this(pluginManager, new ExecutorSchedulerBackend());
+  }
+
+  @VisibleForTesting
+  VelocityScheduler(PluginManager pluginManager, SchedulerBackend backend) {
     this.pluginManager = pluginManager;
-    this.timerExecutionService = Executors
-        .newSingleThreadScheduledExecutor(new ThreadFactoryBuilder().setDaemon(true)
-            .setNameFormat("Velocity Task Scheduler Timer").build());
+    this.backend = backend;
   }
 
   @Override
@@ -118,7 +119,7 @@ public class VelocityScheduler implements Scheduler {
     for (ScheduledTask task : terminating) {
       task.cancel();
     }
-    timerExecutionService.shutdown();
+    backend.shutdown();
     final List<PluginContainer> plugins = new ArrayList<>(this.pluginManager.getPlugins());
     final Iterator<PluginContainer> pluginIterator = plugins.iterator();
     while (pluginIterator.hasNext()) {
@@ -232,10 +233,9 @@ public class VelocityScheduler implements Scheduler {
 
     void schedule() {
       if (repeat == 0) {
-        this.future = timerExecutionService.schedule(this, delay, TimeUnit.MILLISECONDS);
+        this.future = backend.schedule(this, delay, TimeUnit.MILLISECONDS);
       } else {
-        this.future = timerExecutionService
-            .scheduleAtFixedRate(this, delay, repeat, TimeUnit.MILLISECONDS);
+        this.future = backend.scheduleAtFixedRate(this, delay, repeat, TimeUnit.MILLISECONDS);
       }
     }
 

proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListLegacy.java

@@ -85,7 +85,7 @@ public class VelocityTabListLegacy extends KeyedVelocityTabList {
 
   @Override
   public void processLegacy(LegacyPlayerListItemPacket packet) {
-    Item item = packet.getItems().get(0); // Only one item per packet in 1.7
+    Item item = packet.getItems().getFirst(); // Only one item per packet in 1.7
 
     switch (packet.getAction()) {
       case LegacyPlayerListItemPacket.ADD_PLAYER:

proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java

@@ -145,45 +145,44 @@ public enum InformationUtils {
    * @return {@link String} address with public parts redacted
    */
   public static String anonymizeInetAddress(InetAddress address) {
-    if (address instanceof Inet4Address) {
-      Inet4Address v4 = (Inet4Address) address;
-      if (v4.isAnyLocalAddress() || v4.isLoopbackAddress()
-          || v4.isLinkLocalAddress()
-          || v4.isSiteLocalAddress()) {
-        return address.getHostAddress();
-      } else {
-        byte[] addr = v4.getAddress();
-        return (addr[0] & 0xff) + "." + (addr[1] & 0xff) + ".XXX.XXX";
-      }
-    } else if (address instanceof Inet6Address) {
-      Inet6Address v6 = (Inet6Address) address;
-      if (v6.isAnyLocalAddress() || v6.isLoopbackAddress()
-          || v6.isSiteLocalAddress()
-          || v6.isSiteLocalAddress()) {
-        return address.getHostAddress();
-      } else {
-        String[] bits = v6.getHostAddress().split(":");
-        String ret = "";
-        boolean flag = false;
-        for (int iter = 0; iter < bits.length; iter++) {
-          if (flag) {
-            ret += ":X";
-            continue;
-          }
-          if (!bits[iter].equals("0")) {
-            if (iter == 0) {
-              ret = bits[iter];
-            } else {
-              ret = "::" + bits[iter];
-            }
-            flag = true;
-          }
+    return switch (address) {
+      case Inet4Address v4 -> {
+        if (v4.isAnyLocalAddress() || v4.isLoopbackAddress()
+                || v4.isLinkLocalAddress()
+                || v4.isSiteLocalAddress()) {
+          yield address.getHostAddress();
+        } else {
+          byte[] addr = v4.getAddress();
+          yield (addr[0] & 0xff) + "." + (addr[1] & 0xff) + ".XXX.XXX";
+        }
+      } case Inet6Address v6 -> {
+        if (v6.isAnyLocalAddress() || v6.isLoopbackAddress()
+                || v6.isSiteLocalAddress()
+                || v6.isSiteLocalAddress()) {
+          yield address.getHostAddress();
+        } else {
+          String[] bits = v6.getHostAddress().split(":");
+          String ret = "";
+          boolean flag = false;
+          for (int iter = 0; iter < bits.length; iter++) {
+            if (flag) {
+              ret += ":X";
+              continue;
+            }
+            if (!bits[iter].equals("0")) {
+              if (iter == 0) {
+                ret = bits[iter];
+              } else {
+                ret = "::" + bits[iter];
+              }
+              flag = true;
+            }
+          }
+          yield ret;
         }
-        return ret;
       }
-    } else {
-      return address.getHostAddress();
-    }
+      default -> address.getHostAddress();
+    };
   }
 
   /**

proxy/src/main/java/com/velocitypowered/proxy/util/IntervalledCounter.java

@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2025 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.velocitypowered.proxy.util;
+
+/**
+ * IntervalledCounter maintains a rolling sum of values associated with timestamps, keeping
+ * only those entries that fall within a fixed time interval from the most recent timestamp.
+ *
+ * <p>Time values must be provided in the same unit as {@link System#nanoTime()} (nanoseconds),
+ * and the configured interval is also expressed in nanoseconds. Callers are expected to
+ * periodically advance the counter to the current time using {@link #updateCurrentTime()} or
+ * {@link #updateCurrentTime(long)} to evict expired entries before adding new ones via
+ * {@link #addTime(long)} or {@link #addTime(long, long)}.</p>
+ *
+ * <p>This class is not thread-safe. If multiple threads access an instance concurrently,
+ * external synchronization is required.</p>
+ */
+@SuppressWarnings("checkstyle:WhitespaceAfter") // Not our class
+public final class IntervalledCounter {
+
+  private static final int INITIAL_SIZE = 8;
+
+  /**
+   * Ring buffer holding the timestamp (in nanoseconds) for each data point.
+   */
+  protected long[] times;
+  /**
+   * Ring buffer holding the count associated with each timestamp.
+   */
+  protected long[] counts;
+  /**
+   * The sliding window size in nanoseconds. Only entries with time >= (currentTime - interval)
+   * are considered part of the window.
+   */
+  protected final long interval;
+  /**
+   * Cached lower bound of the window (in nanoseconds) after the last update.
+   */
+  protected long minTime;
+  /**
+   * Running sum of all counts currently within the window.
+   */
+  protected long sum;
+  /**
+   * Head index (inclusive) of the ring buffer.
+   */
+  protected int head; // inclusive
+  /**
+   * Tail index (exclusive) of the ring buffer.
+   */
+  protected int tail; // exclusive
+
+  /**
+   * Creates a new counter with the specified interval.
+   *
+   * @param interval the window size in nanoseconds (compatible with {@link System#nanoTime()})
+   */
+  public IntervalledCounter(final long interval) {
+    this.times = new long[INITIAL_SIZE];
+    this.counts = new long[INITIAL_SIZE];
+    this.interval = interval;
+  }
+
+  /**
+   * Advances the window to the current time using {@link System#nanoTime()}, evicting any
+   * data points that have fallen outside of the interval and updating the running sum.
+   */
+  public void updateCurrentTime() {
+    this.updateCurrentTime(System.nanoTime());
+  }
+
+  /**
+   * Advances the window to the provided time, evicting any data points older than
+   * {@code currentTime - interval} and updating the running sum.
+   *
+   * @param currentTime the current time in nanoseconds (as from {@link System#nanoTime()})
+   */
+  public void updateCurrentTime(final long currentTime) {
+    long sum = this.sum;
+    int head = this.head;
+    final int tail = this.tail;
+    final long minTime = currentTime - this.interval;
+
+    final int arrayLen = this.times.length;
+
+    // guard against overflow by using subtraction
+    while (head != tail && this.times[head] - minTime < 0) {
+      sum -= this.counts[head];
+      // there are two ways we can do this:
+      // 1. free the count when adding
+      // 2. free it now
+      // option #2
+      this.counts[head] = 0;
+      if (++head >= arrayLen) {
+        head = 0;
+      }
+    }
+
+    this.sum = sum;
+    this.head = head;
+    this.minTime = minTime;
+  }
+
+  /**
+   * Adds a single unit at the specified timestamp, assuming the timestamp is within the current
+   * window. If the timestamp is older than the current window lower bound, the value is ignored.
+   * This method does not automatically advance the window; callers should invoke
+   * {@link #updateCurrentTime()} or {@link #updateCurrentTime(long)} beforehand.
+   *
+   * @param currTime the timestamp in nanoseconds
+   */
+  public void addTime(final long currTime) {
+    this.addTime(currTime, 1L);
+  }
+
+  /**
+   * Adds {@code count} units at the specified timestamp, assuming the timestamp is within the
+   * current window. If the timestamp is older than {@code minTime}, the value is ignored.
+   * This method does not automatically advance the window; callers should invoke
+   * {@link #updateCurrentTime()} or {@link #updateCurrentTime(long)} beforehand.
+   *
+   * @param currTime the timestamp in nanoseconds
+   * @param count the amount to add (non-negative)
+   */
+  public void addTime(final long currTime, final long count) {
+    // guard against overflow by using subtraction
+    if (currTime - this.minTime < 0) {
+      return;
+    }
+    int nextTail = (this.tail + 1) % this.times.length;
+    if (nextTail == this.head) {
+      this.resize();
+      nextTail = (this.tail + 1) % this.times.length;
+    }
+
+    this.times[this.tail] = currTime;
+    this.counts[this.tail] += count;
+    this.sum += count;
+    this.tail = nextTail;
+  }
+
+  /**
+   * Convenience method that advances the window to the current time and then adds {@code count}
+   * units at that time.
+   *
+   * @param count the amount to add (non-negative)
+   */
+  public void updateAndAdd(final long count) {
+    final long currTime = System.nanoTime();
+    this.updateCurrentTime(currTime);
+    this.addTime(currTime, count);
+  }
+
+  /**
+   * Convenience method that advances the window to {@code currTime} and then adds {@code count}
+   * units at that time.
+   *
+   * @param count the amount to add (non-negative)
+   * @param currTime the timestamp in nanoseconds
+   */
+  public void updateAndAdd(final long count, final long currTime) {
+    this.updateCurrentTime(currTime);
+    this.addTime(currTime, count);
+  }
+
+  /**
+   * Doubles the capacity of the internal ring buffers, preserving the order of existing data.
+   */
+  private void resize() {
+    final long[] oldElements = this.times;
+    final long[] oldCounts = this.counts;
+    final long[] newElements = new long[this.times.length * 2];
+    final long[] newCounts = new long[this.times.length * 2];
+    this.times = newElements;
+    this.counts = newCounts;
+
+    final int head = this.head;
+    final int tail = this.tail;
+    final int size = tail >= head ? (tail - head) : (tail + (oldElements.length - head));
+    this.head = 0;
+    this.tail = size;
+
+    if (tail >= head) {
+      // sequentially ordered from [head, tail)
+      System.arraycopy(oldElements, head, newElements, 0, size);
+      System.arraycopy(oldCounts, head, newCounts, 0, size);
+    } else {
+      // ordered from [head, length)
+      // then followed by [0, tail)
+
+      System.arraycopy(oldElements, head, newElements, 0, oldElements.length - head);
+      System.arraycopy(oldElements, 0, newElements, oldElements.length - head, tail);
+
+      System.arraycopy(oldCounts, head, newCounts, 0, oldCounts.length - head);
+      System.arraycopy(oldCounts, 0, newCounts, oldCounts.length - head, tail);
+    }
+  }
+
+  /**
+   * Returns the current rate in units per second based on the rolling sum and the configured
+   * interval. Specifically: {@code sum / (intervalSeconds)} where {@code intervalSeconds}
+   * equals {@code interval / 1e9}.
+   *
+   * @return the rate in units per second for the current window
+   */
+  public double getRate() {
+    return (double)this.sum / ((double)this.interval * 1.0E-9);
+  }
+
+  /**
+   * Returns the configured interval size in nanoseconds.
+   *
+   * @return the interval size in nanoseconds
+   */
+  public long getInterval() {
+    return this.interval;
+  }
+
+  /**
+   * Returns the rolling sum of all counts currently within the window.
+   *
+   * @return the rolling sum
+   */
+  public long getSum() {
+    return this.sum;
+  }
+
+  /**
+   * Returns the number of data points currently stored in the internal ring buffer. This may be
+   * less than or equal to the number of points added since older entries may have been evicted.
+   *
+   * @return the number of stored data points
+   */
+  public int totalDataPoints() {
+    return this.tail >= this.head ? (this.tail - this.head) : (this.tail + (this.counts.length - this.head));
+  }
+}

proxy/src/main/java/com/velocitypowered/proxy/util/TranslatableMapper.java

@@ -43,6 +43,12 @@ public enum TranslatableMapper implements BiConsumer<TranslatableComponent, Cons
     final Locale locale = ClosestLocaleMatcher.INSTANCE.lookupClosest(Locale.getDefault());
     if (GlobalTranslator.translator().canTranslate(translatableComponent.key(), locale)) {
       componentConsumer.accept(GlobalTranslator.render(translatableComponent, locale));
+    } else {
+      String fallback = translatableComponent.fallback();
+      if (fallback == null) {
+        fallback = translatableComponent.key();
+      }
+      componentConsumer.accept(Component.text(fallback));
     }
   }
 }

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=You are already connected to this server!
 velocity.error.already-connected-proxy=You are already connected to this proxy!
 velocity.error.already-connecting=You are already trying to connect to a server!
-velocity.error.cant-connect=Unable to connect to {0}: {1}
-velocity.error.connecting-server-error=Unable to connect you to {0}. Please try again later.
-velocity.error.connected-server-error=Your connection to {0} encountered a problem.
+velocity.error.cant-connect=Unable to connect to <arg:0>: <arg:1>
+velocity.error.connecting-server-error=Unable to connect you to <arg:0>. Please try again later.
+velocity.error.connected-server-error=Your connection to <arg:0> encountered a problem.
 velocity.error.internal-server-connection-error=An internal server connection error occurred.
 velocity.error.logging-in-too-fast=You are logging in too fast, try again later.
 velocity.error.online-mode-only=You are not logged into your Minecraft account. If you are logged into your Minecraft account, try restarting your Minecraft client.
 velocity.error.player-connection-error=An internal error occurred in your connection.
 velocity.error.modern-forwarding-needs-new-client=This server is only compatible with Minecraft 1.13 and above.
 velocity.error.modern-forwarding-failed=Your server did not send a forwarding request to the proxy. Make sure the server is configured for Velocity forwarding.
-velocity.error.moved-to-new-server=You were kicked from {0}: {1}
+velocity.error.moved-to-new-server=You were kicked from <arg:0>: <arg:1>
 velocity.error.no-available-servers=There are no available servers to connect you to. Try again later or contact an admin.
 velocity.error.illegal-chat-characters=Illegal characters in chat
 # Commands
 velocity.command.generic-error=An error occurred while running this command.
 velocity.command.command-does-not-exist=This command does not exist.
 velocity.command.players-only=Only players can run this command.
-velocity.command.server-does-not-exist=The specified server {0} does not exist.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=You are currently connected to {0}.
+velocity.command.server-does-not-exist=The specified server <arg:0> does not exist.
+velocity.command.player-not-found=The specified player <arg:0> does not exist.
+velocity.command.server-current-server=You are currently connected to <arg:0>.
 velocity.command.server-too-many=There are too many servers set up. Use tab completion to view all servers available.
 velocity.command.server-available=Available servers:
-velocity.command.server-tooltip-player-online={0} player online
-velocity.command.server-tooltip-players-online={0} players online
+velocity.command.server-tooltip-player-online=<arg:0> player online
+velocity.command.server-tooltip-players-online=<arg:0> players online
 velocity.command.server-tooltip-current-server=Currently connected to this server
 velocity.command.server-tooltip-offer-connect-server=Click to connect to this server
-velocity.command.glist-player-singular={0} player is currently connected to the proxy.
-velocity.command.glist-player-plural={0} players are currently connected to the proxy.
+velocity.command.glist-player-singular=<arg:0> player is currently connected to the proxy.
+velocity.command.glist-player-plural=<arg:0> players are currently connected to the proxy.
 velocity.command.glist-view-all=To view all players on servers, use /glist all.
 velocity.command.reload-success=Velocity configuration successfully reloaded.
 velocity.command.reload-failure=Unable to reload your Velocity configuration. Check the console for more details.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} is licensed under the terms of the GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018-<arg:2> <arg:0>. <arg:1> is licensed under the terms of the GNU General Public License v3.
 velocity.command.no-plugins=There are no plugins currently installed.
-velocity.command.plugins-list=Plugins: {0}
-velocity.command.plugin-tooltip-website=Website: {0}
-velocity.command.plugin-tooltip-author=Author: {0}
-velocity.command.plugin-tooltip-authors=Authors: {0}
+velocity.command.plugins-list=Plugins: <arg:0>
+velocity.command.plugin-tooltip-website=Website: <arg:0>
+velocity.command.plugin-tooltip-author=Author: <arg:0>
+velocity.command.plugin-tooltip-authors=Authors: <arg:0>
 velocity.command.dump-uploading=Uploading gathered information...
 velocity.command.dump-send-error=An error occurred while communicating with the Velocity servers. The servers may be temporarily unavailable or there is an issue with your network settings. You can find more information in the log or console of your Velocity server.
 velocity.command.dump-success=Created an anonymised report containing useful information about this proxy. If a developer requested it, you may share the following link with them:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_ar_SA.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=أنت بالفعل متصل بهذا السيرفر\!
 velocity.error.already-connected-proxy=أنت بالفعل متصل بهذا الوكيل\!
 velocity.error.already-connecting=أنت بالفعل تحاول الاتصال بأحد السيرفرات\!
-velocity.error.cant-connect=فشل الاتصال بـ{0}\: {1}
-velocity.error.connecting-server-error=فشل الاتصال بـ{0}، حاول في وقتٍ لاحق.
-velocity.error.connected-server-error=واجه اتصالك بـ{0} مشكلة.
+velocity.error.cant-connect=فشل الاتصال بـ<arg:0>\: <arg:1>
+velocity.error.connecting-server-error=فشل الاتصال بـ<arg:0>، حاول في وقتٍ لاحق.
+velocity.error.connected-server-error=واجه اتصالك بـ<arg:0> مشكلة.
 velocity.error.internal-server-connection-error=حدث خطأ في الاتصال بالسيرفر الداخلي.
 velocity.error.logging-in-too-fast=لقد حاولت تسجيل الدخول كثيرًا مؤخرًا، حاول في وقتٍ لاحق.
 velocity.error.online-mode-only=لم تقم بتسجيل الدخول بحساب ماينكرافت. إذا كنت مسجل بالفعل جرب إعادة تشغيل اللعبة.
 velocity.error.player-connection-error=حدث خطأ داخلي في الاتصال الخاص بك.
 velocity.error.modern-forwarding-needs-new-client=هذا السيرفر متوافق فقط مع ماينكرافت 1.13 و ما فوق.
 velocity.error.modern-forwarding-failed=السيرفر الخاص بك لم يرسل طلب إعادة توجيه إلى الوكيل. تأكد من إعداد الخادم لإعادة التوجيه بـVelocity.
-velocity.error.moved-to-new-server=لقد تم طردك من {0}\: {1}
+velocity.error.moved-to-new-server=لقد تم طردك من <arg:0>\: <arg:1>
 velocity.error.no-available-servers=لا توجد سيرفرات متاحة للاتصال. حاول مرة أخرى أو اتصل بالأدمِن.
 velocity.error.illegal-chat-characters=Illegal characters in chat
 # Commands
 velocity.command.generic-error=حدث خطأ أثناء تنفيذ هذا الأمر.
 velocity.command.command-does-not-exist=هذا الأمر غير موجود.
 velocity.command.players-only=يمكن للاعبين فقط تشغيل هذا الأمر.
-velocity.command.server-does-not-exist=السيرفر المطلوب {0} غير موجود.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=أنت الآن متصل بـ{0}
+velocity.command.server-does-not-exist=السيرفر المطلوب <arg:0> غير موجود.
+velocity.command.player-not-found=The specified player <arg:0> does not exist.
+velocity.command.server-current-server=أنت الآن متصل بـ<arg:0>
 velocity.command.server-too-many=هناك العديد من السيرفرات المتاحة، استخدم البحث بزر tab لتصفح قائمة السيرفرات.
 velocity.command.server-available=السيرفرات المتاحة\:
 velocity.command.server-tooltip-player-online=لاعب واحد متصل
-velocity.command.server-tooltip-players-online={0} لاعبين متصلون
+velocity.command.server-tooltip-players-online=<arg:0> لاعبين متصلون
 velocity.command.server-tooltip-current-server=انت متصل حاليًا بهذا السيرفر
 velocity.command.server-tooltip-offer-connect-server=انقر للاتصال بهذا السيرفر
 velocity.command.glist-player-singular=هناك لاعب واحد متصل بالوكيل.
-velocity.command.glist-player-plural=هناك {0} لاعبين متصلون بالوكيل.
+velocity.command.glist-player-plural=هناك <arg:0> لاعبين متصلون بالوكيل.
 velocity.command.glist-view-all=لعرض اللاعبين على جميع السيرفرات استخدم /glist all
 velocity.command.reload-success=تم إعادة تحميل إعدادات Velocity بنجاح.
 velocity.command.reload-failure=فشلت إعادة تحميل إعدادات Velocity. تفقد الـconsole للمزيد من التفاصيل.
-velocity.command.version-copyright=حقوق الطبع والنشر 2018-{2} {0}. {1} مرخصة بموجب شروط الإصدار الثالث لرخصة GNU العامة (GPLv3).
+velocity.command.version-copyright=حقوق الطبع والنشر 2018-<arg:2> <arg:0>. <arg:1> مرخصة بموجب شروط الإصدار الثالث لرخصة GNU العامة (GPLv3).
 velocity.command.no-plugins=لا توجد إضافات مثبتة على Velocity.
-velocity.command.plugins-list=الإضافات\: {0}
-velocity.command.plugin-tooltip-website=موقعها\: {0}
-velocity.command.plugin-tooltip-author=تصميم\: {0}
-velocity.command.plugin-tooltip-authors=تصميم\: {0}
+velocity.command.plugins-list=الإضافات\: <arg:0>
+velocity.command.plugin-tooltip-website=موقعها\: <arg:0>
+velocity.command.plugin-tooltip-author=تصميم\: <arg:0>
+velocity.command.plugin-tooltip-authors=تصميم\: <arg:0>
 velocity.command.dump-uploading=جاري تجميع و رفع معلومات نظامك...
 velocity.command.dump-send-error=حدث خطأ أثناء الاتصال بسيرفر Velocity. قد يكون السيرفر غير متاح مؤقتاً أو هناك مشكلة في إعدادات الشبكة الخاصة بك. يمكنك العثور على مزيد من المعلومات في log أو console وكيل Velocity الخاص بك.
 velocity.command.dump-success=تم إنشاء تقرير مفصل يحتوي على معلومات مفيدة عن الوكيل الخاص بك. إذا طلبه المطور، يمكنك مشاركة الرابط التالي معه\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_bg_BG.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=Вече сте свързани към този сървър\!
 velocity.error.already-connected-proxy=Вече сте свързани към това прокси\!
 velocity.error.already-connecting=Вече се опитвате да се свържете към сървър\!
-velocity.error.cant-connect=Не успяхме да Ви свържем към {0}\: {1}
-velocity.error.connecting-server-error=Не успяхме да Ви свържем към {0}. Моля, опитайте по-късно.
-velocity.error.connected-server-error=Възникна грешка, докато бяхте свързан към {0}.
+velocity.error.cant-connect=Не успяхме да Ви свържем към <arg:0>\: <arg:1>
+velocity.error.connecting-server-error=Не успяхме да Ви свържем към <arg:0>. Моля, опитайте по-късно.
+velocity.error.connected-server-error=Възникна грешка, докато бяхте свързан към <arg:0>.
 velocity.error.internal-server-connection-error=Възникна вътрешна грешка със сървърната връзка.
 velocity.error.logging-in-too-fast=Опитвате се да влизате твърде бързо - моля, опитайте по-късно.
 velocity.error.online-mode-only=Не сте влезли в своя Minecraft акаунт. Ако вече сте го направили, опитайте да рестартирате играта и лаунчера и опитайте отново.
 velocity.error.player-connection-error=Възникна грешка с вашата връзка.
 velocity.error.modern-forwarding-needs-new-client=Този сървър е съвместим само с Minecraft 1.13 или по-нова версия.
 velocity.error.modern-forwarding-failed=Сървъра Ви не изпрати заявка за препращане на информация към проксито. Моля, убедете се, че сървъра Ви е настроен за работа с Velocity.
-velocity.error.moved-to-new-server=Ти беше изхвърлен от {0}\: {1}
+velocity.error.moved-to-new-server=Ти беше изхвърлен от <arg:0>\: <arg:1>
 velocity.error.no-available-servers=Няма налични сървъри, км които да Ви свържем. Моля, опитайте по-късно, или се свържете с администратор.
 velocity.error.illegal-chat-characters=Неодобрени символи в чата
 # Commands
 velocity.command.generic-error=Възникна грешка при изпълняването на командата.
 velocity.command.command-does-not-exist=Тази команда не съществува.
 velocity.command.players-only=Само играчи могат да изпълняват тази команда.
-velocity.command.server-does-not-exist=Сървър с името {0} не съществува.
-velocity.command.player-not-found=Играч с името {0} не съществува.
-velocity.command.server-current-server=В момента сте свързан към {0}.
+velocity.command.server-does-not-exist=Сървър с името <arg:0> не съществува.
+velocity.command.player-not-found=Играч с името <arg:0> не съществува.
+velocity.command.server-current-server=В момента сте свързан към <arg:0>.
 velocity.command.server-too-many=Има прекалено много регистрирани сървъри. Използвайте TAB, за да видите всички налични сървъри.
 velocity.command.server-available=Налични сървъри\:
-velocity.command.server-tooltip-player-online={0} играч на линия
-velocity.command.server-tooltip-players-online={0} играчи на линия
+velocity.command.server-tooltip-player-online=<arg:0> играч на линия
+velocity.command.server-tooltip-players-online=<arg:0> играчи на линия
 velocity.command.server-tooltip-current-server=В момента сте свързани към този сървър
 velocity.command.server-tooltip-offer-connect-server=Натиснете тук, за да Ви свържем към този сървър
-velocity.command.glist-player-singular={0} играч е свързан към проксито.
-velocity.command.glist-player-plural={0} играчи са свързани към проксито.
+velocity.command.glist-player-singular=<arg:0> играч е свързан към проксито.
+velocity.command.glist-player-plural=<arg:0> играчи са свързани към проксито.
 velocity.command.glist-view-all=За да видите всички играчи, разпределени по сървъри, използвайте /glist all.
 velocity.command.reload-success=Настройките на Velocity бяха презаредени успешно.
 velocity.command.reload-failure=Не успяхме да презаредим настройките на Velocity. Моля, проверете конзолата за повече информация.
-velocity.command.version-copyright=Авторско право 2018-{2} {0}. {1} е лицензиран под условията на GNU General Public License v3.
+velocity.command.version-copyright=Авторско право 2018-<arg:2> <arg:0>. <arg:1> е лицензиран под условията на GNU General Public License v3.
 velocity.command.no-plugins=За момента няма инсталирани добавки.
-velocity.command.plugins-list=Добавки\: {0}
-velocity.command.plugin-tooltip-website=Уебсайт\: {0}
-velocity.command.plugin-tooltip-author=Автор\: {0}
-velocity.command.plugin-tooltip-authors=Автори\: {0}
+velocity.command.plugins-list=Добавки\: <arg:0>
+velocity.command.plugin-tooltip-website=Уебсайт\: <arg:0>
+velocity.command.plugin-tooltip-author=Автор\: <arg:0>
+velocity.command.plugin-tooltip-authors=Автори\: <arg:0>
 velocity.command.dump-uploading=Качваме събраната информация...
 velocity.command.dump-send-error=Възникна грешка при комуникацията със сървърите на Velocity. Сървърите може временно да не са налични, или да имате проблем с мрежовите настройки. Ще откриете повече информация в логовете или конзолата на Вашето Velocity прокси.
 velocity.command.dump-success=Създадохме анонимен доклад, съдържащ полезна информация относно това прокси. Ако разработчик Ви го е поискал, може да споделите този линк с тях\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_cs_CZ.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=K tomuto serveru jsi již připojen\!
 velocity.error.already-connected-proxy=K tomuto proxy serveru jsi již připojen\!
 velocity.error.already-connecting=Již se pokoušíš o připojení k serveru\!
-velocity.error.cant-connect=Nepodařilo se připojit k serveru {0}\: {1}
-velocity.error.connecting-server-error=Nepodařilo se tě připojit k serveru {0}. Zkus to prosím později.
-velocity.error.connected-server-error=Nastala chyba ve tvém připojení k serveru {0}.
+velocity.error.cant-connect=Nepodařilo se připojit k serveru <arg:0>\: <arg:1>
+velocity.error.connecting-server-error=Nepodařilo se tě připojit k serveru <arg:0>. Zkus to prosím později.
+velocity.error.connected-server-error=Nastala chyba ve tvém připojení k serveru <arg:0>.
 velocity.error.internal-server-connection-error=V připojení k serveru se vyskytla interní chyba.
 velocity.error.logging-in-too-fast=Přihlašuješ se příliš rychle, počkej chvíli.
 velocity.error.online-mode-only=Nejsi připojen ke svému Minecraft účtu. Pokud ano, nastala chyba. Zkus restartovat hru.
 velocity.error.player-connection-error=Ve tvém připojení nastala chyba.
 velocity.error.modern-forwarding-needs-new-client=Tento server je kompatibilní pouze s verzí Minecraftu 1.13 a vyšší.
 velocity.error.modern-forwarding-failed=Tvůj server neodeslal přesměrovávací požadavek na proxy server. Ujisti se, že je server nastaven na Velocity přesměrování.
-velocity.error.moved-to-new-server=Byl jsi vyhozen ze serveru {0}\: {1}
+velocity.error.moved-to-new-server=Byl jsi vyhozen ze serveru <arg:0>\: <arg:1>
 velocity.error.no-available-servers=Nejsou k dispozici žádné servery, ke kterým by ses mohl připojit. Zkus to později nebo kontaktuj správce.
 velocity.error.illegal-chat-characters=Nepovolené znaky v chatu
 # Commands
 velocity.command.generic-error=Při vykonávání tohoto příkazu nastala chyba.
 velocity.command.command-does-not-exist=Tento příkaz neexistuje.
 velocity.command.players-only=Tento příkaz mohou vykonávat pouze hráči.
-velocity.command.server-does-not-exist=Zadaný server {0} neexistuje.
-velocity.command.player-not-found=Zadaný hráč {0} neexistuje.
-velocity.command.server-current-server=Právě jsi připojen k serveru {0}.
+velocity.command.server-does-not-exist=Zadaný server <arg:0> neexistuje.
+velocity.command.player-not-found=Zadaný hráč <arg:0> neexistuje.
+velocity.command.server-current-server=Právě jsi připojen k serveru <arg:0>.
 velocity.command.server-too-many=Je nastaveno příliš mnoho serverů. Klávesa tab ukáže všechny dostupné servery.
 velocity.command.server-available=Dostupné servery\:
-velocity.command.server-tooltip-player-online={0} hráč online
-velocity.command.server-tooltip-players-online=Počet hráčů online\: {0}
+velocity.command.server-tooltip-player-online=<arg:0> hráč online
+velocity.command.server-tooltip-players-online=Počet hráčů online\: <arg:0>
 velocity.command.server-tooltip-current-server=Právě jsi připojen k tomuto serveru
 velocity.command.server-tooltip-offer-connect-server=Kliknutím se připojíš k tomuto serveru
-velocity.command.glist-player-singular=K tomuto proxy serveru je připojen {0} hráč.
-velocity.command.glist-player-plural=Počet hráčů připojených k tomuto proxy serveru\: {0}
+velocity.command.glist-player-singular=K tomuto proxy serveru je připojen <arg:0> hráč.
+velocity.command.glist-player-plural=Počet hráčů připojených k tomuto proxy serveru\: <arg:0>
 velocity.command.glist-view-all=Ke zobrazení všech hráčů na všech serverech použij /glist all.
 velocity.command.reload-success=Konfigurace Velocity úspěšně načtena.
 velocity.command.reload-failure=Nebylo možné načíst konfiguraci Velocity. Podrobnosti jsou na konzoli.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} je licencovaný pod podmínkami GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018-<arg:2> <arg:0>. <arg:1> je licencovaný pod podmínkami GNU General Public License v3.
 velocity.command.no-plugins=V tuto chvíli nejsou nainstalovány žádné zásuvné moduly.
-velocity.command.plugins-list=Zásuvné moduly\: {0}
-velocity.command.plugin-tooltip-website=Webová stránka\: {0}
-velocity.command.plugin-tooltip-author=Autor\: {0}
-velocity.command.plugin-tooltip-authors=Autoři\: {0}
+velocity.command.plugins-list=Zásuvné moduly\: <arg:0>
+velocity.command.plugin-tooltip-website=Webová stránka\: <arg:0>
+velocity.command.plugin-tooltip-author=Autor\: <arg:0>
+velocity.command.plugin-tooltip-authors=Autoři\: <arg:0>
 velocity.command.dump-uploading=Nahrávání získaných informací...
 velocity.command.dump-send-error=Nastala chyba při komunikaci s Velocity servery. Servery mohou být dočasně nedostupné nebo je chyba v přístupu na internet. Podrobnosti jsou v logu a na konzoli Velocity serveru.
 velocity.command.dump-success=Byla vytvořena anonymizovaná zpráva obsahující užitečné informace o tomto serveru. Vyžádal-li si je vývojář, můžeš mu poslat nasledující odkaz\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_da_DK.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=Du er allerede tilsluttet til den server\!
 velocity.error.already-connected-proxy=Du er allerede tilsluttet til proxyen\!
 velocity.error.already-connecting=Du forsøger allerede at oprette forbindelse til en server\!
-velocity.error.cant-connect=Kan ikke forbinde til {0}\: {1}
-velocity.error.connecting-server-error=Kan ikke forbinde dig til {0}. Prøv igen senere.
-velocity.error.connected-server-error=Din forbindelse til {0} stødte på et problem.
+velocity.error.cant-connect=Kan ikke forbinde til <arg:0>\: <arg:1>
+velocity.error.connecting-server-error=Kan ikke forbinde dig til <arg:0>. Prøv igen senere.
+velocity.error.connected-server-error=Din forbindelse til <arg:0> stødte på et problem.
 velocity.error.internal-server-connection-error=Der opstod en intern server forbindelsesfejl.
 velocity.error.logging-in-too-fast=Du logger ind for hurtigt, prøv igen senere.
 velocity.error.online-mode-only=Du er ikke logget ind på din Minecraft-konto. Hvis du er logget ind på din Minecraft-konto, så prøv at genstarte din Minecraft-klient.
 velocity.error.player-connection-error=Der opstod en intern fejl i din forbindelse.
 velocity.error.modern-forwarding-needs-new-client=Denne server er kun kompatibel med Minecraft 1.13 og derover.
 velocity.error.modern-forwarding-failed=Din server sendte ikke en viderestillingsanmodning til proxyen. Sørg for, at serveren er konfigureret til Velocity forwarding.
-velocity.error.moved-to-new-server=Du blev smidt ud fra {0}\: {1}
+velocity.error.moved-to-new-server=Du blev smidt ud fra <arg:0>\: <arg:1>
 velocity.error.no-available-servers=Der er ingen tilgængelige servere at forbinde dig til. Prøv igen senere eller kontakt en administrator.
 velocity.error.illegal-chat-characters=Illegal characters in chat
 # Commands
 velocity.command.generic-error=Der opstod en fejl da du kørte kommandoen.
 velocity.command.command-does-not-exist=Denne kommando eksisterer ikke.
 velocity.command.players-only=Kun spillere kan køre denne kommando.
-velocity.command.server-does-not-exist=Den angivne server {0} findes ikke.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=Du er i øjeblikket forbundet til {0}.
+velocity.command.server-does-not-exist=Den angivne server <arg:0> findes ikke.
+velocity.command.player-not-found=The specified player <arg:0> does not exist.
+velocity.command.server-current-server=Du er i øjeblikket forbundet til <arg:0>.
 velocity.command.server-too-many=Der er sat for mange servere op. Brug tab færdiggørelse til at se alle tilgængelige servere.
 velocity.command.server-available=Tilgængelige servere\:
-velocity.command.server-tooltip-player-online={0} spiller online
-velocity.command.server-tooltip-players-online={0} spillere online
+velocity.command.server-tooltip-player-online=<arg:0> spiller online
+velocity.command.server-tooltip-players-online=<arg:0> spillere online
 velocity.command.server-tooltip-current-server=I øjeblikket forbundet til serveren
 velocity.command.server-tooltip-offer-connect-server=Klik for at forbinde til denne server
-velocity.command.glist-player-singular={0} spiller er i øjeblikket forbundet til proxyen.
-velocity.command.glist-player-plural={0} spillere er i øjeblikket forbundet til proxyen.
+velocity.command.glist-player-singular=<arg:0> spiller er i øjeblikket forbundet til proxyen.
+velocity.command.glist-player-plural=<arg:0> spillere er i øjeblikket forbundet til proxyen.
 velocity.command.glist-view-all=For at se alle spillere på servere, brug /glist all.
 velocity.command.reload-success=Velocity konfiguration blev genindlæst.
 velocity.command.reload-failure=Kan ikke genindlæse din Velocity konfiguration. Tjek konsollen for flere detaljer.
-velocity.command.version-copyright=Ophavsret 2018-{2} {0}. {1} er licenseret under betingelserne i GNU General Public License v3.
+velocity.command.version-copyright=Ophavsret 2018-<arg:2> <arg:0>. <arg:1> er licenseret under betingelserne i GNU General Public License v3.
 velocity.command.no-plugins=Der er ingen plugins installeret i øjeblikket.
-velocity.command.plugins-list=Plugins\: {0}
-velocity.command.plugin-tooltip-website=Hjemmeside\: {0}
-velocity.command.plugin-tooltip-author=Forfatter\: {0}
-velocity.command.plugin-tooltip-authors=Skabere\: {0}
+velocity.command.plugins-list=Plugins\: <arg:0>
+velocity.command.plugin-tooltip-website=Hjemmeside\: <arg:0>
+velocity.command.plugin-tooltip-author=Forfatter\: <arg:0>
+velocity.command.plugin-tooltip-authors=Skabere\: <arg:0>
 velocity.command.dump-uploading=Uploader indsamlet information...
 velocity.command.dump-send-error=Der opstod en fejl under kommunikation med Velocity serverne. Serverne kan være midlertidigt utilgængelige, eller der er et problem med dine netværksindstillinger. Du kan finde mere information i loggen eller konsollen på din Velocity server.
 velocity.command.dump-success=Oprettet en anonymiseret rapport med nyttige oplysninger om denne proxy. Hvis en udvikler anmodede om det, kan du dele følgende link med dem\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_de_DE.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=Du bist bereits mit diesem Server verbunden\!
 velocity.error.already-connected-proxy=Du bist bereits mit diesem Proxy verbunden\!
 velocity.error.already-connecting=Du versuchst dich bereits mit einem Server zu verbinden\!
-velocity.error.cant-connect=Kein Verbindungsaufbau zu {0} möglich\: {1}
-velocity.error.connecting-server-error=Kein Verbindungsaufbau zu {0} möglich. Bitte versuche es später erneut.
-velocity.error.connected-server-error=Bei der Verbindung zu {0} ist ein Problem aufgetreten.
+velocity.error.cant-connect=Kein Verbindungsaufbau zu <arg:0> möglich\: <arg:1>
+velocity.error.connecting-server-error=Kein Verbindungsaufbau zu <arg:0> möglich. Bitte versuche es später erneut.
+velocity.error.connected-server-error=Bei der Verbindung zu <arg:0> ist ein Problem aufgetreten.
 velocity.error.internal-server-connection-error=Bei der Verbindung mit dem Server ist ein interner Fehler aufgetreten.
 velocity.error.logging-in-too-fast=Du meldest dich zu schnell an, versuche es später noch einmal.
 velocity.error.online-mode-only=Du bist nicht in deinem Minecraft Konto eingeloggt. Wenn du in deinem Minecraft Konto eingeloggt bist, versuche deinen Minecraft Client neu zu starten.
 velocity.error.player-connection-error=Bei deiner Verbindung ist ein interner Fehler aufgetreten.
 velocity.error.modern-forwarding-needs-new-client=Dieser Server ist nur mit der Minecraft Version 1.13 und höher kompatibel.
 velocity.error.modern-forwarding-failed=Dein Server hat keine Weiterleitungsanforderung an den Proxy gesendet. Stelle sicher, dass der Server für die Velocity Weiterleitung konfiguriert ist.
-velocity.error.moved-to-new-server=Du wurdest von {0} vom Server geworfen\: {1}
+velocity.error.moved-to-new-server=Du wurdest von <arg:0> vom Server geworfen\: <arg:1>
 velocity.error.no-available-servers=Es gibt keine verfügbaren Server mit denen du dich verbinden kannst. Versuche es später erneut oder kontaktiere einen Admin.
 velocity.error.illegal-chat-characters=Ungültige Zeichen im Chat
 # Commands
 velocity.command.generic-error=Beim Ausführen des Befehls ist ein Fehler aufgetreten.
 velocity.command.command-does-not-exist=Dieser Befehl existiert nicht.
 velocity.command.players-only=Nur Spieler können diesen Befehl ausführen.
-velocity.command.server-does-not-exist=Der angegebene Server {0} existiert nicht.
-velocity.command.player-not-found=Der angegebene Spieler {0} existiert nicht.
-velocity.command.server-current-server=Du bist derzeit mit {0} verbunden.
+velocity.command.server-does-not-exist=Der angegebene Server <arg:0> existiert nicht.
+velocity.command.player-not-found=Der angegebene Spieler <arg:0> existiert nicht.
+velocity.command.server-current-server=Du bist derzeit mit <arg:0> verbunden.
 velocity.command.server-too-many=Es sind zu viele Server eingerichtet. Verwende die Tabvervollständigung, um alle verfügbaren Server aufzulisten.
 velocity.command.server-available=Verfügbare Server\:
-velocity.command.server-tooltip-player-online={0} Spieler online
-velocity.command.server-tooltip-players-online={0} Spieler online
+velocity.command.server-tooltip-player-online=<arg:0> Spieler online
+velocity.command.server-tooltip-players-online=<arg:0> Spieler online
 velocity.command.server-tooltip-current-server=Du bist derzeit mit diesem Server verbunden
 velocity.command.server-tooltip-offer-connect-server=Klicke, um dich mit diesem Server zu verbinden
-velocity.command.glist-player-singular={0} Spieler ist derzeit mit dem Proxy verbunden.
-velocity.command.glist-player-plural={0} Spieler sind derzeit mit dem Proxy verbunden.
+velocity.command.glist-player-singular=<arg:0> Spieler ist derzeit mit dem Proxy verbunden.
+velocity.command.glist-player-plural=<arg:0> Spieler sind derzeit mit dem Proxy verbunden.
 velocity.command.glist-view-all=Um alle Spieler auf Servern aufzulisten, verwende /glist all.
 velocity.command.reload-success=Velocity-Konfiguration erfolgreich neu geladen.
 velocity.command.reload-failure=Die Velocity-Konfiguration konnte nicht neu geladen werden. Prüfe die Konsole für weitere Details.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} ist lizenziert unter den Bedingungen der GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018-<arg:2> <arg:0>. <arg:1> ist lizenziert unter den Bedingungen der GNU General Public License v3.
 velocity.command.no-plugins=Es sind derzeit keine Plugins installiert.
-velocity.command.plugins-list=Plugins\: {0}
-velocity.command.plugin-tooltip-website=Webseite\: {0}
-velocity.command.plugin-tooltip-author=Entwickler\: {0}
-velocity.command.plugin-tooltip-authors=Entwickler\: {0}
+velocity.command.plugins-list=Plugins\: <arg:0>
+velocity.command.plugin-tooltip-website=Webseite\: <arg:0>
+velocity.command.plugin-tooltip-author=Entwickler\: <arg:0>
+velocity.command.plugin-tooltip-authors=Entwickler\: <arg:0>
 velocity.command.dump-uploading=Erfasste Daten werden hochgeladen...
 velocity.command.dump-send-error=Bei der Kommunikation mit den Velocity-Servern ist ein Fehler aufgetreten. Diese Server sind möglicherweise vorübergehend nicht verfügbar oder es gibt ein Problem mit deinen Netzwerkeinstellungen. Weitere Informationen findest du in der Log-Datei oder in der Konsole deines Velocity-Servers.
 velocity.command.dump-success=Ein anonymisierter Bericht mit nützlichen Informationen über diesen Proxy wurde erstellt. Wenn ein Entwickler den Bericht angefordert hat, kannst du diesen über folgenden Link mit ihm teilen\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_es_ES.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=¡Ya estás conectado a este servidor\!
 velocity.error.already-connected-proxy=¡Ya estás conectado a este proxy\!
 velocity.error.already-connecting=¡Ya estás intentando conectarte a un servidor\!
-velocity.error.cant-connect=No se ha podido conectar a {0}\: {1}
-velocity.error.connecting-server-error=No hemos podido conectarte a {0}. Por favor, inténtalo de nuevo más tarde.
-velocity.error.connected-server-error=Tu conexión a {0} ha sufrido un problema.
+velocity.error.cant-connect=No se ha podido conectar a <arg:0>\: <arg:1>
+velocity.error.connecting-server-error=No hemos podido conectarte a <arg:0>. Por favor, inténtalo de nuevo más tarde.
+velocity.error.connected-server-error=Tu conexión a <arg:0> ha sufrido un problema.
 velocity.error.internal-server-connection-error=Se ha producido un error interno en la conexión al servidor.
 velocity.error.logging-in-too-fast=Estás iniciando sesión demasiado rápido, inténtalo de nuevo más tarde.
 velocity.error.online-mode-only=No has iniciado sesión con tu cuenta de Minecraft. Si crees que ya lo estás, intenta reiniciar tu cliente de Minecraft.
 velocity.error.player-connection-error=Se ha producido un error interno en tu conexión.
 velocity.error.modern-forwarding-needs-new-client=Este servidor solo es compatible con Minecraft 1.13 y superior.
 velocity.error.modern-forwarding-failed=El servidor no ha enviado una solicitud de reenvío al proxy. Asegúrate de que tu servidor está configurado para usar el método de reenvío de Velocity.
-velocity.error.moved-to-new-server=Has sido echado de {0}\: {1}
+velocity.error.moved-to-new-server=Has sido echado de <arg:0>\: <arg:1>
 velocity.error.no-available-servers=No hay servidores disponibles a los que conectarte. Inténtalo de nuevo más tarde o contacta con un administrador.
 velocity.error.illegal-chat-characters=Caracteres no válidos en el chat
 # Commands
 velocity.command.generic-error=Se ha producido un error al ejecutar este comando.
 velocity.command.command-does-not-exist=Este comando no existe.
 velocity.command.players-only=Solo los jugadores pueden ejecutar este comando.
-velocity.command.server-does-not-exist=El servidor especificado {0} no existe.
-velocity.command.player-not-found=El jugador especificado {0} no existe.
-velocity.command.server-current-server=Estás conectado a {0}.
+velocity.command.server-does-not-exist=El servidor especificado <arg:0> no existe.
+velocity.command.player-not-found=El jugador especificado <arg:0> no existe.
+velocity.command.server-current-server=Estás conectado a <arg:0>.
 velocity.command.server-too-many=Hay demasiados servidores registrados. Usa la finalización con tabulación para ver todos los servidores disponibles.
 velocity.command.server-available=Servidores disponibles\:
-velocity.command.server-tooltip-player-online={0} jugador conectado
-velocity.command.server-tooltip-players-online={0} jugadores conectados
+velocity.command.server-tooltip-player-online=<arg:0> jugador conectado
+velocity.command.server-tooltip-players-online=<arg:0> jugadores conectados
 velocity.command.server-tooltip-current-server=Estás conectado a este servidor
 velocity.command.server-tooltip-offer-connect-server=Haz clic para conectarte a este servidor
-velocity.command.glist-player-singular={0} jugador está conectado al proxy.
-velocity.command.glist-player-plural={0} jugadores están conectados al proxy.
+velocity.command.glist-player-singular=<arg:0> jugador está conectado al proxy.
+velocity.command.glist-player-plural=<arg:0> jugadores están conectados al proxy.
 velocity.command.glist-view-all=Para ver todos los jugadores por servidores, usa /glist all.
 velocity.command.reload-success=La configuración de Velocity ha sido recargada correctamente.
 velocity.command.reload-failure=No ha sido posible recargar la configuración de Velocity. Para obtener más información, revisa la consola.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} está licenciado bajo los términos de la Licencia Pública General de GNU v3.
+velocity.command.version-copyright=Copyright 2018-<arg:2> <arg:0>. <arg:1> está licenciado bajo los términos de la Licencia Pública General de GNU v3.
 velocity.command.no-plugins=Actualmente no hay plugins instalados.
-velocity.command.plugins-list=Complementos\: {0}
-velocity.command.plugin-tooltip-website=Página web\: {0}
-velocity.command.plugin-tooltip-author=Autor\: {0}
-velocity.command.plugin-tooltip-authors=Autores\: {0}
+velocity.command.plugins-list=Complementos\: <arg:0>
+velocity.command.plugin-tooltip-website=Página web\: <arg:0>
+velocity.command.plugin-tooltip-author=Autor\: <arg:0>
+velocity.command.plugin-tooltip-authors=Autores\: <arg:0>
 velocity.command.dump-uploading=Subiendo la información recopilada...
 velocity.command.dump-send-error=Se ha producido un error al comunicarse con los servidores de Velocity. Es posible que los servidores no estén disponibles temporalmente o que exista un problema en tu configuración de red. Puedes encontrar más información en el archivo de registro o la consola de tu servidor Velocity.
 velocity.command.dump-success=Se ha creado un informe anónimo que contiene información útil sobre este proxy. Si un desarrollador lo solicita, puedes compartir el siguiente enlace con él\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_et_EE.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=Sa oled juba antud serveriga ühendatud\!
 velocity.error.already-connected-proxy=Sa oled juba antud proksiga ühendatud\!
 velocity.error.already-connecting=Sa juba ühendad severiga\!
-velocity.error.cant-connect=Unable to connect to {0}\: {1}
-velocity.error.connecting-server-error=Unable to connect you to {0}. Please try again later.
-velocity.error.connected-server-error=Your connection to {0} encountered a problem.
+velocity.error.cant-connect=Unable to connect to <arg:0>\: <arg:1>
+velocity.error.connecting-server-error=Unable to connect you to <arg:0>. Please try again later.
+velocity.error.connected-server-error=Your connection to <arg:0> encountered a problem.
 velocity.error.internal-server-connection-error=An internal server connection error occurred.
 velocity.error.logging-in-too-fast=Sa logid sisse liiga kiiresti, proovi hiljem uuesti.
 velocity.error.online-mode-only=You are not logged into your Minecraft account. If you are logged into your Minecraft account, try restarting your Minecraft client.
 velocity.error.player-connection-error=An internal error occurred in your connection.
 velocity.error.modern-forwarding-needs-new-client=This server is only compatible with Minecraft 1.13 and above.
 velocity.error.modern-forwarding-failed=Your server did not send a forwarding request to the proxy. Make sure the server is configured for Velocity forwarding.
-velocity.error.moved-to-new-server=You were kicked from {0}\: {1}
+velocity.error.moved-to-new-server=You were kicked from <arg:0>\: <arg:1>
 velocity.error.no-available-servers=There are no available servers to connect you to. Try again later or contact an admin.
 velocity.error.illegal-chat-characters=Illegal characters in chat
 # Commands
 velocity.command.generic-error=An error occurred while running this command.
 velocity.command.command-does-not-exist=Antud käsklust ei eksisteeri.
 velocity.command.players-only=Ainult mängijad saavad antud käsklust kasutada.
-velocity.command.server-does-not-exist=Server {0} ei eksisteeri.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=Sa oled hetkel ühendatud serveriga {0}.
+velocity.command.server-does-not-exist=Server <arg:0> ei eksisteeri.
+velocity.command.player-not-found=The specified player <arg:0> does not exist.
+velocity.command.server-current-server=Sa oled hetkel ühendatud serveriga <arg:0>.
 velocity.command.server-too-many=There are too many servers set up. Use tab completion to view all servers available.
 velocity.command.server-available=Saadaolevad serverid\:
-velocity.command.server-tooltip-player-online={0} mängija online
-velocity.command.server-tooltip-players-online={0} mängijat online
+velocity.command.server-tooltip-player-online=<arg:0> mängija online
+velocity.command.server-tooltip-players-online=<arg:0> mängijat online
 velocity.command.server-tooltip-current-server=Currently connected to this server
 velocity.command.server-tooltip-offer-connect-server=Vajuta, et ühendada antud serveriga
-velocity.command.glist-player-singular={0} player is currently connected to the proxy.
-velocity.command.glist-player-plural={0} players are currently connected to the proxy.
+velocity.command.glist-player-singular=<arg:0> player is currently connected to the proxy.
+velocity.command.glist-player-plural=<arg:0> players are currently connected to the proxy.
 velocity.command.glist-view-all=Et näha kõiki mängijaid kõikides serverites, kasuta käsklust /glist all.
 velocity.command.reload-success=Velocity seadistus edukalt taaslaetud.
 velocity.command.reload-failure=Unable to reload your Velocity configuration. Check the console for more details.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} is licensed under the terms of the GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018-<arg:2> <arg:0>. <arg:1> is licensed under the terms of the GNU General Public License v3.
 velocity.command.no-plugins=There are no plugins currently installed.
-velocity.command.plugins-list=Pluginad\: {0}
-velocity.command.plugin-tooltip-website=Veebileht\: {0}
-velocity.command.plugin-tooltip-author=Autor\: {0}
-velocity.command.plugin-tooltip-authors=Autorid\: {0}
+velocity.command.plugins-list=Pluginad\: <arg:0>
+velocity.command.plugin-tooltip-website=Veebileht\: <arg:0>
+velocity.command.plugin-tooltip-author=Autor\: <arg:0>
+velocity.command.plugin-tooltip-authors=Autorid\: <arg:0>
 velocity.command.dump-uploading=Kogutud informatsiooni üleslaadimine...
 velocity.command.dump-send-error=An error occurred while communicating with the Velocity servers. The servers may be temporarily unavailable or there is an issue with your network settings. You can find more information in the log or console of your Velocity server.
 velocity.command.dump-success=Created an anonymised report containing useful information about this proxy. If a developer requested it, you may share the following link with them\:

proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fi_FI.properties

@@ -18,42 +18,42 @@
 velocity.error.already-connected=Olet jo yhteydessä tälle palvelimelle\!
 velocity.error.already-connected-proxy=Olet jo yhteydessä tälle välityspalvelimelle\!
 velocity.error.already-connecting=Yrität jo yhdistää palvelimeen\!
-velocity.error.cant-connect={0} ei saatu yhteyttä\: {1}
-velocity.error.connecting-server-error=Yhteyttä palvelimeen {0} ei voitu muodostaa. Yritä myöhemmin uudelleen.
-velocity.error.connected-server-error=Yhteydessäsi palvelimeen {0} tapahtui virhe.
+velocity.error.cant-connect=<arg:0> ei saatu yhteyttä\: <arg:1>
+velocity.error.connecting-server-error=Yhteyttä palvelimeen <arg:0> ei voitu muodostaa. Yritä myöhemmin uudelleen.
+velocity.error.connected-server-error=Yhteydessäsi palvelimeen <arg:0> tapahtui virhe.
 velocity.error.internal-server-connection-error=Tapahtui palvelimen sisäinen yhteysvirhe.
 velocity.error.logging-in-too-fast=Kirjaudut sisään liian nopeasti, yritä uudelleen hetken kuluttua.
 velocity.error.online-mode-only=Et ole kirjautuneena Minecraft-tilillesi. Jos olet kirjautuneena sisään, yritä pelin uudelleenkäynnistämistä.
 velocity.error.player-connection-error=Yhteydessäsi tapahtui sisäinen virhe.
 velocity.error.modern-forwarding-needs-new-client=Tämä palvelin on yhteensopiva vain Minecraft 1.13\:n ja sitä uudempien versioiden kanssa.
 velocity.error.modern-forwarding-failed=Valitsemasi palvelin ei lähettänyt välityspyyntöä välityspalvelimelle. Tarkista että palvelin on määritetty oikein Velocityä varten.
-velocity.error.moved-to-new-server=Sinut potkittiin pois palvelimelta {0}\: {1}
+velocity.error.moved-to-new-server=Sinut potkittiin pois palvelimelta <arg:0>\: <arg:1>
 velocity.error.no-available-servers=Yhtään palvelinta ei ole tällä hetkellä saatavilla. Yritä myöhemmin uudelleen tai ota yhteyttä palvelimen ylläpitäjään.
 velocity.error.illegal-chat-characters=Kiellettyjä merkkejä chatissa
 # Commands
 velocity.command.generic-error=Tämän komennon suorittamisessa tapahtui virhe.
 velocity.command.command-does-not-exist=Tuota komentoa ei ole olemassa.
 velocity.command.players-only=Vain pelaajat voivat käyttää tuota komentoa.
-velocity.command.server-does-not-exist=Palvelinta {0} ei ole olemassa.
-velocity.command.player-not-found=Annettua pelaajaa {0} ei ole olemassa.
-velocity.command.server-current-server=Olet tällä hetkellä yhdistettynä palvelimeen {0}.
+velocity.command.server-does-not-exist=Palvelinta <arg:0> ei ole olemassa.
+velocity.command.player-not-found=Annettua pelaajaa <arg:0> ei ole olemassa.
+velocity.command.server-current-server=Olet tällä hetkellä yhdistettynä palvelimeen <arg:0>.
 velocity.command.server-too-many=Liian monta palvelinta on määritetty. Paina Tab -näppäintä nähdäksesi kaikki saatavilla olevat palvelimet.
 velocity.command.server-available=Saatavilla olevat palvelimet\:
-velocity.command.server-tooltip-player-online={0} pelaaja paikalla
-velocity.command.server-tooltip-players-online={0} pelaajaa paikalla
+velocity.command.server-tooltip-player-online=<arg:0> pelaaja paikalla
+velocity.command.server-tooltip-players-online=<arg:0> pelaajaa paikalla
 velocity.command.server-tooltip-current-server=Tällä hetkellä yhdistetty tähän palvelimeen
 velocity.command.server-tooltip-offer-connect-server=Napsauta yhdistääksesi tähän palvelimeen
-velocity.command.glist-player-singular={0} pelaaja on tällä hetkellä yhdistänyt välityspalvelimelle.
-velocity.command.glist-player-plural={0} pelaajaa on tällä hetkellä yhdistänyt välityspalvelimelle.
+velocity.command.glist-player-singular=<arg:0> pelaaja on tällä hetkellä yhdistänyt välityspalvelimelle.
+velocity.command.glist-player-plural=<arg:0> pelaajaa on tällä hetkellä yhdistänyt välityspalvelimelle.
 velocity.command.glist-view-all=Nähdäksesi pelaajat kaikilla palvelimilla, käytä komentoa /glist all.
 velocity.command.reload-success=Velocityn konfiguraatio uudelleenladattiin onnistuneesti.
 velocity.command.reload-failure=Velocityn konfiguraation uudelleenlataus epäonnistui. Katso tarkemmat lisätiedot konsolista.
-velocity.command.version-copyright=Tekijänoikeus 2018-{2} {0}. {1} on lisensoitu GNU General Public License v3\:n ehtojen mukaisesti.
+velocity.command.version-copyright=Tekijänoikeus 2018-<arg:2> <arg:0>. <arg:1> on lisensoitu GNU General Public License v3\:n ehtojen mukaisesti.
 velocity.command.no-plugins=Yhtäkään pluginia ei ole asennettu.
-velocity.command.plugins-list=Pluginit\: {0}
-velocity.command.plugin-tooltip-website=Verkkosivu\: {0}
-velocity.command.plugin-tooltip-author=Tekijä\: {0}
-velocity.command.plugin-tooltip-authors=Tekijät\: {0}
+velocity.command.plugins-list=Pluginit\: <arg:0>
+velocity.command.plugin-tooltip-website=Verkkosivu\: <arg:0>
+velocity.command.plugin-tooltip-author=Tekijä\: <arg:0>
+velocity.command.plugin-tooltip-authors=Tekijät\: <arg:0>
 velocity.command.dump-uploading=Lähetetään kerättyjä tietoja...
 velocity.command.dump-send-error=Velocity-palvelimien kanssa kommunikoidessa tapahtui virhe. Palvelimet eivät ehkä ole tilapäisesti käytettävissä tai verkkoasetuksissa on ongelma. Löydät lisätietoja Velocity-palvelimesi lokista tai konsolista.
 velocity.command.dump-success=Luotiin anonyymi raportti, joka sisältää hyödyllistä tietoa tästä välityspalvelimesta. Jos jokin kehittäjä on pyytänyt sitä, voit jakaa seuraavan linkin heidän kanssaan\: