Release 2.0.32 (#320 )

Recode verification system (#319 )
* feat: [wip] recode the entire verification * feat: [wip] add CAPTCHA session handler * feat: add CAPTCHA xp bar and KeepAlive * fix(fallback): migrate "connected" map to hashset * fix(fallback): 1.8 not being able to connect * fix(fallback): NullPointerException * fix(fallback): 1.7.2-1.7.10 not being able to verify * style: fix some doc comments * style: add doc comment to FallbackVehicleSessionHandler * style: add doc comment to FallbackCAPTCHASessionHandler * fix: prevent users from sending multiple login ack packets * style: rename variable for clarification * fix: [wip] gravity check not being executed properly * fix: use absolute value for motion prediction in gravity check * fix: check for duplicate PluginMessage packets * fix: oops, I broke the plugin message check * refactor: restructure verification failing logic * fix: mark LoginSuccess packet as encode-only * refactor: store channel pipeline in FallbackUser * feat: hook the traffic listener in channelActive to allow listening to handshakes * refactor(common): small maintainability changes * style(common): code clean up in packet registry * refactor(all): replace lombok's val with Java's var * fix: remove unnecessary packet filter in vehicle check * fix: don't send the disconnect message if the player is transferred * style: improve/simplify initialization of VerifiedPlayer * fix: wrong name resulting in compilation error * chore: fix a broken documentation link in the readme * fix: don't check Geyser players for plugin messages * fix: mark 1.7 players successful after 100ms, not 250ms * fix: skip movements if gravity and collision checks are disabled * style: don't store Sonar API instance in Fallback * fix: revert https://github.com/jonesdevelopment/sonar/pull/319/commits/f9c4f42503dfebb6fbba754ff26662e69f7eed00
2026-11-05 09:20:15 -05:00 · 2024-06-12 15:18:11 +02:00 · 2024-06-09 12:55:24 +02:00 · 2024-06-03 00:51:27 +02:00 · 2024-05-31 15:02:48 +02:00 · 2024-05-31 13:27:24 +02:00
199 changed files with 10590 additions and 5645 deletions
@@ -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:

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Documentation
+    url: https://docs.jonesdev.xyz/
+    about: Need help configuring Sonar or have questions regarding the installation and usage?
+  - name: Discord
+    url: https://jonesdev.xyz/discord/
+    about: If you have any further questions, please feel free to join the Discord server and open a ticket.
@@ -42,11 +42,7 @@
 - [Fallback](https://github.com/jonesdevelopment/sonar#fallback) is Sonar's main anti-bot component
 - Sonar queues new player logins to prevent spam login attacks
 - Sonar checks the handshake packets for legitimacy
- Protective components only on BungeeCord:
-  - Sonar validates the login/server ping packets
-  - Sonar handles all server pings asynchronously
-  - The Varint decoder is updated to Velocity's
-    improved [MinecraftVarintFrameDecoder](https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java).
+- Sonar makes sure some packets cannot be duplicated illegitimately

 ### Fallback

@@ -67,7 +63,7 @@ Fallback is unlikely to ever falsely prevent a player from joining the server si

 ## Building

-If you want to build your own version of Sonar, please take a look at the [Sonar building documentation](https://docs.jonesdev.xyz/sonar/building).
+If you want to build your own version of Sonar, please take a look at the [Sonar building documentation](https://docs.jonesdev.xyz/development/building).
 <br>
 You can also take a look at the [gradle documentation](https://docs.gradle.org/current/userguide/userguide.html) for a better understanding of Gradle.

@@ -30,6 +30,5 @@ gradlew*
 *.jpg
 *.jpeg
 *.log
-*.yml
 *.svg
 *.txt
@@ -1,17 +1,9 @@
-buildscript {
-  dependencies {
-    classpath("gradle.plugin.io.toolebox:gradle-git-versioner:1.6.7")
-  }
-}
-
 plugins {
-  id("java")
-  id("com.github.johnrengelman.shadow") version "8.1.1"
-  id("io.toolebox.git-versioner") version "1.6.7"
+  java
+  alias(libs.plugins.shadow)
+  alias(libs.plugins.versioner) apply true
 }

-apply(plugin = "io.toolebox.git-versioner")
-
 versioner {
  pattern {
    pattern = "$version-%h-%c-%b"
@@ -20,88 +12,77 @@ versioner {

 allprojects {
  repositories {
-    mavenCentral() // Lombok
-    maven(url = "https://jitpack.io") // simple-yaml
+    mavenCentral()
    maven(url = "https://repo.jonesdev.xyz/releases/") // Bungee & Velocity proxy module
+    maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") // libby
  }

  apply(plugin = "java")
-  apply(plugin = "com.github.johnrengelman.shadow")
+  apply(plugin = "io.github.goooler.shadow")

  dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.30")
-    annotationProcessor("org.projectlombok:lombok:1.18.30")
+    compileOnly(rootProject.libs.lombok)
+    annotationProcessor(rootProject.libs.lombok)

-    testCompileOnly("org.projectlombok:lombok:1.18.30")
-    testAnnotationProcessor("org.projectlombok:lombok:1.18.30")
+    testCompileOnly(rootProject.libs.lombok)
+    testAnnotationProcessor(rootProject.libs.lombok)

-    val adventureVersion = "4.15.0"
-
-    // adventure
-    implementation("net.kyori:adventure-text-minimessage:$adventureVersion")
-    implementation("net.kyori:adventure-text-serializer-gson:$adventureVersion")
-    // adventure nbt
-    implementation("net.kyori:adventure-nbt:$adventureVersion")
-
-    implementation("com.j256.ormlite:ormlite-jdbc:6.1") // ORM
-    implementation("xyz.jonesdev:cappuccino:0.1.6-SNAPSHOT") // expiring cache
-
-    compileOnly("io.netty:netty-all:4.1.104.Final") // netty
+    compileOnly(rootProject.libs.adventure.minimessage)
+    compileOnly(rootProject.libs.adventure.serializer)
+    compileOnly(rootProject.libs.ormlite)
+    compileOnly(rootProject.libs.caffeine)
+    compileOnly(rootProject.libs.netty)
+    compileOnly(rootProject.libs.libby.core)
  }
-}

-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/*/**")
+
+      // Minimize shadowed jar file
+      minimize {
+        exclude(project(":api"))
+      }
+    }
+
+    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("Sonar.jar")
-
-    // Remove file timestamps
-    isPreserveFileTimestamps = false
-
-    // bStats has to be relocated to the Sonar package otherwise it throws an exception
-    // https://github.com/Bastian/bstats-metrics/blob/master/base/src/main/java/org/bstats/MetricsBase.java#L251
-    relocate("org.bstats", "xyz.jonesdev.sonar.libs.bstats")
-
-    // https://github.com/jonesdevelopment/sonar/issues/46
-    // Relocate some packages, so we don't run into issues where we accidentally use Velocity's classes
-    relocate("org.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("xyz.jonesdev.cappuccino", "xyz.jonesdev.sonar.libs.cappuccino")
-    relocate("net.kyori.examination", "xyz.jonesdev.sonar.libs.examination")
-    relocate("net.kyori.option", "xyz.jonesdev.sonar.libs.option")
-    // We have to be careful here, so we don't accidentally break adventure
-    relocate("net.kyori.adventure", "xyz.jonesdev.sonar.libs.adventure") {
-      exclude("net.kyori.adventure.text.**")
-      exclude("net.kyori.adventure.audience.**")
-    }
-
-    // Exclude unnecessary metadata information
-    exclude("META-INF/versions/**")
-  }
-
-  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)
  }
 }
@@ -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
@@ -1,3 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.14
+version=2.0.32
 description=Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)
@@ -0,0 +1,35 @@
+[versions]
+netty = "4.1.110.Final"
+adventure = "4.17.0"
+adventure-platform = "4.3.3"
+bstats = "3.0.2"
+libby = "2.0.0-SNAPSHOT"
+
+[plugins]
+versioner = "io.toolebox.git-versioner:1.6.7"
+shadow = "io.github.goooler.shadow:8.1.7"
+
+[libraries]
+netty = { module = "io.netty:netty-all", version.ref = "netty" }
+adventure-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" }
+adventure-serializer = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure" }
+adventure-nbt = { module = "net.kyori:adventure-nbt", version.ref = "adventure" }
+adventure-platform-bukkit = { module = "net.kyori:adventure-platform-bukkit", version.ref = "adventure-platform" }
+adventure-platform-bungee = { module = "net.kyori:adventure-platform-bungeecord", version.ref = "adventure-platform" }
+adventure-platform-facet = { module = "net.kyori:adventure-platform-facet", version.ref = "adventure-platform" }
+adventure-platform-api = { module = "net.kyori:adventure-platform-api", version.ref = "adventure-platform" }
+libby-core = { module = "com.alessiodp.libby:libby-core", version.ref = "libby" }
+libby-bungee = { module = "com.alessiodp.libby:libby-bungee", version.ref = "libby" }
+libby-bukkit = { module = "com.alessiodp.libby:libby-bukkit", version.ref = "libby" }
+libby-velocity = { module = "com.alessiodp.libby:libby-velocity", version.ref = "libby" }
+bstats-bungee = { module = "org.bstats:bstats-bungeecord", version.ref = "bstats" }
+bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
+bstats-velocity = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
+caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.8"
+ormlite = "com.j256.ormlite:ormlite-jdbc:6.1"
+lombok = "org.projectlombok:lombok:1.18.32"
+capja = "xyz.jonesdev:capja:1.0.3"
+bungeecord = "net.md_5:bungeecord-proxy:master-SNAPSHOT"
+velocity = "com.velocitypowered:velocity-proxy:3.3.0-SNAPSHOT"
+# We have to use 1.8 for backwards compatibility
+spigot = "org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT"
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -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" \
@@ -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

@@ -1,4 +1,4 @@
-rootProject.name = "sonar"
+rootProject.name = "Sonar"

 sequenceOf("api", "bukkit", "bungee", "common", "velocity").forEach {
  val path = "sonar-$it"
@@ -1,10 +1,14 @@
+repositories {
+  maven(url = "https://jitpack.io/") // simple-yaml
+}
+
 dependencies {
-  implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
+  compileOnly("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
    exclude(group = "org.yaml")
  }

  compileOnly("org.jetbrains:annotations:24.0.1")
 }

-java.sourceCompatibility = JavaVersion.VERSION_1_8
-java.targetCompatibility = JavaVersion.VERSION_1_8
+java.sourceCompatibility = JavaVersion.VERSION_11
+java.targetCompatibility = JavaVersion.VERSION_11
@@ -17,9 +17,10 @@

 package xyz.jonesdev.sonar.api;

-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+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;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
@@ -27,19 +28,23 @@ import xyz.jonesdev.sonar.api.controller.VerifiedPlayerController;
 import xyz.jonesdev.sonar.api.event.SonarEventManager;
 import xyz.jonesdev.sonar.api.fallback.Fallback;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
+import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 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.text.DecimalFormat;
+import java.util.UUID;

 public interface Sonar {
  DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#,###.##");
-  String LINE_SEPARATOR = "\n"; // Using System.lineSeparator is broken, for some reason...

-  Gson GENERAL_GSON = new GsonBuilder()
-    .disableInnerClassSerialization()
-    .create();
+  /**
+   * 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);

  /**
   * @return The platform the plugin is being run on
@@ -51,8 +56,6 @@ public interface Sonar {
   */
  @NotNull LoggerWrapper getLogger();

-  @NotNull File getDataDirectory();
-
  @NotNull SonarConfiguration getConfig();

  @NotNull SubcommandRegistry getSubcommandRegistry();
@@ -61,14 +64,24 @@ public interface Sonar {

  @NotNull Verbose getVerboseHandler();

+  @NotNull Notification getNotificationHandler();
+
  @NotNull SystemTimer getLaunchTimer();

+  @NotNull SonarStatistics getStatistics();
+
  /**
   * Set a custom verbose handler
   */
  @SuppressWarnings("unused")
  void setVerboseHandler(final @NotNull Verbose verboseHandler);

+  /**
+   * Set a custom notification handler
+   */
+  @SuppressWarnings("unused")
+  void setNotificationHandler(final @NotNull Notification notificationHandler);
+
  /**
   * Reloads the entire plugin
   */
@@ -23,16 +23,15 @@ import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.event.impl.AttackDetectedEvent;
 import xyz.jonesdev.sonar.api.event.impl.AttackMitigatedEvent;
-import xyz.jonesdev.sonar.api.profiler.JVMProfiler;
-import xyz.jonesdev.sonar.api.statistics.Counters;
-import xyz.jonesdev.sonar.api.statistics.Statistics;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.util.Optional;

+import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;
+
@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class AttackTracker implements JVMProfiler {
+public final class AttackTracker {
  public static final AttackTracker INSTANCE = new AttackTracker();
  private @Nullable AttackStatistics currentAttack;
  private int attackThreshold;
@@ -43,8 +42,8 @@ public final class AttackTracker implements JVMProfiler {
  public static final class AttackStatistics {
    private final SystemTimer duration = new SystemTimer();
    private final SystemTimer timer = new SystemTimer();
-    private int peakJoinsPerSecond;
-    private int peakConnectionsPerSecond;
+    private long peakJoinsPerSecond;
+    private long peakConnectionsPerSecond;
    private double peakProcessCPUUsage;
    private long peakProcessMemoryUsage;
    // Calculate during-attack-statistics using their deltas
@@ -52,7 +51,7 @@ public final class AttackTracker implements JVMProfiler {
  }

  public void checkIfUnderAttack() {
-    final int joinsPerSecond = Counters.LOGINS_PER_SECOND.estimatedSize();
+    final long joinsPerSecond = Sonar.get().getStatistics().getLoginsPerSecond();
    final int verifyingPlayers = Sonar.get().getFallback().getConnected().size();
    final int queuedPlayers = Sonar.get().getFallback().getQueue().getQueuedPlayers().size();
    final int minPlayers = Sonar.get().getConfig().getMinPlayersForAttack();
@@ -67,8 +66,9 @@ public final class AttackTracker implements JVMProfiler {
      if (currentAttack == null) {
        currentAttack = new AttackStatistics();
        currentAttack.successfulVerifications = Sonar.get().getVerifiedPlayerController().estimatedSize();
-        currentAttack.failedVerifications = Statistics.FAILED_VERIFICATIONS.get();
+        currentAttack.failedVerifications = Sonar.get().getStatistics().getTotalFailedVerifications();
        Sonar.get().getEventManager().publish(new AttackDetectedEvent());
+        Sonar.get().getNotificationHandler().sendAttackNotification();
      } else {
        // Reset attack timer if we're still under attack
        currentAttack.timer.reset();
@@ -79,7 +79,7 @@ public final class AttackTracker implements JVMProfiler {
        // Update joins per second peak if necessary
        currentAttack.peakJoinsPerSecond = joinsPerSecond;
      }
-      final int connectionsPerSecond = Counters.CONNECTIONS_PER_SECOND.estimatedSize();
+      final long connectionsPerSecond = Sonar.get().getStatistics().getConnectionsPerSecond();
      if (connectionsPerSecond > currentAttack.peakConnectionsPerSecond) {
        // Update connections per second peak if necessary
        currentAttack.peakConnectionsPerSecond = connectionsPerSecond;
@@ -101,41 +101,44 @@ public final class AttackTracker implements JVMProfiler {
        Sonar.get().getEventManager().publish(new AttackMitigatedEvent(currentAttack));

        if (++attackThreshold > Sonar.get().getConfig().getMinAttackThreshold()) {
-          // Save attack statistics
-          final long deltaInMillis = currentAttack.duration.delay();
-          final String peakCPU = Sonar.DECIMAL_FORMAT.format(currentAttack.peakProcessCPUUsage);
-          final String peakMem = formatMemory(currentAttack.peakProcessMemoryUsage);
-          final String peakBPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakJoinsPerSecond);
-          final String peakCPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakConnectionsPerSecond);
-          final long minutes = deltaInMillis / (60 * 1000); // Convert milliseconds to minutes
-          final double seconds = (deltaInMillis % (60 * 1000)) / 1000D; // Convert remaining milliseconds to seconds
-          final String formattedDuration = String.format("%d minutes, %.0f seconds", minutes, seconds);
-          final String startTimestamp = String.valueOf(currentAttack.duration.getStart() / 1000L);
-          final String endTimestamp = String.valueOf(System.currentTimeMillis() / 1000L);
-          final long blacklisted = Sonar.get().getFallback().getBlacklisted().estimatedSize();
-          // Calculate during-attack-statistics using their deltas
-          final long totalVerified = Sonar.get().getVerifiedPlayerController().estimatedSize();
-          final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);
-          final long totalFailed = Statistics.FAILED_VERIFICATIONS.get();
-          final long failed = Math.max(totalFailed - currentAttack.failedVerifications, 0);
-
          // Post webhook to Discord
-          Optional.ofNullable(Sonar.get().getConfig().getDiscordWebhook()).ifPresent(webhook -> webhook.post(() -> {
-            final SonarConfiguration.Webhook.Embed config = Sonar.get().getConfig().getWebhook().getEmbed();
-            final String description = config.getDescription()
-              .replace("%start-timestamp%", startTimestamp)
-              .replace("%end-timestamp%", endTimestamp)
-              .replace("%duration%", formattedDuration)
-              .replace("%peak-cpu%", peakCPU)
-              .replace("%peak-memory%", peakMem)
-              .replace("%peak-bps%", peakBPS)
-              .replace("%peak-cps%", peakCPS)
-              .replace("%total-blacklisted%", Sonar.DECIMAL_FORMAT.format(blacklisted))
-              .replace("%total-failed%", Sonar.DECIMAL_FORMAT.format(failed))
-              .replace("%total-success%", Sonar.DECIMAL_FORMAT.format(verified));
-            return new SonarConfiguration.Webhook.Embed(
-              config.getTitle(), config.getTitleUrl(), description, config.getR(), config.getG(), config.getB());
-          }));
+          Optional.ofNullable(Sonar.get().getConfig().getWebhook().getDiscordWebhook())
+            .ifPresent(webhook -> {
+              // Save attack statistics
+              final long deltaInMillis = currentAttack.duration.delay();
+              final String peakCPU = Sonar.DECIMAL_FORMAT.format(currentAttack.peakProcessCPUUsage);
+              final String peakMem = formatMemory(currentAttack.peakProcessMemoryUsage);
+              final String peakBPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakJoinsPerSecond);
+              final String peakCPS = Sonar.DECIMAL_FORMAT.format(currentAttack.peakConnectionsPerSecond);
+              final long minutes = deltaInMillis / (60 * 1000); // Convert milliseconds to minutes
+              final double seconds = (deltaInMillis % (60 * 1000)) / 1000D; // Convert remaining milliseconds to seconds
+              final String formattedDuration = String.format("%d minutes, %.0f seconds", minutes, seconds);
+              final String startTimestamp = String.valueOf(currentAttack.duration.getStart() / 1000L);
+              final String endTimestamp = String.valueOf(System.currentTimeMillis() / 1000L);
+              final long blacklisted = Sonar.get().getFallback().getBlacklist().estimatedSize();
+              // Calculate during-attack-statistics using their deltas
+              final long totalVerified = Sonar.get().getVerifiedPlayerController().estimatedSize();
+              final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);
+              final long totalFailed = Sonar.get().getStatistics().getTotalFailedVerifications();
+              final long failed = Math.max(totalFailed - currentAttack.failedVerifications, 0);
+
+              webhook.post(() -> {
+                final SonarConfiguration.Webhook.Embed config = Sonar.get().getConfig().getWebhook().getEmbed();
+                final String description = config.getDescription()
+                  .replace("%start-timestamp%", startTimestamp)
+                  .replace("%end-timestamp%", endTimestamp)
+                  .replace("%duration%", formattedDuration)
+                  .replace("%peak-cpu%", peakCPU)
+                  .replace("%peak-memory%", peakMem)
+                  .replace("%peak-bps%", peakBPS)
+                  .replace("%peak-cps%", peakCPS)
+                  .replace("%total-blacklisted%", Sonar.DECIMAL_FORMAT.format(blacklisted))
+                  .replace("%total-failed%", Sonar.DECIMAL_FORMAT.format(failed))
+                  .replace("%total-success%", Sonar.DECIMAL_FORMAT.format(verified));
+                return new SonarConfiguration.Webhook.Embed(
+                  config.getTitle(), config.getTitleUrl(), description, config.getR(), config.getG(), config.getB());
+              });
+            });
        }

        // Reset the attack status
@@ -148,10 +151,4 @@ public final class AttackTracker implements JVMProfiler {
      attackThreshold = 0;
    }
  }
-
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-  public boolean isCurrentlyUnderAttack() {
-    final int minDelay = Sonar.get().getConfig().getAttackCooldownDelay();
-    return currentAttack != null && currentAttack.timer.delay() < minDelay;
-  }
 }
@@ -23,34 +23,38 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;

+import java.util.UUID;
 import java.util.function.Predicate;

@Getter
@RequiredArgsConstructor
-public abstract class InvocationSource {
-  private final String name;
+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);
  }
 }
@@ -17,15 +17,18 @@

 package xyz.jonesdev.sonar.api.command;

+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Ticker;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.cappuccino.Cappuccino;
-import xyz.jonesdev.cappuccino.ExpiringCache;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
 import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

+import java.time.Duration;
 import java.util.*;
 import java.util.stream.Collectors;

@@ -36,7 +39,10 @@ public interface SonarCommand {

  Map<String, List<String>> ARG_TAB_SUGGESTIONS = new HashMap<>();

-  ExpiringCache<Object> DELAY = Cappuccino.buildExpiring(500L);
+  Cache<Audience, Long> COMMAND_DELAY = Caffeine.newBuilder()
+    .expireAfterWrite(Duration.ofMillis(500))
+    .ticker(Ticker.systemTicker())
+    .build();

  List<Component> CACHED_HELP_MESSAGE = new ArrayList<>();

@@ -47,10 +53,9 @@ public interface SonarCommand {
        source.sendMessage(Sonar.get().getConfig().getNoPermission());
        return;
      }
-      // Checking if it contains will only break more since it can throw
-      // a NullPointerException if the cache is being accessed from parallel threads
-      DELAY.cleanUp(); // Clean up the cache
-      final long mapTimestamp = DELAY.asMap().getOrDefault(source, -1L);
+
+      final long timestamp = System.currentTimeMillis();
+      final long mapTimestamp = COMMAND_DELAY.get(source.getAudience(), audience -> -1L);

      // There were some exploits with spamming commands in the past.
      // Spamming should be prevented, especially if some heavy operations are done,
@@ -59,7 +64,6 @@ public interface SonarCommand {
        source.sendMessage(Sonar.get().getConfig().getCommands().getCommandCoolDown());

        // Format delay
-        final long timestamp = System.currentTimeMillis();
        final double left = 0.5D - (timestamp - mapTimestamp) / 1000D;

        source.sendMessage(Sonar.get().getConfig().getCommands().getCommandCoolDownLeft()
@@ -67,7 +71,7 @@ public interface SonarCommand {
        return;
      }

-      DELAY.put(source);
+      COMMAND_DELAY.put(source.getAudience(), timestamp);
    }

    if (args.length > 0) {
@@ -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;
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 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.api.config;
+
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+
+@Getter
+enum Language {
+  SYSTEM("system"),
+  AB("Abkhazian"),
+  AA("Afar"),
+  AF("Afrikaans"),
+  SQ("Albanian"),
+  AM("Amharic"),
+  AR("Arabic"),
+  AN("Aragonese"),
+  HY("Armenian"),
+  AS("Assamese"),
+  AE("Avestan"),
+  AY("Aymara"),
+  AZ("Azerbaijani"),
+  BA("Bashkir"),
+  EU("Basque"),
+  BE("Belarusian"),
+  BN("Bengali"),
+  BH("Bihari"),
+  BI("Bislama"),
+  BS("Bosnian"),
+  BR("Breton"),
+  BG("Bulgarian"),
+  MY("Burmese"),
+  CA("Catalan"),
+  CH("Chamorro"),
+  CE("Chechen"),
+  ZH("Chinese"),
+  CU("Slavic"),
+  CV("Chuvash"),
+  KW("Cornish"),
+  CO("Corsican"),
+  HR("Croatian"),
+  CS("Czech"),
+  DA("Danish"),
+  DV("Maldivian"),
+  NL("Dutch"),
+  DZ("Dzongkha"),
+  EN("English"),
+  EO("Esperanto"),
+  ET("Estonian"),
+  FO("Faroese"),
+  FJ("Fijian"),
+  FI("Finnish"),
+  FR("French"),
+  GD("Gaelic"),
+  GL("Galician"),
+  KA("Georgian"),
+  DE("German"),
+  EL("Greek"),
+  GN("Guarani"),
+  GU("Gujarati"),
+  HT("Haitian Creole"),
+  HA("Hausa"),
+  HE("Hebrew"),
+  HZ("Herero"),
+  HI("Hindi"),
+  HO("Hiri Motu"),
+  HU("Hungarian"),
+  IS("Icelandic"),
+  IO("Ido"),
+  ID("Indonesian"),
+  IE("Interlingue"),
+  IU("Inuktitut"),
+  IK("Inupiaq"),
+  GA("Irish"),
+  IT("Italian"),
+  JA("Japanese"),
+  JV("Javanese"),
+  KL("Kalaallisut"),
+  KN("Kannada"),
+  KS("Kashmiri"),
+  KK("Kazakh"),
+  KM("Khmer"),
+  KI("Kikuyu"),
+  RW("Kinyarwanda"),
+  KY("Kirghiz"),
+  KV("Komi"),
+  KO("Korean"),
+  KJ("Kwanyama"),
+  KU("Kurdish"),
+  LO("Lao"),
+  LA("Latin"),
+  LV("Latvian"),
+  LI("Limburgish"),
+  LN("Lingala"),
+  LT("Lithuanian"),
+  LB("Luxembourgish"),
+  MK("Macedonian"),
+  MG("Malagasy"),
+  MS("Malay"),
+  ML("Malayalam"),
+  MT("Maltese"),
+  GV("Manx"),
+  MI("Maori"),
+  MR("Marathi"),
+  MH("Marshallese"),
+  MO("Moldavian"),
+  MN("Mongolian"),
+  NA("Nauru"),
+  NV("Navajo"),
+  ND("Ndebele, North"),
+  NR("Ndebele, South"),
+  NG("Ndonga"),
+  NE("Nepali"),
+  SE("Northern Sami"),
+  NO("Norwegian"),
+  NB("Norwegian Bokmal"),
+  NN("Norwegian Nynorsk"),
+  NY("Chewa"),
+  OC("Occitan"),
+  OR("Oriya"),
+  OM("Oromo"),
+  OS("Ossetian"),
+  PI("Pali"),
+  PA("Panjabi"),
+  FA("Persian"),
+  PL("Polish"),
+  PT("Portuguese"),
+  PS("Pushto"),
+  QU("Quechua"),
+  RM("Raeto-Romance"),
+  RO("Romanian"),
+  RN("Rundi"),
+  RU("Russian"),
+  SM("Samoan"),
+  SG("Sango"),
+  SA("Sanskrit"),
+  SC("Sardinian"),
+  SR("Serbian"),
+  SN("Shona"),
+  II("Sichuan Yi"),
+  SD("Sindhi"),
+  SI("Sinhala"),
+  SK("Slovak"),
+  SL("Slovenian"),
+  SO("Somali"),
+  ST("Sotho, Southern"),
+  ES("Spanish"),
+  SU("Sundanese"),
+  SW("Swahili"),
+  SS("Swati"),
+  SV("Swedish"),
+  TL("Tagalog"),
+  TY("Tahitian"),
+  TG("Tajik"),
+  TA("Tamil"),
+  TT("Tatar"),
+  TE("Telugu"),
+  TH("Thai"),
+  BO("Tibetan"),
+  TI("Tigrinya"),
+  TO("Tonga"),
+  TS("Tsonga"),
+  TN("Tswana"),
+  TR("Turkish"),
+  TK("Turkmen"),
+  TW("Twi"),
+  UG("Uighur"),
+  UK("Ukrainian"),
+  UR("Urdu"),
+  UZ("Uzbek"),
+  VI("Vietnamese"),
+  VO("Volapuk"),
+  WA("Walloon"),
+  CY("Welsh"),
+  FY("Western Frisian"),
+  WO("Wolof"),
+  XH("Xhosa"),
+  YI("Yiddish"),
+  YO("Yoruba"),
+  ZA("Zhuang"),
+  ZU("Zulu");
+
+  private final String name;
+  private final String code;
+
+  Language(final String name) {
+    this.name = name;
+    this.code = name().toLowerCase();
+  }
+
+  public static Language fromCode(final @NotNull String code) {
+    return Language.valueOf(code.toUpperCase());
+  }
+}
@@ -19,64 +19,69 @@ package xyz.jonesdev.sonar.api.config;

 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
-import org.simpleyaml.configuration.comments.format.YamlCommentFormat;
+import org.simpleyaml.configuration.MemorySection;
 import org.simpleyaml.configuration.file.YamlFile;
-import xyz.jonesdev.sonar.api.Sonar;

 import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;

-import static xyz.jonesdev.sonar.api.Sonar.LINE_SEPARATOR;
+import static xyz.jonesdev.sonar.api.config.SonarConfiguration.LOGGER;

@Getter
 public final class SimpleYamlConfig {
  private final File file;
  private final YamlFile yaml;

-  private static final List<String> HEADER = Arrays.asList(
-    "",
-    String.format("Running Sonar version %s on %s",
-      Sonar.get().getVersion(), Sonar.get().getPlatform().getDisplayName()),
-    "Need help or have questions? https://jonesdev.xyz/discord",
-    "https://github.com/jonesdevelopment/sonar",
-    ""
-  );
-
-  public SimpleYamlConfig(final File dataFolder, final String fileName) {
-    this(new File(dataFolder, fileName + ".yml"), dataFolder);
-  }
-
-  private SimpleYamlConfig(final File file, final @NotNull File folder) {
-    if (!folder.exists() && !folder.mkdir()) {
-      throw new IllegalStateException("Could not create folder?!");
-    }
-
+  public SimpleYamlConfig(final @NotNull File file) {
    this.file = file;
    this.yaml = new YamlFile(file.getPath());
  }

-  public void save() {
-    try {
-      yaml.save();
-    } catch (IOException exception) {
-      exception.printStackTrace(System.err);
+  private void replaceConfigFile(final @NotNull URL defaultData) throws Exception {
+    try (final InputStream inputStream = defaultData.openStream()) {
+      Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
    }
  }

-  public void load() throws Exception {
-    // https://github.com/jonesdevelopment/sonar/issues/26
-    // Only load the configuration if the file already exists
-    if (yaml.exists()) {
-      yaml.loadWithComments();
-    } else {
-      yaml.createOrLoadWithComments();
+  public void load(final @NotNull URL defaultData) throws Exception {
+    final boolean exists = yaml.exists();
+
+    // Copy the configuration from the translations
+    if (!exists) {
+      replaceConfigFile(defaultData);
    }

-    // Always load the comment format and options
-    yaml.setCommentFormat(YamlCommentFormat.DEFAULT);
-    yaml.setHeader(String.join(LINE_SEPARATOR, HEADER));
+    // Load the configuration
+    yaml.loadWithComments();
+
+    // I hate my life... but this works... somehow
+    if (exists) {
+      // First, we store all values from the current (old) config
+      final Map<String, Object> values = yaml.getValues(true);
+      // Then, we replace the old config file with the default one
+      replaceConfigFile(defaultData);
+      // Re-load the configuration
+      yaml.loadWithComments();
+      // Loop through the new values from the new configuration
+      yaml.getValues(true).forEach((path, v) -> {
+        final Object value = values.get(path);
+        // Make sure we actually need to update the value
+        if (value != null && !value.equals(v)
+          && !(v instanceof MemorySection)
+          && !(value instanceof MemorySection)) {
+          // Set the old values to the new values
+          yaml.set(path, value);
+        }
+      });
+      // Save the yaml file to ensure we keep the original values
+      yaml.save();
+    }
  }

  public void set(final String path, final Object v) {
@@ -88,33 +93,81 @@ public final class SimpleYamlConfig {
    return yaml.getInt(path, def);
  }

+  public int getInt(final String path) {
+    if (!yaml.contains(path)) {
+      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      return 0;
+    }
+    return yaml.getInt(path);
+  }
+
  public boolean getBoolean(final String path, final boolean def) {
    yaml.addDefault(path, def);
    return yaml.getBoolean(path, def);
  }

+  public boolean getBoolean(final String path) {
+    if (!yaml.contains(path)) {
+      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      return false;
+    }
+    return yaml.getBoolean(path);
+  }
+
  public String getString(final String path, final String def) {
    final Object object = getObject(path, def);
    if (object instanceof String) {
      return (String) object;
    }
-    Sonar.get().getLogger().info("[config] Migrated {} to {}", path, def);
+    LOGGER.info("[config] Migrated {} to {}", path, def);
    set(path, def);
    return def;
  }

+  public @NotNull String getString(final String path) {
+    if (!yaml.contains(path)) {
+      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      return "";
+    }
+    final Object object = getObject(path);
+    if (object instanceof String) {
+      return (String) object;
+    }
+    throw new IllegalStateException("Invalid entry " + path);
+  }
+
  public Object getObject(final String path, final Object def) {
    yaml.addDefault(path, def);
    return yaml.get(path, def);
  }

+  public Object getObject(final String path) {
+    return yaml.get(path);
+  }
+
  public List<String> getStringList(final String path, final List<String> def) {
    yaml.addDefault(path, def);
    return yaml.getStringList(path);
  }

+  public List<String> getStringList(final String path) {
+    if (!yaml.contains(path)) {
+      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      return new ArrayList<>(0);
+    }
+    return yaml.getStringList(path);
+  }
+
  public List<Integer> getIntList(final String path, final List<Integer> def) {
    yaml.addDefault(path, def);
    return yaml.getIntegerList(path);
  }
+
+  public List<Integer> getIntList(final String path) {
+    if (!yaml.contains(path)) {
+      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      return new ArrayList<>(0);
+    }
+    return yaml.getIntegerList(path);
+  }
 }
@@ -19,6 +19,7 @@ package xyz.jonesdev.sonar.api.controller;

 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
+import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
@@ -26,9 +27,10 @@ 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.dependencies.DependencyLoader;
+import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
 import xyz.jonesdev.sonar.api.model.VerifiedPlayer;

 import java.net.InetAddress;
@@ -42,9 +44,27 @@ 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() {
+
+    @Override
+    public void info(final String message, final Object... args) {
+      Sonar.get().getLogger().info("[database] " + message, args);
+    }
+
+    @Override
+    public void warn(final String message, final Object... args) {
+      Sonar.get().getLogger().warn("[database] " + message, args);
+    }
+
+    @Override
+    public void error(final String message, final Object... args) {
+      Sonar.get().getLogger().error("[database] " + message, args);
+    }
+  };
+
+  private final Map<String, Collection<UUID>> cache = new ConcurrentHashMap<>(128);
  private @Nullable ConnectionSource connectionSource;
  private Dao<VerifiedPlayer, Integer> dao;
  private QueryBuilder<VerifiedPlayer, Integer> queryBuilder;
@@ -52,17 +72,24 @@ public final class VerifiedPlayerController {
  private final @NotNull SonarConfiguration.Database.Type cachedDatabaseType;

  public VerifiedPlayerController() {
+    final SonarConfiguration.Database database = Sonar.get().getConfig().getDatabase();
    // Cache selected database type, so we don't need to call Sonar.get() every time
-    cachedDatabaseType = Sonar.get().getConfig().getDatabase().getType();
+    cachedDatabaseType = database.getType();

    // Don't establish a database connection if the type is NONE
    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
-      Sonar.get().getLogger().warn("Make sure to configure a database to save verified players.");
+      LOGGER.warn("Configure a database to save verified players.");
      return;
    }

-    try (final ConnectionSource connectionSource = DependencyLoader.setUpDriverAndConnect()) {
-      this.connectionSource = connectionSource;
+    // Initialize MySQL/MariaDB driver
+    database.getType().getDatabaseType().loadDriver();
+
+    try {
+      connectionSource = new JdbcPooledConnectionSource(
+        String.format(database.getType().getConnectionString(),
+          database.getHost(), database.getPort(), database.getName()),
+        database.getUsername(), database.getPassword(), database.getType().getDatabaseType());

      // Create table
      try {
@@ -76,13 +103,56 @@ public final class VerifiedPlayerController {
      dao = DaoManager.createDao(connectionSource, VerifiedPlayer.class);
      queryBuilder = dao.queryBuilder();

-      // Make sure to clear all outdated entries first
-      clearOld(Sonar.get().getConfig().getDatabase().getMaximumAge());
-      // Add all entries from the database to the cache
-      dao.queryForAll().forEach(this::_add);
-    } catch (Throwable throwable) {
-      Sonar.get().getLogger().error("Error setting up database connection: {}", throwable);
-      throwable.printStackTrace(System.err);
+      // Make sure to run the clean task and the caching task in the same thread
+      // https://github.com/jonesdevelopment/sonar/issues/150
+      DB_UPDATE_SERVICE.execute(() -> {
+        try {
+          // Make sure to clear all outdated entries first
+          clearOld(database.getMaximumAge());
+          // Add all entries from the database to the cache
+          dao.queryForAll().forEach(this::_add);
+        } catch (SQLException exception) {
+          LOGGER.error("Error initializing database: {}", exception);
+        }
+      });
+    } catch (SQLException exception) {
+      LOGGER.error("Error setting up database: {}", exception);
+    }
+  }
+
+  /**
+   * 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.
+   */
+  private void clearOld(final @Range(from = 1, to = 365) int maximumAge) throws SQLException {
+    final long timestamp = Instant.now()
+      .minus(maximumAge, ChronoUnit.DAYS)
+      .getEpochSecond() * 1000L; // convert to ms
+
+    final List<VerifiedPlayer> oldEntries = queryBuilder.where()
+      .lt("timestamp", new Timestamp(timestamp))
+      .query();
+
+    if (oldEntries != null) {
+      for (final VerifiedPlayer player : oldEntries) {
+        dao.delete(player);
+      }
+      LOGGER.info("Removed {} database entries older than {} days.",
+        oldEntries.size(), maximumAge);
    }
  }

@@ -118,7 +188,7 @@ public final class VerifiedPlayerController {
          }
        }
      } catch (SQLException exception) {
-        Sonar.get().getLogger().error("Error trying to remove entry: {}", exception);
+        LOGGER.error("Error trying to remove entry: {}", exception);
      }
    });
  }
@@ -129,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);
  }

  /**
@@ -156,7 +226,7 @@ public final class VerifiedPlayerController {
      try {
        dao.create(player);
      } catch (SQLException exception) {
-        Sonar.get().getLogger().error("Error trying to add entry: {}", exception);
+        LOGGER.error("Error trying to add entry: {}", exception);
      }
    });
  }
@@ -167,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<>())
-      .add(player.getPlayerUUID());
+    cache.computeIfAbsent(player.getInetAddress(), v -> new ArrayList<>())
+      .add(player.getPlayerUuid());
  }

  /**
+   * Returns the number 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());
  }

  /**
@@ -193,62 +269,24 @@ 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) {
        dao.deleteBuilder().delete();
      }
    } catch (SQLException exception) {
-      Sonar.get().getLogger().error("Error trying to clear entries: {}", exception);
+      LOGGER.error("Error trying to clear entries: {}", exception);
    }
  }

-  /**
-   * Clear all old entries using the given timestamp.
-   */
-  public void clearOld(final @Range(from = 1, to = 365) int maximumAge) {
-    // Don't try to update the column if the database type is NONE
-    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
-      return;
-    }
-
-    DB_UPDATE_SERVICE.execute(() -> {
-      // We cannot throw a NullPointerException within the executor service
-      // because we want to handle the error instead of simply throwing an exception
-      if (connectionSource == null) {
-        return;
-      }
-
-      try {
-        final long timestamp = Instant.now()
-          .minus(maximumAge, ChronoUnit.DAYS)
-          .getEpochSecond() * 1000L; // convert to ms
-
-        final List<VerifiedPlayer> oldEntries = queryBuilder.where()
-          .lt("timestamp", new Timestamp(timestamp))
-          .query();
-
-        if (oldEntries != null) {
-          for (final VerifiedPlayer player : oldEntries) {
-            dao.delete(player);
-          }
-          Sonar.get().getLogger().info("Removed {} database entries older than {} days.",
-            oldEntries.size(), maximumAge);
-        }
-      } catch (SQLException exception) {
-        Sonar.get().getLogger().error("Error trying to clear old entries: {}", exception);
-      }
-    });
-  }
-
  /**
   * @param inetAddress IP address
   * @param uuid        UUID associated to the IP
   * @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);
    }
@@ -270,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);
  }
 }
@@ -1,90 +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.api.dependencies;
-
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.timer.SystemTimer;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
-
-// Mostly taken from
-// https://github.com/Elytrium/LimboAuth/blob/master/src/main/java/net/elytrium/limboauth/dependencies/BaseLibrary.java
-public enum Dependency {
-  // https://mvnrepository.com/artifact/com.mysql/mysql-connector-j
-  MYSQL(
-    "com/mysql",
-    "mysql-connector-j",
-    "8.2.0"
-  ),
-  // TODO: MariaDB still seems to have some issues; investigate!
-  // https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client
-  MARIADB(
-    "org/mariadb/jdbc",
-    "mariadb-java-client",
-    "3.1.4"
-  );
-
-  private final Path tempFilePath;
-  private final URL mvnRepoURL;
-
-  Dependency(final @NotNull String groupId,
-             final @NotNull String artifactId,
-             final @NotNull String version) {
-    final String archiveFileName = String.format("%s-%s.jar", artifactId, version);
-    this.tempFilePath = new File(Sonar.get().getDataDirectory(), "libraries/" + archiveFileName).toPath();
-
-    try {
-      final String mvnCentralPath = String.format("%s/%s/%s/%s-%s.jar",
-        groupId, artifactId, version, artifactId, version);
-
-      this.mvnRepoURL = new URL("https://repo1.maven.org/maven2/" + mvnCentralPath);
-    } catch (MalformedURLException exception) {
-      throw new IllegalStateException(exception);
-    }
-  }
-
-  /**
-   * @return URL for the local file used for the external URLClassLoader
-   */
-  public @NotNull URL getClassLoaderURL() throws MalformedURLException {
-    if (!Files.exists(tempFilePath)) {
-      final SystemTimer timer = new SystemTimer();
-      Sonar.get().getLogger().info("Downloading dependency {}...", tempFilePath.getFileName());
-
-      try (final InputStream inputStream = mvnRepoURL.openStream()) {
-        Files.createDirectories(tempFilePath.getParent());
-        Files.copy(inputStream, Files.createFile(tempFilePath), REPLACE_EXISTING);
-      } catch (IOException exception) {
-        throw new IllegalStateException(exception);
-      }
-
-      Sonar.get().getLogger().info("Finished downloading {} ({}s)!", tempFilePath.getFileName(), timer);
-    }
-
-    return tempFilePath.toUri().toURL();
-  }
-}
@@ -1,81 +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.api.dependencies;
-
-import com.j256.ormlite.jdbc.JdbcSingleConnectionSource;
-import com.j256.ormlite.support.ConnectionSource;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.api.config.SonarConfiguration;
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.file.Path;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.util.Properties;
-
-@UtilityClass
-public class DependencyLoader {
-  public ConnectionSource setUpDriverAndConnect() throws Throwable {
-    final SonarConfiguration.Database database = Sonar.get().getConfig().getDatabase();
-
-    final ClassLoader currentClassLoader = DependencyLoader.class.getClassLoader();
-    ClassLoader classLoader = currentClassLoader;
-
-    // Velocity doesn't include the JDBC driver, which is why we need to load it manually
-    if (Sonar.get().getPlatform() == SonarPlatform.VELOCITY) {
-      final URL url = database.getType().getDependency().getClassLoaderURL();
-
-      final Method addPath = currentClassLoader.getClass().getDeclaredMethod("addPath", Path.class);
-      addPath.setAccessible(true);
-      addPath.invoke(currentClassLoader, new File(url.toURI()).toPath());
-
-      classLoader = new ExternalClassLoader(new URL[]{url});
-    }
-
-    final String jdbcURL = String.format("jdbc:%s://%s:%d/%s",
-      database.getType().name().toLowerCase(), database.getUrl(), database.getPort(), database.getName());
-
-    final Connection connection = connect(classLoader, jdbcURL, database);
-    return new JdbcSingleConnectionSource(jdbcURL, connection);
-  }
-
-  // Mostly taken from
-  // https://github.com/Elytrium/LimboAuth/blob/master/src/main/java/net/elytrium/limboauth/dependencies/DatabaseLibrary.java#L137
-  private Connection connect(final @NotNull ClassLoader classLoader,
-                             final @NotNull String databaseURL,
-                             final @NotNull SonarConfiguration.Database database) throws Throwable {
-    final Class<?> driverClass = classLoader.loadClass(database.getType().getDriverClassName());
-    final Object driver = driverClass.getDeclaredConstructor().newInstance();
-
-    DriverManager.registerDriver((Driver) driver);
-
-    final Properties properties = new Properties();
-    properties.put("user", database.getUsername());
-    properties.put("password", database.getPassword());
-
-    final Method connect = driverClass.getDeclaredMethod("connect", String.class, Properties.class);
-    connect.setAccessible(true);
-    return (Connection) connect.invoke(driver, databaseURL, properties);
-  }
-}
@@ -31,5 +31,5 @@ import xyz.jonesdev.sonar.api.fallback.FallbackUser;
@RequiredArgsConstructor
 public final class UserBlacklistedEvent implements SonarEvent {
  @ApiStatus.Experimental
-  private final FallbackUser<?> user;
+  private final FallbackUser user;
 }
@@ -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;
 }
@@ -30,5 +30,5 @@ import xyz.jonesdev.sonar.api.fallback.FallbackUser;
@RequiredArgsConstructor
 public final class UserVerifyJoinEvent implements SonarEvent {
  private final String username;
-  private final FallbackUser<?> user;
+  private final FallbackUser user;
 }
@@ -33,6 +33,6 @@ import java.util.UUID;
 public final class UserVerifySuccessEvent implements SonarEvent {
  private final String username;
  private final UUID offlineUuid;
-  private final FallbackUser<?> user;
+  private final FallbackUser user;
  private final long timeTakenToVerify;
 }
@@ -17,65 +17,71 @@

 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;
-import xyz.jonesdev.cappuccino.Cappuccino;
-import xyz.jonesdev.cappuccino.ExpiringCache;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;

 import java.net.InetAddress;
-import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ConcurrentMap;

@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class Fallback {
  public static final Fallback INSTANCE = new Fallback();
-  private static final @NotNull Sonar SONAR = Objects.requireNonNull(Sonar.get());

-  private final Map<String, InetAddress> connected = new ConcurrentHashMap<>(64, 0.75f);
-  // Only block the player for a few minutes to avoid issues
-  private final ExpiringCache<InetAddress> blacklisted = Cappuccino.buildExpiring(
-    10L, TimeUnit.MINUTES, 5000L);
-  private final @NotNull FallbackQueue queue = FallbackQueue.INSTANCE;
-  private final @NotNull FallbackRatelimiter ratelimiter = FallbackRatelimiter.INSTANCE;
+  // Map of all players connected to the server in general
+  private final ConcurrentMap<InetAddress, Integer> online = new ConcurrentHashMap<>(128);
+  // Map of all connected IP addresses (used for fast checking)
+  private final ConcurrentMap<InetAddress, Byte> connected = new ConcurrentHashMap<>(128);
+  // Cache of all blacklisted IP addresses to ensure each entry can expire after the given time
+  @Setter
+  private Cache<InetAddress, Byte> blacklist;
+  @Setter
+  private long blacklistTime;
+
+  private final @NotNull FallbackQueue queue = new FallbackQueue();
+  private final @NotNull FallbackRatelimiter ratelimiter = new FallbackRatelimiter();

  private final LoggerWrapper logger = new LoggerWrapper() {

    @Override
    public void info(final String message, final Object... args) {
-      SONAR.getLogger().info("[fallback] " + message, args);
+      Sonar.get().getLogger().info("[fallback] " + message, args);
    }

    @Override
    public void warn(final String message, final Object... args) {
-      SONAR.getLogger().warn("[fallback] " + message, args);
+      Sonar.get().getLogger().warn("[fallback] " + message, args);
    }

    @Override
    public void error(final String message, final Object... args) {
-      SONAR.getLogger().error("[fallback] " + message, args);
+      Sonar.get().getLogger().error("[fallback] " + message, args);
    }
  };

-  @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);
  }
 }
@@ -21,6 +21,5 @@ public interface FallbackPipelines {
  String FALLBACK_HANDLER = "sonar-fallback-handler";
  String FALLBACK_PACKET_ENCODER = "sonar-fallback-encoder";
  String FALLBACK_PACKET_DECODER = "sonar-fallback-decoder";
-  String FALLBACK_IN_TRAFFIC = "sonar-traffic-in";
-  String FALLBACK_OUT_TRAFFIC = "sonar-traffic-out";
+  String FALLBACK_BANDWIDTH = "sonar-fallback-bandwidth";
 }
@@ -26,50 +26,33 @@ import java.net.InetAddress;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;

@Getter
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 public final class FallbackQueue {
-  public static final FallbackQueue INSTANCE = new FallbackQueue();
-  private final Map<InetAddress, Runnable> queuedPlayers = new ConcurrentHashMap<>(16, 0.5f);
+  // Fixed thread pool executor for all new verifications
+  private static final int THREAD_POOL_SIZE = Math.min(0x7fff, Runtime.getRuntime().availableProcessors() * 2);
+  private static final ExecutorService QUEUE_EXECUTOR = Executors.newFixedThreadPool(THREAD_POOL_SIZE);

-  /**
-   * @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);
-  }
+  private final ConcurrentMap<InetAddress, Runnable> queuedPlayers = new ConcurrentHashMap<>(
+    128, 0.75f, Runtime.getRuntime().availableProcessors());

  public void poll() {
    final int maxQueuePolls = Sonar.get().getConfig().getQueue().getMaxQueuePolls();
    int index = 0;

-    // We need to be cautious here since we don't want any concurrency issues.
+    // Iterate through the map and process up to maxQueuePolls entries
+    // We need to be cautious here since we don't want any concurrency issues
    final Iterator<Map.Entry<InetAddress, Runnable>> iterator = queuedPlayers.entrySet().iterator();
-    while (iterator.hasNext()) {
-      // Break if we reached our maximum entries
-      if (++index > maxQueuePolls) {
-        break;
-      }
+    while (iterator.hasNext() && index++ < maxQueuePolls) {
      // Run the cached runnable
      final Map.Entry<InetAddress, Runnable> entry = iterator.next();
-      entry.getValue().run();
-      // Remove runnable from iterator
+      QUEUE_EXECUTOR.execute(entry.getValue());
+      // Remove runnable from the map
      iterator.remove();
    }
-
-    // Run the attack check task
-    Sonar.get().getAttackTracker().checkIfUnderAttack();
-    // Clean up the cache of rate-limited IPs
-    Sonar.get().getFallback().getRatelimiter().cleanUpCache();
  }
 }
@@ -17,44 +17,49 @@

 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;
-import xyz.jonesdev.cappuccino.ExpiringCache;

 import java.net.InetAddress;

-@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public final class FallbackRatelimiter {
-  public static final FallbackRatelimiter INSTANCE = new FallbackRatelimiter();
-  @Setter
-  private ExpiringCache<InetAddress> expiringCache;
+  private long timeout;
+  private Cache<InetAddress, Long> attemptCache;
+  @Getter
+  private Cache<InetAddress, Integer> failCountCache;

  /**
-   * We don't want to clean up the cache in the
-   * {@link #attempt(InetAddress)} method because
-   * it would take up too many resources.
-   */
-  public void cleanUpCache() {
-    expiringCache.cleanUp(false);
-  }
-
-  /**
-   * Checks if the player has tried verifying too fast
+   * Attempts to rate-limit the client
   *
   * @param inetAddress IP address of the player
   * @return Whether the player is allowed to verify
   */
-  @SuppressWarnings("BooleanMethodIsAlwaysInverted")
  public boolean attempt(final @NotNull InetAddress inetAddress) {
-    // Cache the IP address if it's not already cached
-    if (!expiringCache.has(inetAddress)) {
-      // Cache the IP address
-      expiringCache.put(inetAddress);
-      return true;
+    final long expectedTimestamp = System.currentTimeMillis() + timeout;
+    // Check if the time since the last join has not exceeded the timeout
+    // The idea for this check was Taken from Velocity
+    final long last = attemptCache.get(inetAddress, result -> expectedTimestamp);
+    return expectedTimestamp == last;
+  }
+
+  /**
+   * 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);
    }
-    // Deny the connection attempt
-    return false;
+    failCountCache.put(inetAddress, count + 1);
  }
 }
@@ -19,66 +19,90 @@ package xyz.jonesdev.sonar.api.fallback;

 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
+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.cappuccino.Cappuccino;
-import xyz.jonesdev.cappuccino.ExpiringCache;
-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.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.api.statistics.Statistics;
+import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.net.InetAddress;
-import java.util.concurrent.TimeUnit;
+import java.util.UUID;

-public interface FallbackUser<T> {
-  @NotNull Fallback getFallback();
+public interface FallbackUser {
+  @NotNull
+  Channel getChannel();

-  @NotNull T getConnection();
+  @NotNull
+  ChannelPipeline getPipeline();

-  @NotNull Channel getChannel();
+  @NotNull
+  InetAddress getInetAddress();

-  @NotNull ChannelPipeline getPipeline();
+  @NotNull
+  ProtocolVersion getProtocolVersion();

-  @NotNull InetAddress getInetAddress();
+  @NotNull
+  SystemTimer getLoginTimer();

-  @NotNull ProtocolVersion getProtocolVersion();
+  boolean isReceivedClientSettings();
+
+  void setReceivedClientSettings(final boolean receivedClientSettings);
+
+  boolean isReceivedPluginMessage();
+
+  void setReceivedPluginMessage(final boolean receivedPluginMessage);
+
+  boolean isGeyser();

  /**
-   * Kicks the player from the server with
-   * the given disconnect message.
+   * Disconnect the player during/after verification
+   * using our custom Disconnect packet.
   *
-   * @param reason Legacy disconnect message string
-   * @see #disconnect(Component)
+   * @param reason      Disconnect message component
+   * @param duringLogin True, if the player has not joined yet
   */
-  default void disconnect(final @NotNull String reason) {
-    disconnect(Component.text(reason));
-  }
+  @ApiStatus.Internal
+  void disconnect(final @NotNull Component reason, final boolean duringLogin);

  /**
-   * Kicks the player from the server with
-   * the given disconnect message.
+   * Takes over the channel and begins the verification process
   *
-   * @param reason Disconnect message component
+   * @param username Username of the player
+   * @param uuid     UUID of the player
+   * @param encoder  Name of the encoder pipeline
+   * @param decoder  Name of the decoder pipeline
+   * @param timeout  Name of the read timeout pipeline
+   * @param handler  Name of the main pipeline
   */
-  void disconnect(final @NotNull Component reason);
+  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 handler);

  /**
   * Sends a packet/message to the player
   *
   * @param msg Message to send to the player
   */
-  void write(final @NotNull Object msg);
+  default void write(final @NotNull Object msg) {
+    if (getChannel().isActive()) {
+      getChannel().writeAndFlush(msg, getChannel().voidPromise());
+    } else {
+      ReferenceCountUtil.release(msg);
+    }
+  }

  /**
   * Queues a buffered message that will be
   * sent once all messages are flushed.
   */
-  void delayedWrite(final @NotNull Object msg);
-
-  ExpiringCache<String> PREVIOUS_FAILS = Cappuccino.buildExpiring(3L, TimeUnit.MINUTES);
+  default void delayedWrite(final @NotNull Object msg) {
+    if (getChannel().isActive()) {
+      getChannel().write(msg, getChannel().voidPromise());
+    } else {
+      ReferenceCountUtil.release(msg);
+    }
+  }

  /**
   * Disconnects the player who failed the verification
@@ -87,39 +111,8 @@ public interface FallbackUser<T> {
   * 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
   */
-  default void fail(final @Nullable String reason) {
-    if (getChannel().isActive()) {
-      disconnect(Sonar.get().getConfig().getVerification().getVerificationFailed());
-
-      if (reason != null) {
-        getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getFailedLog()
-          .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
-          .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol()))
-          .replace("%reason%", reason));
-      }
-    }
-
-    Statistics.FAILED_VERIFICATIONS.increment();
-
-    // Call the VerifyFailedEvent for external API usage
-    Sonar.get().getEventManager().publish(new UserVerifyFailedEvent(this, reason));
-
-    // Make sure old entries are removed
-    PREVIOUS_FAILS.cleanUp();
-
-    // Check if the player has too many failed attempts
-    if (PREVIOUS_FAILS.has(getInetAddress().toString())) {
-      // Call the BotBlacklistedEvent for external API usage
-      Sonar.get().getEventManager().publish(new UserBlacklistedEvent(this));
-
-      getFallback().getBlacklisted().put(getInetAddress());
-      getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getBlacklistLog()
-        .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
-        .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol())));
-    } else {
-      // Cache the InetAddress for 3 minutes
-      PREVIOUS_FAILS.put(getInetAddress().toString());
-    }
-  }
+  void fail(final @NotNull String reason);
 }
@@ -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;
-  }
 }
@@ -0,0 +1,115 @@
+/*
+ * 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.api.jvm;
+
+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 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();
+  }
+}
@@ -23,7 +23,9 @@ import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.jetbrains.annotations.NotNull;

+import java.net.InetAddress;
 import java.sql.Timestamp;
 import java.util.UUID;

@@ -50,7 +52,7 @@ public final class VerifiedPlayer {
    uniqueIndexName = "ip_address_player_uuid_idx",
    width = 36
  )
-  private UUID playerUUID;
+  private UUID playerUuid;

  @DatabaseField(
    columnName = "timestamp",
@@ -58,9 +60,11 @@ public final class VerifiedPlayer {
  )
  private Timestamp timestamp;

-  public VerifiedPlayer(final String inetAddress, final UUID playerUUID, final long timestamp) {
-    this.inetAddress = inetAddress;
-    this.playerUUID = playerUUID;
+  public VerifiedPlayer(final @NotNull InetAddress inetAddress,
+                        final @NotNull UUID playerUuid,
+                        final long timestamp) {
+    this.inetAddress = inetAddress.toString();
+    this.playerUuid = playerUuid;
    this.timestamp = new Timestamp(timestamp);
  }
 }
@@ -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).getUsername() : "Console",
-      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"};
  }
 }
@@ -15,19 +15,20 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.bukkit.command;
+package xyz.jonesdev.sonar.api.ormlite;

-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
+import com.j256.ormlite.jdbc.db.MysqlDatabaseType;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
-import xyz.jonesdev.sonar.bukkit.SonarBukkit;

-public final class BukkitInvocationSource extends InvocationSource {
-  public BukkitInvocationSource(final @NotNull CommandSender sender) {
-    super(sender.getName(),
-      SonarBukkit.INSTANCE.getBukkitAudiences().sender(sender),
-      sender instanceof Player,
-      sender::hasPermission);
+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"};
  }
 }
@@ -1,80 +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.api.profiler;
-
-import com.sun.management.OperatingSystemMXBean;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-
-public interface JVMProfiler {
-  Runtime RUNTIME = Runtime.getRuntime();
-  OperatingSystemMXBean OPERATING_SYSTEM_MX_BEAN = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
-  RuntimeMXBean RUNTIME_MX_BEAN = ManagementFactory.getRuntimeMXBean();
-  char[] MEMORY_UNITS = {'k', 'M', 'G', 'T', 'P', 'E'};
-
-  default String formatMemory(final long size) {
-    if (size < 1024L) {
-      return size + " B";
-    }
-    final int group = (63 - Long.numberOfLeadingZeros(size)) / 10;
-    final double formattedSize = (double) size / (1L << (group * 10));
-    final char unit = MEMORY_UNITS[group - 1];
-    return String.format("%.1f %sB", formattedSize, unit);
-  }
-
-  default int getVirtualCores() {
-    return RUNTIME.availableProcessors();
-  }
-
-  default double getProcessCPUUsage() {
-    return OPERATING_SYSTEM_MX_BEAN.getProcessCpuLoad() * 100;
-  }
-
-  default double getAverageProcessCPUUsage() {
-    return getProcessCPUUsage() / getVirtualCores();
-  }
-
-  default double getSystemCPUUsage() {
-    return OPERATING_SYSTEM_MX_BEAN.getSystemCpuLoad() * 100;
-  }
-
-  default double getAverageSystemCPUUsage() {
-    return getSystemCPUUsage() / getVirtualCores();
-  }
-
-  default double getSystemLoadAverage() {
-    return OPERATING_SYSTEM_MX_BEAN.getSystemLoadAverage() * 100;
-  }
-
-  default long getMaxMemory() {
-    return RUNTIME.maxMemory();
-  }
-
-  default long getTotalMemory() {
-    return RUNTIME.totalMemory();
-  }
-
-  default long getFreeMemory() {
-    return RUNTIME.freeMemory();
-  }
-
-  default long getUsedMemory() {
-    return getTotalMemory() - getFreeMemory();
-  }
-}
@@ -1,28 +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.api.statistics;
-
-import xyz.jonesdev.cappuccino.Cappuccino;
-import xyz.jonesdev.cappuccino.ExpiringCache;
-
-import java.util.concurrent.TimeUnit;
-
-public interface Counters {
-  ExpiringCache<Long> LOGINS_PER_SECOND = Cappuccino.buildExpiring(1L, TimeUnit.SECONDS);
-  ExpiringCache<Long> CONNECTIONS_PER_SECOND = Cappuccino.buildExpiring(1L, TimeUnit.SECONDS);
-}
@@ -0,0 +1,118 @@
+/*
+ * 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.api.statistics;
+
+import org.jetbrains.annotations.ApiStatus;
+
+@SuppressWarnings("unused")
+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 number of blacklisted IPs
+   */
+  long getTotalBlacklistSize();
+
+  @ApiStatus.Internal
+  void cleanUpCache();
+}
@@ -1,68 +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.api.statistics;
-
-public enum Statistics {
-  TOTAL_TRAFFIC,
-  REAL_TRAFFIC,
-  FAILED_VERIFICATIONS;
-
-  private int val = -1;
-
-  /**
-   * Increments the current value by 1 with the default value of 0
-   *
-   * @see #get(int)
-   * @see #set(int)
-   */
-  public void increment() {
-    increment(0);
-  }
-
-  /**
-   * Increments the current value by 1 with a custom default value
-   *
-   * @see #get(int)
-   * @see #set(int)
-   */
-  public void increment(final int def) {
-    set(get(def) + 1);
-  }
-
-  /**
-   * @return The current value with the default value of 0
-   * @see #get(int)
-   */
-  public int get() {
-    return get(0);
-  }
-
-  /**
-   * @return The current value with a custom default value
-   */
-  public int get(final int def) {
-    return val == -1 ? def : val;
-  }
-
-  /**
-   * Set current value to a new value
-   */
-  public void set(final int value) {
-    val = value;
-  }
-}
@@ -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);
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 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.api.verbose;
+
+import lombok.Getter;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+
+import java.util.Collection;
+import java.util.UUID;
+import java.util.Vector;
+
+@Getter
+public final class Notification implements Observable {
+  private final @NotNull Collection<UUID> subscribers = new Vector<>(0);
+
+  public void sendAttackNotification() {
+    // 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;
+
+      // 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());
+    }
+  }
+}
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 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.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();
+
+  /**
+   * @param uuid UUID of the player
+   * @return Whether the audience is subscribed or not
+   */
+  default boolean isSubscribed(final @NotNull UUID uuid) {
+    return getSubscribers().contains(uuid);
+  }
+
+  /**
+   * @param uuid UUID of the player
+   */
+  default void subscribe(final UUID uuid) {
+    getSubscribers().add(uuid);
+  }
+
+  /**
+   * @param uuid UUID of the player
+   */
+  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());
+  }
+}
@@ -18,108 +18,55 @@
 package xyz.jonesdev.sonar.api.verbose;

 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.profiler.JVMProfiler;
