Release 2.0.31 (#308)

* fix: some English grammar mistakes

* fix: add missing Dutch translation string

* fix: add missing Georgian translations

.github/CONTRIBUTING.md

@@ -8,7 +8,6 @@ joining the [Discord](https://jonesdev.xyz/discord).
 2. Follow the coding guidelines for your code.
 3. Test your code before committing and pushing it.
 4. Use [semantic](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716) commit messages for your commits.
-5. Create a feature branch or push to the `dev` branch.
 
 ## Coding Guidelines:
 

build.gradle.kts

@@ -6,7 +6,7 @@ buildscript {
 
 plugins {
   id("java")
-  id("io.github.goooler.shadow") version "8.1.5"
+  id("io.github.goooler.shadow") version "8.1.7"
   id("io.toolebox.git-versioner") version "1.6.7"
 }
 
@@ -29,78 +29,67 @@ allprojects {
   apply(plugin = "io.github.goooler.shadow")
 
   dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.30")
-    annotationProcessor("org.projectlombok:lombok:1.18.30")
+    compileOnly("org.projectlombok:lombok:1.18.32")
+    annotationProcessor("org.projectlombok:lombok:1.18.32")
 
-    testCompileOnly("org.projectlombok:lombok:1.18.30")
-    testAnnotationProcessor("org.projectlombok:lombok:1.18.30")
+    testCompileOnly("org.projectlombok:lombok:1.18.32")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.32")
 
     // adventure
-    implementation("net.kyori:adventure-text-minimessage:4.16.0")
-    implementation("net.kyori:adventure-text-serializer-gson:4.16.0")
-    implementation("net.kyori:adventure-nbt:4.16.0")
+    compileOnly("net.kyori:adventure-text-minimessage:4.17.0")
+    compileOnly("net.kyori:adventure-text-serializer-gson:4.17.0")
 
     compileOnly("com.j256.ormlite:ormlite-jdbc:6.1") // ORMLite
     compileOnly("com.github.ben-manes.caffeine:caffeine:3.1.8") // caching
-    compileOnly("io.netty:netty-all:4.1.107.Final") // netty
+    compileOnly("io.netty:netty-all:4.1.109.Final") // netty
 
     // Library/dependency loading
     compileOnly("com.alessiodp.libby:libby-core:2.0.0-SNAPSHOT")
   }
-}
 
-dependencies {
-  sequenceOf("api", "bukkit", "bungee", "common", "velocity").forEach {
-    // We want the jar to actually contain our modules
-    implementation(project(":$it"))
+  tasks {
+    shadowJar {
+      // Set the file name of the shadowed jar
+      archiveFileName.set("${rootProject.name}-${project.name.replaceFirstChar { it.uppercase() }}.jar")
+
+      // Remove file timestamps
+      isPreserveFileTimestamps = false
+
+      // Relocate libraries
+      relocate("org.bstats", "xyz.jonesdev.sonar.libs.bstats")
+      relocate("com.alessiodp.libby", "xyz.jonesdev.sonar.libs.libby")
+      relocate("com.simpleyaml", "xyz.jonesdev.sonar.libs.yaml")
+      relocate("com.google.gson", "xyz.jonesdev.sonar.libs.gson")
+      relocate("com.j256.ormlite", "xyz.jonesdev.sonar.libs.ormlite")
+      relocate("com.github.benmanes.caffeine", "xyz.jonesdev.sonar.libs.caffeine")
+      relocate("com.mysql", "xyz.jonesdev.sonar.libs.mysql")
+      relocate("org.mariadb", "xyz.jonesdev.sonar.libs.mariadb")
+      relocate("xyz.jonesdev.capja", "xyz.jonesdev.sonar.libs.capja")
+
+      // Exclude unnecessary metadata information
+      exclude("META-INF/*/**")
+    }
+
+    compileJava {
+      options.encoding = "UTF-8"
+    }
+
+    jar {
+      manifest {
+        // Set the implementation version, so we can create exact version
+        // information in-game and make it accessible to the user.
+        attributes["Implementation-Version"] = rootProject.version
+        attributes["Implementation-Vendor"] = "Jones Development, Sonar Contributors"
+      }
+    }
   }
 }
 
 tasks {
-  jar {
-    manifest {
-      // Set the implementation version, so we can create exact version
-      // information in-game and make it accessible to the user.
-      attributes["Implementation-Version"] = version
-      attributes["Implementation-Vendor"] = "Jones Development, Sonar Contributors"
-    }
-  }
-
-  shadowJar {
-    // Set the file name of the shadowed jar
-    archiveFileName.set("${rootProject.name}.jar")
-
-    // Remove file timestamps
-    isPreserveFileTimestamps = false
-
-    // Relocate libraries
-    relocate("org.bstats", "xyz.jonesdev.sonar.libs.bstats")
-    relocate("com.alessiodp.libby", "xyz.jonesdev.sonar.libs.libby")
-    relocate("com.simpleyaml", "xyz.jonesdev.sonar.libs.yaml")
-    relocate("com.google.gson", "xyz.jonesdev.sonar.libs.gson")
-    relocate("com.j256.ormlite", "xyz.jonesdev.sonar.libs.ormlite")
-    relocate("com.github.benmanes.caffeine", "xyz.jonesdev.sonar.libs.caffeine")
-
-    // TODO: actually fix this :/
-    // We have to be careful here, so we don't accidentally break adventure
-    relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori") {
-      exclude("net.kyori.adventure.text.**")
-      exclude("net.kyori.adventure.audience.Audience")
-      exclude("net.kyori.adventure.title.*")
-    }
-
-    // Exclude unnecessary metadata information
-    exclude("META-INF/*/**")
-    // We want to load our own Gson dynamically
-    exclude("com/google/gson/**")
-  }
-
-  compileJava {
-    options.encoding = "UTF-8"
-  }
-
   // This is a small wrapper tasks to simplify the building process
   register("build-sonar") {
-    dependsOn(clean, shadowJar)
+    val subprojects = listOf("api", "common", "bukkit", "bungee", "velocity")
+    val buildTasks = subprojects.flatMap { listOf("$it:clean", "$it:shadowJar") }
+    dependsOn(buildTasks)
   }
 }

build.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# Fix permissions so we are actually able to run our gradle script
-chmod +x gradle*
-# You can also use clean shadowJar if something goes wrong here
-# e.g. "./gradlew clean shadowJar --stacktrace"
-./gradlew build-sonar --stacktrace

gradle.properties

@@ -1,3 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.20
+version=2.0.31
 description=Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ 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='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

sonar-api/src/main/java/xyz/jonesdev/sonar/api/Sonar.java

@@ -18,6 +18,7 @@
 package xyz.jonesdev.sonar.api;
 
 import net.kyori.adventure.audience.Audience;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.attack.AttackTracker;
@@ -32,7 +33,7 @@ import xyz.jonesdev.sonar.api.timer.SystemTimer;
 import xyz.jonesdev.sonar.api.verbose.Notification;
 import xyz.jonesdev.sonar.api.verbose.Verbose;
 
-import java.io.File;
+import java.net.InetAddress;
 import java.text.DecimalFormat;
 import java.util.UUID;
 
@@ -43,6 +44,7 @@ public interface Sonar {
    * Since we want to use Adventure on every server platform,
    * we have to use their platform module to support BungeeCord and Bukkit
    */
+  @ApiStatus.Internal
   @Nullable Audience audience(final @Nullable UUID uniqueId);
 
   /**
@@ -50,13 +52,16 @@ public interface Sonar {
    */
   @NotNull SonarPlatform getPlatform();
 
+  /**
+   * @return If the amount of players online with the same IP address is greater than a maximum
+   */
+  boolean hasTooManyAccounts(final @NotNull InetAddress inetAddress, final int limit);
+
   /**
    * @return A small wrapper for the plugin logger so we can use the logger everywhere
    */
   @NotNull LoggerWrapper getLogger();
 
-  @NotNull File getDataDirectory();
-
   @NotNull SonarConfiguration getConfig();
 
   @NotNull SubcommandRegistry getSubcommandRegistry();

sonar-api/src/main/java/xyz/jonesdev/sonar/api/attack/AttackTracker.java

@@ -151,10 +151,4 @@ public final class AttackTracker {
       attackThreshold = 0;
     }
   }
-
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-  public boolean isCurrentlyUnderAttack() {
-    final int minDelay = Sonar.get().getConfig().getAttackCooldownDelay();
-    return currentAttack != null && currentAttack.timer.delay() < minDelay;
-  }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/command/InvocationSource.java

@@ -28,30 +28,33 @@ import java.util.function.Predicate;
 
 @Getter
 @RequiredArgsConstructor
-public abstract class InvocationSource {
+public final class InvocationSource {
   private final UUID uuid;
   private final Audience audience;
-  private final boolean player;
   private final Predicate<String> permissionFunction;
 
   /**
-   * Sends an empty chat message to the command executor
+   * @return True, if {@link InvocationSource#uuid} is not null
+   * @apiNote This indicates a player as a player will always have a UUID
    */
-  public final void sendMessage() {
-    sendMessage(Component.empty());
+  public boolean isPlayer() {
+    return uuid != null;
   }
 
   /**
    * Sends a message to the command executor
+   *
+   * @apiNote We should probably use cached components...
+   * (See {@link InvocationSource#sendMessage(Component)})
    */
-  public final void sendMessage(final String legacy) {
+  public void sendMessage(final String legacy) {
     sendMessage(MiniMessage.miniMessage().deserialize(legacy));
   }
 
   /**
    * Sends a message to the command executor
    */
-  public final void sendMessage(final Component component) {
+  public void sendMessage(final Component component) {
     audience.sendMessage(component);
   }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/command/subcommand/Subcommand.java

@@ -53,13 +53,8 @@ public abstract class Subcommand {
     final InetAddress inetAddress;
     try {
       inetAddress = InetAddress.getByName(rawIP);
-
-      if (inetAddress.isAnyLocalAddress() || inetAddress.isLoopbackAddress()) {
-        source.sendMessage(SONAR.getConfig().getCommands().getIllegalIpAddress());
-        return null;
-      }
     } catch (UnknownHostException exception) {
-      source.sendMessage(SONAR.getConfig().getCommands().getIncorrectIpAddress());
+      source.sendMessage(SONAR.getConfig().getCommands().getInvalidIpAddress());
       return null;
     }
     return inetAddress;

sonar-api/src/main/java/xyz/jonesdev/sonar/api/config/SonarConfiguration.java

@@ -18,16 +18,17 @@
 package xyz.jonesdev.sonar.api.config;
 
 import com.j256.ormlite.db.DatabaseType;
-import com.j256.ormlite.jdbc.db.MariaDbDatabaseType;
-import com.j256.ormlite.jdbc.db.MysqlDatabaseType;
 import lombok.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.title.Title;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
+import xyz.jonesdev.sonar.api.ormlite.MariaDbDatabaseTypeAdapter;
+import xyz.jonesdev.sonar.api.ormlite.MysqlDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.webhook.DiscordWebhook;
 
 import java.io.File;
@@ -171,26 +172,41 @@ public final class SonarConfiguration {
 
     // Verification
     verification.timing = Verification.Timing.valueOf(generalConfig.getString("verification.timing"));
+
     verification.gravity.enabled = generalConfig.getBoolean("verification.checks.gravity.enabled");
     verification.gravity.checkCollisions = generalConfig.getBoolean("verification.checks.gravity.check-collisions");
+    verification.gravity.captchaOnFail = generalConfig.getBoolean("verification.checks.gravity.captcha-on-fail");
     verification.gravity.maxMovementTicks = clamp(generalConfig.getInt("verification.checks.gravity.max-movement-ticks"), 2, 100);
-    verification.gravity.maxIgnoredTicks = clamp(generalConfig.getInt("verification.checks.gravity.max-ignored-ticks"), 1, 128);
     verification.gravity.gamemode = Verification.Gravity.Gamemode.valueOf(generalConfig.getString("verification.checks.gravity.gamemode"));
 
+    verification.vehicle.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.vehicle.timing"));
+
     verification.map.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.map-captcha.timing"));
-    verification.map.randomizePositions = generalConfig.getBoolean("verification.checks.map-captcha.random-position");
-    verification.map.distortionsFactorX = clamp(generalConfig.getInt(
-      "verification.checks.map-captcha.distortions-factor-x"), 0, 100) / 100D;
-    verification.map.distortionsFactorY = clamp(generalConfig.getInt(
-      "verification.checks.map-captcha.distortions-factor-y"), 0, 100) / 100D;
-    verification.map.randomLinesAmount = generalConfig.getInt("verification.checks.map-captcha.random-lines");
-    verification.map.randomOvalsAmount = generalConfig.getInt("verification.checks.map-captcha.random-ovals");
-    verification.map.randomizeFontSize = generalConfig.getBoolean("verification.checks.map-captcha.random-font-size");
-    verification.map.precomputeAmount = generalConfig.getInt("verification.checks.map-captcha.precompute");
-    verification.map.maxDuration = generalConfig.getInt("verification.checks.map-captcha.max-duration");
+    verification.map.scratches = generalConfig.getBoolean("verification.checks.map-captcha.effects.scratches");
+    verification.map.ripple = generalConfig.getBoolean("verification.checks.map-captcha.effects.ripple");
+    verification.map.bump = generalConfig.getBoolean("verification.checks.map-captcha.effects.bump");
+
+    verification.map.distortion.enabled = generalConfig.getBoolean("verification.checks.map-captcha.effects.distortion.enabled");
+    verification.map.distortion.shape = generalConfig.getInt("verification.checks.map-captcha.effects.distortion.shape");
+    verification.map.distortion.distance = generalConfig.getInt("verification.checks.map-captcha.effects.distortion.distance");
+    verification.map.distortion.density = (float) generalConfig.getYaml().getDouble("verification.checks.map-captcha.effects.distortion.density");
+    verification.map.distortion.mix = (float) generalConfig.getYaml().getDouble("verification.checks.map-captcha.effects.distortion.mix");
+
+    final String backgroundImagePath = generalConfig.getString("verification.checks.map-captcha.background");
+    if (!backgroundImagePath.isEmpty()) {
+      verification.map.backgroundImage = new File(pluginFolder, backgroundImagePath);
+      if (!verification.map.backgroundImage.exists()) {
+        Sonar.get().getLogger().error("The background image does not exist! Please check the configuration.");
+      }
+    } else {
+      verification.map.backgroundImage = null;
+    }
+
+    verification.map.autoColor = generalConfig.getBoolean("verification.checks.map-captcha.auto-color");
+    verification.map.precomputeAmount = clamp(generalConfig.getInt("verification.checks.map-captcha.precompute"), 1, 1000);
+    verification.map.maxDuration = clamp(generalConfig.getInt("verification.checks.map-captcha.max-duration"), 5000, 360000);
     verification.map.maxTries = generalConfig.getInt("verification.checks.map-captcha.max-tries");
     verification.map.dictionary = generalConfig.getString("verification.checks.map-captcha.dictionary");
-    verification.map.fonts = generalConfig.getStringList("verification.checks.map-captcha.fonts");
 
     verification.brand.enabled = generalConfig.getBoolean("verification.checks.client-brand.enabled");
     verification.brand.validRegex = Pattern.compile(generalConfig.getString("verification.checks.client-brand.valid-regex"));
@@ -198,14 +214,23 @@ public final class SonarConfiguration {
 
     verification.validNameRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-name-regex"));
     verification.validLocaleRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-locale-regex"));
-    verification.maxPing = clamp(generalConfig.getInt("verification.checks.max-ping"), 500, 30000);
     verification.maxLoginPackets = clamp(generalConfig.getInt("verification.checks.max-login-packets"), 128, 8192);
 
+    verification.transfer.enabled = generalConfig.getBoolean("verification.transfer.enabled");
+    verification.transfer.host = generalConfig.getString("verification.transfer.destination-host");
+    verification.transfer.port = clamp(generalConfig.getInt("verification.transfer.destination-port"), 0, 0xffff);
+
+    if (verification.transfer.enabled) {
+      Sonar.get().getLogger().info("Transferring 1.20.5+ clients is enabled. Please make sure to follow the instructions in order for this to work properly.");
+    }
+
+    verification.checkGeyser = generalConfig.getBoolean("verification.check-geyser-players");
     verification.logConnections = generalConfig.getBoolean("verification.log-connections");
     verification.logDuringAttack = generalConfig.getBoolean("verification.log-during-attack");
     verification.debugXYZPositions = generalConfig.getBoolean("verification.debug-xyz-positions");
     verification.readTimeout = clamp(generalConfig.getInt("verification.read-timeout"), 500, 30000);
     verification.reconnectDelay = clamp(generalConfig.getInt("verification.rejoin-delay"), 0, 100000);
+    verification.rememberTime = clamp(generalConfig.getInt("verification.remember-time"), 0, 86400000);
     verification.blacklistTime = clamp(generalConfig.getInt("verification.blacklist-time"), 0, 86400000);
     verification.blacklistThreshold = clamp(generalConfig.getInt("verification.blacklist-threshold"), 0, 100);
     verification.whitelistedProtocols.clear();
@@ -252,8 +277,7 @@ public final class SonarConfiguration {
 
     noPermission = formatString(messagesConfig.getString("commands.no-permission"));
     commands.incorrectCommandUsage = formatString(messagesConfig.getString("commands.incorrect-usage"));
-    commands.incorrectIpAddress = formatString(messagesConfig.getString("commands.invalid-ip-address"));
-    commands.illegalIpAddress = formatString(messagesConfig.getString("commands.illegal-ip-address"));
+    commands.invalidIpAddress = formatString(messagesConfig.getString("commands.invalid-ip-address"));
     commands.playersOnly = formatString(messagesConfig.getString("commands.player-only"));
     commands.consoleOnly = formatString(messagesConfig.getString("commands.console-only"));
     commands.commandCoolDown = formatString(messagesConfig.getString("commands.cool-down"));
@@ -286,6 +310,8 @@ public final class SonarConfiguration {
     commands.verifiedCleared = formatString(messagesConfig.getString("commands.verified.cleared"));
     commands.verifiedSize = formatString(messagesConfig.getString("commands.verified.size"));
     commands.verifiedRemove = formatString(messagesConfig.getString("commands.verified.removed"));
+    commands.verifiedAdd = formatString(messagesConfig.getString("commands.verified.added"));
+    commands.verifiedAlready = formatString(messagesConfig.getString("commands.verified.already"));
     commands.verifiedNotFound = formatString(messagesConfig.getString("commands.verified.ip-not-found"));
     commands.verifiedBlocked = formatString(messagesConfig.getString("commands.verified.blocked"));
 
@@ -302,7 +328,6 @@ public final class SonarConfiguration {
     verification.successLog = formatString(messagesConfig.getString("verification.logs.successful"));
 
     verification.map.enterCode = deserialize(formatString(messagesConfig.getString("verification.captcha.enter-code")));
-    verification.map.enterCodeActionBar = formatString(messagesConfig.getString("verification.captcha.action-bar"));
     verification.map.failedCaptcha = deserialize(formatString(messagesConfig.getString("verification.captcha.incorrect")));
     verification.currentlyPreparing = deserialize(fromList(messagesConfig.getStringList("verification.currently-preparing")));
     verification.tooFastReconnect = deserialize(fromList(messagesConfig.getStringList("verification.too-fast-reconnect")));
@@ -314,13 +339,16 @@ public final class SonarConfiguration {
     verification.verificationSuccess = deserialize(fromList(messagesConfig.getStringList("verification.success")));
     verification.verificationFailed = deserialize(fromList(messagesConfig.getStringList("verification.failed")));
 
-    verbose.actionBarLayout = formatString(messagesConfig.getString("verbose.layout.normal"));
-    verbose.actionBarLayoutDuringAttack = formatString(messagesConfig.getString("verbose.layout.attack"));
+    verbose.actionBarLayout = deserialize(formatString(messagesConfig.getString("verbose.layout.normal")));
+    verbose.actionBarLayoutDuringAttack = deserialize(formatString(messagesConfig.getString("verbose.layout.attack")));
     verbose.animation = Collections.unmodifiableList(messagesConfig.getStringList("verbose.animation"));
 
     notifications.notificationTitle = deserialize(formatString(messagesConfig.getString("notifications.title")));
     notifications.notificationSubtitle = deserialize(formatString(messagesConfig.getString("notifications.subtitle")));
-    notifications.notificationChat = formatString(fromList(messagesConfig.getStringList("notifications.chat")));
+    notifications.title = Title.title(
+      Sonar.get().getConfig().getNotifications().getNotificationTitle(),
+      Sonar.get().getConfig().getNotifications().getNotificationSubtitle());
+    notifications.notificationChat = deserialize(formatString(fromList(messagesConfig.getStringList("notifications.chat"))));
   }
 
   private @NotNull URL getAsset(final String url, final @NotNull Language language) {
@@ -334,7 +362,11 @@ public final class SonarConfiguration {
   }
 
   private static int clamp(final int v, final int max, final int min) {
-    return Math.max(Math.min(v, min), max);
+    final int output = Math.max(Math.min(v, min), max);
+    if (output != v) {
+      Sonar.get().getLogger().warn("Clamped configuration value {} to {}", v, output);
+    }
+    return output;
   }
 
   public String formatAddress(final InetAddress inetAddress) {
@@ -395,17 +427,18 @@ public final class SonarConfiguration {
   @Getter
   @NoArgsConstructor(access = AccessLevel.PRIVATE)
   public static final class Verbose {
-    private String actionBarLayout;
-    private String actionBarLayoutDuringAttack;
+    private Component actionBarLayout;
+    private Component actionBarLayoutDuringAttack;
     private List<String> animation;
   }
 
   @Getter
   @NoArgsConstructor(access = AccessLevel.PRIVATE)
   public static final class Notifications {
+    private Title title;
     private Component notificationTitle;
     private Component notificationSubtitle;
-    private String notificationChat;
+    private Component notificationChat;
   }
 
   @Getter
@@ -420,40 +453,55 @@ public final class SonarConfiguration {
     private Timing timing;
 
     @Getter
+    @RequiredArgsConstructor
     public enum Timing {
-      ALWAYS, DURING_ATTACK, NEVER
+      ALWAYS("Always"),
+      DURING_ATTACK("During Attack"),
+      NEVER("Never");
+
+      private final String displayName;
     }
 
     private final Map map = new Map();
     private final Gravity gravity = new Gravity();
+    private final Vehicle vehicle = new Vehicle();
     private final Brand brand = new Brand();
+    private final Transfer transfer = new Transfer();
 
     @Getter
     public static final class Map {
       private Timing timing;
-      private boolean randomizePositions;
-      private boolean randomizeFontSize;
-      private double distortionsFactorX;
-      private double distortionsFactorY;
-      private int randomLinesAmount;
-      private int randomOvalsAmount;
+      private boolean scratches;
+      private boolean ripple;
+      private boolean bump;
+      private File backgroundImage;
+      private boolean autoColor;
       private int precomputeAmount;
       private int maxDuration;
       private int maxTries;
       private String dictionary;
       private Component enterCode;
       private Component failedCaptcha;
-      private String enterCodeActionBar;
-      private List<String> fonts;
+
+      private Smear distortion = new Smear();
+
+      @Getter
+      public static final class Smear {
+        private boolean enabled;
+        private int shape;
+        private int distance;
+        private float density;
+        private float mix;
+      }
     }
 
     @Getter
     public static final class Gravity {
       private boolean enabled;
       private boolean checkCollisions;
+      private boolean captchaOnFail;
       private Gamemode gamemode;
       private int maxMovementTicks;
-      private int maxIgnoredTicks;
 
       @Getter
       @RequiredArgsConstructor
@@ -468,6 +516,11 @@ public final class SonarConfiguration {
       }
     }
 
+    @Getter
+    public static final class Vehicle {
+      private Timing timing;
+    }
+
     @Getter
     public static final class Brand {
       private boolean enabled;
@@ -475,6 +528,14 @@ public final class SonarConfiguration {
       private Pattern validRegex;
     }
 
+    @Getter
+    public static final class Transfer {
+      private boolean enabled;
+      private String host;
+      private int port;
+    }
+
+    private boolean checkGeyser;
     private boolean logConnections;
     private boolean logDuringAttack;
     private boolean debugXYZPositions;
@@ -486,9 +547,9 @@ public final class SonarConfiguration {
     private String blacklistLog;
 
     private int maxLoginPackets;
-    private int maxPing;
     private int readTimeout;
     private int reconnectDelay;
+    private int rememberTime;
     private int blacklistTime;
     private int blacklistThreshold;
     private final Collection<Integer> whitelistedProtocols = new HashSet<>(0);
@@ -509,8 +570,7 @@ public final class SonarConfiguration {
   @NoArgsConstructor(access = AccessLevel.PRIVATE)
   public static final class Commands {
     private String incorrectCommandUsage;
-    private String incorrectIpAddress;
-    private String illegalIpAddress;
+    private String invalidIpAddress;
     private String subCommandNoPerm;
     private String playersOnly;
     private String consoleOnly;
@@ -527,6 +587,8 @@ public final class SonarConfiguration {
     private String blacklistSize;
 
     private String verifiedRemove;
+    private String verifiedAdd;
+    private String verifiedAlready;
     private String verifiedNotFound;
     private String verifiedCleared;
     private String verifiedSize;
@@ -560,13 +622,10 @@ public final class SonarConfiguration {
     @Getter
     @RequiredArgsConstructor
     public enum Type {
-      MYSQL("com.mysql.cj.jdbc.NonRegisteringDriver",
-        "jdbc:mysql://%s:%d/%s", new MysqlDatabaseType()),
-      MARIADB("org.mariadb.jdbc.Driver",
-        "jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseType()),
-      NONE(null, null, null);
+      MYSQL("jdbc:mysql://%s:%d/%s", new MysqlDatabaseTypeAdapter()),
+      MARIADB("jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseTypeAdapter()),
+      NONE(null, null);
 
-      private final String driverClassName;
       private final String connectionString;
       private final DatabaseType databaseType;
     }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/controller/VerifiedPlayerController.java

@@ -27,6 +27,7 @@ import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
+import org.jetbrains.annotations.Unmodifiable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
@@ -43,7 +44,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public final class VerifiedPlayerController {
-  private static final Map<String, Collection<UUID>> MAP = new ConcurrentHashMap<>();
   private static final ExecutorService DB_UPDATE_SERVICE = Executors.newSingleThreadExecutor();
 
   private static final LoggerWrapper LOGGER = new LoggerWrapper() {
@@ -64,6 +64,7 @@ public final class VerifiedPlayerController {
     }
   };
 
+  private final Map<String, Collection<UUID>> cache = new ConcurrentHashMap<>(128);
   private @Nullable ConnectionSource connectionSource;
   private Dao<VerifiedPlayer, Integer> dao;
   private QueryBuilder<VerifiedPlayer, Integer> queryBuilder;
@@ -81,6 +82,9 @@ public final class VerifiedPlayerController {
       return;
     }
 
+    // Initialize MySQL/MariaDB driver
+    database.getType().getDatabaseType().loadDriver();
+
     try {
       connectionSource = new JdbcPooledConnectionSource(
         String.format(database.getType().getConnectionString(),
@@ -116,6 +120,21 @@ public final class VerifiedPlayerController {
     }
   }
 
+  /**
+   * Closes the connection if instantiated
+   */
+  public void close() {
+    // The connection source will always be null if the database type is NONE.
+    if (connectionSource != null) {
+      try {
+        // Properly close the connection
+        connectionSource.close();
+      } catch (Exception exception) {
+        LOGGER.error("Error closing database: {}", exception);
+      }
+    }
+  }
+
   /**
    * Clear all old entries using the given timestamp.
    */
@@ -180,7 +199,7 @@ public final class VerifiedPlayerController {
    * @param inetAddress IP address of the player
    */
   private void _remove(final @NotNull String inetAddress) {
-    MAP.remove(inetAddress);
+    cache.remove(inetAddress);
   }
 
   /**
@@ -218,24 +237,30 @@ public final class VerifiedPlayerController {
    * @param player VerifiedPlayer model
    */
   private void _add(final @NotNull VerifiedPlayer player) {
-    MAP.computeIfAbsent(player.getInetAddress(), v -> new Vector<>())
+    cache.computeIfAbsent(player.getInetAddress(), v -> new ArrayList<>())
       .add(player.getPlayerUUID());
   }
 
   /**
+   * Returns the amount of verified IP addresses
+   *
    * @return Estimated size of the local cache
    */
   public synchronized int estimatedSize() {
-    return MAP.values().stream()
-      .mapToInt(Collection::size)
-      .sum();
+    /*
+     * TODO: Work on this
+     * return MAP.values().stream()
+     *   .mapToInt(Collection::size)
+     *   .sum();
+     */
+    return cache.size();
   }
 
   /**
    * @return List of UUIDs associated with one IP address
    */
-  public Collection<UUID> getUUIDs(final @NotNull String inetAddress) {
-    return MAP.getOrDefault(inetAddress, Collections.emptyList());
+  public @Unmodifiable Collection<UUID> getUUIDs(final @NotNull String inetAddress) {
+    return cache.getOrDefault(inetAddress, Collections.emptyList());
   }
 
   /**
@@ -244,7 +269,7 @@ public final class VerifiedPlayerController {
    */
   public void clearAll() {
     try {
-      MAP.clear();
+      cache.clear();
 
       // Only update the column if the database type is not NONE
       if (cachedDatabaseType != SonarConfiguration.Database.Type.NONE) {
@@ -261,7 +286,7 @@ public final class VerifiedPlayerController {
    * @return Whether the local cache contains the IP and UUID
    */
   public boolean has(final @NotNull String inetAddress, final @NotNull UUID uuid) {
-    final Collection<UUID> got = MAP.get(inetAddress);
+    final Collection<UUID> got = cache.get(inetAddress);
     if (got != null) {
       return got.contains(uuid);
     }
@@ -283,15 +308,6 @@ public final class VerifiedPlayerController {
    * @return Whether the local cache contains the IP
    */
   public boolean has(final @NotNull String inetAddress) {
-    return MAP.containsKey(inetAddress);
-  }
-
-  /**
-   * @param inetAddress IP address
-   * @return Whether the local cache contains the IP
-   * @see #has(String)
-   */
-  public boolean has(final @NotNull InetAddress inetAddress) {
-    return has(inetAddress.toString());
+    return cache.containsKey(inetAddress);
   }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/event/impl/UserVerifyFailedEvent.java

@@ -19,23 +19,17 @@ package xyz.jonesdev.sonar.api.event.impl;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 
-import java.util.Optional;
-
 @Getter
 @ToString
 @EqualsAndHashCode
+@RequiredArgsConstructor
 public final class UserVerifyFailedEvent implements SonarEvent {
-  private final FallbackUser user;
-  @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
-  private final Optional<String> reason;
-
-  public UserVerifyFailedEvent(final FallbackUser user, final @Nullable String reason) {
-    this.user = user;
-    this.reason = Optional.ofNullable(reason);
-  }
+  private final @NotNull FallbackUser user;
+  private final @NotNull String reason;
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/fallback/Fallback.java

@@ -69,16 +69,20 @@ public final class Fallback {
 
   @SuppressWarnings("BooleanMethodIsAlwaysInverted")
   public boolean shouldVerifyNewPlayers() {
-    return performTimingCheck(Sonar.get().getConfig().getVerification().getTiming());
+    return shouldPerform(Sonar.get().getConfig().getVerification().getTiming());
   }
 
-  public boolean shouldDoMapCaptcha() {
-    return performTimingCheck(Sonar.get().getConfig().getVerification().getMap().getTiming());
+  public boolean shouldPerformCaptcha() {
+    return shouldPerform(Sonar.get().getConfig().getVerification().getMap().getTiming());
   }
 
-  private boolean performTimingCheck(final SonarConfiguration.Verification.Timing timing) {
+  public boolean shouldPerformVehicleCheck() {
+    return shouldPerform(Sonar.get().getConfig().getVerification().getVehicle().getTiming());
+  }
+
+  private static boolean shouldPerform(final SonarConfiguration.Verification.Timing timing) {
     return timing == SonarConfiguration.Verification.Timing.ALWAYS
       || (timing == SonarConfiguration.Verification.Timing.DURING_ATTACK
-      && Sonar.get().getAttackTracker().isCurrentlyUnderAttack());
+      && Sonar.get().getAttackTracker().getCurrentAttack() != null);
   }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/fallback/FallbackQueue.java

@@ -26,15 +26,20 @@ import java.net.InetAddress;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ForkJoinPool;
 
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public final class FallbackQueue {
   static final FallbackQueue INSTANCE = new FallbackQueue();
   private final Map<InetAddress, Runnable> queuedPlayers = new ConcurrentHashMap<>(64);
+  // Async executor for all new verifications
+  public static final ExecutorService QUEUE_EXECUTOR = new ForkJoinPool(
+    Math.min(0x7fff, Runtime.getRuntime().availableProcessors()),
+    ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, true);
 
-  // Runnable task executed for polling the queue
-  private final Runnable pollTask = () -> {
+  public void poll() {
     final int maxQueuePolls = Sonar.get().getConfig().getQueue().getMaxQueuePolls();
     int index = 0;
 
@@ -47,30 +52,9 @@ public final class FallbackQueue {
       }
       // Run the cached runnable
       final Map.Entry<InetAddress, Runnable> entry = iterator.next();
-      entry.getValue().run();
+      QUEUE_EXECUTOR.execute(entry.getValue());
       // Remove runnable from iterator
       iterator.remove();
     }
-
-    // Run the attack check task
-    Sonar.get().getAttackTracker().checkIfUnderAttack();
-    // Clean up the cache of rate-limited IPs
-    Sonar.get().getFallback().getRatelimiter().cleanUpCache();
-  };
-
-  /**
-   * @param inetAddress IP address of the player
-   * @param runnable    Queued action on the netty thread
-   * @see #remove
-   */
-  public void queue(final InetAddress inetAddress, final Runnable runnable) {
-    queuedPlayers.put(inetAddress, runnable);
-  }
-
-  /**
-   * @param inetAddress IP address of the player
-   */
-  public void remove(final InetAddress inetAddress) {
-    queuedPlayers.remove(inetAddress);
   }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/fallback/FallbackRatelimiter.java

@@ -19,6 +19,7 @@ package xyz.jonesdev.sonar.api.fallback;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.AccessLevel;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
@@ -29,7 +30,10 @@ import java.net.InetAddress;
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class FallbackRatelimiter {
   static final FallbackRatelimiter INSTANCE = new FallbackRatelimiter();
-  private Cache<InetAddress, Byte> expiringCache;
+
+  private Cache<InetAddress, Byte> attemptCache;
+  @Getter
+  private Cache<InetAddress, Integer> failCountCache;
 
   /**
    * We don't want to clean up the cache in the
@@ -37,7 +41,8 @@ public final class FallbackRatelimiter {
    * it would take up too many resources.
    */
   public void cleanUpCache() {
-    expiringCache.cleanUp();
+    attemptCache.cleanUp();
+    failCountCache.cleanUp();
   }
 
   /**
@@ -49,12 +54,27 @@ public final class FallbackRatelimiter {
   @SuppressWarnings("BooleanMethodIsAlwaysInverted")
   public boolean attempt(final @NotNull InetAddress inetAddress) {
     // Cache the IP address if it's not already cached
-    if (!expiringCache.asMap().containsKey(inetAddress)) {
+    if (!attemptCache.asMap().containsKey(inetAddress)) {
       // Cache the IP address
-      expiringCache.put(inetAddress, (byte) 0);
+      attemptCache.put(inetAddress, (byte) 0);
       return true;
     }
     // Deny the connection attempt
     return false;
   }
+
+  /**
+   * Checks if the player is failing verifications too often
+   * Increments the number of times this user has failed the verification
+   *
+   * @param inetAddress IP address of the player
+   * @param count       Count of previously failed verifications
+   */
+  public void incrementFails(final @NotNull InetAddress inetAddress, final int count) {
+    // Make sure to remove the old values from the cache
+    if (count > 0) {
+      failCountCache.invalidate(inetAddress);
+    }
+    failCountCache.put(inetAddress, count + 1);
+  }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/fallback/FallbackUser.java

@@ -17,26 +17,32 @@
 
 package xyz.jonesdev.sonar.api.fallback;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
 import io.netty.channel.Channel;
 import io.netty.util.ReferenceCountUtil;
 import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 
 import java.net.InetAddress;
-import java.time.Duration;
-import java.util.Objects;
 import java.util.UUID;
 
 public interface FallbackUser {
-  @NotNull Channel getChannel();
+  @NotNull
+  Channel getChannel();
 
-  @NotNull InetAddress getInetAddress();
+  @NotNull
+  InetAddress getInetAddress();
 
-  @NotNull ProtocolVersion getProtocolVersion();
+  @NotNull
+  ProtocolVersion getProtocolVersion();
+
+  @NotNull
+  FallbackUserState getState();
+
+  boolean isGeyser();
+
+  void setState(final FallbackUserState state);
 
   /**
    * Disconnect the player during/after verification
@@ -44,6 +50,7 @@ public interface FallbackUser {
    *
    * @param reason Disconnect message component
    */
+  @ApiStatus.Internal
   void disconnect(final @NotNull Component reason);
 
   /**
@@ -54,11 +61,11 @@ public interface FallbackUser {
    * @param encoder  Name of the encoder pipeline
    * @param decoder  Name of the decoder pipeline
    * @param timeout  Name of the read timeout pipeline
-   * @param boss     Name of the main pipeline
+   * @param handler  Name of the main pipeline
    */
   void hijack(final @NotNull String username, final @NotNull UUID uuid,
               final @NotNull String encoder, final @NotNull String decoder,
-              final @NotNull String timeout, final @NotNull String boss);
+              final @NotNull String timeout, final @NotNull String handler);
 
   /**
    * Sends a packet/message to the player
@@ -85,40 +92,6 @@ public interface FallbackUser {
     }
   }
 
-  Cache<InetAddress, Integer> GLOBAL_FAIL_COUNT = Caffeine.newBuilder()
-    .expireAfterWrite(Duration.ofMinutes(5)) // expire after 5 minutes
-    .build();
-
-  /**
-   * Increments the number of times this user (by IP address) has failed the verification
-   */
-  default void incrementFails() {
-    final InetAddress inetAddress = Objects.requireNonNull(getInetAddress());
-    final int failCount = getFailedCount();
-    // Make sure to remove the old values from the cache
-    if (failCount > 0) {
-      GLOBAL_FAIL_COUNT.invalidate(inetAddress);
-    }
-    GLOBAL_FAIL_COUNT.put(inetAddress, failCount + 1);
-  }
-
-  /**
-   * @return The number of times this user (by IP address) has failed the verification
-   * @apiNote Returns 0 if no key/value is present in the cache
-   */
-  default int getFailedCount() {
-    // Make sure to clean up the cache before we try to get cached values
-    GLOBAL_FAIL_COUNT.cleanUp();
-    return GLOBAL_FAIL_COUNT.asMap().getOrDefault(Objects.requireNonNull(getInetAddress()), 0);
-  }
-
-  /**
-   * Removes all previously failed verifications
-   */
-  default void invalidateFails() {
-    GLOBAL_FAIL_COUNT.invalidate(Objects.requireNonNull(getInetAddress()));
-  }
-
   /**
    * Disconnects the player who failed the verification
    * and caches them in FAILED_VERIFICATIONS.
@@ -126,6 +99,8 @@ public interface FallbackUser {
    * the player will be temporarily denied from verifying.
    *
    * @param reason Reason for failing the verification
+   * @apiNote The {@link xyz.jonesdev.sonar.api.event.impl.UserVerifyFailedEvent}
+   * will not be thrown if no reason is given
    */
-  void fail(final @Nullable String reason);
+  void fail(final @NotNull String reason);
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/fallback/FallbackUserState.java

@@ -15,16 +15,27 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.protocol.block;
+package xyz.jonesdev.sonar.api.fallback;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
+public enum FallbackUserState {
+  // 1.20.2 configuration state
+  LOGIN_ACK, CONFIGURE,
+  // pre-JOIN ping check
+  KEEP_ALIVE,
+  // post-JOIN checks
+  CLIENT_SETTINGS, PLUGIN_MESSAGE, TRANSACTION,
+  // PLAY checks
+  TELEPORT, POSITION,
+  // Vehicle check
+  VEHICLE,
+  // CAPTCHA
+  CAPTCHA,
+  // Done
+  SUCCESS,
+  // Placeholder
+  FAILED;
 
-@Getter
-@ToString
-@RequiredArgsConstructor
-public final class BlockPosition {
-  private final int x, y, z;
-  private final int chunkX, chunkZ;
+  public boolean canReceivePackets() {
+    return this != FAILED && this != SUCCESS;
+  }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/fallback/protocol/ProtocolVersion.java

@@ -20,13 +20,15 @@ package xyz.jonesdev.sonar.api.fallback.protocol;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.*;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 @Getter
 @RequiredArgsConstructor
 public enum ProtocolVersion {
   UNKNOWN(-1),
-  LEGACY(-2),
   MINECRAFT_1_7_2(4),
   MINECRAFT_1_7_6(5),
   MINECRAFT_1_8(47),
@@ -66,14 +68,13 @@ public enum ProtocolVersion {
   MINECRAFT_1_19_4(762),
   MINECRAFT_1_20(763),
   MINECRAFT_1_20_2(764),
-  MINECRAFT_1_20_3(765);
+  MINECRAFT_1_20_3(765),
+  MINECRAFT_1_20_5(766);
 
   private final int protocol;
 
-  public static final ProtocolVersion MINIMUM_VERSION = MINECRAFT_1_7_2;
   public static final ProtocolVersion LATEST_VERSION;
   public static final Map<Integer, ProtocolVersion> ID_TO_PROTOCOL_CONSTANT;
-  public static final Set<ProtocolVersion> SUPPORTED_VERSIONS;
 
   static {
     {
@@ -90,12 +91,11 @@ public enum ProtocolVersion {
       final Set<ProtocolVersion> versions = EnumSet.noneOf(ProtocolVersion.class);
 
       for (final ProtocolVersion value : values()) {
-        if (!value.isUnknown() && !value.isLegacy()) {
+        if (!value.isUnknown()) {
           versions.add(value);
         }
       }
 
-      SUPPORTED_VERSIONS = Collections.unmodifiableSet(versions);
       LATEST_VERSION = (ProtocolVersion) versions.toArray()[versions.size() - 1];
     }
   }
@@ -111,9 +111,4 @@ public enum ProtocolVersion {
   public boolean isUnknown() {
     return this == UNKNOWN;
   }
-
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-  public boolean isLegacy() {
-    return this == LEGACY;
-  }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/jvm/JVMProcessInformation.java

@@ -21,60 +21,94 @@ import com.sun.management.OperatingSystemMXBean;
 import lombok.experimental.UtilityClass;
 
 import java.lang.management.ManagementFactory;
+import java.text.DecimalFormat;
 
 @UtilityClass
 public class JVMProcessInformation {
   private final Runtime RUNTIME = Runtime.getRuntime();
   private final OperatingSystemMXBean MX = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
   private final char[] MEMORY_UNITS = {'K', 'M', 'G', 'T', 'P', 'E'};
+  private final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.#");
 
   public String formatMemory(final long size) {
     if (size < 1024L) {
       return size + " B";
     }
+    // https://stackoverflow.com/questions/3758606/how-can-i-convert-byte-size-into-a-human-readable-format-in-java
     final int group = (63 - Long.numberOfLeadingZeros(size)) / 10;
     final double formattedSize = (double) size / (1L << (group * 10));
     final char unit = MEMORY_UNITS[group - 1];
     // https://en.wikipedia.org/wiki/Byte#Multiple-byte_units
-    return String.format("%.1f %siB", formattedSize, unit);
+    return DECIMAL_FORMAT.format(formattedSize) + " " + unit + "iB";
   }
 
+  /**
+   * @return Number of available processors for the JVM
+   */
   public int getVirtualCores() {
     return RUNTIME.availableProcessors();
   }
 
+  /**
+   * @return Current process CPU usage in percent
+   */
   public double getProcessCPUUsage() {
     return MX.getProcessCpuLoad() * 100;
   }
 
+  /**
+   * @return Current per-core process CPU usage in percent
+   */
   public double getAverageProcessCPUUsage() {
     return getProcessCPUUsage() / getVirtualCores();
   }
 
+  /**
+   * @return Current system CPU usage in percent
+   */
   public double getSystemCPUUsage() {
     return MX.getSystemCpuLoad() * 100;
   }
 
+  /**
+   * @return Current per-core system CPU usage in percent
+   */
   public double getAverageSystemCPUUsage() {
     return getSystemCPUUsage() / getVirtualCores();
   }
 
+  /**
+   * @return Current system load average in percent
+   * @apiNote This returns the global process load, not the CPU usage
+   */
   public double getSystemLoadAverage() {
     return MX.getSystemLoadAverage() * 100;
   }
 
+  /**
+   * @return Memory (in bytes) the JVM will attempt to use
+   */
   public long getMaxMemory() {
     return RUNTIME.maxMemory();
   }
 
+  /**
+   * @return Memory (in bytes) available to the host machine
+   */
   public long getTotalMemory() {
     return RUNTIME.totalMemory();
   }
 
+  /**
+   * @return Memory (in bytes) the JVM can allocate
+   */
   public long getFreeMemory() {
     return RUNTIME.freeMemory();
   }
 
+  /**
+   * @return Memory (in bytes) the JVM is using
+   */
   public long getUsedMemory() {
     return getTotalMemory() - getFreeMemory();
   }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/ormlite/MariaDbDatabaseTypeAdapter.java

@@ -15,18 +15,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.velocity.command;
+package xyz.jonesdev.sonar.api.ormlite;
 
-import com.velocitypowered.api.command.CommandSource;
-import com.velocitypowered.api.proxy.Player;
+import com.j256.ormlite.jdbc.db.MariaDbDatabaseType;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
 
-public final class VelocityInvocationSource extends InvocationSource {
-  public VelocityInvocationSource(final @NotNull CommandSource sender) {
-    super(sender instanceof Player ? ((Player) sender).getUniqueId() : null,
-      sender,
-      sender instanceof Player,
-      sender::hasPermission);
+public final class MariaDbDatabaseTypeAdapter extends MariaDbDatabaseType {
+
+  /**
+   * We need to override the default driver class name
+   * in order to use the custom relocated MariaDB driver
+   * Read more: {@link MysqlDatabaseTypeAdapter}
+   */
+  @Override
+  protected String @NotNull [] getDriverClassNames() {
+    return new String[]{"xyz.jonesdev.sonar.libs.mariadb.jdbc.Driver"};
   }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/ormlite/MysqlDatabaseTypeAdapter.java

@@ -15,16 +15,20 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.protocol.map;
+package xyz.jonesdev.sonar.api.ormlite;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import com.j256.ormlite.jdbc.db.MysqlDatabaseType;
+import org.jetbrains.annotations.NotNull;
 
-@Getter
-@RequiredArgsConstructor
-public final class MapInfo {
-  private final String answer;
-  private final int columns, rows;
-  private final int x, y;
-  private final byte[] buffer;
+public final class MysqlDatabaseTypeAdapter extends MysqlDatabaseType {
+
+  /**
+   * We need to override the default driver class name
+   * in order to use the custom relocated MySQL driver
+   * Read more: {@link MariaDbDatabaseTypeAdapter}
+   */
+  @Override
+  protected String @NotNull [] getDriverClassNames() {
+    return new String[]{"xyz.jonesdev.sonar.libs.mysql.cj.jdbc.Driver"};
+  }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/statistics/SonarStatistics.java

@@ -20,40 +20,96 @@ package xyz.jonesdev.sonar.api.statistics;
 import org.jetbrains.annotations.ApiStatus;
 
 public interface SonarStatistics {
+
+  /**
+   * @return Number of connection establishments per second
+   */
   long getConnectionsPerSecond();
 
+  /**
+   * @return Number of logins per second
+   */
   long getLoginsPerSecond();
 
+  /**
+   * @return Currently incoming bytes per second
+   */
   long getCurrentIncomingBandwidth();
 
+  /**
+   * @return Currently outgoing bytes per second
+   */
   long getCurrentOutgoingBandwidth();
 
+  /**
+   * @return Total incoming bytes per second
+   */
   long getTotalIncomingBandwidth();
 
+  /**
+   * @return Total outgoing bytes per second
+   */
   long getTotalOutgoingBandwidth();
 
+  /**
+   * @return Same as {@link SonarStatistics#getCurrentIncomingBandwidth} but formatted
+   */
   String getCurrentIncomingBandwidthFormatted();
 
+  /**
+   * @return Same as {@link SonarStatistics#getCurrentOutgoingBandwidth} but formatted
+   */
   String getCurrentOutgoingBandwidthFormatted();
 
+  /**
+   * @return Same as {@link SonarStatistics#getTotalIncomingBandwidth} but formatted
+   */
   String getTotalIncomingBandwidthFormatted();
 
+  /**
+   * @return Same as {@link SonarStatistics#getTotalOutgoingBandwidth} but formatted
+   */
   String getTotalOutgoingBandwidthFormatted();
 
+  /**
+   * @return Total number of players who logged into the server
+   */
   int getTotalPlayersJoined();
 
+  /**
+   * @return Total number of players who tried to verify
+   */
   int getTotalPlayersVerified();
 
+  /**
+   * @return Total number of players who passed the verification
+   */
   int getTotalSuccessfulVerifications();
 
+  /**
+   * @return Total number of players who failed the verification
+   */
   int getTotalFailedVerifications();
 
+  /**
+   * @return Total number of players who passed the verification
+   */
   long getCurrentAttemptedVerifications();
 
+  /**
+   * @return Total number of players who tried verifying
+   */
   int getTotalAttemptedVerifications();
 
+  /**
+   * @return Current number of IP addresses that are blacklisted
+   */
   long getCurrentBlacklistSize();
 
+  /**
+   * @return Total number of cases where an IP was blacklisted
+   * @apiNote This does not describe the current amount of blacklisted IPs
+   */
   long getTotalBlacklistSize();
 
   @ApiStatus.Internal

sonar-api/src/main/java/xyz/jonesdev/sonar/api/timer/SystemTimer.java

@@ -18,13 +18,12 @@
 package xyz.jonesdev.sonar.api.timer;
 
 import lombok.Getter;
-import org.jetbrains.annotations.NotNull;
 
 import java.text.SimpleDateFormat;
 
 @Getter
 public final class SystemTimer {
-  private static final SimpleDateFormat FORMATTER = new SimpleDateFormat("mm:ss");
+  public static final SimpleDateFormat DATE_FORMATTER = new SimpleDateFormat("mm:ss");
 
   private long start = System.currentTimeMillis();
 
@@ -32,18 +31,20 @@ public final class SystemTimer {
     start = System.currentTimeMillis();
   }
 
+  /**
+   * @return Time between the current timestamp and the start timestamp
+   */
   public long delay() {
     return System.currentTimeMillis() - start;
   }
 
+  /**
+   * @apiNote Read more: {@link SystemTimer#delay}
+   */
   public boolean elapsed(final long amount) {
     return delay() >= amount;
   }
 
-  public @NotNull String formattedDelay() {
-    return FORMATTER.format(delay());
-  }
-
   @Override
   public String toString() {
     return String.format("%.3f", delay() / 1000D);

sonar-api/src/main/java/xyz/jonesdev/sonar/api/verbose/Notification.java

@@ -20,57 +20,33 @@ package xyz.jonesdev.sonar.api.verbose;
 import lombok.Getter;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.title.Title;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 
 import java.util.Collection;
 import java.util.UUID;
 import java.util.Vector;
 
-import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
-
 @Getter
 public final class Notification implements Observable {
   private final @NotNull Collection<UUID> subscribers = new Vector<>(0);
 
   public void sendAttackNotification() {
-    // No need to do anything if we have no subscribers
-    if (subscribers.isEmpty()) return;
-    final SonarStatistics statistics = Sonar.get().getStatistics();
-    // Prepare the title
-    // TODO: Why do custom title times not work?
-    //  Title.Times.times(Ticks.duration(5L), Ticks.duration(60L), Ticks.duration(10L));
-    final Title title = Title.title(
-      Sonar.get().getConfig().getNotifications().getNotificationTitle(),
-      Sonar.get().getConfig().getNotifications().getNotificationSubtitle());
-    // Prepare the chat message
-    final Component chat = MiniMessage.miniMessage().deserialize(
-      Sonar.get().getConfig().getNotifications().getNotificationChat()
-        .replace("%queued%",
-          DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getQueuedPlayers().size()))
-        .replace("%verifying%", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size()))
-        .replace("%blacklisted%",
-          DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize()))
-        .replace("%total-joins%", DECIMAL_FORMAT.format(statistics.getTotalPlayersJoined()))
-        .replace("%logins-per-second%", DECIMAL_FORMAT.format(statistics.getLoginsPerSecond()))
-        .replace("%connections-per-second%", DECIMAL_FORMAT.format(statistics.getConnectionsPerSecond()))
-        .replace("%verify-total%", DECIMAL_FORMAT.format(statistics.getTotalAttemptedVerifications()))
-        .replace("%verify-success%",
-          DECIMAL_FORMAT.format(Sonar.get().getVerifiedPlayerController().estimatedSize()))
-        .replace("%verify-failed%", DECIMAL_FORMAT.format(statistics.getTotalFailedVerifications()))
-        .replace("%incoming-traffic%", statistics.getCurrentIncomingBandwidthFormatted())
-        .replace("%outgoing-traffic%", statistics.getCurrentOutgoingBandwidthFormatted())
-        .replace("%incoming-traffic-ttl%", statistics.getTotalIncomingBandwidthFormatted())
-        .replace("%outgoing-traffic-ttl%", statistics.getTotalOutgoingBandwidthFormatted()));
+    // Don't prepare component if there are no subscribers
+    Component chat = null;
     // Send the title and chat messages to all online players
     for (final UUID subscriber : Sonar.get().getNotificationHandler().getSubscribers()) {
       final Audience audience = Sonar.get().audience(subscriber);
       if (audience == null) continue;
-      audience.showTitle(title);
+
+      // Only prepare component if there are subscribers
+      if (chat == null) {
+        chat = replaceStatistic(Sonar.get().getConfig().getNotifications().getNotificationChat());
+      }
+      // Send the message to all online subscribers
       audience.sendMessage(chat);
+      // Send the title to all online subscribers
+      audience.showTitle(Sonar.get().getConfig().getNotifications().getTitle());
     }
   }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/verbose/Observable.java

@@ -17,11 +17,18 @@
 
 package xyz.jonesdev.sonar.api.verbose;
 
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextReplacementConfig;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 
 import java.util.Collection;
 import java.util.UUID;
 
+import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
+import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;
+
 public interface Observable {
   Collection<UUID> getSubscribers();
 
@@ -46,4 +53,61 @@ public interface Observable {
   default void unsubscribe(final UUID uuid) {
     getSubscribers().remove(uuid);
   }
+
+  // TODO: Make this a bit prettier and better for performance
+  default @NotNull Component replaceStatistic(final @NotNull Component component) {
+    final SonarStatistics statistics = Sonar.get().getStatistics();
+    return component
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%queued%")
+        .replacement(DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getQueuedPlayers().size()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%verifying%")
+        .replacement(DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%blacklisted%")
+        .replacement(DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%total-joins%")
+        .replacement(DECIMAL_FORMAT.format(statistics.getTotalPlayersJoined()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%logins-per-second%")
+        .replacement(DECIMAL_FORMAT.format(statistics.getLoginsPerSecond()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%connections-per-second%")
+        .replacement(DECIMAL_FORMAT.format(statistics.getConnectionsPerSecond()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%verify-total%")
+        .replacement(DECIMAL_FORMAT.format(statistics.getTotalAttemptedVerifications()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%verify-success%")
+        .replacement(DECIMAL_FORMAT.format(statistics.getTotalSuccessfulVerifications()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%verify-failed%")
+        .replacement(DECIMAL_FORMAT.format(statistics.getTotalFailedVerifications()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%incoming-traffic%")
+        .replacement(statistics.getCurrentIncomingBandwidthFormatted())
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%outgoing-traffic%")
+        .replacement(statistics.getCurrentOutgoingBandwidthFormatted())
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%incoming-traffic-ttl%")
+        .replacement(statistics.getTotalIncomingBandwidthFormatted())
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%outgoing-traffic-ttl%")
+        .replacement(statistics.getTotalOutgoingBandwidthFormatted())
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%used-memory%")
+        .replacement(formatMemory(getUsedMemory()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%free-memory%")
+        .replacement(formatMemory(getFreeMemory()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%total-memory%")
+        .replacement(formatMemory(getTotalMemory()))
+        .build())
+      .replaceText(TextReplacementConfig.builder().once().matchLiteral("%max-memory%")
+        .replacement(formatMemory(getMaxMemory()))
+        .build());
+  }
 }

sonar-api/src/main/java/xyz/jonesdev/sonar/api/verbose/Verbose.java

@@ -21,19 +21,17 @@ import lombok.Getter;
 import lombok.val;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.TextReplacementConfig;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.attack.AttackTracker;
-import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
 
 import java.util.Collection;
 import java.util.UUID;
 import java.util.Vector;
 
-import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
-import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;
+import static xyz.jonesdev.sonar.api.timer.SystemTimer.DATE_FORMATTER;
 
 @Getter
 public final class Verbose implements Observable {
@@ -42,52 +40,31 @@ public final class Verbose implements Observable {
 
   // Run action bar verbose
   public void update() {
-    // Make sure to clean up the cached statistics
-    Sonar.get().getStatistics().cleanUpCache();
     // Don't prepare component if there are no subscribers
-    if (subscribers.isEmpty()) return;
-    // Prepare the action bar format component
-    final Component component = prepareActionBarFormat();
-    // Send the action bar to all online players
+    Component component = null;
     for (final UUID subscriber : subscribers) {
       final Audience audience = Sonar.get().audience(subscriber);
       if (audience == null) continue;
+
+      // Only prepare component if there are subscribers
+      if (component == null) {
+        final AttackTracker.AttackStatistics attackStatistics = Sonar.get().getAttackTracker().getCurrentAttack();
+        final SystemTimer attackDuration = attackStatistics == null ? null : attackStatistics.getDuration();
+        component = replaceStatistic(attackDuration != null
+          ? Sonar.get().getConfig().getVerbose().getActionBarLayoutDuringAttack()
+          : Sonar.get().getConfig().getVerbose().getActionBarLayout())
+          .replaceText(TextReplacementConfig.builder().once().matchLiteral("%attack-duration%")
+            .replacement(attackDuration == null ? "00:00" : DATE_FORMATTER.format(attackDuration.delay()))
+            .build())
+          .replaceText(TextReplacementConfig.builder().once().matchLiteral("%animation%")
+            .replacement(nextAnimation())
+            .build());
+      }
+      // Send the action bar to all online subscribers
       audience.sendActionBar(component);
     }
   }
 
-  public @NotNull Component prepareActionBarFormat() {
-    final SonarStatistics statistics = Sonar.get().getStatistics();
-    final AttackTracker.AttackStatistics attackStatistics = Sonar.get().getAttackTracker().getCurrentAttack();
-    final SystemTimer attackDuration = attackStatistics == null ? null : attackStatistics.getDuration();
-    return MiniMessage.miniMessage().deserialize((attackDuration != null
-      ? Sonar.get().getConfig().getVerbose().getActionBarLayoutDuringAttack()
-      : Sonar.get().getConfig().getVerbose().getActionBarLayout())
-      .replace("%queued%",
-        DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getQueuedPlayers().size()))
-      .replace("%verifying%", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size()))
-      .replace("%blacklisted%",
-        DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize()))
-      .replace("%blacklisted%", DECIMAL_FORMAT.format(statistics.getCurrentBlacklistSize()))
-      .replace("%total-joins%", DECIMAL_FORMAT.format(statistics.getTotalPlayersJoined()))
-      .replace("%logins-per-second%", DECIMAL_FORMAT.format(statistics.getLoginsPerSecond()))
-      .replace("%connections-per-second%", DECIMAL_FORMAT.format(statistics.getConnectionsPerSecond()))
-      .replace("%verify-total%", DECIMAL_FORMAT.format(statistics.getTotalAttemptedVerifications()))
-      .replace("%verify-success%",
-        DECIMAL_FORMAT.format(Sonar.get().getVerifiedPlayerController().estimatedSize()))
-      .replace("%verify-failed%", DECIMAL_FORMAT.format(statistics.getTotalFailedVerifications()))
-      .replace("%attack-duration%", attackDuration == null ? "00:00" : attackDuration.formattedDelay())
-      .replace("%incoming-traffic%", statistics.getCurrentIncomingBandwidthFormatted())
-      .replace("%outgoing-traffic%", statistics.getCurrentOutgoingBandwidthFormatted())
-      .replace("%incoming-traffic-ttl%", statistics.getTotalIncomingBandwidthFormatted())
-      .replace("%outgoing-traffic-ttl%", statistics.getTotalOutgoingBandwidthFormatted())
-      .replace("%used-memory%", formatMemory(getUsedMemory()))
-      .replace("%free-memory%", formatMemory(getFreeMemory()))
-      .replace("%total-memory%", formatMemory(getTotalMemory()))
-      .replace("%max-memory%", formatMemory(getMaxMemory()))
-      .replace("%animation%", nextAnimation()));
-  }
-
   public String nextAnimation() {
     val animations = Sonar.get().getConfig().getVerbose().getAnimation();
     final int nextIndex = ++animationIndex % animations.size();

sonar-api/src/main/java/xyz/jonesdev/sonar/api/webhook/DiscordWebhook.java

@@ -34,14 +34,18 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Supplier;
 
+import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
+
 @RequiredArgsConstructor
 public final class DiscordWebhook {
   private final String url;
 
-  private static final Gson GSON = new GsonBuilder().disableInnerClassSerialization().create();
-
+  private static final Gson GSON = new GsonBuilder().create();
   private static final ExecutorService HTTP_REQUEST_SERVICE = Executors.newSingleThreadExecutor();
 
+  /**
+   * Asynchronously posts a Discord webhook via HTTPS
+   */
   public void post(final Supplier<SonarConfiguration.Webhook.Embed> embed) {
     HTTP_REQUEST_SERVICE.execute(() -> {
       try {
@@ -51,9 +55,12 @@ public final class DiscordWebhook {
         try (final OutputStream outputStream = urlConnection.getOutputStream()) {
           outputStream.write(serializedContent.getBytes(StandardCharsets.UTF_8));
         }
-        // Check if the connection was a success
-        if (urlConnection.getResponseCode() != 204) {
-          throw new IllegalStateException("Unexpected response code " + urlConnection.getResponseCode());
+
+        // Warn the user if the connection might've not been successful
+        // I don't know why Discord doesn't respond with OK, but I guess this should be fine
+        final int code = urlConnection.getResponseCode();
+        if (code != HTTP_NO_CONTENT) {
+          Sonar.get().getLogger().warn("Unexpected Discord webhook response code {}", code);
         }
       } catch (Exception exception) {
         Sonar.get().getLogger().error("Could not send webhook: {}", exception);
@@ -61,7 +68,7 @@ public final class DiscordWebhook {
     });
   }
 
-  private String prepareSerializedContent(final SonarConfiguration.Webhook.@NotNull Embed embed) {
+  private static String prepareSerializedContent(final SonarConfiguration.Webhook.@NotNull Embed embed) {
     final String content = Sonar.get().getConfig().getWebhook().getContent();
     final String username = Sonar.get().getConfig().getWebhook().getUsername();
     final String avatarUrl = Sonar.get().getConfig().getWebhook().getAvatarUrl();

sonar-bukkit/build.gradle.kts

@@ -13,7 +13,9 @@ bukkit {
   authors = listOf("Jones Development", "Sonar Contributors")
   website = "https://jonesdev.xyz/discord/"
   load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
-  softDepend = listOf("Geyser-Spigot", "floodgate", "Protocolize", "packetevents", "ProtocolLib", "ViaVersion")
+  softDepend = listOf("Geyser-Spigot", "floodgate", "Protocolize", "ProtocolSupport",
+    "ViaVersion", "packetevents", "ProtocolLib", "FastLogin")
+  foliaSupported = true
 
   commands {
     register("sonar") {
@@ -28,11 +30,15 @@ repositories {
 }
 
 dependencies {
-  compileOnly(project(":api"))
-  compileOnly(project(":common"))
+  implementation(project(":api"))
+  implementation(project(":common"))
 
-  // MiniMessage platform support
+  // adventure platform support
   implementation("net.kyori:adventure-platform-bukkit:4.3.2")
+  implementation("net.kyori:adventure-platform-api:4.3.2")
+  implementation("net.kyori:adventure-platform-facet:4.3.2")
+  // adventure nbt
+  implementation("net.kyori:adventure-nbt:4.17.0")
 
   // We have to use 1.8 for backwards compatibility
   compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
@@ -44,5 +50,11 @@ dependencies {
   implementation("com.alessiodp.libby:libby-bukkit:2.0.0-SNAPSHOT")
 }
 
+tasks {
+  shadowJar {
+    relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori")
+  }
+}
+
 java.sourceCompatibility = JavaVersion.VERSION_11
 java.targetCompatibility = JavaVersion.VERSION_11

sonar-bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/SonarBukkit.java

@@ -22,15 +22,16 @@ import lombok.Getter;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
 import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;
-import xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics;
 
+import java.net.InetAddress;
 import java.util.Objects;
 import java.util.UUID;
 
@@ -39,9 +40,8 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
   public static SonarBukkit INSTANCE;
 
   public SonarBukkit(final @NotNull SonarBukkitPlugin plugin) {
-    super(plugin, new BukkitLibraryManager(
-        plugin, plugin.getDataFolder().getName()),
-      plugin.getDataFolder(), SonarPlatform.BUKKIT);
+    super(plugin, SonarPlatform.BUKKIT, plugin.getDataFolder(),
+      new BukkitLibraryManager(plugin, plugin.getDataFolder().getName()));
     INSTANCE = this;
   }
 
@@ -51,13 +51,27 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
   private final BukkitAudiences bukkitAudiences = BukkitAudiences.create(getPlugin());
 
   @Override
-  public @NotNull Audience audience(final @Nullable UUID uniqueId) {
+  public @Nullable Audience audience(final @Nullable UUID uniqueId) {
     if (uniqueId == null) {
-      return bukkitAudiences.console();
+      return null;
     }
     return bukkitAudiences.player(uniqueId);
   }
 
+  @Override
+  public boolean hasTooManyAccounts(final @NotNull InetAddress inetAddress, final int limit) {
+    int count = 1;
+    for (final Player player : getPlugin().getServer().getOnlinePlayers()) {
+      // I don't know why, but Bukkit is *special*
+      if (Objects.isNull(player.getAddress())) continue;
+      // Check if the IP address of the player is equal to the IP trying to connect
+      if (!Objects.equals(player.getAddress().getAddress(), inetAddress)) continue;
+      // Increment count of duplicated accounts
+      if (++count >= limit) return true;
+    }
+    return false;
+  }
+
   /**
    * Create a wrapper for the plugin logger, so we can use it outside
    * the velocity module.
@@ -82,25 +96,28 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
     }
   };
 
+  private Metrics metrics;
+
   @Override
   public void enable() {
-
     // Initialize bStats.org metrics
-    new Metrics(getPlugin(), getPlatform().getMetricsId());
+    metrics = new Metrics(getPlugin(), getPlatform().getMetricsId());
+
+    // Add charts for some configuration options
+    metrics.addCustomChart(new SimplePie("verification",
+      () -> getConfig().getVerification().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("captcha",
+      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));
 
     // Register Sonar command
     Objects.requireNonNull(getPlugin().getCommand("sonar")).setExecutor(new BukkitSonarCommand());
+  }
 
-    // Register traffic service
-    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(),
-      CachedBandwidthStatistics::reset, 20L, 20L);
-
-    // Register queue service
-    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(),
-      getFallback().getQueue().getPollTask(), 10L, 10L);
-
-    // Register verbose service
-    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(),
-      Sonar.get().getVerboseHandler()::update, 4L, 4L);
+  @Override
+  public void disable() {
+    if (metrics != null) {
+      // Make sure to properly shutdown bStats metrics
+      metrics.shutdown();
+    }
   }
 }

sonar-bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/command/BukkitSonarCommand.java

@@ -21,9 +21,11 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
+import xyz.jonesdev.sonar.bukkit.SonarBukkit;
 
 import java.util.List;
 
@@ -37,7 +39,10 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
                            final String label,
                            final String[] args) {
     // Create our own invocation source wrapper to handle messages properly
-    final InvocationSource invocationSource = new BukkitInvocationSource(sender);
+    final InvocationSource invocationSource = new InvocationSource(
+      sender instanceof Player ? ((Player) sender).getUniqueId() : null,
+      SonarBukkit.INSTANCE.getBukkitAudiences().sender(sender),
+      sender::hasPermission);
     // Pass the invocation source and command arguments to our command handler
     handle(invocationSource, args);
     return true; // Valid

sonar-bungee/build.gradle.kts

@@ -9,18 +9,22 @@ bungee {
   version = rootProject.version.toString().split("-")[0]
   main = "xyz.jonesdev.sonar.bungee.SonarBungeePlugin"
   author = "Jones Development, Sonar Contributors"
-  softDepends = setOf("Geyser-BungeeCord", "floodgate", "Protocolize", "ViaVersion")
+  softDepends = setOf("Geyser-BungeeCord", "floodgate", "Protocolize", "ViaVersion", "packetevents", "FastLogin")
 }
 
 dependencies {
-  compileOnly(project(":api"))
-  compileOnly(project(":common"))
+  implementation(project(":api"))
+  implementation(project(":common"))
 
   compileOnly("net.md_5:bungeecord-proxy:master-SNAPSHOT")
   testCompileOnly("net.md_5:bungeecord-proxy:master-SNAPSHOT")
 
-  // MiniMessage platform support
+  // adventure platform support
   implementation("net.kyori:adventure-platform-bungeecord:4.3.2")
+  implementation("net.kyori:adventure-platform-api:4.3.2")
+  implementation("net.kyori:adventure-platform-facet:4.3.2")
+  // adventure nbt
+  implementation("net.kyori:adventure-nbt:4.17.0")
 
   // Implement bStats.org for metrics
   implementation("org.bstats:bstats-bungeecord:3.0.2")
@@ -29,5 +33,11 @@ dependencies {
   implementation("com.alessiodp.libby:libby-bungee:2.0.0-SNAPSHOT")
 }
 
+tasks {
+  shadowJar {
+    relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori")
+  }
+}
+
 java.sourceCompatibility = JavaVersion.VERSION_11
 java.targetCompatibility = JavaVersion.VERSION_11

sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/SonarBungee.java

@@ -21,27 +21,27 @@ import com.alessiodp.libby.BungeeLibraryManager;
 import lombok.Getter;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import org.bstats.bungeecord.Metrics;
+import org.bstats.charts.SimplePie;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
 import xyz.jonesdev.sonar.bungee.command.BungeeSonarCommand;
 import xyz.jonesdev.sonar.bungee.fallback.FallbackInjectionHelper;
-import xyz.jonesdev.sonar.bungee.fallback.FallbackLoginListener;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;
-import xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics;
 
+import java.net.InetAddress;
+import java.util.Objects;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 @Getter
 public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
   public static SonarBungee INSTANCE;
 
   public SonarBungee(final @NotNull SonarBungeePlugin plugin) {
-    super(plugin, new BungeeLibraryManager(plugin), plugin.getDataFolder(), SonarPlatform.BUNGEE);
+    super(plugin, SonarPlatform.BUNGEE, plugin.getDataFolder(), new BungeeLibraryManager(plugin));
     INSTANCE = this;
   }
 
@@ -51,13 +51,26 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
   private final BungeeAudiences bungeeAudiences = BungeeAudiences.create(getPlugin());
 
   @Override
-  public @NotNull Audience audience(final @Nullable UUID uniqueId) {
+  public @Nullable Audience audience(final @Nullable UUID uniqueId) {
     if (uniqueId == null) {
-      return bungeeAudiences.console();
+      return null;
     }
     return bungeeAudiences.player(uniqueId);
   }
 
+  @Override
+  @SuppressWarnings("deprecation")
+  public boolean hasTooManyAccounts(final @NotNull InetAddress inetAddress, final int limit) {
+    int count = 1;
+    for (final ProxiedPlayer player : getPlugin().getServer().getPlayers()) {
+      // Check if the IP address of the player is equal to the IP trying to connect
+      if (!Objects.equals(player.getAddress().getAddress(), inetAddress)) continue;
+      // Increment count of duplicated accounts
+      if (++count >= limit) return true;
+    }
+    return false;
+  }
+
   /**
    * Create a wrapper for the plugin logger, so we can use it outside
    * the velocity module.
@@ -82,31 +95,31 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
     }
   };
 
+  private Metrics metrics;
+
   @Override
   public void enable() {
-
     // Initialize bStats.org metrics
-    new Metrics(getPlugin(), getPlatform().getMetricsId());
+    metrics = new Metrics(getPlugin(), getPlatform().getMetricsId());
+
+    // Add charts for some configuration options
+    metrics.addCustomChart(new SimplePie("verification",
+      () -> getConfig().getVerification().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("captcha",
+      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));
 
     // Register Sonar command
     getPlugin().getServer().getPluginManager().registerCommand(getPlugin(), new BungeeSonarCommand());
 
-    // Register Fallback listener
-    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new FallbackLoginListener());
-
-    // Register traffic service
-    getPlugin().getServer().getScheduler().schedule(getPlugin(), CachedBandwidthStatistics::reset,
-      1L, 1L, TimeUnit.SECONDS);
-
-    // Register queue service
-    getPlugin().getServer().getScheduler().schedule(getPlugin(), getFallback().getQueue().getPollTask(),
-      500L, 500L, TimeUnit.MILLISECONDS);
-
-    // Register verbose service
-    getPlugin().getServer().getScheduler().schedule(getPlugin(), Sonar.get().getVerboseHandler()::update,
-      200L, 200L, TimeUnit.MILLISECONDS);
-
     // Make sure to inject into the server's connection handler
     FallbackInjectionHelper.inject();
   }
+
+  @Override
+  public void disable() {
+    if (metrics != null) {
+      // Make sure to properly shutdown bStats metrics
+      metrics.shutdown();
+    }
+  }
 }

sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/command/BungeeInvocationSource.java

@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.bungee.command;
-
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
-import xyz.jonesdev.sonar.bungee.SonarBungee;
-
-public final class BungeeInvocationSource extends InvocationSource {
-  public BungeeInvocationSource(final @NotNull CommandSender sender) {
-    super(sender instanceof ProxiedPlayer ? ((ProxiedPlayer) sender).getUniqueId() : null,
-      SonarBungee.INSTANCE.getBungeeAudiences().sender(sender),
-      sender instanceof ProxiedPlayer,
-      sender::hasPermission);
-  }
-}

sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/command/BungeeSonarCommand.java

@@ -18,11 +18,13 @@
 package xyz.jonesdev.sonar.bungee.command;
 
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
+import xyz.jonesdev.sonar.bungee.SonarBungee;
 
 import static java.util.Collections.emptyList;
 
@@ -34,7 +36,10 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
   @Override
   public void execute(final @NotNull CommandSender sender, final String[] args) {
     // Create our own invocation source wrapper to handle messages properly
-    final InvocationSource invocationSource = new BungeeInvocationSource(sender);
+    final InvocationSource invocationSource = new InvocationSource(
+      sender instanceof ProxiedPlayer ? ((ProxiedPlayer) sender).getUniqueId() : null,
+      SonarBungee.INSTANCE.getBungeeAudiences().sender(sender),
+      sender::hasPermission);
     // Pass the invocation source and command arguments to our command handler
     handle(invocationSource, args);
   }

sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/fallback/FallbackChannelHandler.java

@@ -19,7 +19,6 @@ package xyz.jonesdev.sonar.bungee.fallback;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.CorruptedFrameException;
 import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.protocol.DefinedPacket;
@@ -28,24 +27,12 @@ import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.LoginRequest;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.fallback.FallbackUser;
-import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.fallback.FallbackBandwidthHandler;
 import xyz.jonesdev.sonar.common.fallback.FallbackChannelHandlerAdapter;
-import xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper;
-import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
-import xyz.jonesdev.sonar.common.utility.geyser.GeyserUtil;
 
 import java.lang.reflect.Field;
 import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
 
 import static net.md_5.bungee.netty.PipelineUtils.*;
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
-import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.customDisconnect;
-import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
 
 public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter {
 
@@ -74,11 +61,18 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
       if (wrappedPacket != null) {
         // Intercept any handshake packet by the client
         if (wrappedPacket instanceof Handshake) {
-          handleHandshake((Handshake) wrappedPacket);
+          final Handshake handshake = (Handshake) wrappedPacket;
+          handleHandshake(handshake.getHost(), handshake.getProtocolVersion());
         }
         // Intercept any server login packet by the client
         if (wrappedPacket instanceof LoginRequest) {
-          handleLogin(ctx, (LoginRequest) wrappedPacket, msg);
+          // Make sure to use the potentially modified, real IP
+          final LoginRequest loginRequest = (LoginRequest) wrappedPacket;
+          final HandlerBoss handlerBoss = channel.pipeline().get(HandlerBoss.class);
+          final ChannelWrapper channelWrapper = (ChannelWrapper) CHANNEL_WRAPPER_FIELD.get(handlerBoss);
+          final InetSocketAddress socketAddress = (InetSocketAddress) channelWrapper.getRemoteAddress();
+          handleLogin(ctx, msg, loginRequest.getData(), socketAddress,
+            PACKET_ENCODER, PACKET_DECODER, TIMEOUT_HANDLER, BOSS_HANDLER);
           return;
         }
       }
@@ -86,121 +80,4 @@ public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter
     // Make sure to let the server handle the rest
     ctx.fireChannelRead(msg);
   }
-
-  private void handleHandshake(final @NotNull Handshake handshake) throws Exception {
-    // Check if the player has already sent a handshake packet
-    if (protocolVersion != null) {
-      throw new CorruptedFrameException("Already sent handshake");
-    }
-    // Check if the hostname is invalid
-    if (handshake.getHost().isEmpty()) {
-      throw new CorruptedFrameException("Hostname is empty");
-    }
-    // Connections from unknown protocol versions will be discarded
-    // as this is the safest way of handling unwanted connections
-    if (protocolVersion.isUnknown()) {
-      // Sonar does NOT support snapshots or unknown versions;
-      // I'll try my best to stay up-to-date!
-      throw new CorruptedFrameException("Unknown protocol");
-    }
-    // Store the protocol version
-    protocolVersion = ProtocolVersion.fromId(handshake.getProtocolVersion());
-    // Hook the traffic listener
-    // TODO: Can we implement this in channelActive?
-    channel.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
-  }
-
-  private void handleLogin(final @NotNull ChannelHandlerContext ctx,
-                           final @NotNull LoginRequest loginRequest,
-                           final @NotNull Object wrappedMessage) throws Exception {
-    // Check if the player has already sent a login packet
-    if (username != null) {
-      throw new CorruptedFrameException("Already logged on");
-    }
-    // Increase joins per second for the action bar verbose
-    GlobalSonarStatistics.countLogin();
-    // Store the username
-    username = loginRequest.getData();
-    // Make sure to use the potentially modified, real IP
-    final HandlerBoss handlerBoss = channel.pipeline().get(HandlerBoss.class);
-    final ChannelWrapper channelWrapper = (ChannelWrapper) CHANNEL_WRAPPER_FIELD.get(handlerBoss);
-    final InetSocketAddress socketAddress = (InetSocketAddress) channelWrapper.getRemoteAddress();
-    inetAddress = socketAddress.getAddress();
-
-    // Check the blacklist here since we cannot let the player "ghost join"
-    if (FALLBACK.getBlacklist().asMap().containsKey(inetAddress)) {
-      customDisconnect(channel, protocolVersion, blacklisted, PACKET_ENCODER, BOSS_HANDLER);
-      return;
-    }
-
-    // Don't continue the verification process if the verification is disabled
-    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
-      ctx.fireChannelRead(wrappedMessage);
-      return;
-    }
-
-    // Completely skip Geyser connections
-    if (GeyserUtil.isGeyserConnection(channel, socketAddress)) {
-      ctx.fireChannelRead(wrappedMessage);
-      return;
-    }
-
-    // Check if the player is already queued since we don't want bots to flood the queue
-    if (FALLBACK.getQueue().getQueuedPlayers().containsKey(inetAddress)) {
-      customDisconnect(channel, protocolVersion, alreadyQueued, PACKET_ENCODER, BOSS_HANDLER);
-      return;
-    }
-
-    // Check if Fallback is already verifying a player
-    // → is another player with the same IP address connected to Fallback?
-    if (FALLBACK.getConnected().containsKey(loginRequest.getData())
-      || FALLBACK.getConnected().containsValue(inetAddress)) {
-      customDisconnect(channel, protocolVersion, alreadyVerifying, PACKET_ENCODER, BOSS_HANDLER);
-      return;
-    }
-
-    // Check if the protocol ID of the player is not allowed to enter the server
-    if (Sonar.get().getConfig().getVerification().getBlacklistedProtocols()
-      .contains(protocolVersion.getProtocol())) {
-      customDisconnect(channel, protocolVersion, protocolBlacklisted, PACKET_ENCODER, BOSS_HANDLER);
-      return;
-    }
-
-    // Make sure we actually have to verify the player
-    final String offlineUUIDString = "OfflinePlayer:" + loginRequest.getData();
-    final UUID offlineUUID = UUID.nameUUIDFromBytes(offlineUUIDString.getBytes(StandardCharsets.UTF_8));
-    if (Sonar.get().getVerifiedPlayerController().has(inetAddress, offlineUUID)) {
-      ctx.fireChannelRead(wrappedMessage);
-      return;
-    }
-
-    // Check if the IP address is currently being rate-limited
-    if (!FALLBACK.getRatelimiter().attempt(inetAddress)) {
-      customDisconnect(channel, protocolVersion, reconnectedTooFast, PACKET_ENCODER, BOSS_HANDLER);
-      return;
-    }
-
-    // Check if the protocol ID of the player is allowed to bypass verification
-    if (Sonar.get().getConfig().getVerification().getWhitelistedProtocols()
-      .contains(protocolVersion.getProtocol())) {
-      ctx.fireChannelRead(wrappedMessage);
-      return;
-    }
-
-    // Queue the connection for further processing
-    FALLBACK.getQueue().queue(inetAddress, () -> channel.eventLoop().execute(() -> {
-      // Check if the username matches the valid name regex to prevent
-      // UTF-16 names or other types of exploits
-      if (!Sonar.get().getConfig().getVerification().getValidNameRegex()
-        .matcher(loginRequest.getData()).matches()) {
-        customDisconnect(channel, protocolVersion, invalidUsername, PACKET_ENCODER, BOSS_HANDLER);
-        return;
-      }
-
-      // Create an instance for the Fallback connection
-      final FallbackUser user = new FallbackUserWrapper(channel, inetAddress, protocolVersion);
-      // Let the verification handler take over the channel
-      user.hijack(loginRequest.getData(), offlineUUID, PACKET_ENCODER, PACKET_DECODER, TIMEOUT_HANDLER, BOSS_HANDLER);
-    }));
-  }
 }

sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/fallback/FallbackChannelInitializer.java

@@ -22,19 +22,21 @@ import io.netty.channel.ChannelInitializer;
 import lombok.RequiredArgsConstructor;
 import xyz.jonesdev.sonar.api.ReflectiveOperationException;
 
-import java.lang.reflect.Method;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 
 import static net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER;
 import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_HANDLER;
 
 @RequiredArgsConstructor
 public final class FallbackChannelInitializer extends ChannelInitializer<Channel> {
-  private static final Method INIT_CHANNEL_METHOD;
+  private static final MethodHandle INIT_CHANNEL_METHOD;
 
   static {
     try {
-      INIT_CHANNEL_METHOD = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
-      INIT_CHANNEL_METHOD.setAccessible(true);
+      INIT_CHANNEL_METHOD = MethodHandles.privateLookupIn(ChannelInitializer.class, MethodHandles.lookup())
+        .findVirtual(ChannelInitializer.class, "initChannel", MethodType.methodType(void.class, Channel.class));
     } catch (Throwable throwable) {
       throw new ReflectiveOperationException(throwable);
     }
@@ -46,7 +48,7 @@ public final class FallbackChannelInitializer extends ChannelInitializer<Channel
   protected void initChannel(final Channel channel) throws Exception {
     // Invoke the original method
     try {
-      INIT_CHANNEL_METHOD.invoke(originalChannelInitializer, channel);
+      INIT_CHANNEL_METHOD.invokeExact(originalChannelInitializer, channel);
     } catch (Throwable throwable) {
       throw new ReflectiveOperationException(throwable);
     }

sonar-bungee/src/main/java/xyz/jonesdev/sonar/bungee/fallback/FallbackLoginListener.java

@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.bungee.fallback;
-
-import lombok.RequiredArgsConstructor;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.md_5.bungee.api.connection.PendingConnection;
-import net.md_5.bungee.api.event.PreLoginEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.chat.ComponentSerializer;
-import net.md_5.bungee.connection.InitialHandler;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-import net.md_5.bungee.netty.ChannelWrapper;
-import net.md_5.bungee.protocol.packet.Kick;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.bungee.SonarBungee;
-
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.util.Objects;
-
-import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.closeWith;
-
-@RequiredArgsConstructor
-public final class FallbackLoginListener implements Listener {
-
-  private static final Field CHANNEL_FIELD;
-
-  static {
-    try {
-      CHANNEL_FIELD = InitialHandler.class.getDeclaredField("ch");
-      CHANNEL_FIELD.setAccessible(true);
-    } catch (NoSuchFieldException exception) {
-      throw new ReflectiveOperationException(exception);
-    }
-  }
-
-  @SuppressWarnings("deprecation")
-  @EventHandler(priority = EventPriority.LOWEST)
-  public void handle(final @NotNull PreLoginEvent event) throws IllegalAccessException {
-    // Check if the number of online players using the same IP address as
-    // the connecting player is greater than the configured amount
-    final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();
-    // Don't do anything if the setting is disabled
-    if (maxOnlinePerIp <= 0) return;
-
-    final InetAddress inetAddress = event.getConnection().getAddress().getAddress();
-
-    final long onlinePerIp = SonarBungee.INSTANCE.getPlugin().getServer().getPlayers().stream()
-      .filter(player -> Objects.equals(player.getAddress().getAddress(), inetAddress))
-      .count()
-      + 1 /* add 1 because the player hasn't been added to the list of online players yet */;
-
-    // We use '>=' because the player connecting to the server hasn't joined yet
-    if (onlinePerIp >= maxOnlinePerIp) {
-      final Component component = Sonar.get().getConfig().getTooManyOnlinePerIp();
-      final String serialized = GsonComponentSerializer.gson().serialize(component);
-      final PendingConnection connection = event.getConnection();
-      closeWith(((ChannelWrapper) CHANNEL_FIELD.get(connection)).getHandle(),
-        ProtocolVersion.fromId(connection.getVersion()),
-        new Kick(ComponentSerializer.deserialize(serialized)));
-    }
-  }
-}

sonar-common/build.gradle.kts

@@ -1,5 +1,11 @@
 dependencies {
   compileOnly(project(":api"))
+
+  // adventure nbt for packets
+  compileOnly("net.kyori:adventure-nbt:4.17.0")
+
+  // CAPTCHA image generation
+  implementation("xyz.jonesdev:capja:1.0.3")
 }
 
 java.sourceCompatibility = JavaVersion.VERSION_11

sonar-common/src/main/java/xyz/jonesdev/sonar/common/boot/LibraryLoader.java

@@ -21,10 +21,11 @@ import com.alessiodp.libby.Library;
 import com.alessiodp.libby.LibraryManager;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.SonarPlatform;
 
 @UtilityClass
 class LibraryLoader {
-  void loadLibraries(final @NotNull LibraryManager libraryManager) {
+  void loadLibraries(final @NotNull LibraryManager libraryManager, final @NotNull SonarPlatform platform) {
     libraryManager.addMavenCentral();
     libraryManager.addJitPack();
     libraryManager.loadLibraries(
@@ -61,13 +62,33 @@ class LibraryLoader {
         .groupId("com{}mysql")
         .artifactId("mysql-connector-j")
         .version("8.3.0")
+        .relocate("com{}mysql", "xyz{}jonesdev{}sonar{}libs{}mysql")
         .build(),
       // MariaDB driver
       Library.builder()
         .groupId("org{}mariadb{}jdbc")
         .artifactId("mariadb-java-client")
         .version("3.3.3")
+        .relocate("org{}mariadb", "xyz{}jonesdev{}sonar{}libs{}mariadb")
         .build()
     );
+
+    // Only load adventure if not on Velocity
+    if (platform != SonarPlatform.VELOCITY) {
+      libraryManager.loadLibraries(
+        Library.builder()
+          .groupId("net{}kyori")
+          .artifactId("adventure-text-minimessage")
+          .version("4.17.0")
+          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+          .build(),
+        Library.builder()
+          .groupId("net{}kyori")
+          .artifactId("adventure-text-serializer-gson")
+          .version("4.17.0")
+          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+          .build()
+      );
+    }
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/boot/SonarBootstrap.java

@@ -36,6 +36,7 @@ import xyz.jonesdev.sonar.api.timer.SystemTimer;
 import xyz.jonesdev.sonar.api.verbose.Notification;
 import xyz.jonesdev.sonar.api.verbose.Verbose;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer;
+import xyz.jonesdev.sonar.common.service.SonarServiceThreadManager;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
 import xyz.jonesdev.sonar.common.subcommand.SubcommandRegistryHolder;
 import xyz.jonesdev.sonar.common.update.UpdateChecker;
@@ -53,27 +54,23 @@ public abstract class SonarBootstrap<T> implements Sonar {
   private Notification notificationHandler;
   private SonarConfiguration config;
   private VerifiedPlayerController verifiedPlayerController;
-  private File dataDirectory;
-  private final LibraryManager libraryManager;
   private final SonarStatistics statistics;
   private final SonarPlatform platform;
   private final SubcommandRegistry subcommandRegistry;
   private final SystemTimer launchTimer = new SystemTimer();
 
   public SonarBootstrap(final @NotNull T plugin,
-                        final LibraryManager libraryManager,
-                        final File dataDirectory,
-                        final SonarPlatform platform) {
+                        final @NotNull SonarPlatform platform,
+                        final @NotNull File dataDirectory,
+                        final @NotNull LibraryManager libraryManager) {
+    // Load all libraries before anything else
+    LibraryLoader.loadLibraries(libraryManager, platform);
     // Set the Sonar API
     SonarSupplier.set(this);
-    // Store our library manager for the API
-    this.libraryManager = libraryManager;
-    // Load all libraries before anything else
-    LibraryLoader.loadLibraries(libraryManager);
     // Set the plugin instance
     this.plugin = plugin;
-    this.dataDirectory = dataDirectory;
     this.platform = platform;
+    // Load the rest of the components
     this.statistics = new GlobalSonarStatistics();
     this.verboseHandler = new Verbose();
     this.notificationHandler = new Notification();
@@ -104,6 +101,10 @@ public abstract class SonarBootstrap<T> implements Sonar {
       // Run the per-platform initialization method
       enable();
 
+      // Start threads
+      getLogger().info("Starting all managed threads...");
+      SonarServiceThreadManager.start();
+
       // Done
       getLogger().info("Done ({}s)!", launchTimer);
     } catch (Throwable throwable) {
@@ -130,12 +131,16 @@ public abstract class SonarBootstrap<T> implements Sonar {
     }
 
     // Prepare cached packets
+    getLogger().info("Taking cached snapshots of all packets...");
     FallbackPreparer.prepare();
 
-    // Update ratelimiter cache
-    getFallback().getRatelimiter().setExpiringCache(Caffeine.newBuilder()
+    // Update ratelimiter caches
+    getFallback().getRatelimiter().setAttemptCache(Caffeine.newBuilder()
       .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getReconnectDelay()))
       .build());
+    getFallback().getRatelimiter().setFailCountCache(Caffeine.newBuilder()
+      .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getRememberTime()))
+      .build());
 
     // Update blacklist cache
     final long blacklistTime = getConfig().getVerification().getBlacklistTime();
@@ -156,14 +161,27 @@ public abstract class SonarBootstrap<T> implements Sonar {
     }
 
     // Reinitialize database controller
+    if (verifiedPlayerController != null) {
+      // Close the old connection first
+      verifiedPlayerController.close();
+    }
     verifiedPlayerController = new VerifiedPlayerController();
   }
 
-  public void shutdown() {
+  public final void shutdown() {
+    // Initialize shutdown process
     getLogger().info("Starting shutdown process...");
-
-    // ...
-
+    // Interrupt threads
+    SonarServiceThreadManager.stop();
+    // Close database connection if present
+    if (verifiedPlayerController != null) {
+      verifiedPlayerController.close();
+    }
+    // Run the per-platform disable method
+    disable();
+    // Thank the user for using Sonar
     getLogger().info("Successfully shut down. Goodbye!");
   }
+
+  public abstract void disable();
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/FallbackChannelHandlerAdapter.java

@@ -20,15 +20,26 @@ package xyz.jonesdev.sonar.common.fallback;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.CorruptedFrameException;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.fallback.Fallback;
+import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
+import xyz.jonesdev.sonar.common.util.GeyserDetection;
 
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.UUID;
+
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
+import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.customDisconnect;
+import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.deject;
+import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
 
 @RequiredArgsConstructor
 public class FallbackChannelHandlerAdapter extends ChannelInboundHandlerAdapter {
@@ -36,6 +47,7 @@ public class FallbackChannelHandlerAdapter extends ChannelInboundHandlerAdapter
   protected @Nullable String username;
   protected InetAddress inetAddress;
   protected ProtocolVersion protocolVersion;
+  protected @Nullable FallbackUser user;
 
   protected static final Fallback FALLBACK = Sonar.get().getFallback();
 
@@ -57,7 +69,7 @@ public class FallbackChannelHandlerAdapter extends ChannelInboundHandlerAdapter
     // The player cannot be in the queue if the IP address is invalid
     if (inetAddress != null) {
       // Remove the IP address from the queue
-      FALLBACK.getQueue().remove(inetAddress);
+      FALLBACK.getQueue().getQueuedPlayers().remove(inetAddress);
     }
     // Make sure to let the server handle the rest
     ctx.fireChannelInactive();
@@ -72,4 +84,163 @@ public class FallbackChannelHandlerAdapter extends ChannelInboundHandlerAdapter
     // Simply close the channel if we encounter any errors.
     ctx.close();
   }
+
+  /**
+   * Validates and handles incoming handshake packets
+   *
+   * @param hostname Hostname (server address) sent by the client
+   * @param protocol Protocol version number sent by the client
+   */
+  protected final void handleHandshake(final @NotNull String hostname, final int protocol) throws Exception {
+    // Check if the hostname is invalid
+    if (hostname.isEmpty()) {
+      throw new CorruptedFrameException("Hostname is empty");
+    }
+    // Check if the player has already sent a handshake packet
+    if (protocolVersion != null) {
+      throw new CorruptedFrameException("Already sent handshake");
+    }
+    // Store the protocol version
+    protocolVersion = ProtocolVersion.fromId(protocol);
+    // Hook the traffic listener
+    // TODO: Can we implement this in channelActive?
+    channel.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
+  }
+
+  /**
+   * Validates and handles incoming login packets
+   *
+   * @param ctx           Forwarded channel handler context
+   * @param loginPacket   Login packet sent by the client
+   * @param username      Username sent by the client
+   * @param socketAddress Socket address of the client
+   */
+  protected final void handleLogin(final @NotNull ChannelHandlerContext ctx,
+                                   final @NotNull Object loginPacket,
+                                   final @NotNull String username,
+                                   final @NotNull InetSocketAddress socketAddress,
+                                   final @NotNull String encoder,
+                                   final @NotNull String decoder,
+                                   final @NotNull String timeout,
+                                   final @NotNull String handler) throws Exception {
+    // Check if the player has already sent a login packet
+    if (this.username != null) {
+      throw new CorruptedFrameException("Already sent login");
+    }
+    // Connections from unknown protocol versions will be discarded
+    // as this is the safest way of handling unwanted connections
+    if (protocolVersion.isUnknown()) {
+      // Sonar does NOT support snapshots or unknown versions;
+      // I'll try my best to stay up-to-date!
+      throw new CorruptedFrameException("Unknown protocol version");
+    }
+    // Increase joins per second for the action bar verbose
+    GlobalSonarStatistics.countLogin();
+    // Store the username and IP address
+    this.username = username;
+    this.inetAddress = socketAddress.getAddress();
+
+    // Check the blacklist here since we cannot let the player "ghost join"
+    if (FALLBACK.getBlacklist().asMap().containsKey(inetAddress)) {
+      customDisconnect(channel, protocolVersion, blacklisted, encoder, handler);
+      return;
+    }
+
+    // Don't continue the verification process if the verification is disabled
+    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
+      initialLogin(ctx, loginPacket, encoder, handler);
+      return;
+    }
+
+    // Completely skip Geyser connections if configured
+    final boolean geyser = GeyserDetection.isGeyserConnection(channel, socketAddress);
+    if (geyser && !Sonar.get().getConfig().getVerification().isCheckGeyser()) {
+      initialLogin(ctx, loginPacket, encoder, handler);
+      return;
+    }
+
+    // Check if the player is already queued since we don't want bots to flood the queue
+    if (FALLBACK.getQueue().getQueuedPlayers().containsKey(inetAddress)) {
+      customDisconnect(channel, protocolVersion, alreadyQueued, encoder, handler);
+      return;
+    }
+
+    // Check if Fallback is already verifying a player
+    // → is another player with the same IP address connected to Fallback?
+    if (FALLBACK.getConnected().containsKey(username)
+      || FALLBACK.getConnected().containsValue(inetAddress)) {
+      customDisconnect(channel, protocolVersion, alreadyVerifying, encoder, handler);
+      return;
+    }
+
+    // Check if the protocol ID of the player is not allowed to enter the server
+    if (Sonar.get().getConfig().getVerification().getBlacklistedProtocols()
+      .contains(protocolVersion.getProtocol())) {
+      customDisconnect(channel, protocolVersion, protocolBlacklisted, encoder, handler);
+      return;
+    }
+
+    // Make sure we actually have to verify the player
+    final String offlineUUIDString = "OfflinePlayer:" + username;
+    final UUID offlineUUID = UUID.nameUUIDFromBytes(offlineUUIDString.getBytes(StandardCharsets.UTF_8));
+    if (Sonar.get().getVerifiedPlayerController().has(inetAddress, offlineUUID)) {
+      initialLogin(ctx, loginPacket, encoder, handler);
+      return;
+    }
+
+    // Check if the IP address is currently being rate-limited
+    if (!FALLBACK.getRatelimiter().attempt(inetAddress)) {
+      customDisconnect(channel, protocolVersion, reconnectedTooFast, encoder, handler);
+      return;
+    }
+
+    // Check if the protocol ID of the player is allowed to bypass verification
+    if (Sonar.get().getConfig().getVerification().getWhitelistedProtocols()
+      .contains(protocolVersion.getProtocol())) {
+      initialLogin(ctx, loginPacket, encoder, handler);
+      return;
+    }
+
+    // Queue the connection for further processing
+    FALLBACK.getQueue().getQueuedPlayers().put(inetAddress, () -> {
+      // Check if the username matches the valid name regex to prevent
+      // UTF-16 names or other types of exploits
+      if (!Sonar.get().getConfig().getVerification().getValidNameRegex()
+        .matcher(username).matches()) {
+        customDisconnect(channel, protocolVersion, invalidUsername, encoder, handler);
+        return;
+      }
+
+      // Create an instance for the Fallback connection
+      user = new FallbackUserWrapper(channel, inetAddress, protocolVersion, geyser);
+      // Let the verification handler take over the channel
+      user.hijack(username, offlineUUID, encoder, decoder, timeout, handler);
+    });
+  }
+
+  /**
+   * Executes the maximum accounts per IP limit check before letting the player join
+   *
+   * @param ctx         Forwarded channel handler context
+   * @param loginPacket Login packet sent by the client
+   */
+  protected final void initialLogin(final @NotNull ChannelHandlerContext ctx,
+                                    final @NotNull Object loginPacket,
+                                    final @NotNull String encoder,
+                                    final @NotNull String handler) throws Exception {
+    final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();
+    // Skip the maximum online per IP check if it's disabled in the configuration
+    if (maxOnlinePerIp > 0) {
+      // Check if the number of online players using the same IP address as
+      // the connecting player is greater than the configured amount
+      if (Sonar.get().hasTooManyAccounts(inetAddress, maxOnlinePerIp)) {
+        customDisconnect(channel, protocolVersion, tooManyOnlinePerIP, encoder, handler);
+        return;
+      }
+    }
+
+    ctx.fireChannelRead(loginPacket);
+    // Deject the channel since we don't need it anymore
+    deject(channel.pipeline());
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/FallbackUserWrapper.java

@@ -22,21 +22,21 @@ import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPipeline;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.event.impl.UserBlacklistedEvent;
 import xyz.jonesdev.sonar.api.event.impl.UserVerifyFailedEvent;
 import xyz.jonesdev.sonar.api.event.impl.UserVerifyJoinEvent;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
+import xyz.jonesdev.sonar.api.fallback.FallbackUserState;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketDecoder;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketEncoder;
-import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccessPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.DisconnectPacket;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
 
@@ -44,8 +44,10 @@ import java.net.InetAddress;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_DECODER;
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_ENCODER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_20_2;
+import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.CONFIG;
+import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.GAME;
 
 @Getter
 @ToString(of = {"protocolVersion", "inetAddress"})
@@ -54,14 +56,19 @@ public final class FallbackUserWrapper implements FallbackUser {
   private final ChannelPipeline pipeline;
   private final InetAddress inetAddress;
   private final ProtocolVersion protocolVersion;
+  private final boolean geyser;
+  @Setter
+  private FallbackUserState state = FallbackUserState.LOGIN_ACK; // 1.20.2+
 
   public FallbackUserWrapper(final @NotNull Channel channel,
                              final @NotNull InetAddress inetAddress,
-                             final @NotNull ProtocolVersion protocolVersion) {
+                             final @NotNull ProtocolVersion protocolVersion,
+                             final boolean geyser) {
     this.channel = channel;
     this.pipeline = channel.pipeline();
     this.inetAddress = inetAddress;
     this.protocolVersion = protocolVersion;
+    this.geyser = geyser;
   }
 
   @Override
@@ -72,26 +79,14 @@ public final class FallbackUserWrapper implements FallbackUser {
   @Override
   public void hijack(final @NotNull String username, final @NotNull UUID uuid,
                      final @NotNull String encoder, final @NotNull String decoder,
-                     final @NotNull String timeout, final @NotNull String boss) {
-    // This rarely happens when the channel hangs, but the player is still connecting
-    // This also fixes a unique issue with TCPShield and other reverse proxies
-    if (pipeline.get(encoder) == null || pipeline.get(decoder) == null) {
-      channel.close();
-      return;
-    }
-
-    // Remove main pipeline to completely take over the channel
-    if (pipeline.get(boss) != null) {
-      pipeline.remove(boss);
-    }
-
+                     final @NotNull String timeout, final @NotNull String handler) {
     // The player has joined the verification
     GlobalSonarStatistics.totalAttemptedVerifications++;
 
     if (Sonar.get().getConfig().getVerification().isLogConnections()) {
       // Only log the processing message if the server isn't under attack.
       // We let the user override this through the configuration.
-      if (!Sonar.get().getAttackTracker().isCurrentlyUnderAttack()
+      if (Sonar.get().getAttackTracker().getCurrentAttack() == null
         || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
         Sonar.get().getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getConnectLog()
           .replace("%name%", username)
@@ -115,33 +110,56 @@ public final class FallbackUserWrapper implements FallbackUser {
     final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
     pipeline.replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
 
-    // Send LoginSuccess packet to make the client think they are joining the server
-    write(new LoginSuccessPacket(username, uuid));
+    channel.eventLoop().execute(() -> {
+      // Remove main pipeline to completely take over the channel
+      if (pipeline.get(handler) != null) {
+        pipeline.remove(handler);
+      }
 
-    // The LoginSuccess packet has been sent, now we can change the registry state
-    newEncoder.updateRegistry(protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0
-      ? FallbackPacketRegistry.CONFIG : FallbackPacketRegistry.GAME);
+      // Send LoginSuccess packet to make the client think they are joining the server
+      write(FallbackPreparer.LOGIN_SUCCESS);
 
-    // Replace normal decoder to allow custom packets
-    pipeline.replace(decoder, FALLBACK_PACKET_DECODER,
-      new FallbackPacketDecoder(this, new FallbackVerificationHandler(this, username, uuid)));
+      // The LoginSuccess packet has been sent, now we can change the registry state
+      newEncoder.updateRegistry(protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0 ? CONFIG : GAME);
+
+      try {
+        // Prepare custom packet decoder and verification handler
+        final FallbackVerificationHandler verification = new FallbackVerificationHandler(this, username, uuid);
+        final FallbackPacketDecoder fallbackPacketDecoder = new FallbackPacketDecoder(this, verification);
+        // Replace normal decoder to allow custom packets
+        pipeline.replace(decoder, FALLBACK_PACKET_DECODER, fallbackPacketDecoder);
+
+        if (protocolVersion.compareTo(MINECRAFT_1_20_2) < 0) {
+          // Start initializing the actual join process for pre-1.20.2 clients
+          verification.initialJoinProcess();
+        }
+      } catch (Throwable throwable) {
+        // This rarely happens when the channel hangs and the player is still connecting
+        // I honestly have no idea how else I'm supposed to fix this
+        channel.close();
+      }
+    });
   }
 
   @Override
-  public void fail(@Nullable String reason) {
+  public void fail(final @NotNull String reason) {
+    // Make sure to set the state to failed to drop all handlers
+    setState(FallbackUserState.FAILED);
+
+    // Only log the failed message if the server isn't currently under attack.
+    // However, we let the user override this through the configuration.
+    final boolean shouldLog = Sonar.get().getAttackTracker().getCurrentAttack() == null
+      || Sonar.get().getConfig().getVerification().isLogDuringAttack();
+
+    // Only disconnect the player and log if the channel is active
     if (channel.isActive()) {
       disconnect(Sonar.get().getConfig().getVerification().getVerificationFailed());
 
-      if (reason != null) {
-        // Only log the failed message if the server isn't under attack.
-        // We let the user override this through the configuration.
-        if (!Sonar.get().getAttackTracker().isCurrentlyUnderAttack()
-          || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
-          Sonar.get().getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getFailedLog()
-            .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
-            .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol()))
-            .replace("%reason%", reason));
-        }
+      if (shouldLog) {
+        Sonar.get().getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getFailedLog()
+          .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
+          .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol()))
+          .replace("%reason%", reason));
       }
     }
 
@@ -151,35 +169,40 @@ public final class FallbackUserWrapper implements FallbackUser {
     // Call the VerifyFailedEvent for external API usage
     Sonar.get().getEventManager().publish(new UserVerifyFailedEvent(this, reason));
 
-    // Use a label, so we can easily add more code beneath this method
+    // Use a label, so we can easily add more code beneath this method in the future
     blacklist: {
       // Check if the player has too many failed attempts
       final int blacklistThreshold = Sonar.get().getConfig().getVerification().getBlacklistThreshold();
       // The user is allowed to disable the blacklist entirely by setting the threshold to 0
       if (blacklistThreshold <= 0) break blacklist;
 
-      // Add 1 to the amount of fails since we haven't updated the cached entries yet (for performance)
-      final int failCount = getFailedCount() + 1;
+      // Use 1 as the default amount of fails since we haven't cached anything yet
+      final int failCount = Sonar.get().getFallback().getRatelimiter().getFailCountCache()
+        .asMap().getOrDefault(inetAddress, 1);
+
       // Now we simply need to check if the threshold is reached
-      if (failCount >= blacklistThreshold) {
-        // Call the BotBlacklistedEvent for external API usage
-        Sonar.get().getEventManager().publish(new UserBlacklistedEvent(this));
-
-        // Increment amount of total blacklisted players
-        GlobalSonarStatistics.totalBlacklistedPlayers++;
-
-        Sonar.get().getFallback().getBlacklist().put(getInetAddress(), (byte) 0);
-        Sonar.get().getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getBlacklistLog()
-          .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
-          .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol())));
-
-        // Invalidate the cached entry to ensure memory safety
-        invalidateFails();
+      if (failCount < blacklistThreshold) {
+        // Make sure we increment the number of fails
+        Sonar.get().getFallback().getRatelimiter().incrementFails(inetAddress, failCount);
         break blacklist;
       }
 
-      // Make sure we increment the number of fails
-      incrementFails();
+      // Call the BotBlacklistedEvent for external API usage
+      Sonar.get().getEventManager().publish(new UserBlacklistedEvent(this));
+
+      // Increment amount of total blacklisted players
+      GlobalSonarStatistics.totalBlacklistedPlayers++;
+
+      Sonar.get().getFallback().getBlacklist().put(getInetAddress(), (byte) 0);
+
+      if (shouldLog) {
+        Sonar.get().getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getBlacklistLog()
+          .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
+          .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol())));
+      }
+
+      // Invalidate the cached entry to ensure memory safety
+      Sonar.get().getFallback().getRatelimiter().getFailCountCache().invalidate(inetAddress);
     }
   }
 
@@ -212,7 +235,7 @@ public final class FallbackUserWrapper implements FallbackUser {
    *
    * @param packet          Disconnect packet
    * @param encoder         Encoder to replace
-   * @param boss            Main pipeline to remove
+   * @param handler         Main pipeline to remove
    * @param channel         Channel of the player
    * @param protocolVersion Protocol version of the player
    */
@@ -220,7 +243,19 @@ public final class FallbackUserWrapper implements FallbackUser {
                                       final @NotNull ProtocolVersion protocolVersion,
                                       final @NotNull FallbackPacket packet,
                                       final @NotNull String encoder,
-                                      final @NotNull String boss) {
+                                      final @NotNull String handler) {
+    if (channel.eventLoop().inEventLoop()) {
+      _customDisconnect(channel, protocolVersion, packet, encoder, handler);
+    } else {
+      channel.eventLoop().execute(() -> _customDisconnect(channel, protocolVersion, packet, encoder, handler));
+    }
+  }
+
+  private static void _customDisconnect(final @NotNull Channel channel,
+                                        final @NotNull ProtocolVersion protocolVersion,
+                                        final @NotNull FallbackPacket packet,
+                                        final @NotNull String encoder,
+                                        final @NotNull String boss) {
     // Remove main pipeline to completely take over the channel
     if (channel.pipeline().get(boss) != null) {
       channel.pipeline().remove(boss);
@@ -238,4 +273,17 @@ public final class FallbackUserWrapper implements FallbackUser {
       channel.close();
     }
   }
+
+  /**
+   * Removes Sonar's pipelines from a channel to save
+   * unnecessary RAM and CPU usage
+   *
+   * @param pipeline Pipeline object of the channel
+   */
+  public static void deject(final @NotNull ChannelPipeline pipeline) {
+    // Remove Sonar's pipelines if they exist
+    if (pipeline.get(FALLBACK_HANDLER) != null) {
+      pipeline.remove(FALLBACK_HANDLER);
+    }
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/FallbackVerificationHandler.java

@@ -21,24 +21,24 @@ import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.DecoderException;
 import lombok.val;
-import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.event.impl.UserVerifySuccessEvent;
 import xyz.jonesdev.sonar.api.fallback.Fallback;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
+import xyz.jonesdev.sonar.api.fallback.FallbackUserState;
 import xyz.jonesdev.sonar.api.model.VerifiedPlayer;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
 import xyz.jonesdev.sonar.common.fallback.protocol.*;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.ItemMapType;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.MapInfoPreparer;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.PreparedMapInfo;
+import xyz.jonesdev.sonar.common.fallback.protocol.captcha.ItemType;
+import xyz.jonesdev.sonar.common.fallback.protocol.captcha.MapCaptchaInfo;
+import xyz.jonesdev.sonar.common.fallback.protocol.entity.EntityType;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.FinishConfigurationPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledgedPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
-import xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil;
+import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 
 import java.util.Objects;
 import java.util.Random;
@@ -48,48 +48,36 @@ import java.util.regex.Pattern;
 import static xyz.jonesdev.sonar.api.config.SonarConfiguration.Verification.Gravity.Gamemode.CREATIVE;
 import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_DECODER;
 import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_ENCODER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackUserState.*;
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.BRAND_CHANNEL;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.BRAND_CHANNEL_LEGACY;
 
 public final class FallbackVerificationHandler implements FallbackPacketListener {
   private static final Random RANDOM = new Random();
   private static final Fallback FALLBACK = Sonar.get().getFallback();
 
-  // General
   private final SystemTimer login = new SystemTimer();
   private final @NotNull FallbackUser user;
   private final String username;
   private final UUID playerUuid;
-  private @NotNull State state = State.LOGIN_ACK; // 1.20.2
 
   // Checks
   private short expectedTransactionId;
   private int expectedKeepAliveId, expectedTeleportId = -1;
-  private int tick, totalReceivedPackets, ignoredMovementTicks;
+  private int tick, totalReceivedPackets;
   private double posX, posY, posZ, lastY, spawnYPosition;
   private boolean resolvedClientBrand, resolvedClientSettings;
   private boolean listenForMovements;
+  private boolean receivedSteerBoat, receivedPlayerInput;
 
-  // Map captcha
-  private final SystemTimer keepAlive = new SystemTimer();
-  private final SystemTimer actionBar = new SystemTimer();
-  private @Nullable PreparedMapInfo captcha;
-  private int captchaTriesLeft;
+  // CAPTCHA
+  private @Nullable MapCaptchaInfo captcha;
+  private int captchaTriesLeft, lastCountdownIndex;
 
-  public enum State {
-    // 1.20.2 configuration state
-    LOGIN_ACK, CONFIGURE,
-    // pre-JOIN ping check
-    KEEP_ALIVE,
-    // post-JOIN checks
-    CLIENT_SETTINGS, PLUGIN_MESSAGE, TRANSACTION,
-    // PLAY checks
-    TELEPORT, POSITION,
-    // Captcha
-    MAP_CAPTCHA,
-    // Done
-    SUCCESS
-  }
+  // Cached options to make sure the original values don't change throughout the verification
+  private final boolean performVehicle, performCaptcha, performGravity, performCollisions, transfer;
 
   public FallbackVerificationHandler(final @NotNull FallbackUser user,
                                      final @NotNull String username,
@@ -97,18 +85,26 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
     this.user = user;
     this.username = username;
     this.playerUuid = playerUuid;
-
-    if (user.getProtocolVersion().compareTo(MINECRAFT_1_20_2) < 0) {
-      // Start initializing the actual join process
-      initialJoinProcess();
-    }
+    // We don't want to check Geyser players for valid gravity, as this might cause issues because of the protocol
+    this.performGravity = !user.isGeyser() && Sonar.get().getConfig().getVerification().getGravity().isEnabled();
+    this.performCollisions = Sonar.get().getConfig().getVerification().getGravity().isCheckCollisions();
+    this.performCaptcha = FALLBACK.shouldPerformCaptcha();
+    this.performVehicle = FALLBACK.shouldPerformVehicleCheck();
+    this.transfer = Sonar.get().getConfig().getVerification().getTransfer().isEnabled()
+      && user.getProtocolVersion().compareTo(MINECRAFT_1_20_5) >= 0;
   }
 
   private void configure() {
     // Set the state to CONFIGURE to avoid false positives
-    state = State.CONFIGURE;
+    user.setState(CONFIGURE);
     // Send the necessary configuration packets to the client
-    user.delayedWrite(REGISTRY_SYNC);
+    if (user.getProtocolVersion().compareTo(MINECRAFT_1_20_5) >= 0) {
+      for (final FallbackPacket packet : REGISTRY_SYNC_1_20_5) {
+        user.delayedWrite(packet);
+      }
+    } else {
+      user.delayedWrite(REGISTRY_SYNC_LEGACY);
+    }
     user.delayedWrite(FINISH_CONFIGURATION);
     // Send all packets in one flush
     user.getChannel().flush();
@@ -131,13 +127,13 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
     }
   }
 
-  private void initialJoinProcess() {
+  public void initialJoinProcess() {
     if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
       // 1.7 players don't have KeepAlive packets in the login process
       sendJoinGamePacket();
     } else {
       // Set the state to KEEP_ALIVE to avoid false positives
-      state = State.KEEP_ALIVE;
+      user.setState(KEEP_ALIVE);
       // Generate a random KeepAlive ID for the pre-join check
       expectedKeepAliveId = RANDOM.nextInt();
       // Send first KeepAlive to check if the connection is somewhat responsive
@@ -148,7 +144,7 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
   private void sendTransaction() {
     // Set the state to TRANSACTION to avoid false positives
     // and go on with the flow of the verification.
-    state = State.TRANSACTION;
+    user.setState(TRANSACTION);
     // Generate a random transaction ID
     expectedTransactionId = (short) RANDOM.nextInt();
     // Send a transaction with the given ID
@@ -161,7 +157,7 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
       // Set the state to CLIENT_SETTINGS to avoid false positives
       // (1.20.2 needs the LOGIN_ACK state) and go on with
       // the flow of the verification.
-      state = State.CLIENT_SETTINGS;
+      user.setState(CLIENT_SETTINGS);
     }
     // Send the JoinGame packet so we can continue the verification
     user.write(joinGame);
@@ -175,7 +171,7 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
   private void sendAbilitiesAndTeleport() {
     // Set the state to TELEPORT to avoid false positives
     // and go on with the flow of the verification.
-    state = State.TELEPORT;
+    user.setState(TELEPORT);
     // Make sure the player is unable to fly (e.g. if the player is in creative mode)
     if (Sonar.get().getConfig().getVerification().getGravity().getGamemode() == CREATIVE) {
       user.delayedWrite(DEFAULT_ABILITIES);
@@ -195,16 +191,16 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
   }
 
   private void sendChunkData() {
-    // If we don't have gravity and captcha enabled, simply finish verification
-    if (!Sonar.get().getConfig().getVerification().getGravity().isEnabled()
-      && !FALLBACK.shouldDoMapCaptcha()) {
+    // If we don't have any checks, simply finish verification
+    // This is *hopefully* a very rare case though...
+    if (!performGravity && !performCaptcha && !performVehicle) {
       // Save some work by finishing before sending even more packets
       finish();
       return;
     }
     // Set the state to POSITION to avoid false positives
     // and go on with the flow of the verification.
-    state = State.POSITION;
+    user.setState(POSITION);
     // 1.20.3 packets introduced game events
     if (user.getProtocolVersion().compareTo(MINECRAFT_1_20_3) >= 0) {
       // Make sure the client knows that we're sending chunks next
@@ -213,9 +209,9 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
     // Teleport player into the fake lobby by sending an empty chunk
     user.delayedWrite(EMPTY_CHUNK_DATA);
     // Checking gravity is disabled, just finish verification
-    if (!Sonar.get().getConfig().getVerification().getGravity().isEnabled()) {
+    if (!performGravity) {
       // Switch to captcha state if needed
-      captchaOrFinish();
+      vehicleCheckOrNext();
       return;
     }
     // Send an UpdateSectionBlocks packet with a platform of blocks
@@ -255,7 +251,7 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
     }
   }
 
-  private void handlePacketDuringCaptcha(final @NotNull FallbackPacket packet) {
+  private void handlePacketsCAPTCHA(final @NotNull FallbackPacket packet) {
     // Check if the player took too long to enter the captcha
     final int maxDuration = Sonar.get().getConfig().getVerification().getMap().getMaxDuration();
     checkFrame(!login.elapsed(maxDuration), "took too long to enter captcha");
@@ -263,80 +259,122 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
     // Handle incoming chat messages
     if (packet instanceof UniversalChatPacket) {
       final UniversalChatPacket chat = (UniversalChatPacket) packet;
-      Objects.requireNonNull(captcha);
-      if (!chat.getMessage().equals(captcha.getInfo().getAnswer())) {
-        // Captcha is incorrect
-        checkFrame(captchaTriesLeft-- > 0, "failed captcha too often");
-        user.write(incorrectCaptcha);
+      final String answer = Objects.requireNonNull(captcha).getAnswer();
+
+      if (chat.getMessage().equals(answer)) {
+        // Captcha is correct
+        finish();
         return;
       }
-      // Captcha is correct
-      finish();
+
+      // Captcha is incorrect
+      checkFrame(captchaTriesLeft-- > 0, "failed captcha too often");
+      user.write(incorrectCaptcha);
       return;
     }
 
-    // Every second
-    if (actionBar.elapsed(1000L)) {
-      final String actionBarMessage = Sonar.get().getConfig().getVerification().getMap().getEnterCodeActionBar();
-      // Only send action bar if the message is actually supposed to be sent
-      if (!actionBarMessage.isEmpty()) {
-        final String timeLeft = String.format("%.0f", (maxDuration - login.delay()) / 1000D);
-        user.write(new UniversalChatPacket(MiniMessage.miniMessage().deserialize(
-          actionBarMessage.replace("%time-left%", timeLeft)), UniversalChatPacket.GAME_INFO_TYPE));
-        // Make sure to reset the timer
-        actionBar.reset();
+    // Only expect idle (position) packets
+    if (packet instanceof PlayerPositionPacket
+      || packet instanceof PlayerPositionLookPacket) {
+      // A position packet is sent every second
+      final long difference = maxDuration - login.delay();
+      final int index = (int) (difference / 1000D);
+      // Make sure we can actually safely get and send the packet
+      if (lastCountdownIndex != index && index >= 0 && xpCountdown.length > index) {
+        // Send the countdown using the experience bar
+        user.write(xpCountdown[index]);
+        // Send a KeepAlive packet to prevent timeout
+        user.write(CAPTCHA_KEEP_ALIVE);
       }
-    }
-
-    // Every 10 seconds
-    if (keepAlive.elapsed(10_000L)) {
-      // Send a KeepAlive packet to prevent timeout
-      user.delayedWrite(CAPTCHA_KEEP_ALIVE);
-      // Send both packets in one flush
-      user.getChannel().flush();
-      // Make sure to reset the timer
-      keepAlive.reset();
+      lastCountdownIndex = index;
     }
   }
 
   @Override
   public void handle(final @NotNull FallbackPacket packet) {
-    // The player has already been verified, drop all other packets
-    if (state == State.SUCCESS) return;
+    // The player has already been verified or failed the verification -> drop packet
+    if (!user.getState().canReceivePackets()) return;
 
-    // We are expecting a captcha code in chat, drop all other packets
-    if (state == State.MAP_CAPTCHA) {
-      handlePacketDuringCaptcha(packet);
+    // Calculate maximum amount of packets sent by the client to the server
+    final int maxPackets = Sonar.get().getConfig().getVerification().getMaxLoginPackets()
+      + maxMovementTick // Account for positions/fall check
+      + Sonar.get().getConfig().getVerification().getMap().getMaxDuration()
+      + Sonar.get().getConfig().getVerification().getMap().getMaxTries();
+    checkFrame(++totalReceivedPackets < maxPackets, "too many packets");
+
+    // We are expecting a code in chat, drop all other packets
+    if (user.getState() == CAPTCHA) {
+      handlePacketsCAPTCHA(packet);
       return;
     }
 
-    // Check if the player is not sending a ton of packets to the server
-    final int maxPackets = Sonar.get().getConfig().getVerification().getMaxLoginPackets() + maxMovementTick;
-    checkFrame(++totalReceivedPackets < maxPackets, "too many packets");
+    if (packet instanceof PaddleBoatPacket) {
+      // Check if we are currently expecting a PaddleBoatPacket packet
+      assertState(VEHICLE);
 
-    // Check for timeout since the player could be sending packets but not important ones
-    final long timeout = Sonar.get().getConfig().getVerification().getMaxPing();
-    checkFrame(!login.elapsed(timeout), "time limit exceeded");
+      // Only pass the player if both checks are passed
+      if (receivedPlayerInput && receivedSteerBoat) {
+        captchaOrNext();
+      }
+
+      // Mark paddle boat check as passed
+      receivedSteerBoat = true;
+    }
+
+    if (packet instanceof PlayerInputPacket) {
+      // Check if we are currently expecting a PlayerInputPacket packet
+      assertState(VEHICLE);
+
+      final PlayerInputPacket inputPacket = (PlayerInputPacket) packet;
+
+      // Make sure the values sent by the client are legitimate
+      checkFrame(inputPacket.getForward() <= 0.98f, "invalid vehicle speed (f)");
+      checkFrame(inputPacket.getSideways() <= 0.98f, "invalid vehicle speed (s)");
+
+      // Don't verify if the player tries unmounting or jumping
+      checkFrame(!inputPacket.isJump(), "tried to jump in vehicle");
+      checkFrame(!inputPacket.isUnmount(), "tried to escape the vehicle");
+
+      // Only pass the player if both checks are passed
+      if (receivedPlayerInput && receivedSteerBoat) {
+        captchaOrNext();
+      }
+
+      // pre-1.9 clients do not have a PaddleBoat packet
+      if (user.getProtocolVersion().compareTo(MINECRAFT_1_9) < 0) {
+        receivedSteerBoat = true;
+      } else if (!user.isGeyser()) {
+        // PaddleBoat → PlayerInput → PaddleBoat
+        checkFrame(receivedSteerBoat, "invalid vehicle steering order");
+      }
+      // Mark player input check as passed
+      receivedPlayerInput = true;
+      return;
+    }
 
     if (packet instanceof LoginAcknowledgedPacket) {
       // Check if we are currently expecting a LoginAcknowledged packet
-      assertState(State.LOGIN_ACK);
+      assertState(LOGIN_ACK);
 
       // Start the configuration process for 1.20.2 clients
       configure();
+      return;
     }
 
     if (packet instanceof FinishConfigurationPacket) {
       // Check if we are currently expecting a FinishConfiguration packet
-      assertState(State.CONFIGURE);
+      assertState(CONFIGURE);
 
       // Check if the client has already sent valid ClientSettings and PluginMessage packets
-      checkFrame(resolvedClientBrand, "did not resolve client brand");
-      checkFrame(resolvedClientSettings, "did not resolve client settings");
+      if (!user.isGeyser()) {
+        checkFrame(resolvedClientBrand, "did not resolve client brand");
+        checkFrame(resolvedClientSettings, "did not resolve client settings");
+      }
 
       // Start initializing the actual join process
       updateEncoderDecoderState(FallbackPacketRegistry.GAME);
       initialJoinProcess();
+      return;
     }
 
     if (packet instanceof KeepAlivePacket) {
@@ -346,12 +384,13 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
       if (keepAlive.getId() == 0 && user.getProtocolVersion().compareTo(MINECRAFT_1_8) <= 0) return;
 
       // Check if we are currently expecting a KeepAlive packet
-      assertState(State.KEEP_ALIVE);
+      assertState(KEEP_ALIVE);
 
       checkFrame(keepAlive.getId() == expectedKeepAliveId, "invalid KeepAlive ID");
 
       // The correct KeepAlive packet has been received
       sendJoinGamePacket();
+      return;
     }
 
     if (packet instanceof ClientSettingsPacket) {
@@ -361,20 +400,24 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
       checkFrame(validateClientLocale(user, clientSettings.getLocale()), "invalid locale");
 
       // Clients sometimes mess up the ClientSettings or PluginMessage packet.
-      if (state == State.CLIENT_SETTINGS) {
-        state = State.PLUGIN_MESSAGE;
+      // Probably caused by some race condition in Minecraft 1.13+
+      if (user.getState() == CLIENT_SETTINGS) {
+        user.setState(PLUGIN_MESSAGE);
       }
 
       // Make sure we mark the ClientSettings as valid
       resolvedClientSettings = true;
+      return;
     }
 
     if (packet instanceof PluginMessagePacket) {
       final PluginMessagePacket pluginMessage = (PluginMessagePacket) packet;
 
+      final boolean usingModernChannel = pluginMessage.getChannel().equals(BRAND_CHANNEL);
+      final boolean usingLegacyChannel = pluginMessage.getChannel().equals(BRAND_CHANNEL_LEGACY);
+
       // Only the brand channel is important, drop the rest
-      if (pluginMessage.getChannel().equals("MC|Brand")
-        || pluginMessage.getChannel().equals("minecraft:brand")) {
+      if (usingModernChannel || usingLegacyChannel) {
         // Check if the brand packet was sent twice,
         // which is not possible when using a vanilla Minecraft client.
         checkFrame(!resolvedClientBrand, "duplicate client brand packet");
@@ -383,15 +426,15 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
         // system ('minecraft:' + channel) and anything below 1.13 uses
         // the legacy namespace system ('MC|' + channel).
         final boolean v1_13 = user.getProtocolVersion().compareTo(MINECRAFT_1_13) >= 0;
-        checkFrame(pluginMessage.getChannel().equals("MC|Brand") || v1_13, "invalid channel");
+        checkFrame(usingLegacyChannel || v1_13, "invalid channel");
 
         // Validate the client branding using a regex to filter unwanted characters.
         if (Sonar.get().getConfig().getVerification().getBrand().isEnabled()) {
-          checkFrame(validateClientBrand(user, pluginMessage.content()), "invalid client brand");
+          checkFrame(validateClientBrand(user, pluginMessage.getSlicedBuffer()), "invalid client brand");
         }
 
         // Clients sometimes mess up the ClientSettings or PluginMessage packet.
-        if (state == State.PLUGIN_MESSAGE) {
+        if (user.getState() == PLUGIN_MESSAGE) {
           // Send the transaction packet
           sendTransaction();
         }
@@ -399,18 +442,19 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
         // Make sure we mark the PluginMessage as valid
         resolvedClientBrand = true;
       }
+      return;
     }
 
     if (packet instanceof TransactionPacket) {
       // Check if we are currently expecting a Transaction packet
-      assertState(State.TRANSACTION);
+      assertState(TRANSACTION);
 
       final TransactionPacket transaction = (TransactionPacket) packet;
 
       // The transaction should always be accepted
       checkFrame(transaction.isAccepted(), "transaction not accepted?!");
       // Check if the transaction ID is valid
-      checkFrame(transaction.getId() == expectedTransactionId, "invalid transaction id");
+      checkFrame(transaction.getTransactionId() == expectedTransactionId, "invalid transaction id");
 
       // First, send an Abilities packet to the client to make
       // sure the player falls even in spectator mode.
@@ -426,11 +470,12 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
         // the channel earlier when we teleported the player.
         user.getChannel().flush();
       }
+      return;
     }
 
     if (packet instanceof TeleportConfirmPacket) {
       // Check if we are currently expecting a TeleportConfirm packet
-      assertState(State.TELEPORT);
+      assertState(TELEPORT);
 
       // Check if the teleport ID is correct
       final TeleportConfirmPacket teleportConfirm = (TeleportConfirmPacket) packet;
@@ -438,169 +483,202 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
 
       // Reset all values to ensure safety on teleport
       tick = 1;
-      posY = lastY = -1;
-      expectedTeleportId = -1;
+      posY = lastY = expectedTeleportId = -1;
 
       // Now we can send the chunk data
       sendChunkData();
+      return;
     }
 
-    if (state != State.LOGIN_ACK) {
+    // Only handle position packets if we aren't in certain phases
+    if (user.getState() != LOGIN_ACK && user.getState() != VEHICLE) {
       if (packet instanceof PlayerPositionPacket) {
         final PlayerPositionPacket position = (PlayerPositionPacket) packet;
         handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
+        return;
       }
 
       if (packet instanceof PlayerPositionLookPacket) {
         final PlayerPositionLookPacket position = (PlayerPositionLookPacket) packet;
         handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
+        return;
       }
 
-      if (packet instanceof PlayerTickPacket) {
-        final PlayerTickPacket player = (PlayerTickPacket) packet;
+      if (packet instanceof PlayerPositionIdlePacket) {
+        final PlayerPositionIdlePacket player = (PlayerPositionIdlePacket) packet;
         handlePositionUpdate(posX, posY, posZ, player.isOnGround());
       }
     }
   }
 
   private void handlePositionUpdate(final double x, final double y, final double z, final boolean ground) {
-    // 1.8 does not have a TeleportConfirm packet, so we need to handle the spawning differently
-    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) <= 0
-      && expectedTeleportId != -1 // Check if the teleport ID is currently unset
-      // Then, check if the position is equal to the spawn position
-      && x == SPAWN_X_POSITION && y == spawnYPosition && z == SPAWN_Z_POSITION) {
-      // Reset all values to ensure safety on teleport
-      tick = 1;
-      posY = -1;
-      expectedTeleportId = -1;
-    }
-
-    posX = x;
-    lastY = posY;
-    posY = y;
-    posZ = z;
-
-    // The player is not allowed to move away from the collision platform.
-    // This should not happen unless the max movement tick is configured to a high number.
-    checkFrame(Math.abs(x - BLOCKS_PER_ROW) < BLOCKS_PER_ROW, "moved too far (x)");
-    checkFrame(Math.abs(z - BLOCKS_PER_ROW) < BLOCKS_PER_ROW, "moved too far (z)");
-
-    // Check if the client hasn't moved before sending the first movement packet
-    if (!listenForMovements) {
-      if (posX == SPAWN_X_POSITION && posZ == SPAWN_Z_POSITION) {
-        // Now, once we verified the X and Z position, we can safely check for gravity
-        listenForMovements = true;
+    try {
+      // 1.8 does not have a TeleportConfirm packet, so we need to handle the spawning differently
+      if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) <= 0
+        && expectedTeleportId != -1 // Check if the teleport ID is currently unset
+        // Then, check if the position is equal to the spawn position
+        && x == SPAWN_X_POSITION && y == spawnYPosition && z == SPAWN_Z_POSITION) {
+        // Reset all values to ensure safety on teleport
+        tick = 1;
+        posY = expectedTeleportId = -1;
+        // Check for ground state in the first packet
+        checkFrame(!ground, "invalid ground state");
       }
 
-      lastY = spawnYPosition;
-      return;
-    }
+      posX = x;
+      lastY = posY;
+      posY = y;
+      posZ = z;
 
-    final double deltaY = lastY - y;
-    // The deltaY is 0 whenever the player sends their first position packet.
-    // We have to account for this or the player will fail the verification.
-    if (deltaY == 0) {
-      // Check for too many ignored Y ticks
-      final int maxIgnoredTicks = Sonar.get().getConfig().getVerification().getGravity().getMaxIgnoredTicks();
-      checkFrame(++ignoredMovementTicks < maxIgnoredTicks, "too many ignored ticks");
-      return;
-    }
+      // The player is not allowed to move away from the collision platform.
+      // This should not happen unless the max movement tick is configured to a high number.
+      checkFrame(Math.abs(x - BLOCKS_PER_ROW) < BLOCKS_PER_ROW, "moved too far (x)");
+      checkFrame(Math.abs(z - BLOCKS_PER_ROW) < BLOCKS_PER_ROW, "moved too far (z)");
 
-    // Calculate the difference between the player's Y coordinate and the expected Y coordinate
-    double collisionOffsetY = (DEFAULT_Y_COLLIDE_POSITION + blockType.getBlockHeight()) - y;
-    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
-      collisionOffsetY += 1.62f; // 1.7 is weird and sends the head position instead of the AABB minY
-    }
+      // Check if the client hasn't moved before sending the first movement packet
+      if (!listenForMovements) {
+        if (posX == SPAWN_X_POSITION && posZ == SPAWN_Z_POSITION) {
+          // Now, once we verified the X and Z position, we can safely check for gravity
+          listenForMovements = true;
+        }
 
-    // Check if the player is colliding by performing a basic Y offset check.
-    // The offset cannot be greater than 0 since the blocks will not let the player fall through them.
-    checkFrame(collisionOffsetY <= 0, "fell through blocks: " + collisionOffsetY);
-
-    if (tick > maxMovementTick) {
-      // Log/debug position if enabled in the configuration
-      if (Sonar.get().getConfig().getVerification().isDebugXYZPositions()) {
-        FALLBACK.getLogger().info("{}: {}/{}/{} - deltaY: {} - ground: {} - collision: {}",
-          username, x, y, z, deltaY, ground, collisionOffsetY);
-      }
-
-      // If the collision check is disabled, finish verification
-      if (!Sonar.get().getConfig().getVerification().getGravity().isCheckCollisions()) {
-        captchaOrFinish();
+        lastY = spawnYPosition;
         return;
       }
 
-      // Perform the collision check
-      if (ground) {
-        // Make sure the player is actually colliding with the blocks and not only spoofing ground
-        checkFrame(collisionOffsetY > -0.03, "illegal collision: " + collisionOffsetY);
-        // The player is colliding to blocks, finish verification
-        captchaOrFinish();
-        return;
+      final double deltaY = lastY - y;
+      // The deltaY is 0 whenever the player sends their first position packet.
+      // We have to account for this or the player will fail the verification.
+      if (deltaY == 0) return;
+
+      // Calculate the difference between the player's Y coordinate and the expected Y coordinate
+      double collisionOffsetY = (DEFAULT_Y_COLLIDE_POSITION + blockType.getBlockHeight()) - y;
+      if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
+        collisionOffsetY += 1.62f; // 1.7 is weird and sends the head position instead of the AABB minY
+      }
+
+      // Check if the player is colliding by performing a basic Y offset check.
+      // The offset cannot be greater than 0 since the blocks will not let the player fall through them.
+      checkFrame(collisionOffsetY <= 0, "fell through blocks: " + collisionOffsetY);
+
+      if (tick > maxMovementTick) {
+        // Log/debug position if enabled in the configuration
+        if (Sonar.get().getConfig().getVerification().isDebugXYZPositions()) {
+          FALLBACK.getLogger().info("{}: {}/{}/{} - deltaY: {} - ground: {} - collision: {}",
+            username, x, y, z, deltaY, ground, collisionOffsetY);
+        }
+
+        // If the collision check is disabled, finish verification
+        if (!performCollisions) {
+          vehicleCheckOrNext();
+          return;
+        }
+
+        // Perform the collision check
+        if (ground) {
+          // Make sure the player is actually colliding with the blocks and not only spoofing ground
+          checkFrame(collisionOffsetY > -0.03, "illegal collision: " + collisionOffsetY);
+          // The player is colliding to blocks, finish verification
+          vehicleCheckOrNext();
+          return;
+        } else {
+          // Make sure the player is colliding with blocks but is sending an invalid ground state
+          checkFrame(collisionOffsetY != 0, "no ground: " + collisionOffsetY);
+        }
       } else {
-        // Make sure the player is colliding with blocks but is sending an invalid ground state
-        checkFrame(collisionOffsetY != 0, "no ground: " + collisionOffsetY);
-      }
-    } else {
-      // Check if the player is spoofing the ground state
-      checkFrame(!ground, "spoofed ground state");
-    }
-
-    // Make sure we don't run out of predicted Y motions
-    checkFrame(tick < preparedCachedYMotions.length, "too many movements");
-
-    if (!ground) {
-      final double predictedY = preparedCachedYMotions[tick];
-      final double offsetY = Math.abs(deltaY - predictedY);
-
-      // Log/debug position if enabled in the configuration
-      if (Sonar.get().getConfig().getVerification().isDebugXYZPositions()) {
-        FALLBACK.getLogger().info("{}: {}/{}/{} - deltaY: {} - prediction: {} - offset: {}",
-          username, x, y, z, deltaY, predictedY, offsetY);
+        // Check if the player is spoofing the ground state
+        checkFrame(!ground, "spoofed ground state");
       }
 
-      // Check if the y motion is roughly equal to the predicted value
-      checkFrame(offsetY < 0.005, String.format("invalid gravity: %d, %.7f, %.10f, %.10f != %.10f",
-        tick, y, offsetY, deltaY, predictedY));
-    }
-    tick++;
-  }
+      // Make sure we don't run out of predicted Y motions
+      checkFrame(tick < preparedCachedYMotions.length, "too many movements");
 
-  private void captchaOrFinish() {
-    if (FALLBACK.shouldDoMapCaptcha()) {
-      if (MapInfoPreparer.getPreparedCAPTCHAs() == 0) {
-        // This should not happen, but we have to return if there is no captcha prepared
-        user.disconnect(Sonar.get().getConfig().getVerification().getCurrentlyPreparing());
+      if (!ground && performGravity) {
+        final double predictedY = preparedCachedYMotions[tick];
+        final double offsetY = Math.abs(deltaY - predictedY);
+
+        // Log/debug position if enabled in the configuration
+        if (Sonar.get().getConfig().getVerification().isDebugXYZPositions()) {
+          FALLBACK.getLogger().info("{}: {}/{}/{} - deltaY: {} - prediction: {} - offset: {}",
+            username, x, y, z, deltaY, predictedY, offsetY);
+        }
+
+        // Check if the y motion is roughly equal to the predicted value
+        checkFrame(offsetY < 5e-3, String.format("invalid gravity: %d, %.7f, %.10f, %.10f != %.10f",
+          tick, y, offsetY, deltaY, predictedY));
+      }
+      tick++;
+    } catch (CorruptedFrameException exception) {
+      // Do not throw the exception if the user configured to display the CAPTCHA instead
+      if (Sonar.get().getConfig().getVerification().getGravity().isCaptchaOnFail()) {
+        handleCAPTCHA();
         return;
       }
-      // Set the state to MAP_CAPTCHA, so we don't handle any unnecessary packets
-      state = State.MAP_CAPTCHA;
-      if (!Sonar.get().getConfig().getVerification().getGravity().isEnabled()
-        && user.getProtocolVersion().compareTo(MINECRAFT_1_18_2) >= 0) {
-        // Make sure the player escapes the 1.18.2+ "Loading terrain" screen
-        user.delayedWrite(CAPTCHA_SPAWN_POSITION);
-      }
-      // Initialize the map captcha
-      handleMapCaptcha();
-    } else {
-      // Finish the verification
-      finish();
+      // Interrupt the netty eventLoop to immediately stop further processing
+      throw new DecoderException(exception);
     }
   }
 
-  private void handleMapCaptcha() {
+  // TODO: Maybe recode the flow with a better state system?
+  private void vehicleCheckOrNext() {
+    if (performVehicle) {
+      // Initialize the vehicle check
+      handleVehicleCheck();
+      return;
+    }
+    captchaOrNext();
+  }
+
+  private void captchaOrNext() {
+    if (performCaptcha) {
+      // Initialize the map captcha
+      handleCAPTCHA();
+      return;
+    }
+    // Finish the verification
+    finish();
+  }
+
+  private void handleVehicleCheck() {
+    // Set the state to VEHICLE, so we don't handle any unnecessary packets
+    user.setState(VEHICLE);
+    // Send the necessary packets to mount the player on the vehicle
+    final int vehicleType = EntityType.BOAT.getId(user.getProtocolVersion());
+    user.delayedWrite(new SpawnEntityPacket(VEHICLE_ENTITY_ID, vehicleType, posX, posY, posZ));
+    user.delayedWrite(setPassengers);
+    user.getChannel().flush();
+  }
+
+  private void handleCAPTCHA() {
+    // Set the state to CAPTCHA, so we don't handle any unnecessary packets
+    user.setState(CAPTCHA);
+    if (!MAP_INFO_PREPARER.isCaptchaAvailable()) {
+      // This should not happen, but we have to return if there is no captcha prepared
+      user.disconnect(Sonar.get().getConfig().getVerification().getCurrentlyPreparing());
+      return;
+    }
+    if (!performGravity
+      && user.getProtocolVersion().compareTo(MINECRAFT_1_18_2) >= 0) {
+      // Make sure the player escapes the 1.18.2+ "Loading terrain" screen
+      user.delayedWrite(CAPTCHA_SPAWN_POSITION);
+    }
+    if (performVehicle) {
+      // Make sure the player exits the vehicle before sending the CAPTCHA
+      user.delayedWrite(removeEntities);
+    }
     // Reset max tries
     captchaTriesLeft = Sonar.get().getConfig().getVerification().getMap().getMaxTries();
 
     // Set slot to map
-    user.delayedWrite(new SetSlotPacket(0, 36, 1, 0,
-      ItemMapType.FILLED_MAP.getId(user.getProtocolVersion()), SetSlotPacket.MAP_NBT));
+    user.delayedWrite(new SetSlotPacket(36, 1,
+      ItemType.FILLED_MAP.getId(user.getProtocolVersion()), SetSlotPacket.MAP_NBT));
     // Send random captcha to the player
-    captcha = MapInfoPreparer.getRandomCaptcha();
-    Objects.requireNonNull(captcha).write(user);
+    captcha = MAP_INFO_PREPARER.getRandomCaptcha();
+    Objects.requireNonNull(captcha).delayedWrite(user);
     // Teleport the player to the position above the platform
     user.delayedWrite(CAPTCHA_POSITION);
     // Make sure the player cannot move
-    user.delayedWrite(CAPTCHA_ABILITIES);
+    user.delayedWrite(user.isGeyser() ? CAPTCHA_ABILITIES_BEDROCK : CAPTCHA_ABILITIES);
     // Make sure the player knows what to do
     user.delayedWrite(enterCodeMessage);
     // Send all packets in one flush
@@ -608,7 +686,8 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
   }
 
   private void finish() {
-    state = State.SUCCESS;
+    // Make sure we drop all further packets
+    user.setState(SUCCESS);
 
     // Increment amount of total successful verifications
     GlobalSonarStatistics.totalSuccessfulVerifications++;
@@ -621,6 +700,13 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
     // Call the VerifySuccessEvent for external API usage
     Sonar.get().getEventManager().publish(new UserVerifySuccessEvent(username, playerUuid, user, login.delay()));
 
+    // If enabled, transfer the player back to the origin server
+    // This feature was introduced by Mojang in Minecraft version 1.20.5
+    // Thanks a lot to @Kadeluxe for helping me out with this!
+    if (transfer) {
+      user.write(transferToOrigin);
+    }
+
     // Disconnect player with the verification success message
     user.disconnect(Sonar.get().getConfig().getVerification().getVerificationSuccess());
 
@@ -634,7 +720,8 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    *
    * @param expectedState Expected state
    */
-  private void assertState(final @NotNull State expectedState) {
+  private void assertState(final @NotNull FallbackUserState expectedState) {
+    final FallbackUserState state = user.getState();
     checkFrame(state == expectedState, "expected " + expectedState + ", got " + state);
   }
 
@@ -644,9 +731,14 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    * @param condition Condition to fail if it's false
    * @param message   Messages displayed in the stacktrace
    */
-  private void checkFrame(final boolean condition, final String message) {
+  private void checkFrame(final boolean condition, final @NotNull String message) {
     if (!condition) {
-      user.fail(message);
+      // Only fail the player if we are either not in the POSITION state,
+      // or if the user configured Sonar to display a CAPTCHA instead of failing.
+      if (user.getState() != POSITION
+        || !Sonar.get().getConfig().getVerification().getGravity().isCaptchaOnFail()) {
+        user.fail(message);
+      }
       throw new CorruptedFrameException(message);
     }
   }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPacket.java

@@ -20,7 +20,10 @@ package xyz.jonesdev.sonar.common.fallback.protocol;
 import io.netty.buffer.ByteBuf;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 
+import java.util.UUID;
+
 public interface FallbackPacket {
+  UUID EMPTY_UUID = new UUID(0L, 0L);
 
   /**
    * Encodes the packet sent by the server

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPacketDecoder.java

@@ -28,7 +28,7 @@ import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.Direction.SERVERBOUND;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.GAME;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.LOGIN;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readVarInt;
 
 public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
   private final FallbackUser user;
@@ -98,14 +98,10 @@ public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
         // Release the ByteBuf to avoid memory leaks
         byteBuf.release();
       }
-    } else {
-      // Packets are always ByteBufs - if we detect an unknown object, fail verification
-      user.fail("packet is not a ByteBuf");
-      throw new CorruptedFrameException("Packet is not a ByteBuf?!");
     }
   }
 
-  private void doLengthSanityChecks(final ByteBuf byteBuf,
+  private void doLengthSanityChecks(final @NotNull ByteBuf byteBuf,
                                     final @NotNull FallbackPacket packet) throws Exception {
     final int expectedMaxLen = packet.expectedMaxLength(byteBuf, user.getProtocolVersion());
     if (expectedMaxLen != -1 && byteBuf.readableBytes() > expectedMaxLen) {

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPacketEncoder.java

@@ -25,7 +25,7 @@ import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.Direction.CLIENTBOUND;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.LOGIN;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
 
 public final class FallbackPacketEncoder extends MessageToByteEncoder<FallbackPacket> {
   private final ProtocolVersion protocolVersion;
@@ -42,10 +42,12 @@ public final class FallbackPacketEncoder extends MessageToByteEncoder<FallbackPa
 
   @Override
   protected void encode(final ChannelHandlerContext ctx,
-                        final FallbackPacket msg,
+                        final @NotNull FallbackPacket packet,
                         final ByteBuf out) throws Exception {
-    final int packetId = registry.getPacketId(msg);
+    final FallbackPacket originalPacket = packet instanceof FallbackPacketSnapshot
+      ? ((FallbackPacketSnapshot) packet).getOriginalPacket() : packet;
+    final int packetId = registry.getPacketId(originalPacket);
     writeVarInt(out, packetId);
-    msg.encode(out, protocolVersion);
+    packet.encode(out, protocolVersion);
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPacketRegistry.java

@@ -33,7 +33,7 @@ import java.util.function.Supplier;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 
-// Most of this is taken from
+// Mostly taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
 public enum FallbackPacketRegistry {
   LOGIN {
@@ -51,22 +51,30 @@ public enum FallbackPacketRegistry {
   CONFIG {
     {
       clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
-        map(0x01, MINECRAFT_1_20_2, true));
+        map(0x01, MINECRAFT_1_20_2, true),
+        map(0x02, MINECRAFT_1_20_5, true));
       clientbound.register(FinishConfigurationPacket.class, FinishConfigurationPacket::new,
-        map(0x02, MINECRAFT_1_20_2, false));
+        map(0x02, MINECRAFT_1_20_2, false),
+        map(0x03, MINECRAFT_1_20_5, false));
       clientbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
-        map(0x03, MINECRAFT_1_20_2, false));
+        map(0x03, MINECRAFT_1_20_2, false),
+        map(0x04, MINECRAFT_1_20_5, false));
+
       clientbound.register(RegistryDataPacket.class, RegistryDataPacket::new,
-        map(0x05, MINECRAFT_1_20_2, true));
+        map(0x05, MINECRAFT_1_20_2, true),
+        map(0x07, MINECRAFT_1_20_5, true));
 
       serverbound.register(ClientSettingsPacket.class, ClientSettingsPacket::new,
         map(0x00, MINECRAFT_1_20_2, false));
       serverbound.register(PluginMessagePacket.class, PluginMessagePacket::new,
-        map(0x01, MINECRAFT_1_20_2, false));
+        map(0x01, MINECRAFT_1_20_2, false),
+        map(0x02, MINECRAFT_1_20_5, false));
       serverbound.register(FinishConfigurationPacket.class, FinishConfigurationPacket::new,
-        map(0x02, MINECRAFT_1_20_2, false));
+        map(0x02, MINECRAFT_1_20_2, false),
+        map(0x03, MINECRAFT_1_20_5, false));
       serverbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
-        map(0x03, MINECRAFT_1_20_2, false));
+        map(0x03, MINECRAFT_1_20_2, false),
+        map(0x04, MINECRAFT_1_20_5, false));
     }
   },
   GAME {
@@ -84,7 +92,8 @@ public enum FallbackPacketRegistry {
         map(0x25, MINECRAFT_1_19_1, true),
         map(0x24, MINECRAFT_1_19_3, true),
         map(0x28, MINECRAFT_1_19_4, true),
-        map(0x29, MINECRAFT_1_20_2, true));
+        map(0x29, MINECRAFT_1_20_2, true),
+        map(0x2B, MINECRAFT_1_20_5, true));
       clientbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
         map(0x00, MINECRAFT_1_7_2, false),
         map(0x1F, MINECRAFT_1_9, false),
@@ -98,7 +107,8 @@ public enum FallbackPacketRegistry {
         map(0x20, MINECRAFT_1_19_1, false),
         map(0x1F, MINECRAFT_1_19_3, false),
         map(0x23, MINECRAFT_1_19_4, false),
-        map(0x24, MINECRAFT_1_20_2, false));
+        map(0x24, MINECRAFT_1_20_2, false),
+        map(0x26, MINECRAFT_1_20_5, false));
       clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
         map(0x40, MINECRAFT_1_7_2, true),
         map(0x1A, MINECRAFT_1_9, true),
@@ -112,7 +122,8 @@ public enum FallbackPacketRegistry {
         map(0x19, MINECRAFT_1_19_1, true),
         map(0x17, MINECRAFT_1_19_3, true),
         map(0x1A, MINECRAFT_1_19_4, true),
-        map(0x1B, MINECRAFT_1_20_2, true));
+        map(0x1B, MINECRAFT_1_20_2, true),
+        map(0x1D, MINECRAFT_1_20_5, true));
       clientbound.register(PlayerPositionLookPacket.class, PlayerPositionLookPacket::new,
         map(0x08, MINECRAFT_1_7_2, true),
         map(0x2E, MINECRAFT_1_9, true),
@@ -127,7 +138,8 @@ public enum FallbackPacketRegistry {
         map(0x39, MINECRAFT_1_19_1, true),
         map(0x38, MINECRAFT_1_19_3, true),
         map(0x3C, MINECRAFT_1_19_4, true),
-        map(0x3E, MINECRAFT_1_20_2, true));
+        map(0x3E, MINECRAFT_1_20_2, true),
+        map(0x40, MINECRAFT_1_20_5, true));
       clientbound.register(ClientAbilitiesPacket.class, ClientAbilitiesPacket::new,
         map(0x39, MINECRAFT_1_7_2, true),
         map(0x2B, MINECRAFT_1_9, true),
@@ -142,7 +154,8 @@ public enum FallbackPacketRegistry {
         map(0x31, MINECRAFT_1_19_1, true),
         map(0x30, MINECRAFT_1_19_3, true),
         map(0x34, MINECRAFT_1_19_4, true),
-        map(0x36, MINECRAFT_1_20_2, true));
+        map(0x36, MINECRAFT_1_20_2, true),
+        map(0x38, MINECRAFT_1_20_5, true));
       clientbound.register(ChunkDataPacket.class, ChunkDataPacket::new,
         map(0x21, MINECRAFT_1_7_2, true),
         map(0x20, MINECRAFT_1_9, true),
@@ -156,7 +169,45 @@ public enum FallbackPacketRegistry {
         map(0x21, MINECRAFT_1_19_1, true),
         map(0x20, MINECRAFT_1_19_3, true),
         map(0x24, MINECRAFT_1_19_4, true),
-        map(0x25, MINECRAFT_1_20_2, true));
+        map(0x25, MINECRAFT_1_20_2, true),
+        map(0x27, MINECRAFT_1_20_5, true));
+      clientbound.register(RemoveEntitiesPacket.class, RemoveEntitiesPacket::new,
+        map(0x13, MINECRAFT_1_7_2, true),
+        map(0x30, MINECRAFT_1_9, true),
+        map(0x31, MINECRAFT_1_12, true),
+        map(0x32, MINECRAFT_1_12_2, true),
+        map(0x35, MINECRAFT_1_13, true),
+        map(0x37, MINECRAFT_1_14, true),
+        map(0x38, MINECRAFT_1_15, true),
+        map(0x37, MINECRAFT_1_16, true),
+        map(0x36, MINECRAFT_1_16_2, true),
+        map(0x3A, MINECRAFT_1_17, true),
+        map(0x38, MINECRAFT_1_19, true),
+        map(0x3B, MINECRAFT_1_19_1, true),
+        map(0x3A, MINECRAFT_1_19_3, true),
+        map(0x3E, MINECRAFT_1_19_4, true),
+        map(0x3E, MINECRAFT_1_19_4, true),
+        map(0x40, MINECRAFT_1_20_2, true),
+        map(0x42, MINECRAFT_1_20_5, true));
+      clientbound.register(SetPassengersPacket.class, SetPassengersPacket::new,
+        map(0x1B, MINECRAFT_1_7_2, true),
+        map(0x40, MINECRAFT_1_9, true),
+        map(0x42, MINECRAFT_1_12, true),
+        map(0x43, MINECRAFT_1_12_1, true),
+        map(0x46, MINECRAFT_1_13, true),
+        map(0x4A, MINECRAFT_1_14, true),
+        map(0x4B, MINECRAFT_1_15, true),
+        map(0x54, MINECRAFT_1_17, true),
+        map(0x57, MINECRAFT_1_19_1, true),
+        map(0x55, MINECRAFT_1_19_3, true),
+        map(0x59, MINECRAFT_1_19_4, true),
+        map(0x5B, MINECRAFT_1_20_2, true),
+        map(0x5D, MINECRAFT_1_20_3, true),
+        map(0x5F, MINECRAFT_1_20_5, true));
+      clientbound.register(SpawnEntityPacket.class, SpawnEntityPacket::new,
+        map(0x0E, MINECRAFT_1_7_2, true),
+        map(0x00, MINECRAFT_1_9, true),
+        map(0x01, MINECRAFT_1_19_4, true));
       clientbound.register(UpdateSectionBlocksPacket.class, UpdateSectionBlocksPacket::new,
         map(0x22, MINECRAFT_1_7_2, true),
         map(0x10, MINECRAFT_1_9, true),
@@ -170,7 +221,8 @@ public enum FallbackPacketRegistry {
         map(0x3F, MINECRAFT_1_19_3, true),
         map(0x43, MINECRAFT_1_19_4, true),
         map(0x45, MINECRAFT_1_20_2, true),
-        map(0x47, MINECRAFT_1_20_3, true));
+        map(0x47, MINECRAFT_1_20_3, true),
+        map(0x49, MINECRAFT_1_20_5, true));
       clientbound.register(TransactionPacket.class, TransactionPacket::new,
         map(0x32, MINECRAFT_1_7_2, true),
         map(0x11, MINECRAFT_1_9, true),
@@ -183,7 +235,8 @@ public enum FallbackPacketRegistry {
         map(0x2F, MINECRAFT_1_19_1, true),
         map(0x2E, MINECRAFT_1_19_3, true),
         map(0x32, MINECRAFT_1_19_4, true),
-        map(0x33, MINECRAFT_1_20_2, true));
+        map(0x33, MINECRAFT_1_20_2, true),
+        map(0x35, MINECRAFT_1_20_5, true));
       clientbound.register(DefaultSpawnPositionPacket.class, DefaultSpawnPositionPacket::new,
         map(0x05, MINECRAFT_1_7_2, true),
         map(0x43, MINECRAFT_1_9, true),
@@ -199,7 +252,8 @@ public enum FallbackPacketRegistry {
         map(0x4C, MINECRAFT_1_19_3, true),
         map(0x50, MINECRAFT_1_19_4, true),
         map(0x52, MINECRAFT_1_20_2, true),
-        map(0x54, MINECRAFT_1_20_3, true));
+        map(0x54, MINECRAFT_1_20_3, true),
+        map(0x56, MINECRAFT_1_20_5, true));
       clientbound.register(MapDataPacket.class, MapDataPacket::new,
         map(0x34, MINECRAFT_1_7_2, true),
         map(0x24, MINECRAFT_1_9, true),
@@ -212,7 +266,8 @@ public enum FallbackPacketRegistry {
         map(0x26, MINECRAFT_1_19_1, true),
         map(0x25, MINECRAFT_1_19_3, true),
         map(0x29, MINECRAFT_1_19_4, true),
-        map(0x2A, MINECRAFT_1_20_2, true));
+        map(0x2A, MINECRAFT_1_20_2, true),
+        map(0x2C, MINECRAFT_1_20_5, true));
       clientbound.register(SetSlotPacket.class, SetSlotPacket::new,
         map(0x2F, MINECRAFT_1_7_2, true),
         map(0x16, MINECRAFT_1_9, true),
@@ -226,6 +281,21 @@ public enum FallbackPacketRegistry {
         map(0x12, MINECRAFT_1_19_3, true),
         map(0x14, MINECRAFT_1_19_4, true),
         map(0x15, MINECRAFT_1_20_2, true));
+      clientbound.register(SetExperiencePacket.class, SetExperiencePacket::new,
+        map(0x1F, MINECRAFT_1_7_2, true),
+        map(0x3D, MINECRAFT_1_9, true),
+        map(0x3F, MINECRAFT_1_12, true),
+        map(0x40, MINECRAFT_1_12_1, true),
+        map(0x43, MINECRAFT_1_13, true),
+        map(0x47, MINECRAFT_1_14, true),
+        map(0x48, MINECRAFT_1_15, true),
+        map(0x51, MINECRAFT_1_17, true),
+        map(0x54, MINECRAFT_1_19_1, true),
+        map(0x52, MINECRAFT_1_19_3, true),
+        map(0x56, MINECRAFT_1_19_4, true),
+        map(0x58, MINECRAFT_1_20_2, true),
+        map(0x5A, MINECRAFT_1_20_3, true),
+        map(0x5C, MINECRAFT_1_20_5, true));
       clientbound.register(UniversalChatPacket.class, UniversalChatPacket::new,
         map(0x02, MINECRAFT_1_7_2, false),
         map(0x0F, MINECRAFT_1_9, false),
@@ -238,10 +308,44 @@ public enum FallbackPacketRegistry {
         map(0x60, MINECRAFT_1_19_3, false),
         map(0x64, MINECRAFT_1_19_4, false),
         map(0x67, MINECRAFT_1_20_2, false),
-        map(0x69, MINECRAFT_1_20_3, false));
+        map(0x69, MINECRAFT_1_20_3, false),
+        map(0x6C, MINECRAFT_1_20_5, false));
       clientbound.register(GameEventPacket.class, GameEventPacket::new,
-        map(0x20, MINECRAFT_1_20_3, true));
+        map(0x20, MINECRAFT_1_20_3, true),
+        map(0x22, MINECRAFT_1_20_5, true));
+      clientbound.register(TransferPacket.class, TransferPacket::new,
+        map(0x73, MINECRAFT_1_20_5, true));
 
+      serverbound.register(PaddleBoatPacket.class, PaddleBoatPacket::new,
+        map(0x11, MINECRAFT_1_9, false),
+        map(0x12, MINECRAFT_1_12, false),
+        map(0x11, MINECRAFT_1_12_1, false),
+        map(0x14, MINECRAFT_1_13, false),
+        map(0x16, MINECRAFT_1_14, false),
+        map(0x17, MINECRAFT_1_16, false),
+        map(0x16, MINECRAFT_1_17, false),
+        map(0x18, MINECRAFT_1_19, false),
+        map(0x19, MINECRAFT_1_19_1, false),
+        map(0x18, MINECRAFT_1_19_3, false),
+        map(0x19, MINECRAFT_1_19_4, false),
+        map(0x1B, MINECRAFT_1_20_2, false),
+        map(0x1C, MINECRAFT_1_20_3, false),
+        map(0x1F, MINECRAFT_1_20_5, false));
+      serverbound.register(PlayerInputPacket.class, PlayerInputPacket::new,
+        map(0x0C, MINECRAFT_1_7_2, false),
+        map(0x15, MINECRAFT_1_9, false),
+        map(0x16, MINECRAFT_1_12, false),
+        map(0x1A, MINECRAFT_1_13, false),
+        map(0x1C, MINECRAFT_1_14, false),
+        map(0x1D, MINECRAFT_1_16, false),
+        map(0x1C, MINECRAFT_1_17, false),
+        map(0x1E, MINECRAFT_1_19, false),
+        map(0x1F, MINECRAFT_1_19_1, false),
+        map(0x1E, MINECRAFT_1_19_3, false),
+        map(0x1F, MINECRAFT_1_19_4, false),
+        map(0x22, MINECRAFT_1_20_2, false),
+        map(0x23, MINECRAFT_1_20_3, false),
+        map(0x26, MINECRAFT_1_20_5, false));
       serverbound.register(UniversalChatPacket.class, UniversalChatPacket::new,
         map(0x01, MINECRAFT_1_7_2, false),
         map(0x02, MINECRAFT_1_9, false),
@@ -250,7 +354,8 @@ public enum FallbackPacketRegistry {
         map(0x03, MINECRAFT_1_14, false),
         map(0x04, MINECRAFT_1_19, false),
         map(0x05, MINECRAFT_1_19_1, false),
-        map(0x05, MINECRAFT_1_19_3, false));
+        map(0x05, MINECRAFT_1_19_3, false),
+        map(0x06, MINECRAFT_1_20_5, false));
       serverbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
         map(0x00, MINECRAFT_1_7_2, false),
         map(0x0B, MINECRAFT_1_9, false),
@@ -265,7 +370,8 @@ public enum FallbackPacketRegistry {
         map(0x11, MINECRAFT_1_19_3, false),
         map(0x12, MINECRAFT_1_19_4, false),
         map(0x14, MINECRAFT_1_20_2, false),
-        map(0x15, MINECRAFT_1_20_3, false));
+        map(0x15, MINECRAFT_1_20_3, false),
+        map(0x18, MINECRAFT_1_20_5, false));
       serverbound.register(ClientSettingsPacket.class, ClientSettingsPacket::new,
         map(0x15, MINECRAFT_1_7_2, false),
         map(0x04, MINECRAFT_1_9, false),
@@ -276,7 +382,8 @@ public enum FallbackPacketRegistry {
         map(0x08, MINECRAFT_1_19_1, false),
         map(0x07, MINECRAFT_1_19_3, false),
         map(0x08, MINECRAFT_1_19_4, false),
-        map(0x09, MINECRAFT_1_20_2, false));
+        map(0x09, MINECRAFT_1_20_2, false),
+        map(0x0A, MINECRAFT_1_20_5, false));
       serverbound.register(PluginMessagePacket.class, PluginMessagePacket::new,
         map(0x17, MINECRAFT_1_7_2, false),
         map(0x09, MINECRAFT_1_9, false),
@@ -304,7 +411,8 @@ public enum FallbackPacketRegistry {
         map(0x14, MINECRAFT_1_19_3, false),
         map(0x15, MINECRAFT_1_19_4, false),
         map(0x17, MINECRAFT_1_20_2, false),
-        map(0x18, MINECRAFT_1_20_3, false));
+        map(0x18, MINECRAFT_1_20_3, false),
+        map(0x1B, MINECRAFT_1_20_5, false));
       serverbound.register(TeleportConfirmPacket.class, TeleportConfirmPacket::new,
         map(0x00, MINECRAFT_1_9, false));
       serverbound.register(PlayerPositionPacket.class, PlayerPositionPacket::new,
@@ -321,8 +429,9 @@ public enum FallbackPacketRegistry {
         map(0x13, MINECRAFT_1_19_3, false),
         map(0x14, MINECRAFT_1_19_4, false),
         map(0x16, MINECRAFT_1_20_2, false),
-        map(0x17, MINECRAFT_1_20_3, false));
-      serverbound.register(PlayerTickPacket.class, PlayerTickPacket::new,
+        map(0x17, MINECRAFT_1_20_3, false),
+        map(0x1A, MINECRAFT_1_20_5, false));
+      serverbound.register(PlayerPositionIdlePacket.class, PlayerPositionIdlePacket::new,
         map(0x03, MINECRAFT_1_7_2, false),
         map(0x0F, MINECRAFT_1_9, false),
         map(0x0D, MINECRAFT_1_12, false),
@@ -336,7 +445,8 @@ public enum FallbackPacketRegistry {
         map(0x16, MINECRAFT_1_19_3, false),
         map(0x17, MINECRAFT_1_19_4, false),
         map(0x19, MINECRAFT_1_20_2, false),
-        map(0x1A, MINECRAFT_1_20_3, false));
+        map(0x1A, MINECRAFT_1_20_3, false),
+        map(0x1D, MINECRAFT_1_20_5, false));
       serverbound.register(TransactionPacket.class, TransactionPacket::new,
         map(0x0F, MINECRAFT_1_7_2, false),
         map(0x05, MINECRAFT_1_9, false),
@@ -350,7 +460,8 @@ public enum FallbackPacketRegistry {
         map(0x1F, MINECRAFT_1_19_3, false),
         map(0x20, MINECRAFT_1_19_4, false),
         map(0x23, MINECRAFT_1_20_2, false),
-        map(0x24, MINECRAFT_1_20_3, false));
+        map(0x24, MINECRAFT_1_20_3, false),
+        map(0x27, MINECRAFT_1_20_5, false));
     }
   };
 
@@ -373,7 +484,7 @@ public enum FallbackPacketRegistry {
     PacketRegistry() {
       final Map<ProtocolVersion, ProtocolRegistry> mutableVersions = new EnumMap<>(ProtocolVersion.class);
       for (final ProtocolVersion version : ProtocolVersion.values()) {
-        if (!version.isLegacy() && !version.isUnknown()) {
+        if (!version.isUnknown()) {
           mutableVersions.put(version, new ProtocolRegistry(version));
         }
       }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPacketSnapshot.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.ID_TO_PROTOCOL_CONSTANT;
+
+// Mostly taken from
+// https://github.com/Nan1t/NanoLimbo/blob/main/src/main/java/ua/nanit/limbo/protocol/PacketSnapshot.java
+@Getter
+public final class FallbackPacketSnapshot implements FallbackPacket {
+  private final Map<Integer, Integer> mappings = new HashMap<>(ID_TO_PROTOCOL_CONSTANT.size());
+  private final Map<Integer, byte[]> cachedBytes = new HashMap<>(ID_TO_PROTOCOL_CONSTANT.size());
+  private final FallbackPacket originalPacket;
+
+  public FallbackPacketSnapshot(final @NotNull FallbackPacket originalPacket) {
+    final Map<Integer, Integer> hashes = new HashMap<>(ID_TO_PROTOCOL_CONSTANT.size());
+
+    for (final ProtocolVersion protocolVersion : ID_TO_PROTOCOL_CONSTANT.values()) {
+      // Allocate a buffer for each protocol version
+      final ByteBuf byteBuf = Unpooled.buffer();
+      try {
+        originalPacket.encode(byteBuf, protocolVersion);
+      } catch (Exception exception) {
+        Sonar.get().getLogger().error("Could not encode packet {} for version {}: {}",
+          originalPacket.toString(), protocolVersion, exception);
+        break;
+      }
+
+      // Make sure we don't unnecessarily fill the RAM
+      final int protocol = protocolVersion.getProtocol();
+      final int hash = byteBuf.hashCode();
+      final int hashed = hashes.getOrDefault(hash, -1);
+      if (hashed != -1) {
+        mappings.put(protocol, hashed);
+      } else {
+        hashes.put(hash, protocol);
+        mappings.put(protocol, protocol);
+        // Cache the raw bytes of the encoded packet
+        final byte[] bytes = new byte[byteBuf.readableBytes()];
+        byteBuf.readBytes(bytes);
+        cachedBytes.put(protocol, bytes);
+      }
+      // Make sure to release the buffer to avoid memory leaks
+      byteBuf.release();
+    }
+    this.originalPacket = originalPacket;
+  }
+
+  @Override
+  public void encode(final @NotNull ByteBuf byteBuf,
+                     final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    final int hash = mappings.get(protocolVersion.getProtocol());
+    final byte[] bytes = cachedBytes.get(hash);
+
+    if (bytes != null) {
+      byteBuf.writeBytes(bytes);
+    } else {
+      Sonar.get().getLogger().error("Could not find cached packet {} for version {}",
+        toString(), protocolVersion);
+      throw new IllegalStateException("Unable to find cached packet. Contact the developer!");
+    }
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
+    throw new UnsupportedOperationException();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPreparer.java

@@ -20,39 +20,50 @@ package xyz.jonesdev.sonar.common.fallback.protocol;
 import lombok.experimental.UtilityClass;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
-import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockPosition;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockType;
-import xyz.jonesdev.sonar.common.fallback.protocol.block.ChangedBlock;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.MapInfoPreparer;
+import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockUpdate;
+import xyz.jonesdev.sonar.common.fallback.protocol.captcha.CaptchaPreparer;
+import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.FinishConfigurationPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.RegistryDataPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccessPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;
 
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+
 @UtilityClass
 public class FallbackPreparer {
 
+  // LoginSuccess
+  public final FallbackPacket LOGIN_SUCCESS = new FallbackPacketSnapshot(new LoginSuccessPacket(new UUID(1L, 1L), "Sonar"));
   // Abilities
-  public final FallbackPacket DEFAULT_ABILITIES = new ClientAbilitiesPacket(0x00, 0f, 0f);
-  public final FallbackPacket CAPTCHA_ABILITIES = new ClientAbilitiesPacket(0x02, 0f, 0f);
+  public final FallbackPacket DEFAULT_ABILITIES = new FallbackPacketSnapshot(new ClientAbilitiesPacket(0x00, 0f, 0f));
+  public final FallbackPacket CAPTCHA_ABILITIES = new FallbackPacketSnapshot(new ClientAbilitiesPacket(0x02, 0f, 0f));
+  public final FallbackPacket CAPTCHA_ABILITIES_BEDROCK = new FallbackPacketSnapshot(new ClientAbilitiesPacket(0x06, 0f, 0f));
   // Chunks
-  public final FallbackPacket EMPTY_CHUNK_DATA = new ChunkDataPacket(0, 0);
+  public final FallbackPacket EMPTY_CHUNK_DATA = new FallbackPacketSnapshot(new ChunkDataPacket(0, 0));
   // Finish Configuration
-  public final FallbackPacket FINISH_CONFIGURATION = new FinishConfigurationPacket();
+  public final FallbackPacket FINISH_CONFIGURATION = new FinishConfigurationPacket(); // No snapshot needed because it's empty either way
   // Synchronize Registry
-  public final FallbackPacket REGISTRY_SYNC = new RegistryDataPacket();
+  public final FallbackPacket REGISTRY_SYNC_LEGACY = new FallbackPacketSnapshot(new RegistryDataPacket(DimensionRegistry.CODEC_1_20, null, null));
+  public final FallbackPacket[] REGISTRY_SYNC_1_20_5 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_20);
   // Keep Alive
-  public final FallbackPacket CAPTCHA_KEEP_ALIVE = new KeepAlivePacket(0L);
+  public final FallbackPacket CAPTCHA_KEEP_ALIVE = new FallbackPacketSnapshot(new KeepAlivePacket(-1337L));
   // Game Event (1.20.3+)
-  public final FallbackPacket START_WRITING_CHUNKS = new GameEventPacket(13, 0);
+  public final FallbackPacket START_WRITING_CHUNKS = new FallbackPacketSnapshot(new GameEventPacket(13, 0));
   // Chat
   public FallbackPacket enterCodeMessage;
   public FallbackPacket incorrectCaptcha;
   // JoinGame
+  public final int PLAYER_ENTITY_ID = ThreadLocalRandom.current().nextInt(10);
   public FallbackPacket joinGame;
   // Update Section Blocks
   public FallbackPacket updateSectionBlocks;
   // Default Spawn Position
   public FallbackPacket dynamicSpawnPosition;
+  // Transfer packet
+  public FallbackPacket transferToOrigin;
 
   // Disconnect messages
   public FallbackPacket blacklisted;
@@ -61,6 +72,12 @@ public class FallbackPreparer {
   public FallbackPacket reconnectedTooFast;
   public FallbackPacket protocolBlacklisted;
   public FallbackPacket invalidUsername;
+  public FallbackPacket tooManyOnlinePerIP;
+
+  // Vehicle
+  public FallbackPacket removeEntities;
+  public FallbackPacket setPassengers;
+  public static final int VEHICLE_ENTITY_ID = PLAYER_ENTITY_ID + 1;
 
   // Collisions
   public final int BLOCKS_PER_ROW = 8; // 8 * 8 = 64 (protocol maximum)
@@ -69,26 +86,34 @@ public class FallbackPreparer {
   public final int DEFAULT_Y_COLLIDE_POSITION = 255; // 255 is the maximum Y position allowed
 
   // Captcha position
-  public final FallbackPacket CAPTCHA_POSITION = new PlayerPositionLookPacket(
-    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION, 0f, 90f, 0, false);
-  public final FallbackPacket CAPTCHA_SPAWN_POSITION = new DefaultSpawnPositionPacket(
-    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION);
+  public final FallbackPacket CAPTCHA_POSITION = new FallbackPacketSnapshot(new PlayerPositionLookPacket(
+    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION, 0f, 90f, 0, false));
+  public final FallbackPacket CAPTCHA_SPAWN_POSITION = new FallbackPacketSnapshot(new DefaultSpawnPositionPacket(
+    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION));
 
   // Blocks
-  private final ChangedBlock[] CHANGED_BLOCKS = new ChangedBlock[BLOCKS_PER_ROW * BLOCKS_PER_ROW];
+  private final BlockUpdate[] CHANGED_BLOCKS = new BlockUpdate[BLOCKS_PER_ROW * BLOCKS_PER_ROW];
   public BlockType blockType = BlockType.BARRIER;
 
   public int maxMovementTick, dynamicSpawnYPosition;
   public double[] preparedCachedYMotions;
   public double maxFallDistance;
 
+  // CAPTCHA
+  public final CaptchaPreparer MAP_INFO_PREPARER = new CaptchaPreparer();
+
+  // XP packets
+  public FallbackPacket[] xpCountdown;
+
   public void prepare() {
-    joinGame = new JoinGamePacket(1,
+    // Prepare JoinGame packet
+    joinGame = new JoinGamePacket(PLAYER_ENTITY_ID,
       Sonar.get().getConfig().getVerification().getGravity().getGamemode().getId(),
       0, false, 0,
       true, false, false,
       new String[]{"minecraft:overworld"}, "minecraft:overworld");
 
+    // Prepare cached motions for the gravity check
     maxFallDistance = 0;
     maxMovementTick = Sonar.get().getConfig().getVerification().getGravity().getMaxMovementTicks();
     preparedCachedYMotions = new double[maxMovementTick + 8];
@@ -101,39 +126,61 @@ public class FallbackPreparer {
 
     // Set the dynamic block and collide Y position based on the maximum fall distance
     dynamicSpawnYPosition = DEFAULT_Y_COLLIDE_POSITION + (int) Math.ceil(maxFallDistance);
-    dynamicSpawnPosition = new DefaultSpawnPositionPacket(SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION);
+    dynamicSpawnPosition = new FallbackPacketSnapshot(new DefaultSpawnPositionPacket(
+      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION));
 
     // Prepare collision platform positions
     int index = 0;
     for (int x = 0; x < BLOCKS_PER_ROW; x++) {
       for (int z = 0; z < BLOCKS_PER_ROW; z++) {
-        final BlockPosition position = new BlockPosition(
+        final BlockUpdate.BlockPosition position = new BlockUpdate.BlockPosition(
           x + (BLOCKS_PER_ROW / 2),
           DEFAULT_Y_COLLIDE_POSITION,
           z + (BLOCKS_PER_ROW / 2),
           0, 0);
-        CHANGED_BLOCKS[index++] = new ChangedBlock(position, blockType);
+        CHANGED_BLOCKS[index++] = new BlockUpdate(position, blockType);
       }
     }
 
     // Prepare UpdateSectionBlocks packet
-    updateSectionBlocks = new UpdateSectionBlocksPacket(0, 0, CHANGED_BLOCKS);
+    updateSectionBlocks = new FallbackPacketSnapshot(new UpdateSectionBlocksPacket(0, 0, CHANGED_BLOCKS));
 
     // Prepare disconnect packets during login
-    blacklisted = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getBlacklisted(), true);
-    alreadyVerifying = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getAlreadyVerifying(), true);
-    alreadyQueued = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getAlreadyQueued(), true);
-    protocolBlacklisted = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getProtocolBlacklisted(), true);
-    reconnectedTooFast = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getTooFastReconnect(), true);
-    invalidUsername = DisconnectPacket.create(Sonar.get().getConfig().getVerification().getInvalidUsername(), true);
+    blacklisted = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getVerification().getBlacklisted(), true));
+    alreadyVerifying = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getVerification().getAlreadyVerifying(), true));
+    alreadyQueued = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getVerification().getAlreadyQueued(), true));
+    protocolBlacklisted = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getVerification().getProtocolBlacklisted(), true));
+    reconnectedTooFast = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getVerification().getTooFastReconnect(), true));
+    invalidUsername = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getVerification().getInvalidUsername(), true));
+    tooManyOnlinePerIP = new FallbackPacketSnapshot(DisconnectPacket.create(Sonar.get().getConfig().getTooManyOnlinePerIp(), true));
 
-    // Precompute captcha answers
-    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER) {
-      enterCodeMessage = new UniversalChatPacket(Sonar.get().getConfig().getVerification().getMap().getEnterCode(), UniversalChatPacket.SYSTEM_TYPE);
-      incorrectCaptcha = new UniversalChatPacket(
-        Sonar.get().getConfig().getVerification().getMap().getFailedCaptcha(), UniversalChatPacket.SYSTEM_TYPE);
+    // Prepare transfer packet
+    transferToOrigin = new FallbackPacketSnapshot(new TransferPacket(
+      Sonar.get().getConfig().getVerification().getTransfer().getHost(),
+      Sonar.get().getConfig().getVerification().getTransfer().getPort()));
 
-      MapInfoPreparer.prepare();
+    // Prepare packets for the vehicle check
+    removeEntities = new FallbackPacketSnapshot(new RemoveEntitiesPacket(VEHICLE_ENTITY_ID));
+    setPassengers = new FallbackPacketSnapshot(new SetPassengersPacket(VEHICLE_ENTITY_ID, PLAYER_ENTITY_ID));
+
+    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER
+      || Sonar.get().getConfig().getVerification().getGravity().isCaptchaOnFail()) {
+      // Prepare CAPTCHA messages
+      enterCodeMessage = new FallbackPacketSnapshot(new UniversalChatPacket(
+        Sonar.get().getConfig().getVerification().getMap().getEnterCode(), UniversalChatPacket.SYSTEM_TYPE));
+      incorrectCaptcha = new FallbackPacketSnapshot(new UniversalChatPacket(
+        Sonar.get().getConfig().getVerification().getMap().getFailedCaptcha(), UniversalChatPacket.SYSTEM_TYPE));
+
+      // Prepare countdown
+      xpCountdown = new FallbackPacket[Sonar.get().getConfig().getVerification().getMap().getMaxDuration() / 1000];
+
+      for (int i = 0; i < xpCountdown.length; i++) {
+        final float bar = (float) i / xpCountdown.length;
+        xpCountdown[i] = new FallbackPacketSnapshot(new SetExperiencePacket(bar, i, i));
+      }
+
+      // Prepare CAPTCHA answers
+      MAP_INFO_PREPARER.prepare();
     }
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/block/BlockType.java

@@ -78,6 +78,7 @@ public enum BlockType {
         return 10225;
       case MINECRAFT_1_20_2:
       case MINECRAFT_1_20_3:
+      case MINECRAFT_1_20_5:
         return 10366;
     }
   }, 1D);

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/block/BlockUpdate.java

@@ -18,15 +18,17 @@
 package xyz.jonesdev.sonar.common.fallback.protocol.block;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 
 @Getter
-public final class ChangedBlock {
+public final class BlockUpdate {
   private final @NotNull BlockPosition position;
   private final BlockType type;
   private final int legacyBlockState, blockState;
 
-  public ChangedBlock(final @NotNull BlockPosition position, final BlockType type) {
+  public BlockUpdate(final @NotNull BlockPosition position, final BlockType type) {
     this.position = position;
     this.type = type;
     final int x = position.getX() - (position.getChunkX() << 4);
@@ -35,4 +37,12 @@ public final class ChangedBlock {
     this.legacyBlockState = x << 12 | z << 8 | y;
     this.blockState = x << 8 | z << 4 | y - ((y >> 4) << 4);
   }
+
+  @Getter
+  @ToString
+  @RequiredArgsConstructor
+  public static final class BlockPosition {
+    private final int x, y, z;
+    private final int chunkX, chunkZ;
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/captcha/CaptchaPreparer.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.captcha;
+
+import org.jetbrains.annotations.Nullable;
+import xyz.jonesdev.capja.SimpleCaptchaGenerator;
+import xyz.jonesdev.capja.filter.SimpleRippleFilter;
+import xyz.jonesdev.capja.filter.SimpleScratchFilter;
+import xyz.jonesdev.capja.libs.jhlabs.image.AbstractBufferedImageOp;
+import xyz.jonesdev.capja.libs.jhlabs.image.BumpFilter;
+import xyz.jonesdev.capja.libs.jhlabs.image.SmearFilter;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.timer.SystemTimer;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadLocalRandom;
+
+public final class CaptchaPreparer {
+  private static final ExecutorService PREPARATION_SERVICE = Executors.newSingleThreadExecutor();
+  private static final Random RANDOM = new Random();
+
+  private MapCaptchaInfo[] cached;
+  private int preparedAmount;
+
+  public void prepare() {
+    // Make sure we're not preparing when Sonar is already preparing answers
+    if (cached != null && preparedAmount != cached.length) return;
+    preparedAmount = 0;
+
+    final SystemTimer timer = new SystemTimer();
+    Sonar.get().getLogger().info("Asynchronously preparing CAPTCHA answers...");
+    Sonar.get().getLogger().info("Players will be able to join even if the preparation isn't finished");
+
+    // Prepare cache
+    final SonarConfiguration.Verification.Map config = Sonar.get().getConfig().getVerification().getMap();
+    cached = new MapCaptchaInfo[config.getPrecomputeAmount()];
+
+    // Prepare everything asynchronously
+    PREPARATION_SERVICE.execute(() -> {
+      // Create the images using capja
+      final @Nullable File backgroundImage = Sonar.get().getConfig().getVerification().getMap().getBackgroundImage();
+      final SimpleCaptchaGenerator generator = new SimpleCaptchaGenerator(128, 128, backgroundImage);
+      final char[] dictionary = config.getDictionary().toCharArray();
+
+      // Prepare the filters for the CAPTCHA
+      final List<AbstractBufferedImageOp> filters = new ArrayList<>();
+      if (Sonar.get().getConfig().getVerification().getMap().isScratches()) {
+        filters.add(new SimpleScratchFilter(5));
+      }
+      if (Sonar.get().getConfig().getVerification().getMap().isRipple()) {
+        final SimpleRippleFilter rippleFilter = new SimpleRippleFilter();
+        rippleFilter.setXAmplitude(0);
+        float yAmplitude = 10 - ThreadLocalRandom.current().nextInt(20);
+        if (Math.abs(yAmplitude) < 3) {
+          yAmplitude = yAmplitude >= 0 ? 3 : -3;
+        }
+        rippleFilter.setYAmplitude(yAmplitude);
+        filters.add(rippleFilter);
+      }
+      if (Sonar.get().getConfig().getVerification().getMap().getDistortion().isEnabled()) {
+        final SmearFilter smearFilter = new SmearFilter();
+        smearFilter.setShape(Sonar.get().getConfig().getVerification().getMap().getDistortion().getShape());
+        smearFilter.setMix(Sonar.get().getConfig().getVerification().getMap().getDistortion().getMix());
+        smearFilter.setDensity(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDensity());
+        smearFilter.setDistance(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDistance());
+        filters.add(smearFilter);
+      }
+      if (Sonar.get().getConfig().getVerification().getMap().isBump()) {
+        filters.add(new BumpFilter());
+      }
+
+      for (preparedAmount = 0; preparedAmount < config.getPrecomputeAmount(); preparedAmount++) {
+        if (!Sonar.get().getConfig().getVerification().getMap().isAutoColor()) {
+          // Generate a random gradient color if automatic coloring is disabled
+          final Color color0 = Color.getHSBColor((float) Math.random(), 1, 1);
+          final Color color1 = Color.getHSBColor((float) Math.random(), 1, 0.5f);
+          final GradientPaint gradient = new GradientPaint(0, 0, color0,
+            generator.getWidth(), generator.getHeight(), color1);
+          generator.setGradient(gradient);
+        }
+        // Generate CAPTCHA answer
+        final char[] answer = new char[5];
+        for (int j = 0; j < answer.length; j++) {
+          answer[j] = dictionary[ThreadLocalRandom.current().nextInt(dictionary.length)];
+        }
+        final BufferedImage image = generator.createImage(answer, filters);
+        // Convert and cache converted Minecraft map bytes
+        final int[] buffer = MapColorPalette.getBufferFromImage(image);
+        cached[preparedAmount] = new MapCaptchaInfo(new String(answer), buffer);
+      }
+
+      Sonar.get().getLogger().info("Finished preparing {} CAPTCHA answers ({}s)!", preparedAmount, timer);
+    });
+  }
+
+  public boolean isCaptchaAvailable() {
+    return cached != null && cached[0] != null;
+  }
+
+  public MapCaptchaInfo getRandomCaptcha() {
+    // Give the player a random CAPTCHA out of the ones that we've already prepared
+    return cached[RANDOM.nextInt(preparedAmount)];
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/captcha/ItemType.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.protocol.map;
+package xyz.jonesdev.sonar.common.fallback.protocol.captcha;
 
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
@@ -25,7 +25,7 @@ import java.util.function.Function;
 
 @SuppressWarnings("unused")
 @RequiredArgsConstructor
-public enum ItemMapType {
+public enum ItemType {
   FILLED_MAP(protocolVersion -> {
     // Useful resources:
     // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
@@ -72,6 +72,8 @@ public enum ItemMapType {
         return 941;
       case MINECRAFT_1_20_3:
         return 979;
+      case MINECRAFT_1_20_5:
+        return 982;
     }
   });
 

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/captcha/MapCaptchaInfo.java

@@ -15,51 +15,50 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.protocol.map;
+package xyz.jonesdev.sonar.common.fallback.protocol.captcha;
 
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.MapDataPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;
 
 @Getter
-public final class PreparedMapInfo {
-  public static final int DIMENSIONS = (int) Math.pow(2, 7);
-  public static final int SCALE = DIMENSIONS * DIMENSIONS;
+public final class MapCaptchaInfo {
+  private final String answer;
 
-  private final MapInfo info;
-  private final MapDataPacket[] legacy;
-  private final MapDataPacket modern;
+  private final FallbackPacket[] legacy;
+  private final FallbackPacket modern;
 
-  public PreparedMapInfo(final String answer,
-                         final int columns, final int rows,
-                         final byte @NotNull [] buffer) {
-    this.info = new MapInfo(answer, columns, rows, 0, 0, buffer);
+  public MapCaptchaInfo(final @NotNull String answer, final int @NotNull [] buffer) {
+    this.answer = answer;
 
     // Prepare 1.7 map data using a grid
-    final byte[][] grid = new byte[DIMENSIONS][DIMENSIONS];
+    final int[][] grid = new int[128][128];
     for (int i = 0; i < buffer.length; i++) {
-      final byte buf = buffer[i];
+      final int buf = buffer[i];
       grid[i & Byte.MAX_VALUE][i >> 7] = buf;
     }
-    this.legacy = new MapDataPacket[grid.length];
+    this.legacy = new FallbackPacket[grid.length];
     for (int i = 0; i < grid.length; i++) {
-      this.legacy[i] = new MapDataPacket(new MapInfo(answer, DIMENSIONS, DIMENSIONS, i, 0, grid[i]));
+      this.legacy[i] = new MapDataPacket(grid[i], i, 0);
     }
 
     // Prepare 1.8+ map data
-    this.modern = new MapDataPacket(info);
+    this.modern = new MapDataPacket(buffer, 0, 0);
   }
 
-  public void write(final @NotNull FallbackUser user) {
+  public void delayedWrite(final @NotNull FallbackUser user) {
     if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
-      for (final MapDataPacket data : legacy) {
-        user.delayedWrite(data);
+      // 1.7.2-1.7.10 needs separate packets for each axis
+      for (final FallbackPacket legacyPacket : legacy) {
+        user.delayedWrite(legacyPacket);
       }
-    } else {
-      user.delayedWrite(modern);
+      return;
     }
+    // Send modern packet
+    user.delayedWrite(modern);
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/captcha/MapColorPalette.java

@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.captcha;
+
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.image.BufferedImage;
+
+@UtilityClass
+public class MapColorPalette {
+  // https://minecraft.wiki/w/Map_item_format#Full_color_tables
+  public static final int[] COLOR_MAP = {
+    -16777216,
+    -16777216,
+    -16777216,
+    -16777216,
+    -10912473,
+    -9594576,
+    -8408520,
+    -12362211,
+    -5331853,
+    -2766452,
+    -530013,
+    -8225962,
+    -7566196,
+    -5526613,
+    -3684409,
+    -9868951,
+    -4980736,
+    -2359296,
+    -65536,
+    -7929856,
+    -9408332,
+    -7697700,
+    -6250241,
+    -11250553,
+    -9079435,
+    -7303024,
+    -5789785,
+    -10987432,
+    -16754944,
+    -16750080,
+    -16745472,
+    -16760576,
+    -4934476,
+    -2302756,
+    -1,
+    -7895161,
+    -9210239,
+    -7499618,
+    -5986120,
+    -11118495,
+    -9810890,
+    -8233406,
+    -6853299,
+    -11585240,
+    -11579569,
+    -10461088,
+    -9408400,
+    -12895429,
+    -13816396,
+    -13158436,
+    -12566273,
+    -14605945,
+    -10202062,
+    -8690114,
+    -7375032,
+    -11845850,
+    -4935252,
+    -2303533,
+    -779,
+    -7895679,
+    -6792924,
+    -4559572,
+    -2588877,
+    -9288933,
+    -8571496,
+    -6733382,
+    -5092136,
+    -10606478,
+    -12030824,
+    -10976070,
+    -10053160,
+    -13217422,
+    -6184668,
+    -3816148,
+    -1710797,
+    -8816357,
+    -10907631,
+    -9588715,
+    -8401895,
+    -12358643,
+    -5613196,
+    -3117682,
+    -884827,
+    -8371369,
+    -13290187,
+    -12500671,
+    -11776948,
+    -14145496,
+    -9671572,
+    -8092540,
+    -6710887,
+    -11447983,
+    -13280916,
+    -12489340,
+    -11763815,
+    -14138543,
+    -10933123,
+    -9619815,
+    -8437838,
+    -12377762,
+    -14404227,
+    -13876839,
+    -13415246,
+    -14997410,
+    -12045020,
+    -10993364,
+    -10073037,
+    -13228005,
+    -12035804,
+    -10982100,
+    -10059981,
+    -13221093,
+    -9690076,
+    -8115156,
+    -6737101,
+    -11461861,
+    -15658735,
+    -15395563,
+    -15132391,
+    -15921907,
+    -5199818,
+    -2634430,
+    -332211,
+    -8094168,
+    -12543338,
+    -11551561,
+    -10691627,
+    -13601936,
+    -13346124,
+    -12620068,
+    -11894529,
+    -14204025,
+    -16738008,
+    -16729294,
+    -16721606,
+    -16748002,
+    -10798046,
+    -9483734,
+    -8301007,
+    -12309223,
+    -11599616,
+    -10485504,
+    -9436672,
+    -12910336,
+  };
+
+  public int[] getBufferFromImage(final @NotNull BufferedImage bufferedImage) {
+    final int[] buffer = new int[128 * 128];
+
+    bufferedImage.getRGB(0, 0,
+      bufferedImage.getWidth(), bufferedImage.getHeight(),
+      buffer, 0, bufferedImage.getWidth());
+
+    for (int i = 0; i < buffer.length; i++) {
+      buffer[i] = mapColorToMinecraft(buffer[i]);
+    }
+    return buffer;
+  }
+
+  private byte mapColorToMinecraft(final int argb) {
+    int minDistance = Integer.MAX_VALUE;
+    byte closestIndex = 0;
+    for (int i = 0; i < COLOR_MAP.length; i++) {
+      final byte index = (byte) (i < 128 ? i : -129 + (i - 127));
+      final int distance = calculateColorDistance(argb, COLOR_MAP[i]);
+      if (distance < minDistance) {
+        minDistance = distance;
+        closestIndex = index;
+      }
+    }
+    return closestIndex;
+  }
+
+  private int calculateColorDistance(final int argb0, final int argb1) {
+    final int red0 = (argb0 >> 16) & 0xFF;
+    final int green0 = (argb0 >> 8) & 0xFF;
+    final int blue0 = argb0 & 0xFF;
+    final int red1 = (argb1 >> 16) & 0xFF;
+    final int green1 = (argb1 >> 8) & 0xFF;
+    final int blue1 = argb1 & 0xFF;
+    // Color distance metric (e.g. squared Euclidean distance)
+    return (red0 - red1) * (red0 - red1)
+      + (green0 - green1) * (green0 - green1)
+      + (blue0 - blue1) * (blue0 - blue1);
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/entity/EntityType.java

@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.entity;
+
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+
+import java.util.function.Function;
+
+@RequiredArgsConstructor
+public enum EntityType {
+  BOAT(protocolVersion -> {
+    // Useful resources:
+    // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
+    // - https://pokechu22.github.io/Burger/1.20.4.html
+    switch (protocolVersion) {
+      default:
+      case MINECRAFT_1_7_2:
+      case MINECRAFT_1_7_6:
+      case MINECRAFT_1_8:
+      case MINECRAFT_1_9:
+      case MINECRAFT_1_9_1:
+      case MINECRAFT_1_9_2:
+      case MINECRAFT_1_9_4:
+      case MINECRAFT_1_10:
+      case MINECRAFT_1_11:
+      case MINECRAFT_1_11_1:
+      case MINECRAFT_1_12:
+      case MINECRAFT_1_12_1:
+      case MINECRAFT_1_12_2:
+      case MINECRAFT_1_13:
+      case MINECRAFT_1_13_1:
+      case MINECRAFT_1_13_2:
+        return 1;
+      case MINECRAFT_1_14:
+      case MINECRAFT_1_14_1:
+      case MINECRAFT_1_14_2:
+      case MINECRAFT_1_14_3:
+      case MINECRAFT_1_14_4:
+        return 5;
+      case MINECRAFT_1_15:
+      case MINECRAFT_1_15_1:
+      case MINECRAFT_1_15_2:
+      case MINECRAFT_1_16:
+      case MINECRAFT_1_16_1:
+      case MINECRAFT_1_16_2:
+      case MINECRAFT_1_16_3:
+      case MINECRAFT_1_16_4:
+        return 6;
+      case MINECRAFT_1_17:
+      case MINECRAFT_1_17_1:
+      case MINECRAFT_1_18:
+      case MINECRAFT_1_18_2:
+        return 7;
+      case MINECRAFT_1_19:
+      case MINECRAFT_1_19_1:
+      case MINECRAFT_1_19_3:
+        return 8;
+      case MINECRAFT_1_19_4:
+      case MINECRAFT_1_20:
+      case MINECRAFT_1_20_2:
+      case MINECRAFT_1_20_3:
+        return 9;
+      case MINECRAFT_1_20_5:
+        return 10;
+    }
+  });
+
+  private final Function<ProtocolVersion, Integer> function;
+
+  public int getId(final @NotNull ProtocolVersion protocolVersion) {
+    return function.apply(protocolVersion);
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/map/MapInfoPreparer.java

@@ -1,248 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.map;
-
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.config.SonarConfiguration;
-import xyz.jonesdev.sonar.api.timer.SystemTimer;
-
-import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.GlyphVector;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import static java.awt.Font.*;
-import static xyz.jonesdev.sonar.common.fallback.protocol.map.PreparedMapInfo.DIMENSIONS;
-
-@UtilityClass
-public class MapInfoPreparer {
-  private final Random RANDOM = new Random();
-
-  private final ExecutorService PREPARATION_SERVICE = Executors.newSingleThreadExecutor();
-
-  private final int[] FONT_STYLES = new int[]{
-    PLAIN,
-    BOLD,
-    ITALIC,
-    ITALIC | BOLD
-  };
-
-  private final int[][] COLOR_PALETTE = new int[][]{
-    new int[]{ // Blue
-      48,
-      49,
-      50,
-      51
-    },
-    new int[]{ // Orange
-      60,
-      61,
-      62,
-      63,
-    },
-    new int[]{ // Green
-      4,
-      28,
-      29,
-      30,
-    },
-    new int[]{ // Black
-      27,
-      45,
-      46,
-      47,
-    },
-    new int[]{ // Red
-      16,
-      17,
-      18,
-      19
-    }
-  };
-
-  private PreparedMapInfo[] cached;
-  @Getter
-  private int preparedCAPTCHAs;
-  private boolean currentlyPreparing;
-
-  public PreparedMapInfo getRandomCaptcha() {
-    return cached[RANDOM.nextInt(preparedCAPTCHAs)];
-  }
-
-  public void prepare() {
-    final SystemTimer timer = new SystemTimer();
-    Sonar.get().getLogger().info("Precomputing map captcha answers...");
-
-    // Make sure we're not running into concurrency issues
-    if (currentlyPreparing) {
-      Sonar.get().getLogger().warn("Did not precompute map captcha answers as another task is running.");
-      return;
-    }
-
-    // Reset all statistics
-    preparedCAPTCHAs = 0;
-    currentlyPreparing = true;
-    final SonarConfiguration.Verification.Map config = Sonar.get().getConfig().getVerification().getMap();
-    cached = null;
-    cached = new PreparedMapInfo[config.getPrecomputeAmount()];
-
-    // Prepare fonts from config
-    final String dictionary = config.getDictionary();
-    final List<String> fonts = config.getFonts();
-    if (fonts.isEmpty()) {
-      Sonar.get().getLogger().warn("No fonts found, using fallback font...");
-      fonts.add(DIALOG);
-    }
-    final String[] fontTypes = fonts.toArray(new String[0]);
-
-    // Prepare distortions values from config
-    final double distortionsFactorX = config.getDistortionsFactorX();
-    final double distortionsFactorY = config.getDistortionsFactorY();
-    final double halfDistortionsFactorX = distortionsFactorX / 2D;
-    final double halfDistortionsFactorY = distortionsFactorY / 2D;
-
-    for (int _i = 0; _i < cached.length; _i++) {
-      final int currentIndex = _i;
-      final byte[] buffer = new byte[PreparedMapInfo.SCALE];
-      PREPARATION_SERVICE.execute(() -> {
-        // Create image
-        final BufferedImage image = new BufferedImage(DIMENSIONS, DIMENSIONS, BufferedImage.TYPE_3BYTE_BGR);
-        final Graphics2D graphics = (Graphics2D) image.getGraphics();
-        try {
-          // Create random font
-          final String fontType = fontTypes[RANDOM.nextInt(fontTypes.length)];
-          final int fontStyle = FONT_STYLES[RANDOM.nextInt(FONT_STYLES.length)];
-          final int fontSize = 27
-            + (config.isRandomizeFontSize()
-            ? RANDOM.nextInt(6) - 2 : 5);
-          @SuppressWarnings("all") final Font answerFont = new Font(fontType, fontStyle, fontSize);
-          graphics.setFont(answerFont);
-
-          // Build answer to the captcha
-          final StringBuilder answerBuilder = new StringBuilder();
-          for (int _j = 0; _j < 5; _j++) {
-            answerBuilder.append(dictionary.charAt(RANDOM.nextInt(dictionary.length())));
-          }
-          final String answer = answerBuilder.toString();
-
-          // Calculate text position
-          final int stringWidth = graphics.getFontMetrics().stringWidth(answer);
-          final int halfWidth = image.getWidth() / 2;
-          final int halfHeight = image.getHeight() / 2;
-          final int spacing = 5;
-          double _x = halfWidth - stringWidth / 2f - spacing;
-          double _y = halfHeight + fontSize / 3f;
-
-          // Draw each character one by one
-          final FontRenderContext fontRenderContext = graphics.getFontRenderContext();
-          for (final char c : answer.toCharArray()) {
-            // Randomize x and y
-            if (config.isRandomizePositions()) {
-              _y += RANDOM.nextInt(8) - 4;
-            }
-
-            // Apply random distortion
-            final double distortionFactorX = RANDOM.nextDouble() * distortionsFactorX - halfDistortionsFactorX;
-            final double distortionFactorY = RANDOM.nextDouble() * distortionsFactorY - halfDistortionsFactorY;
-
-            // Create a GlyphVector for the character
-            final String character = String.valueOf(c);
-            final GlyphVector glyphVector = graphics.getFont().createGlyphVector(fontRenderContext, character);
-
-            // Apply the distortion to the GlyphVector using AffineTransform
-            final AffineTransform transform = AffineTransform.getTranslateInstance(_x, _y);
-            transform.shear(distortionFactorX, distortionFactorY);
-            final Shape distortedCharacter = glyphVector.getOutline();
-            final Shape distorted = transform.createTransformedShape(distortedCharacter);
-
-            // Draw the distorted character
-            graphics.fill(distorted);
-
-            // Update x by width
-            _x += glyphVector.getVisualBounds().getWidth() + spacing;
-          }
-
-          // TODO: Color converter
-          graphics.setColor(Color.RED);
-
-          // Draw random lines
-          for (int i = 0; i < config.getRandomLinesAmount(); i++) {
-            final int startX = RANDOM.nextInt(halfWidth);
-            final int startY = RANDOM.nextInt(halfHeight);
-            final int endX = halfWidth + RANDOM.nextInt(halfWidth);
-            final int endY = halfHeight + RANDOM.nextInt(halfHeight);
-
-            graphics.drawLine(startX, startY, endX, endY);
-          }
-
-          // Draw random ovals
-          for (int i = 0; i < config.getRandomOvalsAmount(); i++) {
-            final int startX = RANDOM.nextInt(halfWidth);
-            final int startY = RANDOM.nextInt(halfHeight);
-            final int endX = halfWidth + RANDOM.nextInt(halfWidth);
-            final int endY = halfHeight + RANDOM.nextInt(halfHeight);
-
-            graphics.drawOval(startX, startY, endX, endY);
-          }
-
-          // Select random color palette
-          final int[] colorPalette = COLOR_PALETTE[currentIndex % COLOR_PALETTE.length];
-          // Select the next color palette for geometry
-          final int[] nextColorPalette = COLOR_PALETTE[(currentIndex + 1) % COLOR_PALETTE.length];
-          // Clear background
-          Arrays.fill(buffer, (byte) 57);
-          // Color every pixel individually
-          final int spacingY = halfHeight - fontSize;
-          for (int x = spacing; x < image.getWidth() - spacing; x++) {
-            for (int y = spacingY; y < image.getHeight() - spacingY; y++) {
-              final int pixel = image.getRGB(x, y);
-              final int index = y * image.getWidth() + x;
-              if (pixel == -16777216 && RANDOM.nextInt(100) < 97) continue;
-              // Set color of pixel to random color from the palette
-              final byte color = (byte) (pixel == -16777216 ? RANDOM.nextInt(100) < 75 ? 14 :
-                RANDOM.nextInt(Byte.MAX_VALUE)
-                : pixel != -65536 ? colorPalette[RANDOM.nextInt(colorPalette.length)]
-                : nextColorPalette[RANDOM.nextInt(nextColorPalette.length)]);
-              // Write pixel color to buffer
-              buffer[index] = color;
-            }
-          }
-          // Cache buffer to map
-          cached[currentIndex] = new PreparedMapInfo(answer, image.getWidth(), image.getHeight(), buffer);
-        } finally {
-          // Dispose graphics
-          graphics.dispose();
-          // Finished?
-          if (currentIndex == cached.length - 1) {
-            Sonar.get().getLogger().info("Successfully precomputed map captcha answers in {}s!", timer);
-            currentlyPreparing = false;
-          }
-          preparedCAPTCHAs++;
-        }
-      });
-    }
-  }
-}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/netty/DeferredByteBufHolder.java

@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.netty;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufHolder;
-import io.netty.util.IllegalReferenceCountException;
-import lombok.AllArgsConstructor;
-import lombok.ToString;
-
-// Taken from
-// https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/DeferredByteBufHolder.java
-@ToString
-@AllArgsConstructor
-public class DeferredByteBufHolder implements ByteBufHolder {
-  private ByteBuf backing;
-
-  @Override
-  public ByteBuf content() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    if (backing.refCnt() <= 0) {
-      throw new IllegalReferenceCountException(backing.refCnt());
-    }
-    return backing;
-  }
-
-  @Override
-  public ByteBufHolder copy() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    return new DeferredByteBufHolder(backing.copy());
-  }
-
-  @Override
-  public ByteBufHolder duplicate() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    return new DeferredByteBufHolder(backing.duplicate());
-  }
-
-  @Override
-  public ByteBufHolder retainedDuplicate() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    return new DeferredByteBufHolder(backing.retainedDuplicate());
-  }
-
-  @Override
-  public ByteBufHolder replace(final ByteBuf content) {
-    if (content == null) {
-      throw new NullPointerException("content");
-    }
-    backing = content;
-    return this;
-  }
-
-  @Override
-  public int refCnt() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    return backing.refCnt();
-  }
-
-  @Override
-  public ByteBufHolder retain() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    backing.retain();
-    return this;
-  }
-
-  @Override
-  public ByteBufHolder retain(final int increment) {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    backing.retain(increment);
-    return this;
-  }
-
-  @Override
-  public ByteBufHolder touch() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    backing.touch();
-    return this;
-  }
-
-  @Override
-  public ByteBufHolder touch(final Object hint) {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    backing.touch(hint);
-    return this;
-  }
-
-  @Override
-  public boolean release() {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    return backing.release();
-  }
-
-  @Override
-  public boolean release(final int decrement) {
-    if (backing == null) {
-      throw new IllegalStateException("Trying to obtain contents of holder with a null buffer");
-    }
-    return backing.release(decrement);
-  }
-}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/config/FinishConfigurationPacket.java

@@ -18,11 +18,9 @@
 package xyz.jonesdev.sonar.common.fallback.protocol.packets.config;
 
 import io.netty.buffer.ByteBuf;
-import lombok.ToString;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
-@ToString
 public final class FinishConfigurationPacket implements FallbackPacket {
 
   @Override
@@ -35,6 +33,7 @@ public final class FinishConfigurationPacket implements FallbackPacket {
 
   @Override
   public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    // This packet is always empty; see https://wiki.vg/Protocol#Finish_Configuration
     return 0;
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/config/RegistryDataPacket.java

@@ -18,26 +18,74 @@
 package xyz.jonesdev.sonar.common.fallback.protocol.packets.config;
 
 import io.netty.buffer.ByteBuf;
-import lombok.Getter;
-import lombok.ToString;
+import lombok.*;
+import net.kyori.adventure.nbt.BinaryTag;
+import net.kyori.adventure.nbt.CompoundBinaryTag;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketSnapshot;
 
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeNamelessCompoundTag;
+import java.util.ArrayList;
+import java.util.List;
+
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
 
 @Getter
-@ToString
+@NoArgsConstructor
+@AllArgsConstructor
 public final class RegistryDataPacket implements FallbackPacket {
+  private CompoundBinaryTag tag;
+  private String type;
+  private List<RegistryDataPacket.Bundle> bundles;
 
   @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    writeNamelessCompoundTag(byteBuf, DimensionRegistry.CODEC_1_20);
+  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_20_5) < 0) {
+      writeNamelessCompoundTag(byteBuf, tag);
+    } else if (type != null) {
+      writeString(byteBuf, type);
+      writeVarInt(byteBuf, bundles.size());
+
+      for (final RegistryDataPacket.Bundle bundle : bundles) {
+        writeString(byteBuf, bundle.getName());
+        // Write the bundle tag
+        final CompoundBinaryTag tag = bundle.getTag();
+        if (tag != null) {
+          byteBuf.writeBoolean(true);
+          writeNamelessCompoundTag(byteBuf, tag);
+        } else {
+          byteBuf.writeBoolean(false);
+        }
+      }
+    }
   }
 
   @Override
   public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
     throw new UnsupportedOperationException();
   }
+
+  public static FallbackPacket @NotNull [] of(final @NotNull CompoundBinaryTag rootTag) {
+    final FallbackPacket[] packets = new FallbackPacket[rootTag.size()];
+    int index = 0;
+    for (final String type : rootTag.keySet()) {
+      final ArrayList<RegistryDataPacket.Bundle> bundles = new ArrayList<>();
+      for (final BinaryTag binaryTag : rootTag.getCompound(type).getList("value")) {
+        final CompoundBinaryTag tag = (CompoundBinaryTag) binaryTag;
+        bundles.add(new Bundle(tag.getString("name"), tag.getCompound("element")));
+      }
+      packets[index++] = new FallbackPacketSnapshot(new RegistryDataPacket(rootTag, type, bundles));
+    }
+    return packets;
+  }
+
+  @Data
+  @Value
+  public static class Bundle {
+    @NotNull String name;
+    // In the protocol, it is able to be null
+    @Nullable CompoundBinaryTag tag;
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/login/LoginAcknowledgedPacket.java

@@ -25,9 +25,16 @@ public final class LoginAcknowledgedPacket implements FallbackPacket {
 
   @Override
   public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
   }
 
   @Override
   public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
   }
+
+  @Override
+  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    // This packet is always empty; see https://wiki.vg/Protocol#Login_Acknowledged
+    return 0;
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/login/LoginSuccessPacket.java

@@ -25,24 +25,23 @@ import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.netty.FastUUID;
+import xyz.jonesdev.sonar.common.util.FastUuidSansHyphens;
 
 import java.util.UUID;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
 
 @Getter
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
 public final class LoginSuccessPacket implements FallbackPacket {
-  private String username;
   private UUID uuid;
+  private String username;
 
   @Override
-  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     if (protocolVersion.compareTo(MINECRAFT_1_19) >= 0) {
       writeUUID(byteBuf, uuid);
     } else if (protocolVersion.compareTo(MINECRAFT_1_16) >= 0) {
@@ -50,7 +49,7 @@ public final class LoginSuccessPacket implements FallbackPacket {
     } else if (protocolVersion.compareTo(MINECRAFT_1_7_6) >= 0) {
       writeString(byteBuf, uuid.toString());
     } else {
-      writeString(byteBuf, FastUUID.toString(uuid));
+      writeString(byteBuf, FastUuidSansHyphens.toString(uuid));
     }
 
     writeString(byteBuf, username);
@@ -58,6 +57,9 @@ public final class LoginSuccessPacket implements FallbackPacket {
     if (protocolVersion.compareTo(MINECRAFT_1_19) >= 0) {
       writeVarInt(byteBuf, 0); // properties
     }
+    if (protocolVersion.compareTo(MINECRAFT_1_20_5) >= 0) {
+      byteBuf.writeBoolean(false); // should authenticate
+    }
   }
 
   @Override

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/ChunkDataPacket.java

@@ -29,8 +29,7 @@ import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
 
 @Getter
 @ToString
@@ -67,7 +66,7 @@ public final class ChunkDataPacket implements FallbackPacket {
   }
 
   @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     byteBuf.writeInt(x);
     byteBuf.writeInt(z);
 

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/ClientAbilitiesPacket.java

@@ -30,12 +30,12 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
-public class ClientAbilitiesPacket implements FallbackPacket {
+public final class ClientAbilitiesPacket implements FallbackPacket {
   private int encodedFlags;
   private float flySpeed, walkSpeed;
 
   @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
     byteBuf.writeByte(encodedFlags);
     byteBuf.writeFloat(flySpeed);
     byteBuf.writeFloat(walkSpeed);
@@ -43,8 +43,6 @@ public class ClientAbilitiesPacket implements FallbackPacket {
 
   @Override
   public void decode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    encodedFlags = byteBuf.readByte();
-    flySpeed = byteBuf.readFloat();
-    walkSpeed = byteBuf.readFloat();
+    throw new UnsupportedOperationException();
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/ClientSettingsPacket.java

@@ -27,8 +27,8 @@ import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.readString;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readString;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readVarInt;
 
 @Getter
 @ToString
@@ -39,24 +39,19 @@ public final class ClientSettingsPacket implements FallbackPacket {
   private byte viewDistance;
   private int chatVisibility;
   private boolean chatColors;
-  private byte difficulty; // 1.7 Protocol
+  private byte difficulty; // 1.7
   private short skinParts;
   private int mainHand;
   private boolean chatFilteringEnabled; // Added in 1.17
   private boolean clientListingAllowed; // Added in 1.18, overwrites server-list "anonymous" mode
 
   @Override
-  public int expectedMinLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return 2;
+  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
   }
 
   @Override
-  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return 0xff + 1; // 256 as a hard-limit
-  }
-
-  @Override
-  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     locale = readString(byteBuf, 16);
     viewDistance = byteBuf.readByte();
     chatVisibility = readVarInt(byteBuf);
@@ -82,7 +77,12 @@ public final class ClientSettingsPacket implements FallbackPacket {
   }
 
   @Override
-  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    throw new UnsupportedOperationException();
+  public int expectedMinLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    return 2;
+  }
+
+  @Override
+  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    return 0xff + 1; // 256 as a hard-limit
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/DefaultSpawnPositionPacket.java

@@ -37,7 +37,7 @@ public final class DefaultSpawnPositionPacket implements FallbackPacket {
   private int x, y, z;
 
   @Override
-  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
       byteBuf.writeInt(x);
       byteBuf.writeInt(y);

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/DisconnectPacket.java

@@ -26,7 +26,7 @@ import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.utility.component.ComponentHolder;
+import xyz.jonesdev.sonar.common.util.ComponentHolder;
 
 @Getter
 @ToString
@@ -37,7 +37,7 @@ public final class DisconnectPacket implements FallbackPacket {
   private boolean login;
 
   @Override
-  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     componentHolder.write(byteBuf, login ? ProtocolVersion.MINECRAFT_1_20_2 : protocolVersion);
   }
 
@@ -46,8 +46,7 @@ public final class DisconnectPacket implements FallbackPacket {
     throw new UnsupportedOperationException();
   }
 
-  public static @NotNull DisconnectPacket create(final @NotNull Component component,
-                                                 final boolean login) {
-    return new DisconnectPacket(new ComponentHolder(component), login);
+  public static @NotNull DisconnectPacket create(final @NotNull Component component, final boolean duringLogin) {
+    return new DisconnectPacket(new ComponentHolder(component), duringLogin);
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/GameEventPacket.java

@@ -33,7 +33,7 @@ public final class GameEventPacket implements FallbackPacket {
   private float value;
 
   @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
     byteBuf.writeByte(type);
     byteBuf.writeFloat(value);
   }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/JoinGamePacket.java

@@ -27,8 +27,7 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 import static xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
 
 // Mostly taken from
 // https://github.com/Nan1t/NanoLimbo/blob/main/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketJoinGame.java
@@ -48,7 +47,7 @@ public final class JoinGamePacket implements FallbackPacket {
   private String levelName;
 
   @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     byteBuf.writeInt(entityId);
 
     if (protocolVersion.inBetween(MINECRAFT_1_7_2, MINECRAFT_1_7_6)) {
@@ -210,7 +209,7 @@ public final class JoinGamePacket implements FallbackPacket {
       return;
     }
 
-    if (protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0) {
+    if (protocolVersion.inBetween(MINECRAFT_1_20_2, MINECRAFT_1_20_3)) {
       byteBuf.writeBoolean(isHardcore);
       writeStringArray(byteBuf, levelNames);
       writeVarInt(byteBuf, 0); // max players
@@ -228,6 +227,29 @@ public final class JoinGamePacket implements FallbackPacket {
       byteBuf.writeBoolean(false); // flat
       byteBuf.writeBoolean(false); // no last death location
       writeVarInt(byteBuf, 0);
+      return;
+    }
+
+    if (protocolVersion.compareTo(MINECRAFT_1_20_5) >= 0) {
+      byteBuf.writeBoolean(isHardcore);
+      writeStringArray(byteBuf, levelNames);
+      writeVarInt(byteBuf, 0); // max players
+      writeVarInt(byteBuf, viewDistance);
+      writeVarInt(byteBuf, viewDistance); // simulation distance
+      byteBuf.writeBoolean(reducedDebugInfo);
+      byteBuf.writeBoolean(showRespawnScreen);
+      byteBuf.writeBoolean(false); // limited crafting
+      // It depends on the dimension data we send in RegistryData. If we only send one dimension. It should be 0.
+      writeVarInt(byteBuf, 0);
+      writeString(byteBuf, levelName);
+      byteBuf.writeLong(partialHashedSeed);
+      byteBuf.writeByte(gamemode);
+      byteBuf.writeByte(-1); // previous gamemode
+      byteBuf.writeBoolean(false); // debug type
+      byteBuf.writeBoolean(false); // flat
+      byteBuf.writeBoolean(false); // no last death location
+      writeVarInt(byteBuf, 0); // pearl cooldown
+      byteBuf.writeBoolean(false); // secure profile
     }
   }
 

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/KeepAlivePacket.java

@@ -28,8 +28,8 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_12_2;
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
 
 @Getter
 @ToString
@@ -39,7 +39,7 @@ public final class KeepAlivePacket implements FallbackPacket {
   private long id;
 
   @Override
-  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     if (protocolVersion.compareTo(MINECRAFT_1_12_2) >= 0) {
       byteBuf.writeLong(id);
     } else if (protocolVersion.compareTo(MINECRAFT_1_8) >= 0) {
@@ -50,7 +50,7 @@ public final class KeepAlivePacket implements FallbackPacket {
   }
 
   @Override
-  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     if (protocolVersion.compareTo(MINECRAFT_1_12_2) >= 0) {
       id = byteBuf.readLong();
     } else if (protocolVersion.compareTo(MINECRAFT_1_8) >= 0) {

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/MapDataPacket.java

@@ -21,32 +21,29 @@ import io.netty.buffer.ByteBuf;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.map.MapInfo;
 
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
 
 @Getter
-@ToString
 @NoArgsConstructor
 @AllArgsConstructor
 public final class MapDataPacket implements FallbackPacket {
-  private MapInfo mapInfo;
+  private int[] buffer;
+  private int x, y;
 
   @Override
   public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
     writeVarInt(byteBuf, 0);
 
     if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
-      byteBuf.writeShort(mapInfo.getBuffer().length + 3);
+      byteBuf.writeShort(buffer.length + 3);
       byteBuf.writeByte(0); // scaling
-      byteBuf.writeByte(mapInfo.getX());
-      byteBuf.writeByte(mapInfo.getY());
-
-      byteBuf.writeBytes(mapInfo.getBuffer());
+      byteBuf.writeByte(x);
+      byteBuf.writeByte(y);
+      writeArray(byteBuf, buffer);
     } else {
       byteBuf.writeByte(0); // scaling
 
@@ -65,13 +62,19 @@ public final class MapDataPacket implements FallbackPacket {
         writeVarInt(byteBuf, 0);
       }
 
-      byteBuf.writeByte(mapInfo.getColumns());
-      byteBuf.writeByte(mapInfo.getRows());
-      byteBuf.writeByte(mapInfo.getX());
-      byteBuf.writeByte(mapInfo.getY());
+      byteBuf.writeByte(128); // rows
+      byteBuf.writeByte(128); // columns
+      byteBuf.writeByte(x);
+      byteBuf.writeByte(y);
 
-      writeVarInt(byteBuf, mapInfo.getBuffer().length);
-      byteBuf.writeBytes(mapInfo.getBuffer());
+      writeVarInt(byteBuf, buffer.length);
+      writeArray(byteBuf, buffer);
+    }
+  }
+
+  private static void writeArray(final ByteBuf byteBuf, final int @NotNull [] array) {
+    for (final int i : array) {
+      byteBuf.writeByte(i);
     }
   }
 

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/PaddleBoatPacket.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class PaddleBoatPacket implements FallbackPacket {
+  private boolean leftPaddle, rightPaddle;
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    leftPaddle = byteBuf.readBoolean();
+    rightPaddle = byteBuf.readBoolean();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/PlayerInputPacket.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class PlayerInputPacket implements FallbackPacket {
+  private float sideways, forward;
+  private boolean jump, unmount;
+
+  @Override
+  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    sideways = byteBuf.readFloat();
+    forward = byteBuf.readFloat();
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
+      jump = byteBuf.readBoolean();
+      unmount = byteBuf.readBoolean();
+    } else {
+      final byte flags = byteBuf.readByte();
+      jump = (flags & 0x01) != 0;
+      unmount = (flags & 0x02) != 0;
+    }
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/PlayerPositionIdlePacket.java

@@ -30,16 +30,16 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
-public final class PlayerTickPacket implements FallbackPacket {
+public final class PlayerPositionIdlePacket implements FallbackPacket {
   private boolean onGround;
 
-  @Override
-  public void decode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    onGround = byteBuf.readBoolean();
-  }
-
   @Override
   public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  public void decode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
+    onGround = byteBuf.readBoolean();
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/PlayerPositionLookPacket.java

@@ -27,7 +27,7 @@ import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
 
 @Getter
 @ToString
@@ -39,19 +39,6 @@ public final class PlayerPositionLookPacket implements FallbackPacket {
   private int teleportId;
   private boolean onGround;
 
-  @Override
-  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    x = byteBuf.readDouble();
-    y = byteBuf.readDouble();
-    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
-      y = byteBuf.readDouble(); // Account for weird y positions on 1.7
-    }
-    z = byteBuf.readDouble();
-    yaw = byteBuf.readFloat();
-    pitch = byteBuf.readFloat();
-    onGround = byteBuf.readBoolean();
-  }
-
   @Override
   public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
     byteBuf.writeDouble(x);
@@ -77,8 +64,21 @@ public final class PlayerPositionLookPacket implements FallbackPacket {
   }
 
   @Override
-  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0 ? 41 : 33;
+  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    x = byteBuf.readDouble();
+    y = byteBuf.readDouble();
+    if (protocolVersion.compareTo(MINECRAFT_1_8) < 0) {
+      y = byteBuf.readDouble(); // Account for weird y positions on 1.7
+    }
+    z = byteBuf.readDouble();
+    yaw = byteBuf.readFloat();
+    pitch = byteBuf.readFloat();
+    onGround = byteBuf.readBoolean();
+  }
+
+  @Override
+  public int expectedMaxLength(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    return protocolVersion.compareTo(MINECRAFT_1_8) < 0 ? 41 : 33;
   }
 
   @Override

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/PlayerPositionPacket.java

@@ -26,6 +26,8 @@ import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;
+
 @Getter
 @ToString
 @NoArgsConstructor
@@ -35,24 +37,24 @@ public final class PlayerPositionPacket implements FallbackPacket {
   private boolean onGround;
 
   @Override
-  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void decode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     x = byteBuf.readDouble();
     y = byteBuf.readDouble();
-    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
+    if (protocolVersion.compareTo(MINECRAFT_1_8) < 0) {
       y = byteBuf.readDouble(); // Account for weird y positions on 1.7
     }
     z = byteBuf.readDouble();
     onGround = byteBuf.readBoolean();
   }
 
-  @Override
-  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public int expectedMaxLength(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    return protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0 ? 33 : 25;
+    return protocolVersion.compareTo(MINECRAFT_1_8) < 0 ? 33 : 25;
   }
 
   @Override

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/PluginMessagePacket.java

@@ -23,50 +23,40 @@ import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.netty.DeferredByteBufHolder;
 
-import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_13;
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_8;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readRetainedByteBufSlice17;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readString;
 
-// Mostly taken from
-// https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/PluginMessage.java
 @Getter
 @ToString
-public final class PluginMessagePacket extends DeferredByteBufHolder implements FallbackPacket {
+public final class PluginMessagePacket implements FallbackPacket {
   private String channel;
-
-  public PluginMessagePacket() {
-    super(null);
-  }
-
-  @Override
-  public int expectedMinLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return 8;
-  }
-
-  @Override
-  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    return 0xfff + 1; // limit packet size to 4096
-  }
-
-  @Override
-  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    channel = readString(byteBuf);
-
-    if (protocolVersion.compareTo(MINECRAFT_1_13) >= 0) {
-      channel = transformLegacyToModernChannel(channel);
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_8) >= 0) {
-      replace(byteBuf.readRetainedSlice(byteBuf.readableBytes()));
-    } else {
-      replace(readRetainedByteBufSlice17(byteBuf));
-    }
-  }
+  private ByteBuf slicedBuffer;
 
   @Override
   public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
     throw new UnsupportedOperationException();
   }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    channel = readString(byteBuf, 64);
+
+    if (protocolVersion.compareTo(MINECRAFT_1_8) >= 0) {
+      slicedBuffer = byteBuf.readRetainedSlice(byteBuf.readableBytes());
+    } else {
+      slicedBuffer = readRetainedByteBufSlice17(byteBuf);
+    }
+  }
+
+  @Override
+  public int expectedMinLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    return 4;
+  }
+
+  @Override
+  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    return 0xFFF; // strict size limit
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/RemoveEntitiesPacket.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class RemoveEntitiesPacket implements FallbackPacket {
+  private int entityId; // We only need one entityId
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    // No idea why Mojang decided that this is a good idea, but whatever
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_17) != 0) {
+      writeVarInt(byteBuf, 1); // size
+    }
+
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
+      byteBuf.writeInt(entityId);
+    } else {
+      writeVarInt(byteBuf, entityId);
+    }
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/SetExperiencePacket.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class SetExperiencePacket implements FallbackPacket {
+  private float experienceBar;
+  private int level;
+  private int totalExperience;
+
+  @Override
+  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    byteBuf.writeFloat(experienceBar);
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
+      byteBuf.writeShort(level);
+      byteBuf.writeShort(totalExperience);
+    } else {
+      writeVarInt(byteBuf, level);
+      writeVarInt(byteBuf, totalExperience);
+    }
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/SetPassengersPacket.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class SetPassengersPacket implements FallbackPacket {
+  private int entityId, passengerId;
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    // You can find this in the EntityAttach packet,
+    // which was later replaced by SetPassengers in 1.9+
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_9) < 0) {
+      byteBuf.writeInt(passengerId);
+      byteBuf.writeInt(entityId);
+      byteBuf.writeByte(0); // leash
+      return;
+    }
+
+    writeVarInt(byteBuf, entityId);
+    writeVarInt(byteBuf, 1); // passenger count
+    writeVarInt(byteBuf, passengerId);
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/SetSlotPacket.java

@@ -29,20 +29,14 @@ import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeCompoundTag;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeNamelessCompoundTag;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
 
 @Getter
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
 public final class SetSlotPacket implements FallbackPacket {
-  private int windowId;
-  private int slot;
-  private int count;
-  private int data;
-  private int itemId;
+  private int slot, count, itemId;
   private CompoundBinaryTag compoundBinaryTag;
 
   public static final CompoundBinaryTag MAP_NBT = CompoundBinaryTag.builder()
@@ -50,13 +44,8 @@ public final class SetSlotPacket implements FallbackPacket {
     .build();
 
   @Override
-  public void decode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    byteBuf.writeByte(windowId);
+  public void encode(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    byteBuf.writeByte(0); // windowId
 
     if (protocolVersion.compareTo(MINECRAFT_1_17_1) >= 0) {
       writeVarInt(byteBuf, 0);
@@ -64,32 +53,53 @@ public final class SetSlotPacket implements FallbackPacket {
 
     byteBuf.writeShort(slot);
 
-    if (protocolVersion.compareTo(MINECRAFT_1_13_2) >= 0) {
+    if (protocolVersion.inBetween(MINECRAFT_1_13_2, MINECRAFT_1_20_3)) {
       byteBuf.writeBoolean(true);
     }
 
+    if (protocolVersion.compareTo(MINECRAFT_1_20_5) >= 0) {
+      writeVarInt(byteBuf, count);
+    }
+
     if (protocolVersion.compareTo(MINECRAFT_1_13_2) < 0) {
       byteBuf.writeShort(itemId);
     } else {
       writeVarInt(byteBuf, itemId);
     }
-    byteBuf.writeByte(count);
+
+    if (protocolVersion.compareTo(MINECRAFT_1_20_5) < 0) {
+      byteBuf.writeByte(count);
+    }
+
     if (protocolVersion.compareTo(MINECRAFT_1_13) < 0) {
-      byteBuf.writeShort(data);
+      byteBuf.writeShort(0); // data
     }
 
     if (protocolVersion.compareTo(MINECRAFT_1_17) < 0) {
-      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0) {
+      if (protocolVersion.compareTo(MINECRAFT_1_8) < 0) {
         byteBuf.writeShort(-1);
       } else {
         byteBuf.writeByte(0);
       }
     } else {
-      if (protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0) {
-        writeNamelessCompoundTag(byteBuf, compoundBinaryTag);
-      } else {
+      if (protocolVersion.compareTo(MINECRAFT_1_20_2) < 0) {
         writeCompoundTag(byteBuf, compoundBinaryTag);
+      } else if (protocolVersion.compareTo(MINECRAFT_1_20_5) < 0) {
+        writeNamelessCompoundTag(byteBuf, compoundBinaryTag);
+      } else { // 1.20.5
+        // TODO: find a way to improve this
+        // component
+        writeVarInt(byteBuf, 1); // component count to add
+        writeVarInt(byteBuf, 0); // component count to remove
+        // single VarInt component
+        writeVarInt(byteBuf, 26); // map component
+        writeVarInt(byteBuf, 0); // map id
       }
     }
   }
+
+  @Override
+  public void decode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/SpawnEntityPacket.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeUUID;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class SpawnEntityPacket implements FallbackPacket {
+  private int entityId, entityType;
+  private double x, y, z;
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    writeVarInt(byteBuf, entityId);
+
+    final boolean v1_9orHigher = protocolVersion.compareTo(MINECRAFT_1_8) > 0;
+
+    if (v1_9orHigher) {
+      writeUUID(byteBuf, EMPTY_UUID);
+    }
+
+    if (protocolVersion.compareTo(MINECRAFT_1_14) >= 0) {
+      writeVarInt(byteBuf, entityType);
+    } else {
+      byteBuf.writeByte(entityType);
+    }
+
+    if (v1_9orHigher) {
+      byteBuf.writeDouble(x);
+      byteBuf.writeDouble(y);
+      byteBuf.writeDouble(z);
+    } else {
+      byteBuf.writeInt(floor(x * 32D));
+      byteBuf.writeInt(floor(y * 32D));
+      byteBuf.writeInt(floor(z * 32D));
+    }
+
+    byteBuf.writeByte(0); // pitch or yaw
+    byteBuf.writeByte(0); // yaw or pitch
+
+    if (protocolVersion.compareTo(MINECRAFT_1_19) >= 0) {
+      byteBuf.writeByte(0); // head yaw
+      writeVarInt(byteBuf, 0); // data
+    } else {
+      byteBuf.writeInt(0); // data
+    }
+
+    if (v1_9orHigher) {
+      byteBuf.writeShort(0); // velocity X
+      byteBuf.writeShort(0); // velocity Y
+      byteBuf.writeShort(0); // velocity Z
+    }
+  }
+
+  private static int floor(final double value) {
+    final int __value = (int) value;
+    return value < (double) __value ? __value - 1 : __value;
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/TeleportConfirmPacket.java

@@ -25,7 +25,7 @@ import lombok.ToString;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readVarInt;
 
 @Getter
 @ToString
@@ -40,7 +40,7 @@ public final class TeleportConfirmPacket implements FallbackPacket {
   }
 
   @Override
-  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) throws Exception {
     teleportId = readVarInt(byteBuf);
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/TransactionPacket.java

@@ -33,33 +33,33 @@ import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT
 @NoArgsConstructor
 @AllArgsConstructor
 public final class TransactionPacket implements FallbackPacket {
-  private int windowId, id;
+  private int windowId, transactionId;
   private boolean accepted;
 
   @Override
-  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
-    if (protocolVersion.compareTo(MINECRAFT_1_17) < 0) {
-      byteBuf.writeByte(windowId);
-      byteBuf.writeShort((short) id);
-      // The "accepted" field is actually really unnecessary since
-      // it's never even used in the client.
-      byteBuf.writeBoolean(accepted);
-    } else {
-      byteBuf.writeInt(id);
-    }
-  }
-
-  @Override
-  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     if (protocolVersion.compareTo(MINECRAFT_1_17) < 0) {
       windowId = byteBuf.readByte();
-      id = byteBuf.readShort();
+      transactionId = byteBuf.readShort();
       accepted = byteBuf.readBoolean();
     } else {
-      id = byteBuf.readInt();
+      transactionId = byteBuf.readInt();
       // Always set accepted to true since 1.17 or higher don't use
       // transactions for inventory confirmation anymore.
       accepted = true;
     }
   }
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    if (protocolVersion.compareTo(MINECRAFT_1_17) < 0) {
+      byteBuf.writeByte(windowId);
+      byteBuf.writeShort((short) transactionId);
+      // The "accepted" field is actually really unnecessary since
+      // it's never even used in the client.
+      byteBuf.writeBoolean(accepted);
+    } else {
+      byteBuf.writeInt(transactionId);
+    }
+  }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/TransferPacket.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2024 jones
+ *
+ * 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 xyz.jonesdev.sonar.common.fallback.protocol.packets.play;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeString;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class TransferPacket implements FallbackPacket {
+  private String destinationHost;
+  private int destinationPort;
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
+    writeString(byteBuf, destinationHost);
+    writeVarInt(byteBuf, destinationPort);
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/UniversalChatPacket.java

@@ -26,21 +26,15 @@ import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.utility.component.ComponentHolder;
-
-import java.time.Instant;
-import java.util.UUID;
+import xyz.jonesdev.sonar.common.util.ComponentHolder;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public final class UniversalChatPacket implements FallbackPacket {
-  private static final UUID PLACEHOLDER_UUID = new UUID(0L, 0L);
   private static final int DIV_FLOOR = -Math.floorDiv(-20, 8);
 
   public static final byte CHAT_TYPE = (byte) 0;
@@ -50,16 +44,9 @@ public final class UniversalChatPacket implements FallbackPacket {
   private ComponentHolder componentHolder;
   private String message;
   private byte type;
-  private boolean signedPreview;
-  private boolean unsigned = false;
-  private Instant timestamp;
-  private Instant expiry;
-  private long salt;
-  private boolean signed;
   private byte[] signature;
 
-  public UniversalChatPacket(final @NotNull Component component,
-                             final byte type) {
+  public UniversalChatPacket(final @NotNull Component component, final byte type) {
     this(new ComponentHolder(component), type);
   }
 
@@ -69,7 +56,7 @@ public final class UniversalChatPacket implements FallbackPacket {
   }
 
   @Override
-  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     // Serialized message
     componentHolder.write(byteBuf, protocolVersion);
 
@@ -85,36 +72,36 @@ public final class UniversalChatPacket implements FallbackPacket {
     // Sender
     if (protocolVersion.compareTo(MINECRAFT_1_16) >= 0
       && protocolVersion.compareTo(MINECRAFT_1_19) < 0) {
-      writeUUID(byteBuf, PLACEHOLDER_UUID);
+      writeUUID(byteBuf, EMPTY_UUID);
     }
   }
 
   @Override
-  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+  public void decode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
     message = readString(byteBuf, 256);
 
-    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19) >= 0) {
-      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19_1) <= 0) {
-        final long expiresAt = byteBuf.readLong();
+    if (protocolVersion.compareTo(MINECRAFT_1_19) >= 0) {
+      if (protocolVersion.compareTo(MINECRAFT_1_19_1) <= 0) {
+        byteBuf.readLong(); // expiresAt
         final long saltLong = byteBuf.readLong();
         final byte[] signatureBytes = readByteArray(byteBuf);
+        boolean unsigned = false;
 
         if (saltLong != 0L && signatureBytes.length > 0) {
           signature = signatureBytes;
-          expiry = Instant.ofEpochMilli(expiresAt);
-        } else if ((protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0
+        } else if ((protocolVersion.compareTo(MINECRAFT_1_19_1) >= 0
           || saltLong == 0L) && signatureBytes.length == 0) {
           unsigned = true;
         } else {
           throw new CorruptedFrameException("Invalid signature");
         }
 
-        signedPreview = byteBuf.readBoolean();
+        final boolean signedPreview = byteBuf.readBoolean();
         if (signedPreview && unsigned) {
           throw new CorruptedFrameException("Signature missing");
         }
 
-        if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0) {
+        if (protocolVersion.compareTo(MINECRAFT_1_19_1) >= 0) {
           final int size = readVarInt(byteBuf);
           if (size < 0 || size > 5) {
             throw new CorruptedFrameException("Invalid previous messages");
@@ -131,11 +118,12 @@ public final class UniversalChatPacket implements FallbackPacket {
           }
         }
       } else {
-        timestamp = Instant.ofEpochMilli(byteBuf.readLong());
-        salt = byteBuf.readLong();
-        signed = byteBuf.readBoolean();
+        byteBuf.readLong(); // timestamp
+        byteBuf.readLong(); // salt
+        final boolean signed = byteBuf.readBoolean();
+
         if (signed) {
-          byte[] sign = new byte[256];
+          final byte[] sign = new byte[256];
           byteBuf.readBytes(sign);
           signature = sign;
         } else {
@@ -143,7 +131,7 @@ public final class UniversalChatPacket implements FallbackPacket {
         }
 
         readVarInt(byteBuf);
-        byte[] bytes = new byte[DIV_FLOOR];
+        final byte[] bytes = new byte[DIV_FLOOR];
         byteBuf.readBytes(bytes);
       }
     }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/UpdateSectionBlocksPacket.java

@@ -25,19 +25,19 @@ import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
-import xyz.jonesdev.sonar.common.fallback.protocol.block.ChangedBlock;
+import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockUpdate;
 
 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarLong;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarLong;
 
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@ToString(exclude = {"changedBlocks"})
+@ToString(exclude = {"blockUpdates"})
 public final class UpdateSectionBlocksPacket implements FallbackPacket {
   private int sectionX, sectionZ;
-  private ChangedBlock[] changedBlocks;
+  private BlockUpdate[] blockUpdates;
 
   @Override
   public void encode(final ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) throws Exception {
@@ -46,13 +46,13 @@ public final class UpdateSectionBlocksPacket implements FallbackPacket {
       byteBuf.writeInt(sectionZ);
 
       if (protocolVersion.compareTo(MINECRAFT_1_8) < 0) {
-        byteBuf.writeShort(changedBlocks.length);
-        byteBuf.writeInt(4 * changedBlocks.length);
+        byteBuf.writeShort(blockUpdates.length);
+        byteBuf.writeInt(4 * blockUpdates.length);
       } else {
-        writeVarInt(byteBuf, changedBlocks.length);
+        writeVarInt(byteBuf, blockUpdates.length);
       }
 
-      for (final ChangedBlock block : changedBlocks) {
+      for (final BlockUpdate block : blockUpdates) {
         byteBuf.writeShort(block.getLegacyBlockState());
         final int blockId = block.getType().getId(protocolVersion);
         if (protocolVersion.compareTo(MINECRAFT_1_13) >= 0) {
@@ -68,7 +68,7 @@ public final class UpdateSectionBlocksPacket implements FallbackPacket {
       }
     } else {
       // We only need one Y position
-      final int sectionY = changedBlocks[0].getPosition().getY() >> 4;
+      final int sectionY = blockUpdates[0].getPosition().getY() >> 4;
 
       // https://wiki.vg/Protocol#Update_Section_Blocks
       byteBuf.writeLong(((sectionX & 0x3FFFFFL) << 42) | (sectionY & 0xFFFFF) | ((sectionZ & 0x3FFFFFL) << 20));
@@ -78,9 +78,9 @@ public final class UpdateSectionBlocksPacket implements FallbackPacket {
         byteBuf.writeBoolean(true); // suppress light updates
       }
 
-      writeVarInt(byteBuf, changedBlocks.length);
+      writeVarInt(byteBuf, blockUpdates.length);
 
-      for (final ChangedBlock block : changedBlocks) {
+      for (final BlockUpdate block : blockUpdates) {
         // https://wiki.vg/Protocol#Update_Section_Blocks
         final int shiftedBlockId = block.getType().getId(protocolVersion) << 12;
         final long positionIdValue = shiftedBlockId | block.getBlockState();

sonar-common/src/main/java/xyz/jonesdev/sonar/common/service/SonarServiceThread.java

@@ -15,19 +15,28 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.bukkit.command;
+package xyz.jonesdev.sonar.common.service;
 
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
-import xyz.jonesdev.sonar.bukkit.SonarBukkit;
+public final class SonarServiceThread extends Thread {
+  private final long delay;
+  private final Runnable runnable;
 
-public final class BukkitInvocationSource extends InvocationSource {
-  public BukkitInvocationSource(final @NotNull CommandSender sender) {
-    super(sender instanceof Player ? ((Player) sender).getUniqueId() : null,
-      SonarBukkit.INSTANCE.getBukkitAudiences().sender(sender),
-      sender instanceof Player,
-      sender::hasPermission);
+  public SonarServiceThread(final String name, final long delay, final Runnable runnable) {
+    setName(name);
+    this.delay = delay;
+    this.runnable = runnable;
+  }
+
+  @Override
+  public void run() {
+    try {
+      while (!isInterrupted()) {
+        runnable.run();
+        // Sleep thread by specified delay
+        Thread.sleep(delay);
+      }
+    } catch (InterruptedException interruptedException) {
+      //
+    }
   }
 }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/service/SonarServiceThreadManager.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2023-2024 Sonar 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 xyz.jonesdev.sonar.common.service;
+
+import lombok.experimental.UtilityClass;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics;
+
+@UtilityClass
+public final class SonarServiceThreadManager {
+  private static final SonarServiceThread VERBOSE = new SonarServiceThread("sonar-verbose-thread", 250L,
+    () -> {
+      // Make sure to clean up the cached statistics
+      // since we don't want to display wrong values.
+      Sonar.get().getStatistics().cleanUpCache();
+      // Update the attack tracker
+      Sonar.get().getAttackTracker().checkIfUnderAttack();
+      // Update the action bar verbose
+      Sonar.get().getVerboseHandler().update();
+    });
+  private static final SonarServiceThread FALLBACK_QUEUE = new SonarServiceThread("sonar-fallback-queue-thread", 1000L,
+    () -> Sonar.get().getFallback().getQueue().poll());
+  private static final SonarServiceThread STATISTICS = new SonarServiceThread("sonar-statistics-thread", 1000L,
+    () -> {
+      // Clean up bandwidth statistics
+      CachedBandwidthStatistics.reset();
+      // Clean up the cache of rate-limited IPs
+      Sonar.get().getFallback().getRatelimiter().cleanUpCache();
+    });
+
+  public void start() {
+    VERBOSE.start();
+    FALLBACK_QUEUE.start();
+    STATISTICS.start();
+  }
+
+  public void stop() {
+    VERBOSE.interrupt();
+    FALLBACK_QUEUE.interrupt();
+    STATISTICS.interrupt();
+  }
+}

sonar-common/src/main/java/xyz/jonesdev/sonar/common/statistics/CachedBandwidthStatistics.java

@@ -47,10 +47,9 @@ public enum CachedBandwidthStatistics {
    * (per-second) value and resets the current value.
    * This method is called every second.
    */
-  public static synchronized void reset() {
-    for (final CachedBandwidthStatistics value : values()) {
-      value.cacheAndReset();
-    }
+  public static void reset() {
+    INCOMING.cacheAndReset();
+    OUTGOING.cacheAndReset();
   }
 
   private void cacheAndReset() {

sonar-common/src/main/java/xyz/jonesdev/sonar/common/statistics/GlobalSonarStatistics.java

@@ -24,28 +24,31 @@ import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 
 import java.time.Duration;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public final class GlobalSonarStatistics implements SonarStatistics {
-  private static final Cache<Long, Byte> LOGINS_PER_SECOND = Caffeine.newBuilder()
+  private static final Cache<Integer, Byte> LOGINS_PER_SECOND = Caffeine.newBuilder()
     .expireAfterWrite(Duration.ofSeconds(1))
     .build();
 
-  private static final Cache<Long, Byte> CONNECTIONS_PER_SECOND = Caffeine.newBuilder()
+  private static final Cache<Integer, Byte> CONNECTIONS_PER_SECOND = Caffeine.newBuilder()
     .expireAfterWrite(Duration.ofSeconds(1))
     .build();
 
+  private static final AtomicInteger ACTION_COUNTER = new AtomicInteger(Integer.MIN_VALUE);
+
   /**
    * Helper methods that make it easier to count new statistics
    */
 
   @ApiStatus.Internal
   public static void countConnection() {
-    CONNECTIONS_PER_SECOND.put(System.nanoTime(), (byte) 0);
+    CONNECTIONS_PER_SECOND.put(ACTION_COUNTER.getAndIncrement(), (byte) 0);
   }
 
   @ApiStatus.Internal
   public static void countLogin() {
-    LOGINS_PER_SECOND.put(System.nanoTime(), (byte) 0);
+    LOGINS_PER_SECOND.put(ACTION_COUNTER.getAndIncrement(), (byte) 0);
     totalJoinedPlayers++;
   }
 
@@ -60,7 +63,7 @@ public final class GlobalSonarStatistics implements SonarStatistics {
    * Called every time the action bar updates to ensure fresh values
    */
   @Override
-  public synchronized void cleanUpCache() {
+  public void cleanUpCache() {
     LOGINS_PER_SECOND.cleanUp();
     CONNECTIONS_PER_SECOND.cleanUp();
     // Also clean up the blacklist

sonar-common/src/main/java/xyz/jonesdev/sonar/common/subcommand/impl/BlacklistCommand.java

@@ -60,7 +60,7 @@ public final class BlacklistCommand extends Subcommand {
         }
 
         // Display a warning if the IP is verified but being added to the blacklist
-        if (SONAR.getVerifiedPlayerController().has(inetAddress)) {
+        if (SONAR.getVerifiedPlayerController().has(inetAddress.toString())) {
           invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistAddWarning()
             .replace("%ip%", rawInetAddress));
         }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/subcommand/impl/StatisticsCommand.java

@@ -17,6 +17,7 @@
 
 package xyz.jonesdev.sonar.common.subcommand.impl;
 
+import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.CommandInvocation;
@@ -62,7 +63,7 @@ public final class StatisticsCommand extends Subcommand {
 
     invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getStatisticsHeader()
       .replace("%type%", type.name().toLowerCase()));
-    invocation.getSender().sendMessage();
+    invocation.getSender().sendMessage(Component.empty());
 
     switch (type) {
       case GENERAL: {

sonar-common/src/main/java/xyz/jonesdev/sonar/common/subcommand/impl/VerifiedCommand.java

@@ -23,8 +23,10 @@ import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;
 import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;
+import xyz.jonesdev.sonar.api.model.VerifiedPlayer;
 
 import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
 import java.util.Queue;
 import java.util.UUID;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -35,6 +37,7 @@ import java.util.concurrent.LinkedBlockingQueue;
   arguments = {
     @Argument("history"),
     @Argument("remove"),
+    @Argument("add"),
     @Argument("clear"),
     @Argument("size")
   }
@@ -107,6 +110,51 @@ public final class VerifiedCommand extends Subcommand {
         break;
       }
 
+      case "add": {
+        if (invocation.getRawArguments().length <= 3) {
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getIncorrectCommandUsage()
+            .replace("%usage%", "verified add <IP address> <UUID/username>"));
+          return;
+        }
+
+        final String rawInetAddress = invocation.getRawArguments()[2];
+
+        // Make sure we aren't currently locking the IP address to avoid a double I/O operation
+        if (LOCK.contains(rawInetAddress)) {
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedBlocked());
+          return;
+        }
+
+        final InetAddress inetAddress = getInetAddressIfValid(invocation.getSender(), rawInetAddress);
+        // Make sure the given IP address is valid
+        if (inetAddress == null) return;
+
+        // Try to parse the UUID (from the username, if needed)
+        final String rawUUID = invocation.getRawArguments()[3];
+        final UUID uuid = rawUUID.length() == 36 ? UUID.fromString(rawUUID)
+          : UUID.nameUUIDFromBytes(("OfflinePlayer:" + rawUUID).getBytes(StandardCharsets.UTF_8));
+
+        // Make sure the player is verified already
+        if (SONAR.getVerifiedPlayerController().has(inetAddress.toString(), uuid)) {
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedAlready());
+          return;
+        }
+
+        // Lock the IP address
+        // Make sure we don't accidentally run 2 operations at the same time
+        LOCK.add(rawInetAddress);
+        // Add verified player to the database
+        final long timestamp = System.currentTimeMillis();
+        final VerifiedPlayer verifiedPlayer = new VerifiedPlayer(inetAddress.toString(), uuid, timestamp);
+        Sonar.get().getVerifiedPlayerController().add(verifiedPlayer);
+
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedAdd()
+          .replace("%ip%", rawInetAddress));
+        // Unlock the IP address
+        LOCK.remove(rawInetAddress);
+        break;
+      }
+
       case "clear": {
         final int verified = SONAR.getVerifiedPlayerController().estimatedSize();
 

sonar-common/src/main/java/xyz/jonesdev/sonar/common/util/ComponentHolder.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.utility.component;
+package xyz.jonesdev.sonar.common.util;
 
 import com.google.gson.*;
 import com.google.gson.internal.LazilyParsedNumber;
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeNamelessCompoundTag;
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeString;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeNamelessCompoundTag;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeString;
 
 // Mostly taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/chat/ComponentHolder.java

sonar-common/src/main/java/xyz/jonesdev/sonar/common/util/FastUuidSansHyphens.java

@@ -15,49 +15,81 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.protocol.netty;
+package xyz.jonesdev.sonar.common.util;
 
+import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Jon Chambers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 // Taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/api/src/main/java/com/velocitypowered/api/util/FastUuidSansHyphens.java
-public final class FastUUID {
+/**
+ * This is a modified FastUUID implementation. The primary difference is that it does not dash its
+ * UUIDs. As the native Java 9+ UUID.toString() implementation dashes its UUIDs, we use the FastUUID
+ * methods, which ought to be faster than a String.replace().
+ */
+@UtilityClass
+public class FastUuidSansHyphens {
   private static final int MOJANG_BROKEN_UUID_LENGTH = 32;
 
   private static final char[] HEX_DIGITS =
-    new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+    new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
 
   /**
    * Returns a string representation of the given UUID. The returned string is formatted as a
    * Mojang-style UUID.
    *
    * @param uuid the UUID to represent as a string
+   *
    * @return a string representation of the given UUID
    */
-  public static String toString(final @NotNull UUID uuid) {
+  public static @NotNull String toString(final @NotNull UUID uuid) {
     final long mostSignificantBits = uuid.getMostSignificantBits();
     final long leastSignificantBits = uuid.getLeastSignificantBits();
 
     final char[] uuidChars = new char[MOJANG_BROKEN_UUID_LENGTH];
 
-    uuidChars[0] = HEX_DIGITS[(int) ((mostSignificantBits & 0xf000000000000000L) >>> 60)];
-    uuidChars[1] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0f00000000000000L) >>> 56)];
-    uuidChars[2] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00f0000000000000L) >>> 52)];
-    uuidChars[3] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000f000000000000L) >>> 48)];
-    uuidChars[4] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000f00000000000L) >>> 44)];
-    uuidChars[5] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000f0000000000L) >>> 40)];
-    uuidChars[6] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000f000000000L) >>> 36)];
-    uuidChars[7] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000f00000000L) >>> 32)];
-    uuidChars[8] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000f0000000L) >>> 28)];
-    uuidChars[9] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000000f000000L) >>> 24)];
+    uuidChars[0]  = HEX_DIGITS[(int) ((mostSignificantBits & 0xf000000000000000L) >>> 60)];
+    uuidChars[1]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x0f00000000000000L) >>> 56)];
+    uuidChars[2]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x00f0000000000000L) >>> 52)];
+    uuidChars[3]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x000f000000000000L) >>> 48)];
+    uuidChars[4]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000f00000000000L) >>> 44)];
+    uuidChars[5]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000f0000000000L) >>> 40)];
+    uuidChars[6]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000f000000000L) >>> 36)];
+    uuidChars[7]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000f00000000L) >>> 32)];
+    uuidChars[8]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000f0000000L) >>> 28)];
+    uuidChars[9]  = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000000f000000L) >>> 24)];
     uuidChars[10] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000000f00000L) >>> 20)];
     uuidChars[11] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000000f0000L) >>> 16)];
     uuidChars[12] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000000000f000L) >>> 12)];
     uuidChars[13] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000000000f00L) >>> 8)];
     uuidChars[14] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000000000f0L) >>> 4)];
-    uuidChars[15] = HEX_DIGITS[(int) (mostSignificantBits & 0x000000000000000fL)];
+    uuidChars[15] = HEX_DIGITS[(int)  (mostSignificantBits & 0x000000000000000fL)];
     uuidChars[16] = HEX_DIGITS[(int) ((leastSignificantBits & 0xf000000000000000L) >>> 60)];
     uuidChars[17] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0f00000000000000L) >>> 56)];
     uuidChars[18] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00f0000000000000L) >>> 52)];
@@ -73,7 +105,7 @@ public final class FastUUID {
     uuidChars[28] = HEX_DIGITS[(int) ((leastSignificantBits & 0x000000000000f000L) >>> 12)];
     uuidChars[29] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0000000000000f00L) >>> 8)];
     uuidChars[30] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00000000000000f0L) >>> 4)];
-    uuidChars[31] = HEX_DIGITS[(int) (leastSignificantBits & 0x000000000000000fL)];
+    uuidChars[31] = HEX_DIGITS[(int)  (leastSignificantBits & 0x000000000000000fL)];
 
     return new String(uuidChars);
   }

sonar-common/src/main/java/xyz/jonesdev/sonar/common/util/GeyserDetection.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.utility.geyser;
+package xyz.jonesdev.sonar.common.util;
 
 import io.netty.channel.Channel;
 import io.netty.util.AttributeKey;
@@ -28,7 +28,7 @@ import java.net.InetSocketAddress;
  * Simple utility to determine if someone joins using GeyserMC
  */
 @UtilityClass
-public class GeyserUtil {
+public class GeyserDetection {
   // https://github.com/GeyserMC/Floodgate/blob/master/core/src/main/java/org/geysermc/floodgate/module/CommonModule.java#L206
   private final AttributeKey<Object> PLAYER_ATTRIBUTE = AttributeKey.valueOf("floodgate-player");
 

sonar-common/src/main/java/xyz/jonesdev/sonar/common/util/ProtocolUtil.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.utility.protocol;
+package xyz.jonesdev.sonar.common.util;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
@@ -31,26 +31,138 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
-import java.util.regex.Pattern;
 
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
-
-// Taken from
+// Mostly taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/ProtocolUtils.java
 @UtilityClass
 public class ProtocolUtil {
   private static final int FORGE_MAX_ARRAY_LENGTH = Integer.MAX_VALUE & 0x1FFF9A;
 
-  private static final String BRAND_CHANNEL_LEGACY = "MC|Brand";
-  private static final String BRAND_CHANNEL = "minecraft:brand";
-  private static final String REGISTER_CHANNEL_LEGACY = "REGISTER";
-  private static final String REGISTER_CHANNEL = "minecraft:register";
-  private static final String UNREGISTER_CHANNEL_LEGACY = "UNREGISTER";
-  private static final String UNREGISTER_CHANNEL = "minecraft:unregister";
-  private static final Pattern INVALID_IDENTIFIER_REGEX = Pattern.compile("[^a-z0-9\\-_]*");
+  public static final String BRAND_CHANNEL_LEGACY = "MC|Brand";
+  public static final String BRAND_CHANNEL = "minecraft:brand";
 
-  public static @NotNull UUID readUUID(final @NotNull ByteBuf byteBuf) {
-    return new UUID(byteBuf.readLong(), byteBuf.readLong());
+  public static int readVarInt(final ByteBuf byteBuf) {
+    int read = readVarIntSafely(byteBuf);
+    if (read == Integer.MIN_VALUE) {
+      throw new CorruptedFrameException("Corrupt VarInt");
+    }
+    return read;
+  }
+
+  public static int readVarIntSafely(final @NotNull ByteBuf byteBuf) {
+    int i = 0;
+    int maxRead = Math.min(5, byteBuf.readableBytes());
+    for (int j = 0; j < maxRead; j++) {
+      int k = byteBuf.readByte();
+      i |= (k & 0x7F) << j * 7;
+      if ((k & 0x80) != 128) {
+        return i;
+      }
+    }
+    return Integer.MIN_VALUE;
+  }
+
+  public static void writeVarInt(final ByteBuf byteBuf, final int value) {
+    // Peel the one and two byte count cases explicitly as they are the most common VarInt sizes
+    // that the proxy will write, to improve inlining.
+    if ((value & (0xFFFFFFFF << 7)) == 0) {
+      byteBuf.writeByte(value);
+    } else if ((value & (0xFFFFFFFF << 14)) == 0) {
+      int w = (value & 0x7F | 0x80) << 8 | (value >>> 7);
+      byteBuf.writeShort(w);
+    } else {
+      writeVarIntFull(byteBuf, value);
+    }
+  }
+
+  private void writeVarIntFull(final ByteBuf byteBuf, final int value) {
+    // See https://steinborn.me/posts/performance/how-fast-can-you-write-a-varint/
+    if ((value & (0xFFFFFFFF << 7)) == 0) {
+      byteBuf.writeByte(value);
+    } else if ((value & (0xFFFFFFFF << 14)) == 0) {
+      int w = (value & 0x7F | 0x80) << 8 | (value >>> 7);
+      byteBuf.writeShort(w);
+    } else if ((value & (0xFFFFFFFF << 21)) == 0) {
+      int w = (value & 0x7F | 0x80) << 16 | ((value >>> 7) & 0x7F | 0x80) << 8 | (value >>> 14);
+      byteBuf.writeMedium(w);
+    } else if ((value & (0xFFFFFFFF << 28)) == 0) {
+      int w = (value & 0x7F | 0x80) << 24 | (((value >>> 7) & 0x7F | 0x80) << 16)
+        | ((value >>> 14) & 0x7F | 0x80) << 8 | (value >>> 21);
+      byteBuf.writeInt(w);
+    } else {
+      int w = (value & 0x7F | 0x80) << 24 | ((value >>> 7) & 0x7F | 0x80) << 16
+        | ((value >>> 14) & 0x7F | 0x80) << 8 | ((value >>> 21) & 0x7F | 0x80);
+      byteBuf.writeInt(w);
+      byteBuf.writeByte(value >>> 28);
+    }
+  }
+
+  public static void writeVarLong(final ByteBuf byteBuf, final long value) {
+    // Peel the one and two byte count cases explicitly as they are the most common VarLong sizes
+    // that the proxy will write, to improve inlining.
+    if ((value & 0xFFFFFFFFFFFFFF80L) == 0L) {
+      byteBuf.writeByte((byte) value);
+    } else if ((value & 0xFFFFFFFFFFFFC000L) == 0L) {
+      int w = (int) ((value & 0x7FL | 0x80L) << 8 | value >>> 7);
+      byteBuf.writeShort(w);
+    } else {
+      writeVarLongFull(byteBuf, value);
+    }
+  }
+
+  private void writeVarLongFull(final ByteBuf byteBuf, final long value) {
+    if ((value & 0xFFFFFFFFFFFFFF80L) == 0L) {
+      byteBuf.writeByte((byte) value);
+    } else if ((value & 0xFFFFFFFFFFFFC000L) == 0L) {
+      int w = (int) ((value & 0x7FL | 0x80L) << 8 | value >>> 7);
+      byteBuf.writeShort(w);
+    } else if ((value & 0xFFFFFFFFFFE00000L) == 0L) {
+      int w = (int) ((value & 0x7FL | 0x80L) << 16 | (value >>> 7 & 0x7FL | 0x80L) << 8 | value >>> 14);
+      byteBuf.writeMedium(w);
+    } else if ((value & 0xFFFFFFFFF0000000L) == 0L) {
+      int w =
+        (int) ((value & 0x7FL | 0x80L) << 24 | (value >>> 7 & 0x7FL | 0x80L) << 16 | (value >>> 14 & 0x7FL | 0x80L) << 8 | value >>> 21);
+      byteBuf.writeInt(w);
+    } else {
+      long l =
+        (value & 0x7FL | 0x80L) << 24 | (value >>> 7 & 0x7FL | 0x80L) << 16 | (value >>> 14 & 0x7FL | 0x80L) << 8 | (value >>> 21 & 0x7FL | 0x80L);
+      if ((value & 0xFFFFFFF800000000L) == 0L) {
+        int w =
+          (int) l;
+        byteBuf.writeInt(w);
+        byteBuf.writeByte((int) (value >>> 28));
+      } else if ((value & 0xFFFFFC0000000000L) == 0L) {
+        int w =
+          (int) l;
+        int w2 = (int) ((value >>> 28 & 0x7FL | 0x80L) << 8 | value >>> 35);
+        byteBuf.writeInt(w);
+        byteBuf.writeShort(w2);
+      } else if ((value & 0xFFFE000000000000L) == 0L) {
+        int w =
+          (int) l;
+        int w2 = (int) ((value >>> 28 & 0x7FL | 0x80L) << 16 | (value >>> 35 & 0x7FL | 0x80L) << 8 | value >>> 42);
+        byteBuf.writeInt(w);
+        byteBuf.writeMedium(w2);
+      } else {
+        long w =
+          (value & 0x7FL | 0x80L) << 56 | (value >>> 7 & 0x7FL | 0x80L) << 48 | (value >>> 14 & 0x7FL | 0x80L) << 40 | (value >>> 21 & 0x7FL | 0x80L) << 32 | (value >>> 28 & 0x7FL | 0x80L) << 24 | (value >>> 35 & 0x7FL | 0x80L) << 16 | (value >>> 42 & 0x7FL | 0x80L) << 8 | value >>> 49;
+        if ((value & 0xFF00000000000000L) == 0L) {
+          byteBuf.writeLong(w);
+        } else if ((value & Long.MIN_VALUE) == 0L) {
+          byteBuf.writeLong(w);
+          byteBuf.writeByte((byte) (value >>> 56));
+        } else {
+          int w2 = (int) ((value >>> 56 & 0x7FL | 0x80L) << 8 | value >>> 63);
+          byteBuf.writeLong(w);
+          byteBuf.writeShort(w2);
+        }
+      }
+    }
+  }
+
+  public static void readUUID(final @NotNull ByteBuf byteBuf) {
+    byteBuf.readLong(); // least
+    byteBuf.readLong(); // most
   }
 
   public static byte @NotNull [] readByteArray(final ByteBuf byteBuf) {
@@ -82,7 +194,7 @@ public class ProtocolUtil {
 
   public static @NotNull String readString(final ByteBuf byteBuf,
                                            final int cap) throws CorruptedFrameException {
-    final int length = VarIntUtil.readVarInt(byteBuf);
+    final int length = readVarInt(byteBuf);
     return readString(byteBuf, cap, length);
   }
 
@@ -98,9 +210,9 @@ public class ProtocolUtil {
     return str;
   }
 
-  public static void writeString(final ByteBuf byteBuf, final CharSequence str) {
+  public static void writeString(final ByteBuf byteBuf, final @NotNull CharSequence str) {
     final int size = ByteBufUtil.utf8Bytes(str);
-    VarIntUtil.writeVarInt(byteBuf, size);
+    writeVarInt(byteBuf, size);
     byteBuf.writeCharSequence(str, StandardCharsets.UTF_8);
   }
 
@@ -118,18 +230,18 @@ public class ProtocolUtil {
 
   public static void writeArray(final ByteBuf byteBuf, final byte @NotNull [] bytes) {
     checkFrame(bytes.length < Short.MAX_VALUE, "Too long array");
-    VarIntUtil.writeVarInt(byteBuf, bytes.length);
+    writeVarInt(byteBuf, bytes.length);
     byteBuf.writeBytes(bytes);
   }
 
   public static void writeStringArray(final ByteBuf byteBuf, final String @NotNull [] stringArray) {
-    VarIntUtil.writeVarInt(byteBuf, stringArray.length);
+    writeVarInt(byteBuf, stringArray.length);
     for (final String s : stringArray) {
       writeString(byteBuf, s);
     }
   }
 
-  public static void writeCompoundTag(final ByteBuf byteBuf, final CompoundBinaryTag compoundTag) {
+  public static void writeCompoundTag(final @NotNull ByteBuf byteBuf, final @NotNull CompoundBinaryTag compoundTag) {
     try {
       BinaryTagIO.writer().write(compoundTag, (DataOutput) new ByteBufOutputStream(byteBuf));
     } catch (IOException exception) {
@@ -176,7 +288,7 @@ public class ProtocolUtil {
     }
   }
 
-  private static int readExtendedForgeShort(@NotNull final ByteBuf byteBuf) {
+  private static int readExtendedForgeShort(final @NotNull ByteBuf byteBuf) {
     int low = byteBuf.readUnsignedShort();
     int high = 0;
     if ((low & 0x8000) != 0) {
@@ -192,26 +304,6 @@ public class ProtocolUtil {
     return byteBuf.readRetainedSlice(length);
   }
 
-  public static @NotNull String transformLegacyToModernChannel(@NotNull final String name) {
-    if (name.indexOf(':') != -1) {
-      return name;
-    }
-
-    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":
-        return "bungeecord:main";
-      default:
-        final String lower = name.toLowerCase();
-        return "legacy:" + INVALID_IDENTIFIER_REGEX.matcher(lower).replaceAll("");
-    }
-  }
-
   private void checkFrame(final boolean expression, final String message) {
     if (!expression) {
       throw new CorruptedFrameException(message);