-import xyz.jonesdev.sonar.api.statistics.Counters;
-import xyz.jonesdev.sonar.api.statistics.Statistics;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.util.Collection;
-import java.util.Map;
+import java.util.UUID;
 import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;

-import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
-import static xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter.INCOMING;
-import static xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter.OUTGOING;
+import static xyz.jonesdev.sonar.api.timer.SystemTimer.DATE_FORMATTER;

@Getter
-public final class Verbose implements JVMProfiler, Counters {
-  private final @NotNull Collection<String> subscribers = new Vector<>(0);
-  private final @NotNull Map<String, Audience> audiences = new ConcurrentHashMap<>();
+public final class Verbose implements Observable {
+  private final @NotNull Collection<UUID> subscribers = new Vector<>(0);
  private int animationIndex;

  // Run action bar verbose
  public void update() {
-    // Clean up all blacklisted IPs
-    Sonar.get().getFallback().getBlacklisted().cleanUp(false);
-    // Clean up all counters
-    LOGINS_PER_SECOND.cleanUp(false);
-    CONNECTIONS_PER_SECOND.cleanUp(false);
-
    // 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
-    for (final String subscriber : subscribers) {
-      final Audience audience = audiences.get(subscriber);
+    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 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().getBlacklisted().estimatedSize()))
-      .replace("%total-joins%", DECIMAL_FORMAT.format(Statistics.TOTAL_TRAFFIC.get()))
-      .replace("%logins-per-second%", DECIMAL_FORMAT.format(LOGINS_PER_SECOND.estimatedSize()))
-      .replace("%connections-per-second%", DECIMAL_FORMAT.format(CONNECTIONS_PER_SECOND.estimatedSize()))
-      .replace("%verify-total%", DECIMAL_FORMAT.format(Statistics.REAL_TRAFFIC.get()))
-      .replace("%verify-success%",
-        DECIMAL_FORMAT.format(Sonar.get().getVerifiedPlayerController().estimatedSize()))
-      .replace("%verify-failed%", DECIMAL_FORMAT.format(Statistics.FAILED_VERIFICATIONS.get()))
-      .replace("%attack-duration%", attackDuration == null ? "00:00" : attackDuration.formattedDelay())
-      .replace("%incoming-traffic%", INCOMING.getCachedSecond())
-      .replace("%outgoing-traffic%", OUTGOING.getCachedSecond())
-      .replace("%incoming-traffic-ttl%", INCOMING.getCachedTtl())
-      .replace("%outgoing-traffic-ttl%", OUTGOING.getCachedTtl())
-      .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 var animations = Sonar.get().getConfig().getVerbose().getAnimation();
    final int nextIndex = ++animationIndex % animations.size();
    return animations.toArray(new String[0])[nextIndex];
  }
-
-  /**
-   * @param name Name of the audience
-   * @return Whether the audience is subscribed or not
-   */
-  public boolean isSubscribed(final @NotNull String name) {
-    return subscribers.contains(name);
-  }
-
-  /**
-   * @param name Name of the audience to subscribe
-   */
-  public void subscribe(final String name) {
-    subscribers.add(name);
-  }
-
-  /**
-   * @param name Name of the audience to unsubscribe
-   */
-  public void unsubscribe(final String name) {
-    subscribers.remove(name);
-  }
 }
@@ -17,6 +17,8 @@

 package xyz.jonesdev.sonar.api.webhook;

+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
@@ -32,12 +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().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 {
@@ -47,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);
@@ -57,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();
@@ -73,7 +84,7 @@ public final class DiscordWebhook {
    final List<Webhook.EmbedMessage> embeds = Collections.singletonList(embedMessage);

    final Webhook webhook = new Webhook(content, username, avatarUrl, false, embeds);
-    return Sonar.GENERAL_GSON.toJson(webhook);
+    return GSON.toJson(webhook);
  }

  private @NotNull HttpsURLConnection prepareConnection(final @NotNull URL url,
@@ -1,18 +1,20 @@
 import net.minecrell.pluginyml.bukkit.BukkitPluginDescription

 plugins {
-  id("net.minecrell.plugin-yml.bukkit") version "0.6.0"
+  id("net.minecrell.plugin-yml.bukkit") version "0.6.0" apply true
 }

-apply(plugin = "net.minecrell.plugin-yml.bukkit")
-
 bukkit {
-  name = "Sonar"
+  name = rootProject.name
+  description = rootProject.description
  version = rootProject.version.toString().split("-")[0]
  main = "xyz.jonesdev.sonar.bukkit.SonarBukkitPlugin"
  authors = listOf("Jones Development", "Sonar Contributors")
  website = "https://jonesdev.xyz/discord/"
  load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
+  softDepend = listOf("Geyser-Spigot", "floodgate", "Protocolize", "ProtocolSupport",
+    "ViaVersion", "packetevents", "ProtocolLib", "FastLogin")
+  foliaSupported = true

  commands {
    register("sonar") {
@@ -27,18 +29,24 @@ repositories {
 }

 dependencies {
-  compileOnly(project(":api"))
-  compileOnly(project(":common"))
+  implementation(project(":api"))
+  implementation(project(":common"))

-  // MiniMessage platform support
-  implementation("net.kyori:adventure-platform-bukkit:4.3.1")
+  compileOnly(rootProject.libs.spigot)

-  // We have to use 1.8 for backwards compatibility
-  compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
-
-  // Implement bStats.org for metrics
-  implementation("org.bstats:bstats-bukkit:3.0.2")
+  implementation(rootProject.libs.adventure.platform.bukkit)
+  implementation(rootProject.libs.adventure.platform.api)
+  implementation(rootProject.libs.adventure.platform.facet)
+  implementation(rootProject.libs.adventure.nbt)
+  implementation(rootProject.libs.bstats.bukkit)
+  implementation(rootProject.libs.libby.bukkit)
 }

-java.sourceCompatibility = JavaVersion.VERSION_1_8
-java.targetCompatibility = JavaVersion.VERSION_1_8
+tasks {
+  shadowJar {
+    relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori")
+  }
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_11
+java.targetCompatibility = JavaVersion.VERSION_11
@@ -17,24 +17,29 @@

 package xyz.jonesdev.sonar.bukkit;

+import com.alessiodp.libby.BukkitLibraryManager;
 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.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.bukkit.audience.AudienceListener;
 import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

 import java.util.Objects;
+import java.util.UUID;

@Getter
 public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
  public static SonarBukkit INSTANCE;

  public SonarBukkit(final @NotNull SonarBukkitPlugin plugin) {
-    super(plugin, plugin.getDataFolder(), SonarPlatform.BUKKIT);
+    super(plugin, SonarPlatform.BUKKIT, plugin.getDataFolder(),
+      new BukkitLibraryManager(plugin, plugin.getDataFolder().getName()));
    INSTANCE = this;
  }

@@ -43,6 +48,14 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
   */
  private final BukkitAudiences bukkitAudiences = BukkitAudiences.create(getPlugin());

+  @Override
+  public @Nullable Audience audience(final @Nullable UUID uniqueId) {
+    if (uniqueId == null) {
+      return null;
+    }
+    return bukkitAudiences.player(uniqueId);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -67,16 +80,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 audience register listener
-    getPlugin().getServer().getPluginManager().registerEvents(new AudienceListener(), getPlugin());
+  @Override
+  public void disable() {
+    if (metrics != null) {
+      // Make sure to properly shutdown bStats metrics
+      metrics.shutdown();
+    }
  }
 }
@@ -1,42 +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.bukkit.audience;
-
-import net.kyori.adventure.audience.Audience;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.bukkit.SonarBukkit;
-
-public final class AudienceListener implements Listener {
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PlayerJoinEvent event) {
-    final Audience audience = SonarBukkit.INSTANCE.getBukkitAudiences().player(event.getPlayer());
-    Sonar.get().getVerboseHandler().getAudiences().put(event.getPlayer().getName(), audience);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PlayerQuitEvent event) {
-    Sonar.get().getVerboseHandler().getAudiences().remove(event.getPlayer().getName());
-  }
-}
@@ -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
@@ -1,29 +1,36 @@
 plugins {
-  id("net.minecrell.plugin-yml.bungee") version "0.6.0"
+  id("net.minecrell.plugin-yml.bungee") version "0.6.0" apply true
 }

-apply(plugin = "net.minecrell.plugin-yml.bungee")
-
 bungee {
-  name = "Sonar"
+  name = rootProject.name
+  description = rootProject.description
  version = rootProject.version.toString().split("-")[0]
  main = "xyz.jonesdev.sonar.bungee.SonarBungeePlugin"
  author = "Jones Development, Sonar Contributors"
+  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")
+  compileOnly(rootProject.libs.bungeecord)
+  testCompileOnly(rootProject.libs.bungeecord)

-  // MiniMessage platform support
-  implementation("net.kyori:adventure-platform-bungeecord:4.3.1")
-
-  // Implement bStats.org for metrics
-  implementation("org.bstats:bstats-bungeecord:3.0.2")
+  implementation(rootProject.libs.adventure.platform.bungee)
+  implementation(rootProject.libs.adventure.platform.api)
+  implementation(rootProject.libs.adventure.platform.facet)
+  implementation(rootProject.libs.adventure.nbt)
+  implementation(rootProject.libs.bstats.bungee)
+  implementation(rootProject.libs.libby.bungee)
 }

-java.sourceCompatibility = JavaVersion.VERSION_1_8
-java.targetCompatibility = JavaVersion.VERSION_1_8
+tasks {
+  shadowJar {
+    relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori")
+  }
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_11
+java.targetCompatibility = JavaVersion.VERSION_11
@@ -17,25 +17,28 @@

 package xyz.jonesdev.sonar.bungee;

+import com.alessiodp.libby.BungeeLibraryManager;
 import lombok.Getter;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 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.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.bungee.audience.AudienceListener;
 import xyz.jonesdev.sonar.bungee.command.BungeeSonarCommand;
-import xyz.jonesdev.sonar.bungee.fallback.FallbackListener;
-import xyz.jonesdev.sonar.bungee.fallback.injection.BaseInjectionHelper;
-import xyz.jonesdev.sonar.bungee.fallback.injection.ChildChannelInitializer;
+import xyz.jonesdev.sonar.bungee.fallback.FallbackInjectionHelper;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

+import java.util.UUID;
+
@Getter
 public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
  public static SonarBungee INSTANCE;

  public SonarBungee(final @NotNull SonarBungeePlugin plugin) {
-    super(plugin, plugin.getDataFolder(), SonarPlatform.BUNGEE);
+    super(plugin, SonarPlatform.BUNGEE, plugin.getDataFolder(), new BungeeLibraryManager(plugin));
    INSTANCE = this;
  }

@@ -44,6 +47,14 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
   */
  private final BungeeAudiences bungeeAudiences = BungeeAudiences.create(getPlugin());

+  @Override
+  public @Nullable Audience audience(final @Nullable UUID uniqueId) {
+    if (uniqueId == null) {
+      return null;
+    }
+    return bungeeAudiences.player(uniqueId);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -68,22 +79,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 FallbackListener());
+    // Make sure to inject into the server's connection handler
+    FallbackInjectionHelper.inject();
+  }

-    // Register audience register listener
-    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new AudienceListener());
-
-    // Inject base into ProtocolUtils
-    BaseInjectionHelper.inject(ChildChannelInitializer.INSTANCE);
+  @Override
+  public void disable() {
+    if (metrics != null) {
+      // Make sure to properly shutdown bStats metrics
+      metrics.shutdown();
+    }
  }
 }
@@ -1,42 +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.audience;
-
-import net.kyori.adventure.audience.Audience;
-import net.md_5.bungee.api.event.PlayerDisconnectEvent;
-import net.md_5.bungee.api.event.PostLoginEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.bungee.SonarBungee;
-
-public final class AudienceListener implements Listener {
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PostLoginEvent event) {
-    final Audience audience = SonarBungee.INSTANCE.getBungeeAudiences().player(event.getPlayer());
-    Sonar.get().getVerboseHandler().getAudiences().put(event.getPlayer().getName(), audience);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void handle(final @NotNull PlayerDisconnectEvent event) {
-    Sonar.get().getVerboseHandler().getAudiences().remove(event.getPlayer().getName());
-  }
-}
@@ -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.getName(),
-      SonarBungee.INSTANCE.getBungeeAudiences().sender(sender),
-      sender instanceof ProxiedPlayer,
-      sender::hasPermission);
-  }
-}
@@ -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);
  }
@@ -0,0 +1,83 @@
+/*
+ * 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 io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import net.md_5.bungee.netty.ChannelWrapper;
+import net.md_5.bungee.netty.HandlerBoss;
+import net.md_5.bungee.protocol.DefinedPacket;
+import net.md_5.bungee.protocol.PacketWrapper;
+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.common.fallback.FallbackChannelHandlerAdapter;
+
+import java.lang.reflect.Field;
+import java.net.InetSocketAddress;
+
+import static net.md_5.bungee.netty.PipelineUtils.*;
+
+public final class FallbackChannelHandler extends FallbackChannelHandlerAdapter {
+
+  public FallbackChannelHandler(final @NotNull Channel channel) {
+    super(channel);
+  }
+
+  private static final Field CHANNEL_WRAPPER_FIELD;
+
+  static {
+    try {
+      CHANNEL_WRAPPER_FIELD = HandlerBoss.class.getDeclaredField("channel");
+      CHANNEL_WRAPPER_FIELD.setAccessible(true);
+    } catch (Exception exception) {
+      throw new ReflectiveOperationException(exception);
+    }
+  }
+
+  @Override
+  public void channelRead(final @NotNull ChannelHandlerContext ctx, final Object msg) throws Exception {
+    // Intercept any packets processed by BungeeCord
+    if (listenForPackets && msg instanceof PacketWrapper) {
+      final PacketWrapper packetWrapper = (PacketWrapper) msg;
+      final DefinedPacket wrappedPacket = packetWrapper.packet;
+      // Don't handle any invalid packets
+      if (wrappedPacket != null) {
+        // Intercept any handshake packet by the client
+        if (wrappedPacket instanceof Handshake) {
+          final Handshake handshake = (Handshake) wrappedPacket;
+          handleHandshake(handshake.getHost(), handshake.getProtocolVersion());
+        }
+        // Intercept any server login packet by the client
+        else if (wrappedPacket instanceof LoginRequest) {
+          // 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;
+        }
+      }
+    }
+    // Make sure to let the server handle the rest
+    ctx.fireChannelRead(msg);
+  }
+}
@@ -0,0 +1,60 @@
+/*
+ * 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 io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import lombok.RequiredArgsConstructor;
+import xyz.jonesdev.sonar.api.ReflectiveOperationException;
+
+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 MethodHandle INIT_CHANNEL_METHOD;
+
+  static {
+    try {
+      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);
+    }
+  }
+
+  private final ChannelInitializer<Channel> originalChannelInitializer;
+
+  @Override
+  protected void initChannel(final Channel channel) throws Exception {
+    // Invoke the original method
+    try {
+      INIT_CHANNEL_METHOD.invokeExact(originalChannelInitializer, channel);
+    } catch (Throwable throwable) {
+      throw new ReflectiveOperationException(throwable);
+    }
+
+    if (channel.pipeline().get(PACKET_DECODER) != null) {
+      channel.pipeline().addAfter(PACKET_DECODER, FALLBACK_HANDLER, new FallbackChannelHandler(channel));
+    }
+  }
+}
@@ -1,87 +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 io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.haproxy.HAProxyMessage;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.connection.DownstreamBridge;
-import net.md_5.bungee.connection.UpstreamBridge;
-import net.md_5.bungee.netty.ChannelWrapper;
-import net.md_5.bungee.netty.HandlerBoss;
-import net.md_5.bungee.netty.PacketHandler;
-import net.md_5.bungee.protocol.PacketWrapper;
-import org.jetbrains.annotations.NotNull;
-
-public final class FallbackHandlerBoss extends HandlerBoss {
-  private ChannelWrapper channel;
-  private PacketHandler handler;
-
-  @Override
-  public void setHandler(final @NotNull PacketHandler handler) {
-    this.handler = handler;
-    super.setHandler(handler);
-  }
-
-  @Override
-  public void channelActive(final ChannelHandlerContext ctx) throws Exception {
-    if (handler != null) {
-      channel = new ChannelWrapper(ctx);
-      super.channelActive(ctx);
-    }
-  }
-
-  @Override
-  public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
-    if (handler != null) {
-      channel.markClosed();
-      super.channelInactive(ctx);
-    }
-  }
-
-  @Override
-  public void channelWritabilityChanged(final ChannelHandlerContext ctx) throws Exception {
-    if (handler != null) {
-      handler.writabilityChanged(channel);
-      super.channelWritabilityChanged(ctx);
-    }
-  }
-
-  @Override
-  public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
-    if (msg instanceof HAProxyMessage || msg instanceof PacketWrapper) {
-      super.channelRead(ctx, msg);
-    }
-  }
-
-  @Override
-  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final Throwable throwable) throws Exception {
-    if (ctx.channel().isActive()) {
-      if (handler instanceof DownstreamBridge || handler instanceof UpstreamBridge) {
-        try {
-          handler.exception(throwable);
-        } catch (Exception exception) {
-          ProxyServer.getInstance().getLogger().severe(handler + " - exception processing exception: " + exception);
-        }
-      }
-
-      channel.markClosed();
-      ctx.close();
-    }
-  }
-}
@@ -1,364 +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 io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.CorruptedFrameException;
-import io.netty.handler.codec.DecoderException;
-import lombok.Getter;
-import lombok.val;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
-import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.EncryptionUtil;
-import net.md_5.bungee.api.config.ListenerInfo;
-import net.md_5.bungee.chat.ComponentSerializer;
-import net.md_5.bungee.connection.InitialHandler;
-import net.md_5.bungee.netty.ChannelWrapper;
-import net.md_5.bungee.protocol.PlayerPublicKey;
-import net.md_5.bungee.protocol.packet.Handshake;
-import net.md_5.bungee.protocol.packet.Kick;
-import net.md_5.bungee.protocol.packet.LoginRequest;
-import net.md_5.bungee.protocol.packet.StatusRequest;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.event.impl.UserVerifyJoinEvent;
-import xyz.jonesdev.sonar.api.fallback.Fallback;
-import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.api.statistics.Counters;
-import xyz.jonesdev.sonar.api.statistics.Statistics;
-import xyz.jonesdev.sonar.common.fallback.FallbackChannelHandler;
-import xyz.jonesdev.sonar.common.fallback.FallbackTimeoutHandler;
-import xyz.jonesdev.sonar.common.fallback.FallbackVerificationHandler;
-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.LoginSuccess;
-import xyz.jonesdev.sonar.common.fallback.traffic.TrafficChannelHooker;
-
-import java.net.InetAddress;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import static net.md_5.bungee.netty.PipelineUtils.*;
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
-import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_19_1;
-import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_19_3;
-import static xyz.jonesdev.sonar.common.utility.geyser.GeyserUtil.isGeyserConnection;
-
-public final class FallbackInitialHandler extends InitialHandler {
-  public FallbackInitialHandler(final @NotNull BungeeCord bungee, final ListenerInfo listener) {
-    super(bungee, listener);
-    this.bungee = bungee;
-  }
-
-  @Getter
-  private ChannelWrapper channelWrapper;
-  private final @NotNull BungeeCord bungee;
-  private @Nullable FallbackUserWrapper user;
-  @Getter
-  private ProtocolVersion protocolVersion;
-  private boolean receivedLoginPacket;
-  private boolean receivedStatusPacket;
-
-  private static final @NotNull Fallback FALLBACK = Objects.requireNonNull(Sonar.get().getFallback());
-
-  @Override
-  public void connected(final ChannelWrapper channelWrapper) throws Exception {
-    this.channelWrapper = channelWrapper;
-    super.connected(channelWrapper);
-    // Increase connections per second for the action bar verbose
-    Counters.CONNECTIONS_PER_SECOND.put(System.nanoTime());
-  }
-
-  @Override
-  public void handle(final @NotNull Handshake handshake) throws Exception {
-    // Check if the host is invalid
-    if (handshake.getHost().isEmpty()) {
-      throw new CorruptedFrameException("Hostname is empty");
-    }
-    super.handle(handshake);
-  }
-
-  @Override
-  public void handle(final StatusRequest statusRequest) throws Exception {
-    // Fix status packet spam exploit
-    if (receivedStatusPacket) {
-      throw new CorruptedFrameException("Duplicate status packet");
-    }
-    receivedStatusPacket = true;
-    // Run the rest of the method asynchronously
-    CompletableFuture.runAsync(() -> {
-      // The channel always stays open because the client sends
-      // a StatusRequest and a Ping packet after one another
-      if (!isConnected()) {
-        throw new CorruptedFrameException("Not connected anymore");
-      }
-      try {
-        super.handle(statusRequest);
-      } catch (Exception exception) {
-        throw new DecoderException(exception);
-      }
-    });
-  }
-
-  @Override
-  public void handle(final LoginRequest loginRequest) throws Exception {
-    // Increase joins per second for the action bar verbose
-    Counters.LOGINS_PER_SECOND.put(System.nanoTime());
-
-    // Fix login packet spam exploit
-    if (receivedLoginPacket || user != null) {
-      throw new CorruptedFrameException("Duplicate login packet");
-    }
-    receivedLoginPacket = true;
-    // Cache protocol version so other handlers don't throw NPEs
-    final int protocolId = getHandshake().getProtocolVersion();
-    protocolVersion = ProtocolVersion.fromId(protocolId);
-    final Channel channel = channelWrapper.getHandle();
-
-    // Run in the channel's event loop
-    channel.eventLoop().execute(() -> {
-
-      // Do not continue if the connection is closed or marked as disconnected
-      if (channelWrapper.isClosed() || channelWrapper.isClosing()) return;
-
-      try {
-        // Hook the custom traffic pipeline, so we can count the incoming and outgoing traffic
-        final ChannelPipeline pipeline = channel.pipeline();
-        TrafficChannelHooker.hook(pipeline, PACKET_DECODER, PACKET_ENCODER);
-
-        // Increase total traffic statistic
-        Statistics.TOTAL_TRAFFIC.increment();
-
-        final InetAddress inetAddress = getAddress().getAddress();
-        // Check the blacklist here since we cannot let the player "ghost join"
-        if (FALLBACK.getBlacklisted().has(inetAddress)) {
-          closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getBlacklisted()));
-          return;
-        }
-
-        // Check if the verification is enabled
-        if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
-          super.handle(loginRequest);
-          return;
-        }
-
-        // Completely skip Geyser connections
-        if (isGeyserConnection(channel)) {
-          FALLBACK.getLogger().info("Skipping Geyser player: {}{}",
-            loginRequest.getData(), Sonar.get().getConfig().formatAddress(inetAddress));
-          super.handle(loginRequest);
-          return;
-        }
-
-        // Check if the protocol ID of the player is not allowed to enter the server
-        if (Sonar.get().getConfig().getVerification().getBlacklistedProtocols().contains(protocolId)) {
-          closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getProtocolBlacklisted()));
-          return;
-        }
-
-        val uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + loginRequest.getData()).getBytes(StandardCharsets.UTF_8));
-        // Check if the player is already verified
-        if (Sonar.get().getVerifiedPlayerController().has(inetAddress, uuid)) {
-          super.handle(loginRequest);
-          return;
-        }
-
-        // Check if the protocol ID of the player is allowed to bypass verification
-        if (Sonar.get().getConfig().getVerification().getWhitelistedProtocols().contains(protocolId)) {
-          super.handle(loginRequest);
-          return;
-        }
-
-        // Create wrapped Fallback user
-        user = new FallbackUserWrapper(
-          FALLBACK, this, channel, channel.pipeline(),
-          inetAddress, protocolVersion
-        );
-
-        // Perform default BungeeCord checks
-        if (bungee.config.isEnforceSecureProfile()
-          && user.getProtocolVersion().compareTo(MINECRAFT_1_19_3) < 0) {
-          final PlayerPublicKey publicKey = loginRequest.getPublicKey();
-          if (publicKey == null) {
-            disconnect(bungee.getTranslation("secure_profile_required"));
-            return;
-          }
-          if (Instant.ofEpochMilli(publicKey.getExpiry()).isBefore(Instant.now())) {
-            disconnect(bungee.getTranslation("secure_profile_expired"));
-            return;
-          }
-          if (user.getProtocolVersion().compareTo(MINECRAFT_1_19_1) < 0
-            && !EncryptionUtil.check(publicKey, null)) {
-            disconnect(bungee.getTranslation("secure_profile_invalid"));
-            return;
-          }
-        }
-
-        // Check if the player is already queued since we don't want bots to flood the queue
-        if (FALLBACK.getQueue().getQueuedPlayers().containsKey(inetAddress)) {
-          closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getAlreadyQueued()));
-          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)) {
-          closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getAlreadyVerifying()));
-          return;
-        }
-
-        // Check if the IP address is currently being rate-limited
-        if (!FALLBACK.getRatelimiter().attempt(inetAddress)) {
-          closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getTooFastReconnect()));
-          return;
-        }
-
-        // We have to add this pipeline to monitor whenever the client disconnects
-        // to remove them from the list of connected and queued players
-        pipeline.addFirst(FALLBACK_HANDLER, new FallbackChannelHandler(loginRequest.getData(), inetAddress));
-
-        // Queue the connection for further processing
-        FALLBACK.getQueue().queue(inetAddress, () -> channel.eventLoop().execute(() -> {
-
-          // Do not continue if the connection is closed or marked as disconnected
-          if (channelWrapper.isClosed() || channelWrapper.isClosing()) return;
-
-          // 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()) {
-            closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getInvalidUsername()));
-            return;
-          }
-
-          // Add better timeout handler to avoid known exploits or issues
-          // We also want to timeout bots quickly to avoid flooding
-          final int readTimeout = Sonar.get().getConfig().getVerification().getReadTimeout();
-          pipeline.replace(TIMEOUT_HANDLER, TIMEOUT_HANDLER,
-            new FallbackTimeoutHandler(readTimeout, TimeUnit.MILLISECONDS));
-
-          // Disconnect if the protocol version could not be resolved
-          if (user.getProtocolVersion().isUnknown()) {
-            closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getInvalidProtocol()));
-            return;
-          }
-
-          // Check if the player is already connected to the proxy but still tries to verify
-          final int limit = bungee.config.getPlayerLimit();
-          if (limit > 0 && bungee.getOnlineCount() >= limit) {
-            disconnect(bungee.getTranslation("proxy_full"));
-            return;
-          } else if (!isOnlineMode() && bungee.getPlayer(loginRequest.getData()) != null) {
-            closeWith(getKickPacket(Sonar.get().getConfig().getVerification().getAlreadyConnected()));
-            return;
-          }
-
-          // The player joined the verification
-          Statistics.REAL_TRAFFIC.increment();
-
-          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()
-              || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
-              FALLBACK.getLogger().info(Sonar.get().getConfig().getVerification().getConnectLog()
-                .replace("%name%", loginRequest.getData())
-                .replace("%ip%", Sonar.get().getConfig().formatAddress(inetAddress))
-                .replace("%protocol%", String.valueOf(user.getProtocolVersion().getProtocol())));
-            }
-          }
-
-          // Call the VerifyJoinEvent for external API usage
-          Sonar.get().getEventManager().publish(new UserVerifyJoinEvent(loginRequest.getData(), user));
-
-          // Mark the player as connected → verifying players
-          FALLBACK.getConnected().put(loginRequest.getData(), inetAddress);
-
-          // This sometimes happens when the channel hangs, but the player is still connecting
-          // This also fixes a unique issue with TCPShield and other reverse proxies
-          if (user.getPipeline().get(PACKET_ENCODER) == null
-            || user.getPipeline().get(PACKET_DECODER) == null) {
-            channelWrapper.close();
-            return;
-          }
-
-          // Replace normal encoder to allow custom packets
-          final FallbackPacketEncoder encoder = new FallbackPacketEncoder(user.getProtocolVersion());
-          user.getPipeline().replace(PACKET_ENCODER, FALLBACK_PACKET_ENCODER, encoder);
-
-          // Send LoginSuccess packet to make the client think they are joining the server
-          user.write(new LoginSuccess(loginRequest.getData(), uuid));
-
-          // The LoginSuccess packet has been sent, now we can change the registry state
-          encoder.updateRegistry(user.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0
-            ? FallbackPacketRegistry.CONFIG : FallbackPacketRegistry.GAME);
-
-          // Replace normal decoder to allow custom packets
-          user.getPipeline().replace(PACKET_DECODER, FALLBACK_PACKET_DECODER,
-            new FallbackPacketDecoder(user, new FallbackVerificationHandler(user, loginRequest.getData(), uuid)));
-        }));
-      } catch (Throwable throwable) {
-        throw new ReflectiveOperationException(throwable);
-      }
-    });
-  }
-
-  private static final Map<Component, Kick> CACHED_KICK_PACKETS = new ConcurrentHashMap<>(10);
-
-  public static @NotNull Kick getKickPacket(final @NotNull Component component) {
-    Kick cachedKickPacket = CACHED_KICK_PACKETS.get(component);
-    if (cachedKickPacket == null) {
-      final String serialized = JSONComponentSerializer.json().serialize(component);
-      cachedKickPacket = new Kick(ComponentSerializer.deserialize(serialized));
-      CACHED_KICK_PACKETS.put(component, cachedKickPacket);
-    }
-    return cachedKickPacket;
-  }
-
-  // Mostly taken from Velocity
-  public void closeWith(final Object msg) {
-    if (channelWrapper.getHandle().isActive()) {
-      boolean is17 = protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0
-        && protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_7_2) >= 0;
-      if (is17) {
-        channelWrapper.getHandle().eventLoop().execute(() -> {
-          channelWrapper.getHandle().config().setAutoRead(false);
-          channelWrapper.getHandle().eventLoop().schedule(() -> {
-            channelWrapper.markClosed();
-            channelWrapper.getHandle().writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
-          }, 250L, TimeUnit.MILLISECONDS);
-        });
-      } else {
-        channelWrapper.markClosed();
-        channelWrapper.getHandle().writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
-      }
-    }
-  }
-}
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.bungee.fallback.injection;
+package xyz.jonesdev.sonar.bungee.fallback;

 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
@@ -27,20 +27,27 @@ import xyz.jonesdev.sonar.api.ReflectiveOperationException;
 import java.lang.reflect.Field;

@UtilityClass
-public class BaseInjectionHelper {
-  public void inject(final ChannelInitializer<Channel> childHandler) {
+public class FallbackInjectionHelper {
+  public void inject() {
    try {
      final Field childField = PipelineUtils.class.getField("SERVER_CHILD");
      childField.setAccessible(true);

+      // Make sure to store the original channel initializer
+      final ChannelInitializer<Channel> originalInitializer = PipelineUtils.SERVER_CHILD;
+      final ChannelInitializer<Channel> fallbackInitializer = new FallbackChannelInitializer(originalInitializer);
+
      final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
      unsafeField.setAccessible(true);
      final Unsafe unsafe = (Unsafe) unsafeField.get(null);

+      // Get the base object (the object containing the field)
      final Object base = unsafe.staticFieldBase(childField);
+      // Get the offset of the static field within its class
      final long offset = unsafe.staticFieldOffset(childField);

-      unsafe.putObject(base, offset, childHandler);
+      // Replace the original channel initializer
+      unsafe.putObject(base, offset, fallbackInitializer);
    } catch (Exception exception) {
      throw new ReflectiveOperationException(exception);
    }
@@ -1,59 +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.md_5.bungee.api.event.LoginEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.bungee.SonarBungee;
-
-import java.net.InetAddress;
-import java.util.Objects;
-
-@RequiredArgsConstructor
-public final class FallbackListener implements Listener {
-
-  @SuppressWarnings("deprecation")
-  @EventHandler(priority = EventPriority.LOWEST)
-  public void handle(final @NotNull LoginEvent event) {
-    final InetAddress inetAddress = event.getConnection().getAddress().getAddress();
-
-    // 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();
-
-    if (maxOnlinePerIp > 0) {
-      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 FallbackInitialHandler fallbackInitialHandler = (FallbackInitialHandler) event.getConnection();
-        final Component component = Sonar.get().getConfig().getTooManyOnlinePerIp();
-        fallbackInitialHandler.closeWith(FallbackInitialHandler.getKickPacket(component));
-      }
-    }
-  }
-}
@@ -1,66 +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 io.netty.channel.Channel;
-import io.netty.channel.ChannelPipeline;
-import io.netty.util.ReferenceCountUtil;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-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.fallback.protocol.packets.play.Disconnect;
-
-import java.net.InetAddress;
-
-@Getter
-@RequiredArgsConstructor
-public final class FallbackUserWrapper implements FallbackUser<FallbackInitialHandler> {
-  private final Fallback fallback;
-  private final FallbackInitialHandler connection;
-  private final Channel channel;
-  private final ChannelPipeline pipeline;
-  private final InetAddress inetAddress;
-  private final ProtocolVersion protocolVersion;
-
-  @Override
-  public void disconnect(final @NotNull Component reason) {
-    connection.closeWith(Disconnect.create(reason));
-  }
-
-  @Override
-  public void write(final @NotNull Object packet) {
-    if (channel.isActive()) {
-      channel.writeAndFlush(packet, channel.voidPromise());
-    } else {
-      ReferenceCountUtil.release(packet);
-    }
-  }
-
-  @Override
-  public void delayedWrite(final @NotNull Object packet) {
-    if (channel.isActive()) {
-      channel.write(packet, channel.voidPromise());
-    } else {
-      ReferenceCountUtil.release(packet);
-    }
-  }
-}
@@ -1,77 +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.injection;
-
-import io.netty.channel.*;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.netty.PipelineUtils;
-import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.bungee.fallback.FallbackHandlerBoss;
-import xyz.jonesdev.sonar.bungee.fallback.varint.Varint21FrameDecoder;
-import xyz.jonesdev.sonar.common.fallback.FallbackTimeoutHandler;
-
-import java.lang.reflect.Field;
-import java.util.concurrent.TimeUnit;
-
-import static net.md_5.bungee.netty.PipelineUtils.*;
-
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class BaseChannelInitializer extends ChannelInitializer<Channel> {
-  public static final BaseChannelInitializer INSTANCE = new BaseChannelInitializer();
-
-  private static final boolean REPLACE_VAR_INT_DECODER = !Boolean.getBoolean("sonar.do-not-replace-decoder");
-
-  // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/network/ConnectionManager.java#L57
-  private static final WriteBufferWaterMark SERVER_WRITE_MARK = new WriteBufferWaterMark(1 << 20, 1 << 21);
-
-  private static final Varint21LengthFieldPrepender FRAME_ENCODER;
-
-  static {
-    try {
-      final Field frameEncoder = PipelineUtils.class.getDeclaredField("framePrepender");
-      frameEncoder.setAccessible(true);
-      FRAME_ENCODER = (Varint21LengthFieldPrepender) frameEncoder.get(null);
-    } catch (Throwable throwable) {
-      throw new ReflectiveOperationException(throwable);
-    }
-  }
-
-  // Mostly taken from BungeeCord
-  // https://github.com/SpigotMC/BungeeCord/blob/master/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java#L162
-  @Override
-  protected void initChannel(final @NotNull Channel channel) throws Exception {
-    try {
-      channel.config().setOption(ChannelOption.IP_TOS, 0x18);
-    } catch (ChannelException ignored) {
-    }
-
-    channel.config().setOption(ChannelOption.TCP_NODELAY, true);
-    channel.config().setWriteBufferWaterMark(SERVER_WRITE_MARK);
-
-    channel.pipeline().addLast(FRAME_DECODER, REPLACE_VAR_INT_DECODER
-      ? new Varint21FrameDecoder() : new net.md_5.bungee.protocol.Varint21FrameDecoder());
-    channel.pipeline().addLast(TIMEOUT_HANDLER, new FallbackTimeoutHandler(
-      BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS));
-    channel.pipeline().addLast(FRAME_PREPENDER, FRAME_ENCODER);
-    channel.pipeline().addLast(BOSS_HANDLER, new FallbackHandlerBoss());
-  }
-}
@@ -1,96 +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.injection;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import io.netty.handler.codec.haproxy.HAProxyMessageDecoder;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.api.config.ListenerInfo;
-import net.md_5.bungee.api.event.ClientConnectEvent;
-import net.md_5.bungee.netty.PipelineUtils;
-import net.md_5.bungee.protocol.*;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.bungee.fallback.FallbackHandlerBoss;
-import xyz.jonesdev.sonar.bungee.fallback.FallbackInitialHandler;
-
-import java.lang.reflect.Field;
-import java.net.SocketAddress;
-
-import static net.md_5.bungee.netty.PipelineUtils.*;
-
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ChildChannelInitializer extends ChannelInitializer<Channel> {
-  public static final ChildChannelInitializer INSTANCE = new ChildChannelInitializer();
-
-  private static final BaseChannelInitializer BASE = BaseChannelInitializer.INSTANCE;
-  private static final BungeeCord BUNGEE = BungeeCord.getInstance();
-  private static final KickStringWriter LEGACY_KICK;
-
-  static {
-    try {
-      final Field kickField = PipelineUtils.class.getDeclaredField("legacyKicker");
-      kickField.setAccessible(true);
-      LEGACY_KICK = (KickStringWriter) kickField.get(null);
-    } catch (Throwable throwable) {
-      throw new ReflectiveOperationException(throwable);
-    }
-  }
-
-  // Mostly taken from BungeeCord
-  // https://github.com/SpigotMC/BungeeCord/blob/master/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-  @Override
-  protected void initChannel(final @NotNull Channel channel) throws Exception {
-    final SocketAddress remoteAddress = channel.remoteAddress() == null ? channel.parent().localAddress()
-      : channel.remoteAddress();
-
-    if (BUNGEE.getConnectionThrottle() != null && BUNGEE.getConnectionThrottle().throttle(remoteAddress)) {
-      channel.close();
-    } else {
-      final ListenerInfo listener = channel.attr(PipelineUtils.LISTENER).get();
-
-      if (BungeeCord.getInstance().getPluginManager().callEvent(new ClientConnectEvent(remoteAddress, listener)).isCancelled()) {
-        channel.close();
-      } else {
-        try {
-          BASE.initChannel(channel);
-        } catch (Exception exception) {
-          exception.printStackTrace(System.err);
-          channel.close();
-          return;
-        }
-
-        channel.pipeline().addBefore(FRAME_DECODER, LEGACY_DECODER, new LegacyDecoder());
-        channel.pipeline().addAfter(FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder(
-          Protocol.HANDSHAKE, true, ProtocolVersion.LATEST_VERSION.getProtocol()));
-        channel.pipeline().addAfter(FRAME_PREPENDER, PACKET_ENCODER, new MinecraftEncoder(
-          Protocol.HANDSHAKE, true, ProtocolVersion.LATEST_VERSION.getProtocol()));
-        channel.pipeline().addBefore(FRAME_PREPENDER, LEGACY_KICKER, LEGACY_KICK);
-        channel.pipeline().get(FallbackHandlerBoss.class).setHandler(new FallbackInitialHandler(BUNGEE, listener));
-
-        if (listener.isProxyProtocol()) {
-          channel.pipeline().addFirst(new HAProxyMessageDecoder());
-        }
-      }
-    }
-  }
-}
@@ -1,92 +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.varint;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.ByteToMessageDecoder;
-import io.netty.handler.codec.CorruptedFrameException;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-// Mostly taken from
-// https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
-public final class Varint21FrameDecoder extends ByteToMessageDecoder {
-
-  @Override
-  protected void decode(final @NotNull ChannelHandlerContext ctx,
-                        final ByteBuf byteBuf,
-                        final List<Object> out) throws Exception {
-    if (!ctx.channel().isActive() || !byteBuf.isReadable()) {
-      // MessageToMessageDecoder always do release after decoding
-      // https://github.com/jonesdevelopment/sonar-legacy/pull/5
-      return;
-    }
-
-    final VarintByteDecoder reader = new VarintByteDecoder();
-    final int end = byteBuf.forEachByte(reader);
-
-    if (end == -1) {
-      // This is probably a good sign that the buffer was too short or empty
-      // since the ByteBuf cannot hold a proper VarInt.
-      if (reader.getResult() == VarintByteDecoder.DecoderResult.RUN_OF_ZEROES) {
-        byteBuf.clear();
-      }
-      return;
-    }
-
-    switch (reader.getResult()) {
-      case RUN_OF_ZEROES: {
-        // this will return to the point where the next varInt starts
-        byteBuf.readerIndex(end);
-        break;
-      }
-
-      case SUCCESS: {
-        final int readVarInt = reader.getReadVarInt();
-
-        if (readVarInt < 0) {
-          byteBuf.clear();
-          throw new CorruptedFrameException("Result: " + reader);
-        } else if (readVarInt == 0) {
-          // Actually, we don't want to throw an Exception if the packet is empty.
-          // The check would also false flag a lot of legit players since packets
-          // in 1.7 could sometimes be empty.
-          byteBuf.readerIndex(end + 1);
-          return;
-        }
-
-        final int bytesRead = reader.getBytesRead();
-        final int minimumRead = bytesRead + readVarInt;
-
-        if (byteBuf.isReadable(minimumRead)) {
-          out.add(byteBuf.retainedSlice(end + 1, readVarInt));
-
-          byteBuf.skipBytes(minimumRead);
-        }
-        break;
-      }
-
-      default: {
-        byteBuf.clear();
-        throw new CorruptedFrameException("Result: " + reader);
-      }
-    }
-  }
-}
@@ -1,63 +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.varint;
-
-import io.netty.util.ByteProcessor;
-import lombok.Getter;
-import lombok.ToString;
-
-// Taken from
-// https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/VarintByteDecoder.java
-@Getter
-@ToString
-public final class VarintByteDecoder implements ByteProcessor {
-  private DecoderResult result = DecoderResult.TOO_SMALL;
-  private int readVarInt, bytesRead;
-
-  @Override
-  public boolean process(byte b) throws Exception {
-    if (b == 0 && bytesRead == 0) {
-      result = DecoderResult.RUN_OF_ZEROES;
-      return true;
-    }
-
-    if (result == DecoderResult.RUN_OF_ZEROES) {
-      return false;
-    }
-
-    readVarInt |= (b & 0x7F) << bytesRead++ * 7;
-
-    if (bytesRead > 3) {
-      result = DecoderResult.TOO_BIG;
-      return false;
-    }
-
-    if ((b & 0x80) != 128) {
-      result = DecoderResult.SUCCESS;
-      return false;
-    }
-    return true;
-  }
-
-  public enum DecoderResult {
-    SUCCESS,
-    TOO_SMALL,
-    TOO_BIG,
-    RUN_OF_ZEROES
-  }
-}
@@ -1,6 +1,10 @@
 dependencies {
  compileOnly(project(":api"))
+
+  compileOnly(rootProject.libs.adventure.nbt)
+
+  implementation(rootProject.libs.capja)
 }

-java.sourceCompatibility = JavaVersion.VERSION_1_8
-java.targetCompatibility = JavaVersion.VERSION_1_8
+java.sourceCompatibility = JavaVersion.VERSION_11
+java.targetCompatibility = JavaVersion.VERSION_11
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 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.boot;
+
+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, final @NotNull SonarPlatform platform) {
+    libraryManager.addMavenCentral();
+    libraryManager.addJitPack();
+    libraryManager.loadLibraries(
+      // Simple-YAML
+      Library.builder()
+        .groupId("com{}github{}Carleslc{}Simple-YAML")
+        .artifactId("Simple-Yaml")
+        .version("1.8.4")
+        .relocate("com{}simpleyaml", "xyz{}jonesdev{}sonar{}libs{}yaml")
+        .build(),
+      // Gson
+      Library.builder()
+        .groupId("com{}google{}code{}gson")
+        .artifactId("gson")
+        .version("2.10.1")
+        .relocate("com{}google{}gson", "xyz{}jonesdev{}sonar{}libs{}gson")
+        .build(),
+      // Caffeine
+      Library.builder()
+        .groupId("com.github.ben-manes.caffeine")
+        .artifactId("caffeine")
+        .version("3.1.8")
+        .relocate("com{}github{}benmanes{}caffeine", "xyz{}jonesdev{}sonar{}libs{}caffeine")
+        .build(),
+      // ORMLite
+      Library.builder()
+        .groupId("com{}j256{}ormlite")
+        .artifactId("ormlite-jdbc")
+        .version("6.1")
+        .relocate("com{}j256{}ormlite", "xyz{}jonesdev{}sonar{}libs{}ormlite")
+        .build(),
+      // MySQL driver
+      Library.builder()
+        .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()
+      );
+    }
+  }
+}
@@ -17,29 +17,33 @@

 package xyz.jonesdev.sonar.common.boot;

+import com.alessiodp.libby.LibraryManager;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.Ticker;
+import com.j256.ormlite.logger.Level;
+import com.j256.ormlite.logger.Logger;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.cappuccino.Cappuccino;
-import xyz.jonesdev.cappuccino.ExpiringCache;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.SonarSupplier;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.controller.VerifiedPlayerController;
-import xyz.jonesdev.sonar.api.fallback.FallbackRatelimiter;
+import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 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.ServiceRepository;
+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;

 import java.io.File;
-import java.net.InetAddress;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;

@Getter
@RequiredArgsConstructor
@@ -47,26 +51,34 @@ public abstract class SonarBootstrap<T> implements Sonar {
  private T plugin;
  @Setter
  private Verbose verboseHandler;
+  @Setter
+  private Notification notificationHandler;
  private SonarConfiguration config;
  private VerifiedPlayerController verifiedPlayerController;
-  private File dataDirectory;
+  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 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);
-
-    // Set the plugin instance before anything else
+    // 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();
    this.config = new SonarConfiguration(dataDirectory);
    this.subcommandRegistry = new SubcommandRegistryHolder();
+    // Hide unnecessary debug information
+    Logger.setGlobalLogLevel(Level.WARNING);
  }

  public final void initialize() {
@@ -86,13 +98,14 @@ public abstract class SonarBootstrap<T> implements Sonar {
    getLogger().info("Successfully initialized components in {}s!", launchTimer);
    getLogger().info("Enabling all tasks and features...");

-    // Start all service threads
-    ServiceRepository.register();
-
    try {
      // 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) {
@@ -113,30 +126,66 @@ public abstract class SonarBootstrap<T> implements Sonar {
    getConfig().load();

    // Warn player if they reloaded and changed the database type
-    if (getVerifiedPlayerController() != null
-      && getVerifiedPlayerController().getCachedDatabaseType() != getConfig().getDatabase().getType()) {
-      Sonar.get().getLogger().warn("Reloading the server after changing the database type"
-        + " is generally not recommended as it can sometimes cause data loss.");
+    if (verifiedPlayerController != null
+      && verifiedPlayerController.getCachedDatabaseType() != getConfig().getDatabase().getType()) {
+      getLogger().warn("Reloading after changing the database type is not recommended as it may cause data loss.");
    }

    // Prepare cached packets
+    getLogger().info("Taking cached snapshots of all packets...");
    FallbackPreparer.prepare();

-    // Update ratelimiter
-    final ExpiringCache<InetAddress> expiringCache = Cappuccino.buildExpiring(
-      getConfig().getVerification().getReconnectDelay(), TimeUnit.MILLISECONDS, 250L);
-    FallbackRatelimiter.INSTANCE.setExpiringCache(expiringCache);
+    // Update ratelimiter caches
+    getFallback().getRatelimiter().setAttemptCache(Caffeine.newBuilder()
+      .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getReconnectDelay()))
+      .ticker(Ticker.systemTicker())
+      .build());
+    getFallback().getRatelimiter().setFailCountCache(Caffeine.newBuilder()
+      .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getRememberTime()))
+      .ticker(Ticker.systemTicker())
+      .build());
+
+    // Update blacklist cache
+    final long blacklistTime = getConfig().getVerification().getBlacklistTime();
+    final boolean blacklistExists = getFallback().getBlacklist() != null;
+    // Make sure the blacklist is only set when we need it to prevent data loss
+    if (!blacklistExists // Make sure we create a new cache if it doesn't exist yet
+      || getFallback().getBlacklistTime() != blacklistTime) {
+      // Create a new cache with the configured blacklist time
+      getFallback().setBlacklist(Caffeine.newBuilder()
+        .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getBlacklistTime()))
+        .ticker(Ticker.systemTicker())
+        .build());
+      // Store the new blacklist time, so we don't have to reset the blacklist every reload
+      getFallback().setBlacklistTime(blacklistTime);
+      // Warn the user about changing the expiry of the blacklist values
+      if (blacklistExists) {
+        getLogger().warn("The blacklist has been reset as the duration of entries has changed.");
+      }
+    }

    // 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...");
-
-    // Shut down service threads
-    ServiceRepository.shutdown();
-
+    // 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();
 }
@@ -15,30 +15,47 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.fallback.traffic;
+package xyz.jonesdev.sonar.common.fallback;

 import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOutboundHandlerAdapter;
 import io.netty.channel.ChannelPromise;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter;
+
+import static xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics.INCOMING;
+import static xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics.OUTGOING;

@ChannelHandler.Sharable
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class OutgoingBandwidthEncoder extends ChannelOutboundHandlerAdapter {
-  public static final OutgoingBandwidthEncoder INSTANCE = new OutgoingBandwidthEncoder();
+public final class FallbackBandwidthHandler extends ChannelDuplexHandler {
+  public static final ChannelHandler INSTANCE = new FallbackBandwidthHandler();
+
+  @Override
+  public void channelRead(final @NotNull ChannelHandlerContext ctx,
+                          final @NotNull Object msg) throws Exception {
+    // We can only get the size of a message if it's a ByteBuf
+    if (msg instanceof ByteBuf) {
+      // Increment the incoming traffic by the number of readable bytes
+      INCOMING.increment(((ByteBuf) msg).readableBytes());
+    }
+    // Make sure to let the server handle the rest
+    ctx.fireChannelRead(msg);
+  }

  @Override
  public void write(final @NotNull ChannelHandlerContext ctx,
                    final @NotNull Object msg,
-                    final @NotNull ChannelPromise promise) throws Exception {
+                    final ChannelPromise promise) throws Exception {
+    // We can only get the size of a message if it's a ByteBuf
    if (msg instanceof ByteBuf) {
-      TrafficCounter.OUTGOING.increment(((ByteBuf) msg).readableBytes());
+      // Increment the outgoing traffic by the number of readable bytes
+      OUTGOING.increment(((ByteBuf) msg).readableBytes());
    }
+    // Make sure to let the server handle the rest
    ctx.write(msg, promise);
  }
 }
@@ -1,44 +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;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import lombok.RequiredArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.fallback.Fallback;
-
-import java.net.InetAddress;
-
-@RequiredArgsConstructor
-public final class FallbackChannelHandler extends ChannelInboundHandlerAdapter {
-  private static final @NotNull Fallback FALLBACK = Sonar.get().getFallback();
-  private final @NotNull String username;
-  private final @NotNull InetAddress inetAddress;
-
-  @Override
-  public void channelUnregistered(final @NotNull ChannelHandlerContext ctx) {
-    // Remove the username from the connected players
-    FALLBACK.getConnected().remove(username);
-    // Remove the IP address from the queue
-    FALLBACK.getQueue().remove(inetAddress);
-    // Make sure other handlers also know we've disconnected
-    ctx.fireChannelUnregistered();
-  }
-}
@@ -0,0 +1,254 @@
+/*
+ * 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;
+
+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.protocol.FallbackPreparer.*;
+
+@RequiredArgsConstructor
+public class FallbackChannelHandlerAdapter extends ChannelInboundHandlerAdapter {
+  protected final Channel channel;
+  protected @Nullable String username;
+  protected InetAddress inetAddress;
+  protected ProtocolVersion protocolVersion;
+  protected boolean listenForPackets = true;
+
+  protected static final Fallback FALLBACK = Sonar.get().getFallback();
+
+  @Override
+  public final void channelActive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+    // Increase connections per second for the action bar verbose
+    GlobalSonarStatistics.countConnection();
+    // Hook the traffic listener
+    channel.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
+    // Make sure to let the server handle the rest
+    ctx.fireChannelActive();
+  }
+
+  @Override
+  public final void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+    // The player can disconnect without sending the login packet first
+    // Account for this by checking if the inetAddress has been set yet
+    if (inetAddress != null) {
+      // Remove the IP address from the connected players
+      FALLBACK.getConnected().remove(inetAddress);
+      // Remove the IP address from the queue
+      FALLBACK.getQueue().getQueuedPlayers().remove(inetAddress);
+      // Remove this account from the online players
+      // or decrement the number of accounts with the same IP
+      FALLBACK.getOnline().compute(inetAddress, (key, value) -> {
+        if (value == null || value <= 1) {
+          return null;
+        } else {
+          return value - 1;
+        }
+      });
+    }
+    // Make sure to let the server handle the rest
+    ctx.fireChannelInactive();
+  }
+
+  // We can override the default exceptionCaught method since this handler
+  // will run before the connection knows that there has been an error.
+  // Additionally, this will also run after our custom decoder.
+  @Override
+  public final void exceptionCaught(final @NotNull ChannelHandlerContext ctx,
+                                    final @NotNull Throwable cause) throws Exception {
+    // 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);
+  }
+
+  /**
+   * 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 Minecraft versions older than 1.7.2
+      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 with the same IP address
+    if (FALLBACK.getConnected().containsKey(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
+      final FallbackUser 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 {
+    // Increment the number of accounts with the same IP
+    FALLBACK.getOnline().compute(inetAddress, (key, value) -> value == null ? 1 : value + 1);
+
+    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
+      final int onlinePerIp = FALLBACK.getOnline().getOrDefault(inetAddress, 0);
+      if (onlinePerIp > maxOnlinePerIp) {
+        customDisconnect(channel, protocolVersion, tooManyOnlinePerIP, encoder, handler);
+        return;
+      }
+    }
+
+    // Don't listen for further packets
+    // TODO: deject the pipeline without breaking disconnect logic
+    listenForPackets = false;
+    // Let the server know about the login packet
+    ctx.fireChannelRead(loginPacket);
+  }
+}
@@ -26,8 +26,6 @@ import org.jetbrains.annotations.NotNull;
 import java.util.concurrent.TimeUnit;

 public final class FallbackTimeoutHandler extends IdleStateHandler {
-  private boolean knownDisconnect;
-
  public FallbackTimeoutHandler(final long timeout, final TimeUnit timeUnit) {
    super(timeout, 0L, 0L, timeUnit);
  }
@@ -35,21 +33,16 @@ public final class FallbackTimeoutHandler extends IdleStateHandler {
  @Override
  protected void channelIdle(final ChannelHandlerContext ctx,
                             final @NotNull IdleStateEvent idleStateEvent) throws Exception {
-    assert idleStateEvent.state() == IdleState.READER_IDLE;
-    readTimedOut(ctx);
-  }
+    // We are only checking the read timeout state - skip all other states
+    if (idleStateEvent.state() != IdleState.READER_IDLE) {
+      return;
+    }

-  private void readTimedOut(final ChannelHandlerContext ctx) {
-    if (!knownDisconnect) {
-
-      // The netty (default) ReadTimeoutHandler would normally just throw an Exception
-      // The default ReadTimeoutHandler does only check for the boolean 'closed' and
-      // still throws the Exception even if the channel is closed
-      if (ctx.channel().isActive()) {
-        ctx.close();
-      }
-
-      knownDisconnect = true;
+    // The netty (default) ReadTimeoutHandler would normally just throw an Exception
+    // The default ReadTimeoutHandler does only check for the boolean 'closed' and
+    // still throws the Exception even if the channel is closed
+    if (ctx.channel().isActive()) {
+      ctx.close();
    }
  }
 }
@@ -0,0 +1,272 @@
+/*
+ * 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;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.CorruptedFrameException;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
+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.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.timer.SystemTimer;
+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.FallbackPreparer;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.DisconnectPacket;
+import xyz.jonesdev.sonar.common.fallback.session.FallbackLoginSessionHandler;
+import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
+
+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.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"})
+public final class FallbackUserWrapper implements FallbackUser {
+  private final Channel channel;
+  private final ChannelPipeline pipeline;
+  private final InetAddress inetAddress;
+  private final ProtocolVersion protocolVersion;
+  @Setter
+  private boolean receivedClientSettings;
+  @Setter
+  private boolean receivedPluginMessage;
+  private final boolean geyser;
+  private final SystemTimer loginTimer = new SystemTimer();
+
+  public FallbackUserWrapper(final @NotNull Channel channel,
+                             final @NotNull InetAddress inetAddress,
+                             final @NotNull ProtocolVersion protocolVersion,
+                             final boolean geyser) {
+    this.channel = channel;
+    this.pipeline = channel.pipeline();
+    this.inetAddress = inetAddress;
+    this.protocolVersion = protocolVersion;
+    this.geyser = geyser;
+  }
+
+  @Override
+  public void disconnect(final @NotNull Component reason, final boolean duringLogin) {
+    closeWith(channel, protocolVersion, DisconnectPacket.create(reason, duringLogin));
+  }
+
+  @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 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().getCurrentAttack() == null
+        || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
+        Sonar.get().getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getConnectLog()
+          .replace("%name%", username)
+          .replace("%ip%", Sonar.get().getConfig().formatAddress(inetAddress))
+          .replace("%protocol%", String.valueOf(protocolVersion.getProtocol())));
+      }
+    }
+
+    // Call the VerifyJoinEvent for external API usage
+    Sonar.get().getEventManager().publish(new UserVerifyJoinEvent(username, this));
+
+    // Mark the player as connected → verifying players
+    Sonar.get().getFallback().getConnected().put(inetAddress, (byte) 0);
+
+    // Add better timeout handler to avoid known exploits or issues
+    // We also want to timeout bots quickly to avoid flooding
+    final int readTimeout = Sonar.get().getConfig().getVerification().getReadTimeout();
+    pipeline.replace(timeout, timeout, new FallbackTimeoutHandler(readTimeout, TimeUnit.MILLISECONDS));
+
+    // Replace normal encoder to allow custom packets
+    final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
+    pipeline.replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
+
+    channel.eventLoop().execute(() -> {
+      // Remove the main pipeline to completely take over the channel
+      if (pipeline.get(handler) != null) {
+        pipeline.remove(handler);
+      }
+
+      // Send LoginSuccess packet to make the client think they are joining the server
+      write(FallbackPreparer.LOGIN_SUCCESS);
+
+      // 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 {
+        // Replace normal decoder to allow custom packets
+        final FallbackPacketDecoder fallbackPacketDecoder = new FallbackPacketDecoder(protocolVersion);
+        pipeline.replace(decoder, FALLBACK_PACKET_DECODER, fallbackPacketDecoder);
+        // Listen for all incoming packets by setting the packet listener
+        fallbackPacketDecoder.setListener(new FallbackLoginSessionHandler(this, username, uuid));
+      } 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(final @NotNull String reason) {
+    disconnect(Sonar.get().getConfig().getVerification().getVerificationFailed(), false);
+
+    // 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();
+
+    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));
+    }
+
+    // Increment number of total failed verifications
+    GlobalSonarStatistics.totalFailedVerifications++;
+
+    // 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 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;
+
+      // Use 1 as the default amount of fails since we haven't cached anything yet
+      final int fails = Sonar.get().getFallback().getRatelimiter().getFailCountCache().get(inetAddress, ignored -> 1);
+      // Now we simply need to check if the threshold is reached
+      if (fails < blacklistThreshold) {
+        // Make sure we increment the number of fails
+        Sonar.get().getFallback().getRatelimiter().incrementFails(inetAddress, fails);
+        break blacklist;
+      }
+
+      // Call the BotBlacklistedEvent for external API usage
+      Sonar.get().getEventManager().publish(new UserBlacklistedEvent(this));
+
+      // Increment number 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);
+    }
+
+    // Throw an exception to avoid further code execution
+    throw new CorruptedFrameException();
+  }
+
+  /**
+   * @param channel         Channel to close
+   * @param protocolVersion Protocol version
+   * @param msg             Packet to close the channel with
+   */
+  public static void closeWith(final @NotNull Channel channel,
+                               final @NotNull ProtocolVersion protocolVersion,
+                               final @NotNull Object msg) {
+    if (channel.isActive()) {
+      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0
+        && protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_7_2) >= 0) {
+        channel.eventLoop().execute(() -> {
+          channel.config().setAutoRead(false);
+          channel.eventLoop().schedule(() -> {
+            channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
+          }, 250L, TimeUnit.MILLISECONDS);
+        });
+      } else {
+        channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
+      }
+    }
+  }
+
+  /**
+   * Disconnect the player before verification (during login)
+   * by replacing the encoder before running the method.
+   *
+   * @param packet          Disconnect packet
+   * @param encoder         Encoder to replace
+   * @param handler         Main pipeline to remove
+   * @param channel         Channel of the player
+   * @param protocolVersion Protocol version of the player
+   */
+  public static void customDisconnect(final @NotNull Channel channel,
+                                      final @NotNull ProtocolVersion protocolVersion,
+                                      final @NotNull FallbackPacket packet,
+                                      final @NotNull String encoder,
+                                      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 the main pipeline to completely take over the channel
+    if (channel.pipeline().get(boss) != null) {
+      channel.pipeline().remove(boss);
+    }
+    final ChannelHandler currentEncoder = channel.pipeline().get(encoder);
+    // Close the channel if no decoder exists
+    if (currentEncoder != null) {
+      // We don't need to update the encoder if it's already present
+      if (!(currentEncoder instanceof FallbackPacketEncoder)) {
+        final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
+        channel.pipeline().replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
+      }
+      closeWith(channel, protocolVersion, packet);
+    } else {
+      channel.close();
+    }
+  }
+}
@@ -1,623 +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;
-
-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.FallbackUser;
-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.packets.config.FinishConfiguration;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledged;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;
-import xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil;
-
-import java.util.Objects;
-import java.util.Random;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-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.protocol.ProtocolVersion.*;
-import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
-
-public final class FallbackVerificationHandler implements FallbackPacketListener {
-  private static final Random RANDOM = new Random();
-
-  // 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 double posX, posY, posZ, lastY;
-  private boolean resolvedClientBrand, resolvedClientSettings;
-  private boolean listenForMovements;
-
-  // Map captcha
-  private final SystemTimer keepAlive = new SystemTimer();
-  private final SystemTimer actionBar = new SystemTimer();
-  private @Nullable PreparedMapInfo captcha;
-  private int captchaTriesLeft;
-
-  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
-  }
-
-  public FallbackVerificationHandler(final @NotNull FallbackUser<?> user,
-                                     final @NotNull String username,
-                                     final @NotNull UUID playerUuid) {
-    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();
-    }
-  }
-
-  private void configure() {
-    // Set the state to CONFIGURE to avoid false positives
-    state = State.CONFIGURE;
-    // Send the necessary configuration packets to the client
-    user.delayedWrite(REGISTRY_SYNC);
-    user.delayedWrite(FINISH_CONFIGURATION);
-    // Send all packets in one flush
-    user.getChannel().flush();
-    // Set decoder state to actually catch all packets
-    updateEncoderDecoderState(FallbackPacketRegistry.CONFIG);
-  }
-
-  private void updateEncoderDecoderState(final @NotNull FallbackPacketRegistry registry) {
-    val decoder = (FallbackPacketDecoder) user.getChannel().pipeline().get(FALLBACK_PACKET_DECODER);
-    val encoder = (FallbackPacketEncoder) user.getChannel().pipeline().get(FALLBACK_PACKET_ENCODER);
-    if (decoder != null && encoder != null) {
-      // Update the packet registry state to be able to listen for CONFIG packets
-      decoder.updateRegistry(registry);
-      encoder.updateRegistry(registry);
-    } else {
-      // Something went wrong - the decoder should not be null
-      user.getFallback().getLogger().warn("Necessary pipelines for {} not found", username);
-      // Close the channel to prevent bypasses or other potential exploits
-      user.getChannel().close();
-    }
-  }
-
-  private 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;
-      // Generate a random KeepAlive ID for the pre-join check
-      expectedKeepAliveId = RANDOM.nextInt();
-      // Send first KeepAlive to check if the connection is somewhat responsive
-      user.write(new KeepAlive(expectedKeepAliveId));
-    }
-  }
-
-  private void sendTransaction() {
-    // Set the state to TRANSACTION to avoid false positives
-    // and go on with the flow of the verification.
-    state = State.TRANSACTION;
-    // Generate a random transaction ID
-    expectedTransactionId = (short) RANDOM.nextInt();
-    // Send a transaction with the given ID
-    user.write(new Transaction(0, expectedTransactionId, false));
-  }
-
-  private void sendJoinGamePacket() {
-    final boolean v1_20_2 = user.getProtocolVersion().compareTo(MINECRAFT_1_20_2) >= 0;
-    if (!v1_20_2) {
-      // 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;
-    }
-    // Send the JoinGame packet so we can continue the verification
-    user.write(joinGame);
-    if (v1_20_2) {
-      // Perform the transaction check since the ClientSettings
-      // and PluginMessage packets have already been validated.
-      sendTransaction();
-    }
-  }
-
-  private void sendAbilitiesAndTeleport() {
-    // Set the state to TELEPORT to avoid false positives
-    // and go on with the flow of the verification.
-    state = State.TELEPORT;
-    // Make sure the player is unable to fly (the player is in spectator mode)
-    user.delayedWrite(DEFAULT_ABILITIES);
-    // Generate the current teleport ID
-    expectedTeleportId = RANDOM.nextInt(Short.MAX_VALUE);
-    // Teleport the player to the spawn position
-    user.delayedWrite(new PositionLook(
-      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION,
-      0f, -90f, expectedTeleportId, false));
-    // Make sure the player escapes the 1.18.2+ "Loading terrain" screen
-    if (user.getProtocolVersion().compareTo(MINECRAFT_1_18_2) >= 0) {
-      user.delayedWrite(dynamicSpawnPosition);
-    }
-  }
-
-  private void sendChunkData() {
-    // Set the state to POSITION to avoid false positives
-    // and go on with the flow of the verification.
-    state = State.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
-      user.delayedWrite(START_WRITING_CHUNKS);
-    }
-    // Teleport player into the fake lobby by sending an empty chunk
-    user.delayedWrite(EMPTY_CHUNK_DATA);
-    // Send an UpdateSectionBlocks packet with a platform of blocks
-    // to check if the player collides with the solid platform.
-    user.delayedWrite(updateSectionBlocks);
-    // Checking gravity is disabled, just finish verification
-    if (!Sonar.get().getConfig().getVerification().getGravity().isEnabled()) {
-      // Switch to captcha state if needed
-      captchaOrFinish();
-    } else {
-      // Make sure the player knows we are checking them
-      user.delayedWrite(youAreBeingChecked);
-      // Send all packets in one flush
-      user.getChannel().flush();
-    }
-  }
-
-  private static boolean validateClientLocale(final @SuppressWarnings("unused") @NotNull FallbackUser<?> user,
-                                              final String locale) {
-    // Check the client locale by performing a simple regex check on it
-    final Pattern pattern = Sonar.get().getConfig().getVerification().getValidLocaleRegex();
-    return pattern.matcher(locale).matches(); // Disallow non-ascii characters (by default)
-  }
-
-  private static boolean validateClientBrand(final @NotNull FallbackUser<?> user, final ByteBuf content) {
-    // We have to catch every DecoderException, so we can fail and punish
-    // the player instead of only disconnecting them due to an exception.
-    try {
-      // No need to check for empty brands since ProtocolUtil#readBrandMessage
-      // already performs these checks by default.
-      final String read = ProtocolUtil.readBrandMessage(content);
-      // Check if the decoded client brand string is too long
-      if (read.length() > Sonar.get().getConfig().getVerification().getMaxBrandLength()) {
-        return false;
-      }
-      // Regex pattern for validating client brands
-      final Pattern pattern = Sonar.get().getConfig().getVerification().getValidBrandRegex();
-      return !read.equals("Vanilla") // The normal brand is always lowercase
-        && pattern.matcher(read).matches(); // Disallow non-ascii characters (by default)
-    } catch (DecoderException exception) {
-      // Fail if the string (client brand) could not be decoded properly
-      user.fail("could not decode string");
-      // Throw the exception so we don't continue checking
-      throw exception;
-    }
-  }
-
-  @Override
-  public void handle(final @NotNull FallbackPacket packet) {
-    // The player has already been verified, drop all other packets
-    if (state == State.SUCCESS) return;
-    // Check for timeout since the player could be sending packets but not important ones
-    final long timeout = Sonar.get().getConfig().getVerification().getMaxPing();
-    // We are expecting a captcha code in chat, drop all other packets
-    if (state == State.MAP_CAPTCHA) {
-      // 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");
-
-      // Handle incoming chat messages
-      if (packet instanceof Chat) {
-        final Chat chat = (Chat) packet;
-        Objects.requireNonNull(captcha);
-        if (!chat.getMessage().equals(captcha.getInfo().getAnswer())) {
-          // Captcha is incorrect
-          checkFrame(captchaTriesLeft-- > 0, "failed captcha too often");
-          user.write(incorrectCaptcha);
-          return;
-        }
-        // Captcha is correct
-        finish();
-        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 Chat(MiniMessage.miniMessage().deserialize(
-            actionBarMessage.replace("%time-left%", timeLeft)), Chat.GAME_INFO_TYPE));
-          // Make sure to reset the timer
-          actionBar.reset();
-        }
-      }
-
-      // Every about 10 seconds
-      if (keepAlive.elapsed(timeout)) {
-        // Send the message again to remind the player
-        user.delayedWrite(enterCodeMessage);
-        // 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();
-      }
-      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");
-
-    // Check if the time limit has exceeded
-    if (login.elapsed(timeout)) {
-      user.getChannel().close();
-      return;
-    }
-
-    if (packet instanceof LoginAcknowledged) {
-      // Check if we are currently expecting a LoginAcknowledged packet
-      assertState(State.LOGIN_ACK);
-
-      // Start the configuration process for 1.20.2 clients
-      configure();
-    }
-
-    if (packet instanceof FinishConfiguration) {
-      // Check if we are currently expecting a FinishConfiguration packet
-      assertState(State.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");
-
-      // Start initializing the actual join process
-      updateEncoderDecoderState(FallbackPacketRegistry.GAME);
-      initialJoinProcess();
-    }
-
-    if (packet instanceof KeepAlive) {
-      final KeepAlive keepAlive = (KeepAlive) packet;
-
-      // 1.7-1.8.9 are sending a KeepAlive packet with the ID 0 every 20 ticks
-      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);
-
-      checkFrame(keepAlive.getId() == expectedKeepAliveId, "invalid KeepAlive ID");
-
-      // The correct KeepAlive packet has been received
-      sendJoinGamePacket();
-    }
-
-    if (packet instanceof ClientSettings) {
-      final ClientSettings clientSettings = (ClientSettings) packet;
-
-      // Validate the locale using a regex to filter unwanted characters.
-      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;
-      }
-
-      // Make sure we mark the ClientSettings as valid
-      resolvedClientSettings = true;
-    }
-
-    if (packet instanceof PluginMessage) {
-      final PluginMessage pluginMessage = (PluginMessage) packet;
-
-      // Only the brand channel is important, drop the rest
-      if (pluginMessage.getChannel().equals("MC|Brand")
-        || pluginMessage.getChannel().equals("minecraft:brand")) {
-        // Check if the brand packet was sent twice,
-        // which is not possible when using a vanilla Minecraft client.
-        checkFrame(!resolvedClientBrand, "duplicate client brand packet");
-
-        // Check if the channel is correct - 1.13 uses the new namespace
-        // 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");
-
-        // Validate the client branding using a regex to filter unwanted characters.
-        checkFrame(validateClientBrand(user, pluginMessage.content()), "invalid client brand");
-
-        // Clients sometimes mess up the ClientSettings or PluginMessage packet.
-        if (state == State.PLUGIN_MESSAGE) {
-          // Send the transaction packet
-          sendTransaction();
-        }
-
-        // Make sure we mark the PluginMessage as valid
-        resolvedClientBrand = true;
-      }
-    }
-
-    if (packet instanceof Transaction) {
-      // Check if we are currently expecting a Transaction packet
-      assertState(State.TRANSACTION);
-
-      final Transaction transaction = (Transaction) 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");
-
-      // First, send an Abilities packet to the client to make
-      // sure the player falls even in spectator mode.
-      // Then, teleport the player to the spawn position.
-      sendAbilitiesAndTeleport();
-
-      // 1.7-1.8 clients do not have a TeleportConfirm packet
-      if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) <= 0) {
-        // Immediately send the chunk data as 1.7-1.8 can't confirm teleport packets
-        sendChunkData();
-      } else {
-        // Send all previously sent packets in one flush since we didn't flush
-        // the channel earlier when we teleported the player.
-        user.getChannel().flush();
-      }
-    }
-
-    if (packet instanceof TeleportConfirm) {
-      // Check if we are currently expecting a TeleportConfirm packet
-      assertState(State.TELEPORT);
-
-      // Check if the teleport ID is correct
-      final TeleportConfirm teleportConfirm = (TeleportConfirm) packet;
-      checkFrame(teleportConfirm.getTeleportId() == expectedTeleportId, "invalid teleport ID");
-
-      // Reset all values to ensure safety on teleport
-      tick = 1;
-      posY = lastY = -1;
-      expectedTeleportId = -1;
-
-      // Now we can send the chunk data
-      sendChunkData();
-    }
-
-    if (state != State.LOGIN_ACK) {
-      if (packet instanceof Position) {
-        final Position position = (Position) packet;
-        handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
-      }
-
-      if (packet instanceof PositionLook) {
-        final PositionLook position = (PositionLook) packet;
-        handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
-      }
-
-      if (packet instanceof Player) {
-        final Player player = (Player) 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 == dynamicSpawnYPosition && 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;
-      }
-
-      lastY = dynamicSpawnYPosition;
-      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) {
-      // Check for too many ignored Y ticks
-      final int maxIgnoredTicks = Sonar.get().getConfig().getVerification().getGravity().getMaxIgnoredTicks();
-      checkFrame(++ignoredMovementTicks < maxIgnoredTicks, "too many ignored ticks");
-      return;
-    }
-
-    // Calculate the difference between the player's Y coordinate and the expected Y coordinate
-    final double collisionOffsetY = DEFAULT_Y_COLLIDE_POSITION - y;
-
-    // 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()) {
-        user.getFallback().getLogger().info("{}: {}/{}/{} - deltaY: {} - ground: {} - collision: {}",
-          username, x, y, z, deltaY, ground, collisionOffsetY);
-      }
-
-      // The player is colliding to blocks, finish verification
-      if (ground) {
-        captchaOrFinish();
-        return;
-      }
-    } 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()) {
-        user.getFallback().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 < 0.005, String.format("invalid gravity: %d, %.7f, %.10f, %.10f != %.10f",
-        tick, y, offsetY, deltaY, predictedY));
-    }
-    tick++;
-  }
-
-  private void captchaOrFinish() {
-    if (user.getFallback().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());
-        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();
-    }
-  }
-
-  private void handleMapCaptcha() {
-    // Reset max tries
-    captchaTriesLeft = Sonar.get().getConfig().getVerification().getMap().getMaxTries();
-
-    // Set slot to map
-    user.delayedWrite(new SetSlot(0, 36, 1, 0,
-      ItemMapType.FILLED_MAP.getId(user.getProtocolVersion()), SetSlot.MAP_NBT));
-    // Send random captcha to the player
-    captcha = MapInfoPreparer.getRandomCaptcha();
-    Objects.requireNonNull(captcha).write(user);
-    // Teleport the player to the position above the platform
-    user.delayedWrite(CAPTCHA_POSITION);
-    // Make sure the player cannot move
-    user.delayedWrite(CAPTCHA_ABILITIES);
-    // Make sure the player knows what to do
-    user.delayedWrite(enterCodeMessage);
-    // Send all packets in one flush
-    user.getChannel().flush();
-  }
-
-  private void finish() {
-    state = State.SUCCESS;
-
-    user.getFallback().getConnected().remove(username);
-
-    // Add verified player to the database
-    final VerifiedPlayer verifiedPlayer = new VerifiedPlayer(user.getInetAddress().toString(), playerUuid,
-      login.getStart());
-    Sonar.get().getVerifiedPlayerController().add(verifiedPlayer);
-
-    // Call the VerifySuccessEvent for external API usage
-    Sonar.get().getEventManager().publish(new UserVerifySuccessEvent(username, playerUuid, user, login.delay()));
-
-    // Disconnect player with the verification success message
-    user.disconnect(Sonar.get().getConfig().getVerification().getVerificationSuccess());
-
-    user.getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getSuccessLog()
-      .replace("%name%", username)
-      .replace("%time%", login.toString()));
-  }
-
-  /**
-   * Fails the verification if a certain state is unexpected.
-   *
-   * @param expectedState Expected state
-   */
-  private void assertState(final @NotNull State expectedState) {
-    checkFrame(state == expectedState, "expected " + expectedState + ", got " + state);
-  }
-
-  /**
-   * Checks if a certain condition is met, fails the verification if not.
-   *
-   * @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) {
-    if (!condition) {
-      user.fail(message);
-      throw new CorruptedFrameException(message);
-    }
-  }
-}
@@ -21,29 +21,29 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.CorruptedFrameException;
+import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.fallback.FallbackUser;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;

 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_20_2;
 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;
-  private final FallbackPacketListener listener;
+  private final ProtocolVersion protocolVersion;
  private FallbackPacketRegistry.ProtocolRegistry registry;
+  @Setter
+  private FallbackPacketListener listener;

-  public FallbackPacketDecoder(final @NotNull FallbackUser<?> user,
-                               final @NotNull FallbackPacketListener listener) {
-    this.user = user;
-    this.listener = listener;
-    updateRegistry(user.getProtocolVersion().compareTo(MINECRAFT_1_20_2) >= 0 ? LOGIN : GAME);
+  public FallbackPacketDecoder(final @NotNull ProtocolVersion protocolVersion) {
+    this.protocolVersion = protocolVersion;
+    updateRegistry(protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0 ? LOGIN : GAME);
  }

  public void updateRegistry(final @NotNull FallbackPacketRegistry registry) {
-    this.registry = registry.getProtocolRegistry(SERVERBOUND, user.getProtocolVersion());
+    this.registry = registry.getProtocolRegistry(SERVERBOUND, protocolVersion);
  }

  @Override
@@ -73,24 +73,24 @@ public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {

      try {
        // Ensure that the packet isn't too large or too small
-        doLengthSanityChecks(byteBuf, packet);
+        checkPacketSize(byteBuf, packet);

        try {
          // Try to decode the packet for the given protocol version
-          packet.decode(byteBuf, user.getProtocolVersion());
+          packet.decode(byteBuf, protocolVersion);
        } catch (Throwable throwable) {
-          user.fail("failed to decode packet (" + byteBuf.readableBytes() + " bytes)");
          throw new CorruptedFrameException("Failed to decode packet");
        }

        // Check if the packet still has bytes left after we decoded it
        if (byteBuf.isReadable()) {
-          user.fail("could not read packet to end (" + byteBuf.readableBytes() + " bytes left)");
          throw new CorruptedFrameException("Could not read packet to end");
        }

        // Let our verification handler process the packet
-        listener.handle(packet);
+        if (listener != null) {
+          listener.handle(packet);
+        }

        // Fire channel read to avoid timeout
        ctx.fireChannelRead(packet);
@@ -98,24 +98,18 @@ 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,
-                                    final @NotNull FallbackPacket packet) throws Exception {
-    final int expectedMaxLen = packet.expectedMaxLength(byteBuf, user.getProtocolVersion());
+  private void checkPacketSize(final @NotNull ByteBuf byteBuf,
+                               final @NotNull FallbackPacket packet) throws Exception {
+    final int expectedMaxLen = packet.expectedMaxLength(byteBuf, protocolVersion);
    if (expectedMaxLen != -1 && byteBuf.readableBytes() > expectedMaxLen) {
-      user.fail("packet too large (" + byteBuf.readableBytes() + " bytes)");
      throw new CorruptedFrameException("Packet too large");
    }

-    final int expectedMinLen = packet.expectedMinLength(byteBuf, user.getProtocolVersion());
-    if (byteBuf.readableBytes() < expectedMinLen) {
-      user.fail("packet too small (" + byteBuf.readableBytes() + " bytes)");
+    final int expectedMinLen = packet.expectedMinLength(byteBuf, protocolVersion);
+    if (expectedMinLen != -1 && byteBuf.readableBytes() < expectedMinLen) {
      throw new CorruptedFrameException("Packet too small");
    }
  }
@@ -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);
  }
 }
@@ -19,13 +19,15 @@ package xyz.jonesdev.sonar.common.fallback.protocol;

 import io.netty.util.collection.IntObjectHashMap;
 import io.netty.util.collection.IntObjectMap;
+import lombok.AccessLevel;
 import lombok.Data;
+import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.FinishConfiguration;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.RegistryData;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledged;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccess;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.FinishConfigurationPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.RegistryDataPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledgedPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccessPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;

 import java.util.*;
@@ -33,42 +35,51 @@ 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 {
    {
-      serverbound.register(LoginAcknowledged.class, LoginAcknowledged::new,
-        map(0x03, MINECRAFT_1_20_2, false));
+      clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
+        map(0x00, MINECRAFT_1_7_2, true));
+      clientbound.register(LoginSuccessPacket.class, LoginSuccessPacket::new,
+        map(0x02, MINECRAFT_1_7_2, true));

-      clientbound.register(LoginSuccess.class, LoginSuccess::new,
-        map(0x02, MINECRAFT_1_7_2, false));
+      serverbound.register(LoginAcknowledgedPacket.class, LoginAcknowledgedPacket::new,
+        map(0x03, MINECRAFT_1_20_2, false));
    }
  },
  CONFIG {
    {
-      clientbound.register(Disconnect.class, Disconnect::new,
-        map(0x01, MINECRAFT_1_20_2, true));
-      clientbound.register(FinishConfiguration.class, FinishConfiguration::new,
-        map(0x02, MINECRAFT_1_20_2, false));
-      clientbound.register(KeepAlive.class, KeepAlive::new,
-        map(0x03, MINECRAFT_1_20_2, false));
-      clientbound.register(RegistryData.class, RegistryData::new,
-        map(0x05, MINECRAFT_1_20_2, true));
+      clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
+        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(0x03, MINECRAFT_1_20_5, false));
+      clientbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
+        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(0x07, MINECRAFT_1_20_5, true));

-      serverbound.register(ClientSettings.class, ClientSettings::new,
+      serverbound.register(ClientSettingsPacket.class, ClientSettingsPacket::new,
        map(0x00, MINECRAFT_1_20_2, false));
-      serverbound.register(PluginMessage.class, PluginMessage::new,
-        map(0x01, MINECRAFT_1_20_2, false));
-      serverbound.register(FinishConfiguration.class, FinishConfiguration::new,
-        map(0x02, MINECRAFT_1_20_2, false));
-      serverbound.register(KeepAlive.class, KeepAlive::new,
-        map(0x03, MINECRAFT_1_20_2, false));
+      serverbound.register(PluginMessagePacket.class, PluginMessagePacket::new,
+        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(0x03, MINECRAFT_1_20_5, false));
+      serverbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
+        map(0x03, MINECRAFT_1_20_2, false),
+        map(0x04, MINECRAFT_1_20_5, false));
    }
  },
  GAME {
    {
-      clientbound.register(JoinGame.class, JoinGame::new,
+      clientbound.register(JoinGamePacket.class, JoinGamePacket::new,
        map(0x01, MINECRAFT_1_7_2, true),
        map(0x23, MINECRAFT_1_9, true),
        map(0x25, MINECRAFT_1_13, true),
@@ -81,8 +92,9 @@ 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));
-      clientbound.register(KeepAlive.class, KeepAlive::new,
+        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),
        map(0x21, MINECRAFT_1_13, false),
@@ -95,8 +107,9 @@ 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));
-      clientbound.register(Disconnect.class, Disconnect::new,
+        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),
        map(0x1B, MINECRAFT_1_13, true),
@@ -109,8 +122,9 @@ 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));
-      clientbound.register(PositionLook.class, PositionLook::new,
+        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),
        map(0x2F, MINECRAFT_1_12_1, true),
@@ -124,8 +138,9 @@ 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));
-      clientbound.register(Abilities.class, Abilities::new,
+        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),
        map(0x2C, MINECRAFT_1_12_1, true),
@@ -139,8 +154,9 @@ 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));
-      clientbound.register(EmptyChunkData.class, EmptyChunkData::new,
+        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),
        map(0x22, MINECRAFT_1_13, true),
@@ -153,8 +169,62 @@ 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));
-      clientbound.register(UpdateSectionBlocks.class, UpdateSectionBlocks::new,
+        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(PlayerInfoPacket.class, PlayerInfoPacket::new,
+        map(0x38, MINECRAFT_1_7_2, true),
+        map(0x2D, MINECRAFT_1_9, true),
+        map(0x2E, MINECRAFT_1_12_1, true),
+        map(0x30, MINECRAFT_1_13, true),
+        map(0x33, MINECRAFT_1_14, true),
+        map(0x34, MINECRAFT_1_15, true),
+        map(0x33, MINECRAFT_1_16, true),
+        map(0x32, MINECRAFT_1_16_2, true),
+        map(0x36, MINECRAFT_1_17, true),
+        map(0x34, MINECRAFT_1_19, true),
+        map(0x37, MINECRAFT_1_19_1, true),
+        map(0x36, MINECRAFT_1_19_3, true),
+        map(0x3A, MINECRAFT_1_19_4, true),
+        map(0x3C, MINECRAFT_1_20_2, true),
+        map(0x3E, MINECRAFT_1_20_5, true));
+      clientbound.register(UpdateSectionBlocksPacket.class, UpdateSectionBlocksPacket::new,
        map(0x22, MINECRAFT_1_7_2, true),
        map(0x10, MINECRAFT_1_9, true),
        map(0x0F, MINECRAFT_1_13, true),
@@ -167,8 +237,9 @@ 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));
-      clientbound.register(Transaction.class, Transaction::new,
+        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),
        map(0x12, MINECRAFT_1_13, true),
@@ -180,8 +251,9 @@ 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));
-      clientbound.register(DefaultSpawnPosition.class, DefaultSpawnPosition::new,
+        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),
        map(0x45, MINECRAFT_1_12, true),
@@ -196,8 +268,9 @@ 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));
-      clientbound.register(MapData.class, MapData::new,
+        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),
        map(0x26, MINECRAFT_1_13, true),
@@ -209,8 +282,9 @@ 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));
-      clientbound.register(SetSlot.class, SetSlot::new,
+        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),
        map(0x17, MINECRAFT_1_13, true),
@@ -223,7 +297,22 @@ 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(Chat.class, Chat::new,
+      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),
        map(0x0E, MINECRAFT_1_13, false),
@@ -235,11 +324,45 @@ 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));
-      clientbound.register(GameEvent.class, GameEvent::new,
-        map(0x20, MINECRAFT_1_20_3, true));
+        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(0x22, MINECRAFT_1_20_5, true));
+      clientbound.register(TransferPacket.class, TransferPacket::new,
+        map(0x73, MINECRAFT_1_20_5, true));

-      serverbound.register(Chat.class, Chat::new,
+      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),
        map(0x03, MINECRAFT_1_12, false),
@@ -247,8 +370,9 @@ 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));
-      serverbound.register(KeepAlive.class, KeepAlive::new,
+        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),
        map(0x0C, MINECRAFT_1_12, false),
@@ -262,8 +386,9 @@ 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));
-      serverbound.register(ClientSettings.class, ClientSettings::new,
+        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),
        map(0x05, MINECRAFT_1_12, false),
@@ -273,8 +398,9 @@ 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));
-      serverbound.register(PluginMessage.class, PluginMessage::new,
+        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),
        map(0x0A, MINECRAFT_1_12, false),
@@ -287,7 +413,7 @@ public enum FallbackPacketRegistry {
        map(0x0C, MINECRAFT_1_19_3, false),
        map(0x0D, MINECRAFT_1_19_4, false),
        map(0x0F, MINECRAFT_1_20_2, false));
-      serverbound.register(PositionLook.class, PositionLook::new,
+      serverbound.register(PlayerPositionLookPacket.class, PlayerPositionLookPacket::new,
        map(0x06, MINECRAFT_1_7_2, false),
        map(0x0D, MINECRAFT_1_9, false),
        map(0x0F, MINECRAFT_1_12, false),
@@ -301,10 +427,11 @@ 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));
-      serverbound.register(TeleportConfirm.class, TeleportConfirm::new,
+        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(Position.class, Position::new,
+      serverbound.register(PlayerPositionPacket.class, PlayerPositionPacket::new,
        map(0x04, MINECRAFT_1_7_2, false),
        map(0x0C, MINECRAFT_1_9, false),
        map(0x0E, MINECRAFT_1_12, false),
@@ -318,8 +445,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(Player.class, Player::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),
@@ -333,8 +461,9 @@ 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));
-      serverbound.register(Transaction.class, Transaction::new,
+        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),
        map(0x06, MINECRAFT_1_12, false),
@@ -347,7 +476,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));
    }
  };

@@ -370,7 +500,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));
        }
      }
@@ -397,7 +527,7 @@ public enum FallbackPacketRegistry {
        final PacketMapping next = (i + 1 < mappings.length) ? mappings[i + 1] : current;

        final ProtocolVersion from = current.protocolVersion;
-        final ProtocolVersion to = getProtocolVersion(current, next, from);
+        final ProtocolVersion to = getProtocolVersion(current, next);

        for (final ProtocolVersion protocol : EnumSet.range(from, to)) {
          if (protocol == to && next != current) {
@@ -406,19 +536,18 @@ public enum FallbackPacketRegistry {

          final ProtocolRegistry registry = versions.get(protocol);
          if (registry == null) {
-            throw new IllegalArgumentException("Unknown protocol version "
-              + current.protocolVersion);
+            throw new IllegalArgumentException("Unknown protocol version " + from);
          }

          if (registry.packetIdToSupplier.containsKey(current.id)) {
            throw new IllegalArgumentException("Can not register class " + clazz.getSimpleName()
-              + " with id " + current.id + " for " + registry.version
+              + " with id " + current.id + " for " + registry.protocolVersion
              + " because another packet is already registered");
          }

          if (registry.packetClassToId.containsKey(clazz)) {
            throw new IllegalArgumentException(clazz.getSimpleName()
-              + " is already registered for version " + registry.version);
+              + " is already registered for version " + registry.protocolVersion);
          }

          if (!current.encodeOnly) {
@@ -431,23 +560,19 @@ public enum FallbackPacketRegistry {

    @NotNull
    private static ProtocolVersion getProtocolVersion(final @NotNull PacketMapping current,
-                                                      final @NotNull PacketMapping next,
-                                                      final @NotNull ProtocolVersion from) {
+                                                      final @NotNull PacketMapping next) {
      return current == next ? LATEST_VERSION : next.protocolVersion;
    }
  }

+  @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
  public static class ProtocolRegistry {
-    private final ProtocolVersion version;
+    private final ProtocolVersion protocolVersion;
    private final IntObjectMap<Supplier<? extends FallbackPacket>> packetIdToSupplier =
      new IntObjectHashMap<>(16, 0.5f);
    private final Map<Class<? extends FallbackPacket>, Integer> packetClassToId =
      new HashMap<>(16, 0.5f);

-    ProtocolRegistry(final ProtocolVersion version) {
-      this.version = version;
-    }
-
    public FallbackPacket createPacket(final int id) {
      final Supplier<? extends FallbackPacket> supplier = packetIdToSupplier.get(id);

@@ -475,16 +600,16 @@ public enum FallbackPacketRegistry {

    PacketMapping(final int id,
                  final ProtocolVersion protocolVersion,
-                  final boolean packetDecoding) {
+                  final boolean encodeOnly) {
      this.id = id;
      this.protocolVersion = protocolVersion;
-      this.encodeOnly = packetDecoding;
+      this.encodeOnly = encodeOnly;
    }
  }

  private static @NotNull PacketMapping map(final int id,
-                                            final ProtocolVersion version,
+                                            final ProtocolVersion protocolVersion,
                                            final boolean encodeOnly) {
-    return new PacketMapping(id, version, encodeOnly);
+    return new PacketMapping(id, protocolVersion, encodeOnly);
  }
 }
@@ -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();
+  }
+}
@@ -20,40 +20,70 @@ 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.packets.config.FinishConfiguration;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.config.RegistryData;
+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.configuration.FinishConfigurationPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.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 Abilities(0x00, 0f, 0f);
-  public final FallbackPacket CAPTCHA_ABILITIES = new Abilities(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 EmptyChunkData(0, 0);
+  public final FallbackPacket EMPTY_CHUNK_DATA = new FallbackPacketSnapshot(new ChunkDataPacket(0, 0));
  // Finish Configuration
-  public final FallbackPacket FINISH_CONFIGURATION = new FinishConfiguration();
+  public final FallbackPacket FINISH_CONFIGURATION = new FinishConfigurationPacket(); // No snapshot needed because it's empty either way
  // Synchronize Registry
-  public final FallbackPacket REGISTRY_SYNC = new RegistryData();
+  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 KeepAlive(0L);
+  public final FallbackPacket CAPTCHA_KEEP_ALIVE = new FallbackPacketSnapshot(new KeepAlivePacket(-1337L));
  // Game Event (1.20.3+)
-  public final FallbackPacket START_WRITING_CHUNKS = new GameEvent(13, 0);
+  public final FallbackPacket START_WRITING_CHUNKS = new FallbackPacketSnapshot(new GameEventPacket(13, 0));
  // Chat
  public FallbackPacket enterCodeMessage;
-  public FallbackPacket youAreBeingChecked;
  public FallbackPacket incorrectCaptcha;
  // JoinGame
+  public final int PLAYER_ENTITY_ID = ThreadLocalRandom.current().nextInt(10);
  public FallbackPacket joinGame;
  // Update Section Blocks
  public FallbackPacket updateSectionBlocks;
+  // Player Info
+  public final FallbackPacket PLAYER_INFO = new FallbackPacketSnapshot(new PlayerInfoPacket(
+    "", new UUID(1L, 1L), 2));
  // Default Spawn Position
-  public FallbackPacket dynamicSpawnPosition;
+  public FallbackPacket defaultSpawnPosition;
+  // Spawn Position
+  public final int TELEPORT_ID = ThreadLocalRandom.current().nextInt();
+  public FallbackPacket spawnPosition;
+  // Transfer packet
+  public static FallbackPacket transferToOrigin;
+
+  // Disconnect messages
+  public FallbackPacket blacklisted;
+  public FallbackPacket alreadyQueued;
+  public FallbackPacket alreadyVerifying;
+  public FallbackPacket reconnectedTooFast;
+  public FallbackPacket protocolBlacklisted;
+  public FallbackPacket invalidUsername;
+  public FallbackPacket tooManyOnlinePerIP;
+
+  // Vehicle
+  public FallbackPacket removeEntities;
+  public static 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)
@@ -62,30 +92,32 @@ 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 PositionLook(
-    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION, 0f, 90f, 0, false);
-  public final FallbackPacket CAPTCHA_SPAWN_POSITION = new DefaultSpawnPosition(
-    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION);
-
-  // Blocks
-  private final ChangedBlock[] CHANGED_BLOCKS = new ChangedBlock[BLOCKS_PER_ROW * BLOCKS_PER_ROW];
+  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));

+  // Platform
+  public BlockType blockType = BlockType.BARRIER;
  public int maxMovementTick, dynamicSpawnYPosition;
  public double[] preparedCachedYMotions;
  public double maxFallDistance;

-  public void prepare() {
-    joinGame = new JoinGame(0,
-      Sonar.get().getConfig().getVerification().getGravity().getGamemode().getId(),
-      0,
-      false,
-      0,
-      true,
-      true,
-      false,
-      new String[]{"minecraft:overworld"},
-      "minecraft:overworld");
+  // CAPTCHA
+  public final CaptchaPreparer MAP_INFO_PREPARER = new CaptchaPreparer();

+  // XP packets
+  public FallbackPacket[] xpCountdown;
+
+  public void prepare() {
+    // 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];
@@ -98,35 +130,65 @@ 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 DefaultSpawnPosition(SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION);
+    defaultSpawnPosition = new FallbackPacketSnapshot(new DefaultSpawnPositionPacket(
+      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION));
+    spawnPosition = new FallbackPacketSnapshot(new PlayerPositionLookPacket(
+      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION,
+      0, -90, TELEPORT_ID, false));

    // Prepare collision platform positions
+    final BlockUpdate[] changedBlocks = new BlockUpdate[BLOCKS_PER_ROW * BLOCKS_PER_ROW];
+
    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.BARRIER);
+        changedBlocks[index++] = new BlockUpdate(position, blockType);
      }
    }

-    // Prepare UpdateSectionBlocks packet
-    updateSectionBlocks = new UpdateSectionBlocks(0, 0, CHANGED_BLOCKS);
+    updateSectionBlocks = new FallbackPacketSnapshot(new UpdateSectionBlocksPacket(0, 0, changedBlocks));

-    // "You are being checked" message
-    if (Sonar.get().getConfig().getVerification().getGravity().isEnabled()) {
-      youAreBeingChecked = new Chat(Sonar.get().getConfig().getVerification().getGravity().getYouAreBeingChecked());
-    }
+    // Prepare disconnect packets during login
+    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));

-    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER) {
-      enterCodeMessage = new Chat(Sonar.get().getConfig().getVerification().getMap().getEnterCode());
-      incorrectCaptcha = new Chat(Sonar.get().getConfig().getVerification().getMap().getFailedCaptcha());
+    // Prepare transfer packet
+    transferToOrigin = new FallbackPacketSnapshot(new TransferPacket(
+      Sonar.get().getConfig().getVerification().getTransfer().getHost(),
+      Sonar.get().getConfig().getVerification().getTransfer().getPort()));

-      // Precompute captcha answers
-      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();
    }
  }
 }
@@ -1,30 +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.block;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
-
-@Getter
-@ToString
-@RequiredArgsConstructor
-public final class BlockPosition {
-  private final int x, y, z;
-  private final int chunkX, chunkZ;
-}
@@ -17,6 +17,7 @@

 package xyz.jonesdev.sonar.common.fallback.protocol.block;

+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
@@ -26,7 +27,7 @@ import java.util.function.Function;
@SuppressWarnings("unused")
@RequiredArgsConstructor
 public enum BlockType {
-  STONE(protocolVersion -> 1),
+  STONE(protocolVersion -> 1, 1D),
  BARRIER(protocolVersion -> {
    // Useful resources:
    // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
@@ -77,13 +78,17 @@ public enum BlockType {
        return 10225;
      case MINECRAFT_1_20_2:
      case MINECRAFT_1_20_3:
+      case MINECRAFT_1_20_5:
        return 10366;
    }
-  });
+  }, 1D);

-  private final Function<ProtocolVersion, Integer> function;
+  private final Function<ProtocolVersion, Integer> idFunction;
+  // TODO: Implement per-version block heights?
+  @Getter
+  private final double blockHeight;

  public int getId(final @NotNull ProtocolVersion protocolVersion) {
-    return function.apply(protocolVersion);
+    return idFunction.apply(protocolVersion);
  }
 }
@@ -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;
+  }
 }
@@ -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)];
+  }
+}
@@ -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;
    }
  });

@@ -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.packets.play.MapData;
+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 MapData[] legacy;
-  private final MapData 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 MapData[grid.length];
+    this.legacy = new FallbackPacket[grid.length];
    for (int i = 0; i < grid.length; i++) {
-      this.legacy[i] = new MapData(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 MapData(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 MapData 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);
  }
 }
@@ -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);
+  }
+}
@@ -61,7 +61,7 @@ public final class DimensionRegistry {
  }

  private @NotNull CompoundBinaryTag getCodec(final @NotNull String fileName) {
-    try (final InputStream inputStream = Sonar.class.getResourceAsStream("/codecs/" + fileName)) {
+    try (final InputStream inputStream = Sonar.class.getResourceAsStream("/assets/codecs/" + fileName)) {
      return BinaryTagIO.reader().read(Objects.requireNonNull(inputStream), BinaryTagIO.Compression.GZIP);
    } catch (Throwable throwable) {
      Sonar.get().getLogger().error("Could not load mappings for {}: {}", fileName, throwable);
@@ -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);
+  }
+}
@@ -1,30 +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.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public final class MapInfo {
-  private final String answer;
-  private final int columns, rows;
-  private final int x, y;
-  private final byte[] buffer;
-}
@@ -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++;
-        }
-      });
-    }
-  }
-}
@@ -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);
-  }
-}
@@ -1,43 +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.packets.config;
-
-import io.netty.buffer.ByteBuf;
-import lombok.Getter;
-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.dimension.DimensionRegistry;
-
-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeNamelessCompoundTag;
-
-@Getter
-@ToString
-public final class RegistryData implements FallbackPacket {
-
-  @Override
-  public void encode(final @NotNull ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    writeNamelessCompoundTag(byteBuf, DimensionRegistry.CODEC_1_20);
-  }
-
-  @Override
-  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    throw new UnsupportedOperationException();
-  }
-}
@@ -15,15 +15,13 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.fallback.protocol.packets.config;
+package xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration;

 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 FinishConfiguration implements FallbackPacket {
+public final class FinishConfigurationPacket implements FallbackPacket {

  @Override
  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
@@ -35,6 +33,7 @@ public final class FinishConfiguration 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;
  }
 }
@@ -0,0 +1,91 @@
+/*
+ * 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.configuration;
+
+import io.netty.buffer.ByteBuf;
+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.FallbackPacketSnapshot;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.*;
+
+@Getter
+@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 @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;
+  }
+}
@@ -21,13 +21,20 @@ import io.netty.buffer.ByteBuf;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;

-public final class LoginAcknowledged implements FallbackPacket {
+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;
+  }
 }
@@ -21,26 +21,27 @@ 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.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 LoginSuccess implements FallbackPacket {
-  private String username;
+public final class LoginSuccessPacket implements FallbackPacket {
  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) {
@@ -48,7 +49,7 @@ public final class LoginSuccess 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);
@@ -56,6 +57,9 @@ public final class LoginSuccess 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
@@ -29,14 +29,13 @@ 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
@NoArgsConstructor
@AllArgsConstructor
-public final class EmptyChunkData implements FallbackPacket {
+public final class ChunkDataPacket implements FallbackPacket {
  private int x, z;

  private static final byte[] SECTION_BYTES = new byte[]{0, 0, 0, 0, 0, 0, 1, 0};
@@ -67,7 +66,7 @@ public final class EmptyChunkData 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);

@@ -30,12 +30,12 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
@ToString
@NoArgsConstructor
@AllArgsConstructor
-public class Abilities 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 Abilities 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();
  }
 }