Merge remote-tracking branch 'origin/main' into feat/full-registries

Use 1.21-1.21.4 codecs from the previous commit
Apply SIMPLE_BIOME filter on 1.18.2-1.21.4 codecs
2026-11-05 09:20:15 -05:00 · 2025-01-15 19:36:50 +01:00 · 2025-01-11 19:21:44 +01:00 · 2025-01-11 17:47:29 +01:00 · 2025-01-11 14:25:11 +01:00 · 2025-01-09 16:31:46 +01:00
217 changed files with 2067 additions and 4852 deletions
@@ -1,11 +1,11 @@
 Before you start contributing, please take a moment to review our contributing guidelines.
 If you can't contribute but like the project, feel free to show your support by starring the project on GitHub or
-joining the [Discord](https://sonar.top/discord).
+joining the [Discord](https://jonesdev.xyz/discord).

 ## Contributing Guidelines:

 1. Fork the repository and create a new branch for your contribution.
-2. Adhere to the Coding Guidelines and LLM Guidelines.
+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.

@@ -17,17 +17,6 @@ joining the [Discord](https://sonar.top/discord).
 - Write clear comments to explain complex parts of your code.
 - Ensure your code is easy to read and maintain.

-## LLM Guidelines
-
-Keep the use of AI (including LLMs) for code generation to an absolute minimum. If possible, avoid using AI entirely due to potential complications regarding authorship, intellectual property, and copyright.
-
-If AI was utilized during the development of a Pull Request, you must disclose its exact use in the PR description. This includes:
- The specific tool and model used (e.g., GPT 5.4, Claude 4.7 Sonnet, Gemini 3.1 Pro)
- The nature of its use (e.g., optimization)
- The exact prompts used, where relevant
-
-Please note that submissions will be rejected if AI usage raises concerns regarding code quality, licensing, or integrity.
-
 ## Bug Reports:

 1. Check if someone has already reported the bug.
@@ -0,0 +1 @@
+patreon: jonesdev
@@ -4,5 +4,5 @@ contact_links:
    url: https://docs.jonesdev.xyz/
    about: Need help configuring Sonar or have questions regarding the installation and usage?
  - name: Discord
-    url: https://sonar.top/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.
@@ -11,7 +11,7 @@
  [![](https://www.codefactor.io/repository/github/jonesdevelopment/sonar/badge/main)](https://www.codefactor.io/repository/github/jonesdevelopment/sonar/overview/main)
  [![](https://img.shields.io/github/v/release/jonesdevelopment/sonar)](https://github.com/jonesdevelopment/sonar/releases)
  [![](https://img.shields.io/github/issues/jonesdevelopment/sonar)](https://github.com/jonesdevelopment/sonar/issues)
-  [![](https://img.shields.io/discord/923308209769426994.svg?logo=discord)](https://sonar.top/discord)
+  [![](https://img.shields.io/discord/923308209769426994.svg?logo=discord)](https://jonesdev.xyz/discord)
  [![](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
  <br>
  <!-- Quick navigation -->
@@ -21,18 +21,11 @@
  |
  [Pull Requests](https://github.com/jonesdevelopment/sonar/pulls)
  |
-  [Discord](https://sonar.top/discord)
+  [Discord](https://jonesdev.xyz/discord)
  |
  [License](https://github.com/jonesdevelopment/sonar/?tab=readme-ov-file#license)
-  |
-  [Documentation](https://docs.jonesdev.xyz/)
 </div>

-> ### Notice about Sonar 3.0
-> 
-> If you want more robust protection, better performance, and awesome new features, check out Sonar 3.0 at https://sonar.top/!
-> You can read more about what sets Sonar 3.0 apart from Sonar 2.0 [here](<https://sonar.top/docs/features>).
-
 ## Design and Goal
 * Effective, lightweight, and easy-to-use
 * No unnecessary features and clean code
@@ -47,22 +40,18 @@ Sonar analyzes a player's behavior before joining the actual server, therefore s
 1. Sonar sends the player to a lightweight fake server when they connect for the first time.
 2. Sonar verifies that players obey the laws of Minecraft's physics, including gravity and proper block collision.
 3. Sonar verifies that players send legitimate packets when interacting with vehicles (e.g. boats).
-4. Sonar makes sure that players send legitimate packets according to the [vanilla Minecraft protocol](<https://minecraft.wiki/w/Java_Edition_protocol/>).
+4. Sonar makes sure that players send legitimate packets according to the [vanilla Minecraft protocol](<https://wiki.vg/Protocol>).

 Sonar also protects against spambot attacks since it queues the incoming connections, therefore making it technically impossible to have a ton of bots join the server at the same time.

 ### False positives
 Sonar is unlikely to ever falsely prevent a player from joining the server since Minecraft uses the TCP protocol, which means that packets are always sent in the correct order. Therefore, lag or ping should not affect the bot check.
-If you or one of your players experiences a false positive, make sure to report it by opening a [GitHub issue](https://github.com/jonesdevelopment/sonar/issues/new/choose) or a ticket on the [Discord server](https://sonar.top/discord/).
+If you or one of your players experiences a false positive, make sure to report it by opening a [GitHub issue](https://github.com/jonesdevelopment/sonar/issues/new/choose) or a ticket on the [Discord server](https://jonesdev.xyz/discord/).

 ## Sponsors
-If you are interested in sponsoring this project, please contact me via [Discord](https://sonar.top/discord/).
+Massive thanks to the sponsors of Sonar who help keep this project running:

-### Past Sponsors
-
-<a href="https://github.com/Chumb3x"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/79834154?v=4&h=50&w=50&fit=cover&mask=circle&maxage=7d" alt="logo" align="center"></a>
 <a href="https://github.com/Hydoxl"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/107579333?v=4&h=50&w=50&fit=cover&mask=circle&maxage=7d" alt="logo" align="center"></a>
-<a href="https://github.com/ItzErpandX"><img src="https://images.weserv.nl/?url=avatars.githubusercontent.com/u/84748484?v=4?s=400?v=4&h=50&w=50&fit=cover&mask=circle&maxage=7d" alt="logo" align="center"></a>

 ## 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).
@@ -13,7 +13,7 @@ If you discover a security vulnerability within Sonar, please follow these steps

 ## Contact

-If you have any questions or concerns regarding the security of this project, please open a ticket on Discord or contact me via email at support@sonar.top.
+If you have any questions or concerns regarding the security of this project, please open a ticket on Discord or contact me via email at contact@jonesdev.xyz.

 ## Acknowledgments

@@ -21,44 +21,42 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

-      - name: Set up JDK 21
-        uses: actions/setup-java@v3
-        with:
-          java-version: '21'
-          distribution: 'temurin'
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'

-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+    - name: Build with Gradle
+      uses: gradle/gradle-build-action@v3
+      with:
+        arguments: build-sonar

-      - name: Build with Gradle
-        run: ./gradlew build-sonar
+    - name: Upload Bukkit Artifact
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        # Artifact name
+        name: Sonar
+        # A file, directory or wildcard pattern that describes what to upload
+        path: bukkit/build/libs/Sonar-Bukkit.jar
+        if-no-files-found: error

-      - name: Upload Bukkit Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Sonar-Bukkit
-          path: bukkit/build/libs/Sonar-Bukkit.jar
-          if-no-files-found: error
+    - name: Upload BungeeCord Artifact
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        # Artifact name
+        name: Sonar
+        # A file, directory or wildcard pattern that describes what to upload
+        path: bungeecord/build/libs/Sonar-Bungee.jar
+        if-no-files-found: error

-      - name: Upload Paper Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Sonar-Paper
-          path: paper/build/libs/Sonar-Paper.jar
-          if-no-files-found: error
-
-      - name: Upload BungeeCord Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Sonar-Bungee
-          path: bungeecord/build/libs/Sonar-Bungee.jar
-          if-no-files-found: error
-
-      - name: Upload Velocity Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: Sonar-Velocity
-          path: velocity/build/libs/Sonar-Velocity.jar
-          if-no-files-found: error
+    - name: Upload Velocity Artifact
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        # Artifact name
+        name: Sonar
+        # A file, directory or wildcard pattern that describes what to upload
+        path: velocity/build/libs/Sonar-Velocity.jar
+        if-no-files-found: error
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2026 Sonar Contributors
+ * Copyright (C) 2025 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
@@ -21,11 +21,11 @@ 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.antibot.AntiBot;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.database.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.notification.ActionBarNotificationHandler;
 import xyz.jonesdev.sonar.api.notification.ChatNotificationHandler;
@@ -49,68 +49,22 @@ public interface Sonar {
  @ApiStatus.Internal
  @NotNull Audience sender(final @NotNull Object object);

-  /**
-   * Gets the platform Sonar is running on (e.g., Bukkit, BungeeCord, Velocity).
-   *
-   * @return The {@link SonarPlatform} enum representing the current platform.
-   */
  @NotNull SonarPlatform getPlatform();

-  /**
-   * Gets the logger instance for Sonar.
-   *
-   * @return The {@link LoggerWrapper} instance.
-   */
  @NotNull LoggerWrapper getLogger();

-  /**
-   * Gets the Sonar configuration.
-   *
-   * @return The {@link SonarConfiguration} instance.
-   */
  @NotNull SonarConfiguration getConfig();

-  /**
-   * Gets the subcommand registry for Sonar commands.
-   *
-   * @return The {@link SubcommandRegistry} instance.
-   */
  @NotNull SubcommandRegistry getSubcommandRegistry();

-  /**
-   * Gets the controller for verified players.
-   * Used for managing players who have passed the verification.
-   *
-   * @return The {@link VerifiedPlayerController} instance.
-   */
  VerifiedPlayerController getVerifiedPlayerController();

-  /**
-   * Gets the handler for action bar notifications.
-   *
-   * @return The {@link ActionBarNotificationHandler} instance.
-   */
  @NotNull ActionBarNotificationHandler getActionBarNotificationHandler();

-  /**
-   * Gets the handler for chat notifications.
-   *
-   * @return The {@link ChatNotificationHandler} instance.
-   */
  @NotNull ChatNotificationHandler getChatNotificationHandler();

-  /**
-   * Gets the system timer used for tracking plugin launch time.
-   *
-   * @return The {@link SystemTimer} instance.
-   */
  @NotNull SystemTimer getLaunchTimer();

-  /**
-   * Gets the statistics tracker for Sonar.
-   *
-   * @return The {@link SonarStatistics} instance.
-   */
  @NotNull SonarStatistics getStatistics();

  @SuppressWarnings("unused")
@@ -119,67 +73,25 @@ public interface Sonar {
  @SuppressWarnings("unused")
  void setChatNotificationHandler(final @NotNull ChatNotificationHandler notificationHandler);

-  /**
-   * Reloads the Sonar configuration.
-   */
  void reload();

-  /**
-   * Gets the current version of Sonar.
-   *
-   * @return The {@link SonarVersion} instance.
-   */
  @NotNull default SonarVersion getVersion() {
    return SonarVersion.INSTANCE;
  }

-  /**
-   * Gets the event manager for Sonar.
-   *
-   * @return The {@link SonarEventManager} instance.
-   */
  @NotNull default SonarEventManager getEventManager() {
    return SonarEventManager.INSTANCE;
  }

-  /**
-   * Gets the attack tracker for Sonar.
-   *
-   * @return The {@link AttackTracker} instance.
-   */
  @NotNull default AttackTracker getAttackTracker() {
    return AttackTracker.INSTANCE;
  }

-  /**
-   * Gets the anti-bot handler for Sonar.
-   *
-   * @return The {@link AntiBot} instance.
-   */
-  @NotNull default AntiBot getAntiBot() {
-    return AntiBot.INSTANCE;
+  @NotNull default Fallback getFallback() {
+    return Fallback.INSTANCE;
  }

-  /**
-   * Gets the instance of the Sonar API.
-   *
-   * @return The {@link Sonar} instance.
-   * @throws IllegalStateException If Sonar has not been initialized.
-   */
  @NotNull static Sonar get() {
-    return SonarSupplier.get();
-  }
-
-  /**
-   * Gets the instance of the Sonar API.
-   * Only use this method if you understand the implications,
-   * and have a specific reason to bypass the standard {@link #get()} method.
-   * In most cases, {@link #get()} is the preferred way to access the Sonar API.
-   *
-   * @return The Sonar instance.
-   */
-  @ApiStatus.Internal
-  @NotNull static Sonar get0() {
    return SonarSupplier.sonar;
  }
 }
@@ -30,8 +30,6 @@ public enum SonarPlatform {
    pipeline -> pipeline.context("outbound_config") != null ? "outbound_config" : "encoder"),
  BUNGEE("BungeeCord", 19109, "inbound-boss",
    pipeline -> "packet-encoder"),
-  PAPER("Paper", 19110, "packet_handler",
-    pipeline -> pipeline.context("outbound_config") != null ? "outbound_config" : "encoder"),
  VELOCITY("Velocity", 19107, "handler",
    pipeline -> "minecraft-encoder");

@@ -30,11 +30,4 @@ public class SonarSupplier {
    }
    sonar = _sonar;
  }
-
-  public Sonar get() {
-    if (sonar == null) {
-      throw new IllegalStateException("Sonar is not initialized yet");
-    }
-    return sonar;
-  }
 }
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2025 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.antibot;
-
-public interface ChannelPipelines {
-  String SONAR_INACTIVE_LISTENER = "sonar-inactive-listener";
-  String SONAR_INBOUND_HANDLER = "sonar-inbound-handler";
-  String SONAR_FRAME_DECODER = "sonar-frame-decoder";
-  String SONAR_FRAME_ENCODER = "sonar-frame-encoder";
-  String SONAR_TIMEOUT = "sonar-timeout";
-  String SONAR_PACKET_HANDLER = "sonar-packet-handler";
-  String SONAR_PACKET_ENCODER = "sonar-packet-encoder";
-  String SONAR_PACKET_DECODER = "sonar-packet-decoder";
-  String SONAR_TAIL_EXCEPTIONS = "sonar-exception-tail";
-  String SONAR_BANDWIDTH = "sonar-bandwidth-counter";
-}
@@ -36,8 +36,8 @@ public interface SonarCommand {
  default void handle(final @NotNull InvocationSource source, final String @NotNull [] args) {
    // Check if the player actually has the permission to run the command
    if (source.isPlayer() && !source.getPermissionFunction().test("sonar.command")) {
-      if (Sonar.get0().getConfig().getNoPermission() != null) {
-        source.sendMessage(Sonar.get0().getConfig().getNoPermission());
+      if (Sonar.get().getConfig().getNoPermission() != null) {
+        source.sendMessage(Sonar.get().getConfig().getNoPermission());
      }
      return;
    }
@@ -46,7 +46,7 @@ public interface SonarCommand {

    if (args.length > 0) {
      // Search subcommand if command arguments are present
-      subcommand = Sonar.get0().getSubcommandRegistry().getSubcommands().stream()
+      subcommand = Sonar.get().getSubcommandRegistry().getSubcommands().stream()
        .filter(sub -> sub.getInfo().name().equalsIgnoreCase(args[0])
          || Arrays.stream(sub.getInfo().aliases()).anyMatch(alias -> alias.equalsIgnoreCase(args[0])))
        .findFirst();
@@ -57,8 +57,8 @@ public interface SonarCommand {
      if (!command.getInfo().onlyConsole()
        && !source.getPermissionFunction().test(command.getPermission())) {
        source.sendMessage(MiniMessage.miniMessage().deserialize(
-          Sonar.get0().getConfig().getMessagesConfig().getString("commands.subcommand-no-permission"),
-          Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
+          Sonar.get().getConfig().getMessagesConfig().getString("commands.subcommand-no-permission"),
+          Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
          Placeholder.unparsed("permission", command.getPermission())));
        return;
      }
@@ -66,28 +66,28 @@ public interface SonarCommand {
      command.invoke(source, args);
    }, () -> {
      final UpdateChecker.CheckResult checkResult = UpdateChecker.getLastCheckResult();
-      Component version = Component.text(Sonar.get0().getVersion().getFormatted());
+      Component version = Component.text(Sonar.get().getVersion().getFormatted());
      if (checkResult.getConfigKey() != null) {
        version = version.append(MiniMessage.miniMessage().deserialize(
-          Sonar.get0().getConfig().getMessagesConfig().getString("commands.main." + checkResult.getConfigKey())));
+          Sonar.get().getConfig().getMessagesConfig().getString("commands.main." + checkResult.getConfigKey())));
      }

      // Print standard help message
      source.sendMessage(MiniMessage.miniMessage().deserialize(
        String.join("<newline>",
-          Sonar.get0().getConfig().getMessagesConfig().getStringList("commands.main.header")),
+          Sonar.get().getConfig().getMessagesConfig().getStringList("commands.main.header")),
        Placeholder.component("version", version),
-        Placeholder.unparsed("platform", Sonar.get0().getPlatform().getDisplayName()),
+        Placeholder.unparsed("platform", Sonar.get().getPlatform().getDisplayName()),
        Placeholder.unparsed("copyright-year", String.valueOf(Calendar.getInstance().get(Calendar.YEAR)))));

      final Component yes = MiniMessage.miniMessage().deserialize(
-        Sonar.get0().getConfig().getMessagesConfig().getString("commands.main.tick"));
+        Sonar.get().getConfig().getMessagesConfig().getString("commands.main.tick"));
      final Component no = MiniMessage.miniMessage().deserialize(
-        Sonar.get0().getConfig().getMessagesConfig().getString("commands.main.cross"));
+        Sonar.get().getConfig().getMessagesConfig().getString("commands.main.cross"));

-      Sonar.get0().getSubcommandRegistry().getSubcommands().forEach(command -> {
+      Sonar.get().getSubcommandRegistry().getSubcommands().forEach(command -> {
        source.sendMessage(MiniMessage.miniMessage().deserialize(
-          Sonar.get0().getConfig().getMessagesConfig().getString("commands.main.subcommands"),
+          Sonar.get().getConfig().getMessagesConfig().getString("commands.main.subcommands"),
          TagResolver.resolver("suggest-subcommand",
            (queue, context) -> Tag.styling(ClickEvent.suggestCommand("/sonar " + command.getInfo().name()))),
          Placeholder.unparsed("subcommand", command.getInfo().name()),
@@ -103,7 +103,7 @@ public interface SonarCommand {
  static void prepareCachedTabSuggestions() {
    if (TAB_SUGGESTIONS.isEmpty()) {
      final List<String> subcommandsAndAliases = new ArrayList<>();
-      for (final Subcommand subcommand : Sonar.get0().getSubcommandRegistry().getSubcommands()) {
+      for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
        subcommandsAndAliases.add(subcommand.getInfo().name());

        final List<String> arguments = Arrays.asList(subcommand.getInfo().arguments());
@@ -48,8 +48,8 @@ public abstract class Subcommand {
  protected static @Nullable String validateIP(final InvocationSource source, final String raw) {
    if (!IPv4_REGEX.matcher(raw).matches() && !IPv6_REGEX.matcher(raw).matches()) {
      source.sendMessage(MiniMessage.miniMessage().deserialize(
-        Sonar.get0().getConfig().getMessagesConfig().getString("commands.invalid-ip-address"),
-        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix())));
+        Sonar.get().getConfig().getMessagesConfig().getString("commands.invalid-ip-address"),
+        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())));
      return null;
    }
    return raw;
@@ -61,8 +61,8 @@ public abstract class Subcommand {

  protected final void incorrectUsage(final @NotNull InvocationSource invocationSource, final String usage) {
    invocationSource.sendMessage(MiniMessage.miniMessage().deserialize(
-      Sonar.get0().getConfig().getMessagesConfig().getString("commands.incorrect-usage"),
-      Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
+      Sonar.get().getConfig().getMessagesConfig().getString("commands.incorrect-usage"),
+      Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
      Placeholder.unparsed("subcommand-usage", usage)));
  }

@@ -70,16 +70,16 @@ public abstract class Subcommand {
    // Check if the subcommand can only be executed by players
    if (info.onlyPlayers() && !invocationSource.isPlayer()) {
      invocationSource.sendMessage(MiniMessage.miniMessage().deserialize(
-        Sonar.get0().getConfig().getMessagesConfig().getString("commands.player-only"),
-        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix())));
+        Sonar.get().getConfig().getMessagesConfig().getString("commands.player-only"),
+        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())));
      return;
    }

    // Check if the subcommand can only be executed though console
    if (info.onlyConsole() && invocationSource.isPlayer()) {
      invocationSource.sendMessage(MiniMessage.miniMessage().deserialize(
-        Sonar.get0().getConfig().getMessagesConfig().getString("commands.console-only"),
-        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix())));
+        Sonar.get().getConfig().getMessagesConfig().getString("commands.console-only"),
+        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())));
      return;
    }

@@ -95,7 +95,7 @@ public abstract class Subcommand {

  public final @NotNull String getDescription() {
    final String path = String.format("commands.%s.description", info.name());
-    return Objects.requireNonNull(Sonar.get0().getConfig().getMessagesConfig().getString(path));
+    return Objects.requireNonNull(Sonar.get().getConfig().getMessagesConfig().getString(path));
  }

  protected abstract void execute(final @NotNull InvocationSource source, final String @NotNull [] args);
@@ -140,7 +140,6 @@ public enum Language {
  FA("Persian"),
  PL("Polish"),
  PT("Portuguese"),
-  PT_BR("Brazilian Portuguese", "pt-br"),
  PS("Pushto"),
  QU("Quechua"),
  RM("Raeto-Romance"),
@@ -204,18 +203,7 @@ public enum Language {
    this.code = name().toLowerCase();
  }

-  Language(final String name, final String code) {
-    this.name = name;
-    this.code = code;
-  }
-
  public static Language fromCode(final @NotNull String code) {
-    for (final Language language : values()) {
-      if (language.code.equalsIgnoreCase(code)) {
-        return language;
-      }
-    }
-    // Fallback to English
-    return EN;
+    return Language.valueOf(code.toUpperCase());
  }
 }
@@ -89,7 +89,7 @@ public final class SimpleYamlConfig {

  public int getInt(final String path) {
    if (!yaml.contains(path)) {
-      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get().getLogger().warn("Could not find {} in {}.", path, file.getName());
      return 0;
    }
    return yaml.getInt(path);
@@ -97,7 +97,7 @@ public final class SimpleYamlConfig {

  public boolean getBoolean(final String path) {
    if (!yaml.contains(path)) {
-      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get().getLogger().warn("Could not find {} in {}.", path, file.getName());
      return false;
    }
    return yaml.getBoolean(path);
@@ -105,7 +105,7 @@ public final class SimpleYamlConfig {

  public @NotNull String getString(final String path) {
    if (!yaml.contains(path)) {
-      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get().getLogger().warn("Could not find {} in {}.", path, file.getName());
      return "";
    }
    final Object object = yaml.get(path);
@@ -117,7 +117,7 @@ public final class SimpleYamlConfig {

  public List<String> getStringList(final String path) {
    if (!yaml.contains(path)) {
-      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get().getLogger().warn("Could not find {} in {}.", path, file.getName());
      return new ArrayList<>(0);
    }
    return yaml.getStringList(path);
@@ -125,7 +125,7 @@ public final class SimpleYamlConfig {

  public List<Integer> getIntList(final String path) {
    if (!yaml.contains(path)) {
-      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get().getLogger().warn("Could not find {} in {}.", path, file.getName());
      return new ArrayList<>(0);
    }
    return yaml.getIntegerList(path);
@@ -30,7 +30,6 @@ import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.database.ormlite.H2DatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.database.ormlite.MariaDbDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.database.ormlite.MysqlDatabaseTypeAdapter;
-import xyz.jonesdev.sonar.api.database.ormlite.PostgresDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.webhook.DiscordWebhook;

 import java.io.File;
@@ -67,14 +66,14 @@ public final class SonarConfiguration {
      final URL defaultLanguageFile = Sonar.class.getResource("/assets/language.properties");
      // Make sure the file actually exists before trying to copy it
      if (defaultLanguageFile == null) {
-        Sonar.get0().getLogger().error("Cannot check for custom language (is the file missing?)");
+        Sonar.get().getLogger().error("Cannot check for custom language (is the file missing?)");
        return DEFAULT_FALLBACK_LANGUAGE;
      }
      // Copy the file to the plugin data directory
      try (final InputStream inputStream = defaultLanguageFile.openStream()) {
        Files.copy(inputStream, languageFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
      } catch (IOException exception) {
-        Sonar.get0().getLogger().error("Error copying file: {}", exception);
+        Sonar.get().getLogger().error("Error copying file: {}", exception);
        return DEFAULT_FALLBACK_LANGUAGE;
      }
    }
@@ -88,13 +87,13 @@ public final class SonarConfiguration {
        // Try parsing the property as a language
        return Language.fromCode(property);
      } catch (Throwable throwable) {
-        Sonar.get0().getLogger().error("Could not find requested language: {}", throwable);
-        Sonar.get0().getLogger().error("You can view a full list of valid language codes here:");
-        Sonar.get0().getLogger().error("https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes");
-        Sonar.get0().getLogger().error("If a translation does not exist yet, Sonar will use English (en).");
+        Sonar.get().getLogger().error("Could not find requested language: {}", throwable);
+        Sonar.get().getLogger().error("You can view a full list of valid language codes here:");
+        Sonar.get().getLogger().error("https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes");
+        Sonar.get().getLogger().error("If a translation does not exist yet, Sonar will use English (en).");
      }
    } catch (IOException exception) {
-      Sonar.get0().getLogger().error("Error reading language file: {}", exception);
+      Sonar.get().getLogger().error("Error reading language file: {}", exception);
    }
    return DEFAULT_FALLBACK_LANGUAGE;
  }
@@ -113,13 +112,13 @@ public final class SonarConfiguration {
        final String property = System.getProperty("user.language", "en");
        language = Language.fromCode(property);
        // Make sure the user knows that we're using the system language for translations
-        Sonar.get0().getLogger().info("Using system language ({}) for translations.", language);
+        Sonar.get().getLogger().info("Using system language ({}) for translations.", language);
      } catch (Exception exception) {
-        Sonar.get0().getLogger().warn("Could not use system language for translations.");
-        Sonar.get0().getLogger().warn("Using default language ({}) for translations.", language);
+        Sonar.get().getLogger().warn("Could not use system language for translations.");
+        Sonar.get().getLogger().warn("Using default language ({}) for translations.", language);
      }
    } else {
-      Sonar.get0().getLogger().info("Using custom language ({}) for translations.", language);
+      Sonar.get().getLogger().info("Using custom language ({}) for translations.", language);
    }

    // Load all configurations
@@ -140,7 +139,7 @@ public final class SonarConfiguration {

    // General settings
    logPlayerAddresses = generalConfig.getBoolean("general.log-player-addresses");
-    maxOnlinePerIp = clamp(generalConfig.getInt("general.max-online-per-ip"), -1, 99);
+    maxOnlinePerIp = clamp(generalConfig.getInt("general.max-online-per-ip"), 0, 99);

    // Attack tracker
    minPlayersForAttack = clamp(generalConfig.getInt("attack-tracker.min-players-for-attack"), 2, 1024);
@@ -159,29 +158,28 @@ public final class SonarConfiguration {
    verification.timing = Verification.Timing.valueOf(generalConfig.getString("verification.timing"));
    // Warn the user if the verification timing is set to NEVER
    if (verification.timing == Verification.Timing.NEVER) {
-      Sonar.get0().getLogger().warn(" ");
-      Sonar.get0().getLogger().warn("You have set the verification timing to 'NEVER'.");
-      Sonar.get0().getLogger().warn("Sonar will NOT perform the bot verification at all, therefore making it useless.");
-      Sonar.get0().getLogger().warn("It is highly suggested to set this option to either 'DURING_ATTACK' or 'ALWAYS'.");
-      Sonar.get0().getLogger().warn("Please only edit this option if you really know what you are doing.");
-      Sonar.get0().getLogger().warn(" ");
+      Sonar.get().getLogger().warn(" ");
+      Sonar.get().getLogger().warn("You have set the verification timing to 'NEVER'.");
+      Sonar.get().getLogger().warn("Sonar will NOT perform the bot verification at all, therefore making it useless.");
+      Sonar.get().getLogger().warn("It is highly suggested to set this option to either 'DURING_ATTACK' or 'ALWAYS'.");
+      Sonar.get().getLogger().warn("Please only edit this option if you really know what you are doing.");
+      Sonar.get().getLogger().warn(" ");
    }

-    verification.gravity.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.gravity.timing"));
-    verification.gravity.collisionTiming = Verification.Timing.valueOf(generalConfig.getString("verification.checks.collision.timing"));
+    verification.gravity.enabled = generalConfig.getBoolean("verification.checks.gravity.enabled");
+    verification.gravity.checkCollisions = generalConfig.getBoolean("verification.checks.collision.enabled");
    verification.gravity.captchaOnFail = generalConfig.getBoolean("verification.checks.gravity.captcha-on-fail");
    verification.gravity.maxMovementTicks = clamp(generalConfig.getInt("verification.checks.gravity.max-movement-ticks"), 2, 100);

-    verification.vehicle.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.vehicle.timing"));
+    verification.vehicle.enabled = generalConfig.getBoolean("verification.checks.vehicle.enabled");
    verification.vehicle.minimumPackets = clamp(generalConfig.getInt("verification.checks.vehicle.minimum-packets"), 0, 20);

    verification.map.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.map-captcha.timing"));
    verification.map.precomputeAmount = clamp(generalConfig.getInt("verification.checks.map-captcha.precompute"), 10, 5000);
    verification.map.maxDuration = clamp(generalConfig.getInt("verification.checks.map-captcha.max-duration"), 5000, 360000);
-    verification.map.maxTries = clamp(generalConfig.getInt("verification.checks.map-captcha.max-tries"), 1, 100);
+    verification.map.maxTries = generalConfig.getInt("verification.checks.map-captcha.max-tries");
    verification.map.alphabet = generalConfig.getString("verification.checks.map-captcha.alphabet");
    verification.map.backgroundImage = null;
-    verification.map.placeInOffhand = generalConfig.getBoolean("verification.checks.map-captcha.place-in-offhand");

    final String backgroundPath = generalConfig.getString("verification.checks.map-captcha.background");
    if (!backgroundPath.isEmpty()) {
@@ -189,7 +187,7 @@ public final class SonarConfiguration {
      if (backgroundFile.exists()) {
        verification.map.backgroundImage = backgroundFile;
      } else {
-        Sonar.get0().getLogger().error("Could not find background image {}", backgroundFile.getAbsolutePath());
+        Sonar.get().getLogger().error("Could not find background image {}", backgroundFile.getAbsolutePath());
      }
    }

@@ -200,15 +198,14 @@ public final class SonarConfiguration {
    verification.timeOfDay = clamp(generalConfig.getInt("verification.time-of-day"), 0, 24000);
    verification.gamemode = Verification.Gamemode.valueOf(generalConfig.getString("verification.gamemode"));
    verification.validNameRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-name-regex"));
+    verification.validLocaleRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-locale-regex"));

    verification.checkGeyser = generalConfig.getBoolean("verification.check-geyser-players");
-    verification.checkEagler = generalConfig.getBoolean("verification.check-eagler-players");
    verification.logConnections = generalConfig.getBoolean("verification.log-connections");
    verification.logDuringAttack = generalConfig.getBoolean("verification.log-during-attack");
    verification.debugXYZPositions = generalConfig.getBoolean("verification.debug-xyz-positions");
    verification.readTimeout = clamp(generalConfig.getInt("verification.read-timeout"), 1000, 30000);
    verification.writeTimeout = clamp(generalConfig.getInt("verification.write-timeout"), 1000, 30000);
-    verification.maxPacketCount = clamp(generalConfig.getInt("verification.max-packets"), 200, 9999);
    verification.reconnectDelay = clamp(generalConfig.getInt("verification.rejoin-delay"), 0, 100000);
    verification.rememberTime = clamp(generalConfig.getInt("verification.remember-time"), 0, 86400000);
    verification.blacklistTime = clamp(generalConfig.getInt("verification.blacklist-time"), 0, 86400000);
@@ -253,12 +250,7 @@ public final class SonarConfiguration {

    SonarCommand.prepareCachedTabSuggestions();

-    supportUrl = messagesConfig.getString("support-url")
-      .replace("jonesdev.xyz", "sonar.top") // Migration: Replace legacy URL
-      .trim();
-    if (supportUrl.contains("://sonar.top/")) {
-      Sonar.get0().getLogger().warn("Consider entering a custom support URL (if applicable).");
-    }
+    supportUrl = messagesConfig.getString("support-url");
    header = MiniMessage.miniMessage().deserialize(
      String.join("<newline>", messagesConfig.getStringList("header")),
      Placeholder.unparsed("support-url", supportUrl),
@@ -296,7 +288,7 @@ public final class SonarConfiguration {
    final String resourceName = url + "/" + language.getCode() + ".yml";
    URL result = Sonar.class.getResource("/assets/" + resourceName);
    if (result == null) {
-      Sonar.get0().getLogger().warn("Could not find " + resourceName + "! Using en.yml!");
+      Sonar.get().getLogger().warn("Could not find " + resourceName + "! Using en.yml!");
      result = Objects.requireNonNull(Sonar.class.getResource("/assets/" + url + "/en.yml"));
    }
    return result;
@@ -305,7 +297,7 @@ public final class SonarConfiguration {
  private static int clamp(final int v, final int max, final int min) {
    final int output = Math.max(Math.min(v, min), max);
    if (output != v) {
-      Sonar.get0().getLogger().warn("Clamped configuration value {} to {}", v, output);
+      Sonar.get().getLogger().warn("Clamped configuration value {} to {}", v, output);
    }
    return output;
  }
@@ -380,20 +372,19 @@ public final class SonarConfiguration {
      private int maxTries;
      private String alphabet;
      private File backgroundImage;
-      private boolean placeInOffhand;
    }

    @Getter
    public static final class Gravity {
-      private Timing timing;
-      private Timing collisionTiming;
+      private boolean enabled;
+      private boolean checkCollisions;
      private boolean captchaOnFail;
      private int maxMovementTicks;
    }

    @Getter
    public static final class Vehicle {
-      private Timing timing;
+      private boolean enabled;
      private int minimumPackets;
    }

@@ -423,15 +414,14 @@ public final class SonarConfiguration {

    private int timeOfDay;
    private boolean checkGeyser;
-    private boolean checkEagler;
    private boolean logConnections;
    private boolean logDuringAttack;
    private boolean debugXYZPositions;
    private Pattern validNameRegex;
+    private Pattern validLocaleRegex;

    private int readTimeout;
    private int writeTimeout;
-    private int maxPacketCount;
    private int reconnectDelay;
    private int rememberTime;
    private int blacklistTime;
@@ -457,14 +447,14 @@ public final class SonarConfiguration {
    @Getter
    @RequiredArgsConstructor
    public enum Type {
-      MYSQL("MySQL", "jdbc:mysql://%s:%d/%s%s", new MysqlDatabaseTypeAdapter(),
+      MYSQL("MySQL", "jdbc:mysql://%s:%d/%s", new MysqlDatabaseTypeAdapter(),
        Library.builder()
          .groupId("com{}mysql")
          .artifactId("mysql-connector-j")
          .version("9.0.0")
          .relocate("com{}mysql", "xyz{}jonesdev{}sonar{}libs{}mysql")
          .build()),
-      MARIADB("MariaDB", "jdbc:mariadb://%s:%d/%s%s", new MariaDbDatabaseTypeAdapter(),
+      MARIADB("MariaDB", "jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseTypeAdapter(),
        Library.builder()
          .groupId("org{}mariadb{}jdbc")
          .artifactId("mariadb-java-client")
@@ -478,13 +468,6 @@ public final class SonarConfiguration {
          .version("2.2.220")
          .relocate("org{}h2", "xyz{}jonesdev{}sonar{}libs{}h2")
          .build()),
-      POSTGRESQL("PostgreSQL", "jdbc:postgresql://%s:%d/%s%s", new PostgresDatabaseTypeAdapter(),
-        Library.builder()
-          .groupId("org{}postgresql")
-          .artifactId("postgresql")
-          .version("42.7.8")
-          .relocate("org{}postgresql", "xyz{}jonesdev{}sonar{}libs{}postgresql")
-          .build()),
      NONE("None", null, null, null);

      private final String displayName;
@@ -21,7 +21,6 @@ import com.alessiodp.libby.LibraryManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
-import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;
@@ -55,21 +54,19 @@ public final class VerifiedPlayerController {
  @Getter
  private final @NotNull SonarConfiguration.Database.Type cachedDatabaseType;
  private final ExecutorService updateService = Executors.newSingleThreadExecutor();
-  @Getter
-  private int maximumAge;

  public VerifiedPlayerController(final @NotNull LibraryManager libraryManager) {
-    final SonarConfiguration.Database database = Sonar.get0().getConfig().getDatabase();
+    final SonarConfiguration.Database database = Sonar.get().getConfig().getDatabase();
    cachedDatabaseType = database.getType();

    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
-      Sonar.get0().getLogger().warn("Configure a database to save verified players.");
+      Sonar.get().getLogger().warn("Configure a database to save verified players.");
      return;
    }

    // Make sure to only load the driver once per database type
    if (!cachedDatabaseType.isLoaded()) {
-      Sonar.get0().getLogger().info("Loading {} driver version {}",
+      Sonar.get().getLogger().info("Loading {} driver version {}",
        cachedDatabaseType.getDatabaseType().getDatabaseName(),
        cachedDatabaseType.getDatabaseDriver().getVersion());
      libraryManager.loadLibrary(cachedDatabaseType.getDatabaseDriver());
@@ -82,23 +79,21 @@ public final class VerifiedPlayerController {
      // H2 has a different JDBC URL layout
      // https://www.codejava.net/java-se/jdbc/connect-to-h2-database-examples
      if (cachedDatabaseType == SonarConfiguration.Database.Type.H2) {
-        final File file = new File(Sonar.get0().getConfig().getPluginFolder(),
-          Sonar.get0().getConfig().getGeneralConfig().getString("database.filename"));
+        final File file = new File(Sonar.get().getConfig().getPluginFolder(),
+          Sonar.get().getConfig().getGeneralConfig().getString("database.filename"));
        jdbcURL = String.format(cachedDatabaseType.getConnectionString(), file.getAbsolutePath());
      } else {
        // Normal JDBC URL layout for MySQL/MariaDB/...
        jdbcURL = String.format(cachedDatabaseType.getConnectionString(),
-          Sonar.get0().getConfig().getGeneralConfig().getString("database.host"),
-          Sonar.get0().getConfig().getGeneralConfig().getInt("database.port"),
-          Sonar.get0().getConfig().getGeneralConfig().getString("database.name"),
-          "?autoReconnect=true");
+          Sonar.get().getConfig().getGeneralConfig().getString("database.host"),
+          Sonar.get().getConfig().getGeneralConfig().getInt("database.port"),
+          Sonar.get().getConfig().getGeneralConfig().getString("database.name"));
      }

-      final String user = Sonar.get0().getConfig().getGeneralConfig().getString("database.username");
-      final String pass = Sonar.get0().getConfig().getGeneralConfig().getString("database.password");
-      connectionSource = cachedDatabaseType == SonarConfiguration.Database.Type.H2
-        ? new JdbcConnectionSource(jdbcURL, user, pass, cachedDatabaseType.getDatabaseType())
-        : new JdbcPooledConnectionSource(jdbcURL, user, pass, cachedDatabaseType.getDatabaseType());
+      connectionSource = new JdbcConnectionSource(jdbcURL,
+        Sonar.get().getConfig().getGeneralConfig().getString("database.username"),
+        Sonar.get().getConfig().getGeneralConfig().getString("database.password"),
+        cachedDatabaseType.getDatabaseType());

      try {
        TableUtils.createTableIfNotExists(connectionSource, VerifiedPlayer.class);
@@ -112,7 +107,6 @@ public final class VerifiedPlayerController {

      dao = DaoManager.createDao(connectionSource, VerifiedPlayer.class);
      queryBuilder = dao.queryBuilder();
-      maximumAge = database.getMaximumAge();

      // Make sure to run the clean task and the caching task in the same thread
      // https://github.com/jonesdevelopment/sonar/issues/150
@@ -120,7 +114,7 @@ public final class VerifiedPlayerController {
        if (connectionSource != null) {
          try {
            // Make sure to clear all outdated entries first
-            clearOld(maximumAge, false);
+            clearOld(database.getMaximumAge());
            // Add all entries from the database to the cache
            dao.queryForAll().forEach(verifiedPlayer -> cache.add(verifiedPlayer.getFingerprint()));
          } catch (SQLException exception) {
@@ -139,8 +133,6 @@ public final class VerifiedPlayerController {
  public void close() {
    // The connection source will always be null if the database type is NONE.
    if (connectionSource != null) {
-      // Shut down the update service before letting it re-use the connection.
-      updateService.shutdown();
      try {
        connectionSource.close();
      } catch (Exception exception) {
@@ -148,14 +140,14 @@ public final class VerifiedPlayerController {
      }
      // Make sure not to reuse a closed connection
      connectionSource = null;
+      updateService.shutdown();
    }
  }

  /**
   * Clear all old entries using the given timestamp
   */
-  public void clearOld(final @Range(from = 1, to = 365) int maximumAge,
-                       final boolean removeExisting) throws SQLException {
+  private void clearOld(final @Range(from = 1, to = 365) int maximumAge) throws SQLException {
    final long timestamp = Instant.now().minus(maximumAge, ChronoUnit.DAYS).getEpochSecond() * 1000L;

    final List<VerifiedPlayer> oldEntries = queryBuilder.where()
@@ -165,11 +157,8 @@ public final class VerifiedPlayerController {
    if (oldEntries != null && !oldEntries.isEmpty()) {
      for (final VerifiedPlayer player : oldEntries) {
        dao.delete(player);
-        if (removeExisting) {
-          cache.remove(player.getFingerprint());
-        }
      }
-      Sonar.get0().getLogger().info("Removed {} database entries older than {} days.",
+      Sonar.get().getLogger().info("Removed {} database entries older than {} days.",
        oldEntries.size(), maximumAge);
    }
  }
@@ -1,14 +0,0 @@
-package xyz.jonesdev.sonar.api.database.ormlite;
-
-import com.j256.ormlite.jdbc.db.PostgresDatabaseType;
-import org.jetbrains.annotations.NotNull;
-
-public final class PostgresDatabaseTypeAdapter extends PostgresDatabaseType {
-
-  // We need to override the default driver class name
-  // to use the custom relocated Postgres driver
-  @Override
-  protected String @NotNull [] getDriverClassNames() {
-     return new String[]{"xyz.jonesdev.sonar.libs.postgresql.Driver"};
-  }
-}
@@ -47,7 +47,7 @@ public final class SonarEventManager {
        try {
          eventListener.handle(event);
        } catch (Throwable throwable) {
-          Sonar.get0().getLogger().error("Could not pass {} to listener: {}",
+          Sonar.get().getLogger().error("Could not pass {} to listener: {}",
            event.getClass().getSimpleName(), throwable);
        }
      }
@@ -20,8 +20,8 @@ package xyz.jonesdev.sonar.api.event.impl;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
-import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.fallback.captcha.CaptchaGenerator;

@Getter
@Setter
@@ -20,12 +20,12 @@ package xyz.jonesdev.sonar.api.event.impl;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import xyz.jonesdev.sonar.api.antibot.SonarUser;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
@RequiredArgsConstructor
 public final class UserBlacklistedEvent implements SonarEvent {
-  private final SonarUser user;
+  private final FallbackUser user;
 }
@@ -21,13 +21,13 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.SonarUser;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
@RequiredArgsConstructor
 public final class UserVerifyFailedEvent implements SonarEvent {
-  private final @NotNull SonarUser user;
+  private final @NotNull FallbackUser user;
  private final @NotNull String reason;
 }
@@ -20,12 +20,12 @@ package xyz.jonesdev.sonar.api.event.impl;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import xyz.jonesdev.sonar.api.antibot.SonarUser;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
@RequiredArgsConstructor
 public final class UserVerifyJoinEvent implements SonarEvent {
-  private final SonarUser user;
+  private final FallbackUser user;
 }
@@ -20,12 +20,12 @@ package xyz.jonesdev.sonar.api.event.impl;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import xyz.jonesdev.sonar.api.antibot.SonarUser;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
@RequiredArgsConstructor
 public final class UserVerifySuccessEvent implements SonarEvent {
-  private final SonarUser user;
+  private final FallbackUser user;
 }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.antibot;
+package xyz.jonesdev.sonar.api.fallback;

 import com.github.benmanes.caffeine.cache.Cache;
 import lombok.AccessLevel;
@@ -23,9 +23,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
-import xyz.jonesdev.sonar.api.antibot.ratelimit.Ratelimiter;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.fallback.captcha.CaptchaGenerator;
+import xyz.jonesdev.sonar.api.fallback.ratelimit.Ratelimiter;

 import java.net.InetAddress;
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,12 +33,12 @@ import java.util.concurrent.ConcurrentMap;

@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class AntiBot {
-  public static final AntiBot INSTANCE = new AntiBot();
+public final class Fallback {
+  public static final Fallback INSTANCE = new Fallback();

  private final ConcurrentMap<InetAddress, Integer> online = new ConcurrentHashMap<>(128);
  private final ConcurrentMap<InetAddress, Boolean> connected = new ConcurrentHashMap<>(256);
-  private final LoginQueue queue = new LoginQueue();
+  private final FallbackLoginQueue queue = new FallbackLoginQueue();
  @Setter
  private Cache<String, Integer> blacklist;
  @Setter
@@ -49,16 +49,16 @@ public final class AntiBot {
  private Ratelimiter<InetAddress> ratelimiter;

  public boolean shouldVerifyNewPlayers() {
-    return shouldPerform(Sonar.get0().getConfig().getVerification().getTiming());
+    return shouldPerform(Sonar.get().getConfig().getVerification().getTiming());
  }

  public boolean shouldPerformCaptcha() {
-    return shouldPerform(Sonar.get0().getConfig().getVerification().getMap().getTiming());
+    return shouldPerform(Sonar.get().getConfig().getVerification().getMap().getTiming());
  }

-  public static boolean shouldPerform(final SonarConfiguration.Verification.Timing timing) {
+  private static boolean shouldPerform(final SonarConfiguration.Verification.Timing timing) {
    return timing == SonarConfiguration.Verification.Timing.ALWAYS
      || (timing == SonarConfiguration.Verification.Timing.DURING_ATTACK
-      && Sonar.get0().getAttackTracker().getCurrentAttack() != null);
+      && Sonar.get().getAttackTracker().getCurrentAttack() != null);
  }
 }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.antibot;
+package xyz.jonesdev.sonar.api.fallback;

 import lombok.AccessLevel;
 import lombok.Getter;
@@ -30,7 +30,7 @@ import java.util.concurrent.Executors;

@Getter
@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-public final class LoginQueue {
+public final class FallbackLoginQueue {
  // 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);
@@ -38,7 +38,7 @@ public final class LoginQueue {
  private final ConcurrentMap<InetAddress, Runnable> players = new ConcurrentHashMap<>(512);

  public void poll() {
-    final int maxQueuePolls = Math.min(players.size(), Sonar.get0().getConfig().getQueue().getMaxQueuePolls());
+    final int maxQueuePolls = Math.min(players.size(), Sonar.get().getConfig().getQueue().getMaxQueuePolls());
    // No need to initiate an executor service task if nobody is currently queued
    if (maxQueuePolls <= 0) return;
    // We need to be cautious here since we don't want any concurrency issues
@@ -15,20 +15,17 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.util;
+package xyz.jonesdev.sonar.api.fallback;

-import io.netty.channel.Channel;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-
-@UtilityClass
-public class EaglerUtil {
-  // Detect EaglerXServer WebSocket connections by checking for Eagler-specific pipeline handlers.
-  private static final String H_EAGLER_HANDSHAKE = "eagler-handshake";
-  private static final String H_EAGLER_FRAME_CODEC = "eagler-frame-codec";
-
-  public boolean isEaglerConnection(final @NotNull Channel channel) {
-    return channel.pipeline().get(H_EAGLER_HANDSHAKE) != null
-      || channel.pipeline().get(H_EAGLER_FRAME_CODEC) != null;
-  }
+public interface FallbackPipelines {
+  String FALLBACK_INACTIVE_LISTENER = "sonar-inactive-listener";
+  String FALLBACK_INBOUND_HANDLER = "sonar-inbound-handler";
+  String FALLBACK_FRAME_DECODER = "sonar-frame-decoder";
+  String FALLBACK_FRAME_ENCODER = "sonar-frame-encoder";
+  String FALLBACK_TIMEOUT = "sonar-timeout";
+  String FALLBACK_PACKET_HANDLER = "sonar-packet-handler";
+  String FALLBACK_PACKET_ENCODER = "sonar-packet-encoder";
+  String FALLBACK_PACKET_DECODER = "sonar-packet-decoder";
+  String FALLBACK_TAIL_EXCEPTIONS = "sonar-exception-tail";
+  String FALLBACK_BANDWIDTH = "sonar-bandwidth-counter";
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2026 Sonar Contributors
+ * Copyright (C) 2025 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
@@ -15,19 +15,18 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.antibot;
+package xyz.jonesdev.sonar.api.fallback;

 import io.netty.channel.Channel;
 import io.netty.util.ReferenceCountUtil;
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.net.InetAddress;

-public interface SonarUser {
+public interface FallbackUser {
  @NotNull Channel channel();

  @NotNull InetAddress getInetAddress();
@@ -46,8 +45,6 @@ public interface SonarUser {

  boolean isGeyser();

-  @Nullable String getHostname();
-
  /**
   * Disconnect the player during/after verification
   * using our custom Disconnect packet.
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.antibot.captcha;
+package xyz.jonesdev.sonar.api.fallback.captcha;

 import org.jetbrains.annotations.NotNull;

@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.antibot.protocol;
+package xyz.jonesdev.sonar.api.fallback.protocol;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -70,15 +70,7 @@ public enum ProtocolVersion {
  MINECRAFT_1_20_5(766, "1.20.5"),
  MINECRAFT_1_21(767, "1.21"),
  MINECRAFT_1_21_2(768, "1.21.2"),
-  MINECRAFT_1_21_4(769, "1.21.4"),
-  MINECRAFT_1_21_5(770, "1.21.5"),
-  MINECRAFT_1_21_6(771, "1.21.6"),
-  MINECRAFT_1_21_7(772, "1.21.7"),
-  MINECRAFT_1_21_9(773, "1.21.9"),
-  MINECRAFT_1_21_11(774, "1.21.11"),
-  MINECRAFT_26_1(775, "26.1"),
-  MINECRAFT_26_2(776, "26.2"),
-  MINECRAFT_26_3(777, "26.3");
+  MINECRAFT_1_21_4(769, "1.21.4");

  private final int protocol;
  private final String name;
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.antibot.ratelimit;
+package xyz.jonesdev.sonar.api.fallback.ratelimit;

 import org.jetbrains.annotations.NotNull;

@@ -33,8 +33,8 @@ import static xyz.jonesdev.sonar.api.profiler.SimpleProcessProfiler.*;
 import static xyz.jonesdev.sonar.api.timer.SystemTimer.DATE_FORMATTER;

@Getter
-public class ActionBarNotificationHandler extends NotificationHandler {
-  protected int animationIndex;
+public final class ActionBarNotificationHandler extends NotificationHandler {
+  private int animationIndex;

  @Override
  public void handleNotification() {
@@ -44,31 +44,29 @@ public class ActionBarNotificationHandler extends NotificationHandler {
    }

    // Prepare the action bar verbose
-    final AttackTracker.AttackStatistics attackStatistics = Sonar.get0().getAttackTracker().getCurrentAttack();
+    final AttackTracker.AttackStatistics attackStatistics = Sonar.get().getAttackTracker().getCurrentAttack();
    final SystemTimer attackTimer = attackStatistics == null ? null : attackStatistics.getDuration();
    final String attackDuration = attackTimer == null ? "00:00" : DATE_FORMATTER.format(attackTimer.delay());

    final Component actionBarComponent = MiniMessage.miniMessage().deserialize(attackTimer == null
-        ? Sonar.get0().getConfig().getMessagesConfig().getString("verbose.layout.normal")
-        : Sonar.get0().getConfig().getMessagesConfig().getString("verbose.layout.attack"),
-      Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
+        ? Sonar.get().getConfig().getMessagesConfig().getString("verbose.layout.normal")
+        : Sonar.get().getConfig().getMessagesConfig().getString("verbose.layout.attack"),
+      Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
      Placeholder.unparsed("attack-duration", attackDuration),
      Placeholder.unparsed("animation", nextAnimation()),
-      Placeholder.unparsed("process-cpu", Sonar.DECIMAL_FORMAT.format(getProcessCPUUsage())),
-      Placeholder.unparsed("system-cpu", Sonar.DECIMAL_FORMAT.format(getSystemCPUUsage())),
-      Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getQueue().getPlayers().size())),
-      Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getConnected().size())),
-      Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getBlacklist().estimatedSize())),
-      Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalPlayersJoined())),
-      Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getLoginsPerSecond())),
-      Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getConnectionsPerSecond())),
-      Placeholder.unparsed("verify-total", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalAttemptedVerifications())),
-      Placeholder.unparsed("verify-success", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalSuccessfulVerifications())),
-      Placeholder.unparsed("verify-failed", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalFailedVerifications())),
-      Placeholder.unparsed("incoming-traffic", Sonar.get0().getStatistics().getPerSecondIncomingBandwidthFormatted()),
-      Placeholder.unparsed("outgoing-traffic", Sonar.get0().getStatistics().getPerSecondOutgoingBandwidthFormatted()),
-      Placeholder.unparsed("incoming-traffic-ttl", formatMemory(Sonar.get0().getStatistics().getTotalIncomingBandwidth())),
-      Placeholder.unparsed("outgoing-traffic-ttl", formatMemory(Sonar.get0().getStatistics().getTotalOutgoingBandwidth())),
+      Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getPlayers().size())),
+      Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size())),
+      Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize())),
+      Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalPlayersJoined())),
+      Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getLoginsPerSecond())),
+      Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getConnectionsPerSecond())),
+      Placeholder.unparsed("verify-total", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalAttemptedVerifications())),
+      Placeholder.unparsed("verify-success", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalSuccessfulVerifications())),
+      Placeholder.unparsed("verify-failed", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalFailedVerifications())),
+      Placeholder.unparsed("incoming-traffic", Sonar.get().getStatistics().getPerSecondIncomingBandwidthFormatted()),
+      Placeholder.unparsed("outgoing-traffic", Sonar.get().getStatistics().getPerSecondOutgoingBandwidthFormatted()),
+      Placeholder.unparsed("incoming-traffic-ttl", formatMemory(Sonar.get().getStatistics().getTotalIncomingBandwidth())),
+      Placeholder.unparsed("outgoing-traffic-ttl", formatMemory(Sonar.get().getStatistics().getTotalOutgoingBandwidth())),
      Placeholder.unparsed("used-memory", formatMemory(getUsedMemory())),
      Placeholder.unparsed("free-memory", formatMemory(getFreeMemory())),
      Placeholder.unparsed("total-memory", formatMemory(getTotalMemory())),
@@ -76,7 +74,7 @@ public class ActionBarNotificationHandler extends NotificationHandler {

    // Send the action bar to all online players
    for (final UUID subscriber : subscribers) {
-      final Audience audience = Sonar.get0().audience(subscriber);
+      final Audience audience = Sonar.get().audience(subscriber);
      if (audience == null) continue;

      // Send the action bar to all online subscribers
@@ -85,7 +83,7 @@ public class ActionBarNotificationHandler extends NotificationHandler {
  }

  public String nextAnimation() {
-    final var animations = Sonar.get0().getConfig().getVerboseAnimation();
+    final var animations = Sonar.get().getConfig().getVerboseAnimation();
    final int nextIndex = ++animationIndex % animations.size();
    return animations.toArray(new String[0])[nextIndex];
  }
@@ -43,30 +43,30 @@ public final class ChatNotificationHandler extends NotificationHandler {

    // Prepare the chat notification
    final Component notificationTitle = MiniMessage.miniMessage().deserialize(
-      Sonar.get0().getConfig().getMessagesConfig().getString("notifications.title"));
+      Sonar.get().getConfig().getMessagesConfig().getString("notifications.title"));
    final Component notificationSubtitle = MiniMessage.miniMessage().deserialize(
-      Sonar.get0().getConfig().getMessagesConfig().getString("notifications.subtitle"));
+      Sonar.get().getConfig().getMessagesConfig().getString("notifications.subtitle"));
    final Title title = Title.title(notificationTitle, notificationSubtitle);

-    final List<String> chatNotification = Sonar.get0().getConfig().getMessagesConfig().getStringList("notifications.chat");
+    final List<String> chatNotification = Sonar.get().getConfig().getMessagesConfig().getStringList("notifications.chat");
    final Component[] chatNotificationComponents = new Component[chatNotification.size()];

    for (int i = 0; i < chatNotificationComponents.length; i++) {
      chatNotificationComponents[i] = MiniMessage.miniMessage().deserialize(chatNotification.get(i),
-        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
-        Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getQueue().getPlayers().size())),
-        Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getConnected().size())),
-        Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getBlacklist().estimatedSize())),
-        Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalPlayersJoined())),
-        Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getLoginsPerSecond())),
-        Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getConnectionsPerSecond())),
-        Placeholder.unparsed("verify-total", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalAttemptedVerifications())),
-        Placeholder.unparsed("verify-success", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalSuccessfulVerifications())),
-        Placeholder.unparsed("verify-failed", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalFailedVerifications())),
-        Placeholder.unparsed("incoming-traffic", Sonar.get0().getStatistics().getPerSecondIncomingBandwidthFormatted()),
-        Placeholder.unparsed("outgoing-traffic", Sonar.get0().getStatistics().getPerSecondOutgoingBandwidthFormatted()),
-        Placeholder.unparsed("incoming-traffic-ttl", formatMemory(Sonar.get0().getStatistics().getTotalIncomingBandwidth())),
-        Placeholder.unparsed("outgoing-traffic-ttl", formatMemory(Sonar.get0().getStatistics().getTotalOutgoingBandwidth())),
+        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
+        Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getPlayers().size())),
+        Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size())),
+        Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklist().estimatedSize())),
+        Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalPlayersJoined())),
+        Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getLoginsPerSecond())),
+        Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getConnectionsPerSecond())),
+        Placeholder.unparsed("verify-total", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalAttemptedVerifications())),
+        Placeholder.unparsed("verify-success", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalSuccessfulVerifications())),
+        Placeholder.unparsed("verify-failed", DECIMAL_FORMAT.format(Sonar.get().getStatistics().getTotalFailedVerifications())),
+        Placeholder.unparsed("incoming-traffic", Sonar.get().getStatistics().getPerSecondIncomingBandwidthFormatted()),
+        Placeholder.unparsed("outgoing-traffic", Sonar.get().getStatistics().getPerSecondOutgoingBandwidthFormatted()),
+        Placeholder.unparsed("incoming-traffic-ttl", formatMemory(Sonar.get().getStatistics().getTotalIncomingBandwidth())),
+        Placeholder.unparsed("outgoing-traffic-ttl", formatMemory(Sonar.get().getStatistics().getTotalOutgoingBandwidth())),
        Placeholder.unparsed("used-memory", formatMemory(getUsedMemory())),
        Placeholder.unparsed("free-memory", formatMemory(getFreeMemory())),
        Placeholder.unparsed("total-memory", formatMemory(getTotalMemory())),
@@ -74,8 +74,8 @@ public final class ChatNotificationHandler extends NotificationHandler {
    }

    // Send the title and chat messages to all online players
-    for (final UUID subscriber : Sonar.get0().getChatNotificationHandler().getSubscribers()) {
-      final Audience audience = Sonar.get0().audience(subscriber);
+    for (final UUID subscriber : Sonar.get().getChatNotificationHandler().getSubscribers()) {
+      final Audience audience = Sonar.get().audience(subscriber);
      if (audience == null) continue;

      // Send the message to all online subscribers
@@ -52,10 +52,10 @@ public final class AttackTracker {
  }

  public void checkIfUnderAttack() {
-    final long joinsPerSecond = Sonar.get0().getStatistics().getLoginsPerSecond();
-    final int verifyingPlayers = Sonar.get0().getAntiBot().getConnected().size();
-    final int queuedPlayers = Sonar.get0().getAntiBot().getQueue().getPlayers().size();
-    final int minPlayers = Sonar.get0().getConfig().getMinPlayersForAttack();
+    final long joinsPerSecond = Sonar.get().getStatistics().getLoginsPerSecond();
+    final int verifyingPlayers = Sonar.get().getFallback().getConnected().size();
+    final int queuedPlayers = Sonar.get().getFallback().getQueue().getPlayers().size();
+    final int minPlayers = Sonar.get().getConfig().getMinPlayersForAttack();

    if (joinsPerSecond > minPlayers // Check the number of bots/joins per second.
      || verifyingPlayers > minPlayers // Check the number of verifying players.
@@ -66,10 +66,10 @@ public final class AttackTracker {
      // An attack has been detected
      if (currentAttack == null) {
        currentAttack = new AttackStatistics();
-        currentAttack.successfulVerifications = Sonar.get0().getVerifiedPlayerController().getCache().size();
-        currentAttack.failedVerifications = Sonar.get0().getStatistics().getTotalFailedVerifications();
-        Sonar.get0().getEventManager().publish(new AttackDetectedEvent());
-        Sonar.get0().getChatNotificationHandler().handleNotification();
+        currentAttack.successfulVerifications = Sonar.get().getVerifiedPlayerController().getCache().size();
+        currentAttack.failedVerifications = Sonar.get().getStatistics().getTotalFailedVerifications();
+        Sonar.get().getEventManager().publish(new AttackDetectedEvent());
+        Sonar.get().getChatNotificationHandler().handleNotification();
      } else {
        // Reset attack timer if we're still under attack
        currentAttack.timer.reset();
@@ -80,7 +80,7 @@ public final class AttackTracker {
        // Update joins per second peak if necessary
        currentAttack.peakJoinsPerSecond = joinsPerSecond;
      }
-      final long connectionsPerSecond = Sonar.get0().getStatistics().getConnectionsPerSecond();
+      final long connectionsPerSecond = Sonar.get().getStatistics().getConnectionsPerSecond();
      if (connectionsPerSecond > currentAttack.peakConnectionsPerSecond) {
        // Update connections per second peak if necessary
        currentAttack.peakConnectionsPerSecond = connectionsPerSecond;
@@ -96,14 +96,14 @@ public final class AttackTracker {
        currentAttack.peakProcessMemoryUsage = processMemoryUsage;
      }
    } else if (currentAttack != null) {
-      if (currentAttack.duration.delay() > Sonar.get0().getConfig().getMinAttackDuration()
-        && currentAttack.timer.delay() > Sonar.get0().getConfig().getAttackCooldownDelay()) {
+      if (currentAttack.duration.delay() > Sonar.get().getConfig().getMinAttackDuration()
+        && currentAttack.timer.delay() > Sonar.get().getConfig().getAttackCooldownDelay()) {
        // The current attack has stopped
-        Sonar.get0().getEventManager().publish(new AttackMitigatedEvent(currentAttack));
+        Sonar.get().getEventManager().publish(new AttackMitigatedEvent(currentAttack));

-        if (++attackThreshold > Sonar.get0().getConfig().getMinAttackThreshold()) {
+        if (++attackThreshold > Sonar.get().getConfig().getMinAttackThreshold()) {
          // Post webhook to Discord
-          Optional.ofNullable(Sonar.get0().getConfig().getWebhook().getDiscordWebhook())
+          Optional.ofNullable(Sonar.get().getConfig().getWebhook().getDiscordWebhook())
            .ifPresent(webhook -> {
              // Save attack statistics
              final long deltaInMillis = currentAttack.duration.delay();
@@ -116,15 +116,15 @@ public final class AttackTracker {
              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.get0().getAntiBot().getBlacklist().estimatedSize();
+              final long blacklisted = Sonar.get().getFallback().getBlacklist().estimatedSize();
              // Calculate during-attack-statistics using their deltas
-              final long totalVerified = Sonar.get0().getVerifiedPlayerController().getCache().size();
+              final long totalVerified = Sonar.get().getVerifiedPlayerController().getCache().size();
              final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);
-              final long totalFailed = Sonar.get0().getStatistics().getTotalFailedVerifications();
+              final long totalFailed = Sonar.get().getStatistics().getTotalFailedVerifications();
              final long failed = Math.max(totalFailed - currentAttack.failedVerifications, 0);

              webhook.post(() -> {
-                final SonarConfiguration.Webhook.Embed config = Sonar.get0().getConfig().getWebhook().getEmbed();
+                final SonarConfiguration.Webhook.Embed config = Sonar.get().getConfig().getWebhook().getEmbed();
                final String description = config.getDescription()
                  .replace("<start-timestamp>", startTimestamp)
                  .replace("<end-timestamp>", endTimestamp)
@@ -48,24 +48,23 @@ public class UpdateChecker {
        final JsonObject json = parseJson(urlConnection);
        final String latestStableRelease = json.get("tag_name").getAsString();
        final int convertedLatestVersion = convertVersion(latestStableRelease);
-        final int convertedCurrentVersion = convertVersion(Sonar.get0().getVersion().getVersion());
+        final int convertedCurrentVersion = convertVersion(Sonar.get().getVersion().getVersion());

        if (convertedCurrentVersion < convertedLatestVersion) {
-          Sonar.get0().getLogger().warn("A new version of Sonar is available: {}", latestStableRelease);
-          Sonar.get0().getLogger().warn("Please make sure to update to the latest version to ensure stability and security:");
-          Sonar.get0().getLogger().warn("https://github.com/jonesdevelopment/sonar/releases/latest");
+          Sonar.get().getLogger().warn("A new version of Sonar is available: {}", latestStableRelease);
+          Sonar.get().getLogger().warn("Please make sure to update to the latest version to ensure stability and security:");
+          Sonar.get().getLogger().warn("https://github.com/jonesdevelopment/sonar/releases/latest");
          lastCheckResult = CheckResult.OUTDATED_VERSION;
-        } else if (convertedCurrentVersion > convertedLatestVersion || !Sonar.get0().getVersion().getGitBranch().equals("main")) {
-          Sonar.get0().getLogger().warn("You are currently using an unreleased version of Sonar!");
-          Sonar.get0().getLogger().warn("The contributors of Sonar are not responsible for any damage done by using an unstable version");
+        } else if (convertedCurrentVersion > convertedLatestVersion || !Sonar.get().getVersion().getGitBranch().equals("main")) {
+          Sonar.get().getLogger().warn("You are currently using an unreleased version of Sonar!");
+          Sonar.get().getLogger().warn("The contributors of Sonar are not responsible for any damage done by using an unstable version");
          lastCheckResult = CheckResult.UNSTABLE_VERSION;
        } else if (lastCheckResult != CheckResult.LATEST_VERSION) {
-          Sonar.get0().getLogger().info("You are currently using the latest stable release of Sonar!");
+          Sonar.get().getLogger().info("You are currently using the latest stable release of Sonar!");
          lastCheckResult = CheckResult.LATEST_VERSION;
        }
      } catch (Throwable throwable) {
-        Sonar.get0().getLogger().warn("Failed to check for updates (is your firewall set up properly?): {}",
-          throwable);
+        Sonar.get().getLogger().warn("Unable to retrieve version information: {}", throwable);
        lastCheckResult = CheckResult.API_ERROR;
      }
    });
@@ -59,18 +59,18 @@ public final class DiscordWebhook {
        // Discord replies with HTTP_NO_CONTENT (204) if the request is successful
        final int code = urlConnection.getResponseCode();
        if (code != HTTP_NO_CONTENT) {
-          Sonar.get0().getLogger().warn("Unexpected Discord webhook response code {}", code);
+          Sonar.get().getLogger().warn("Unexpected Discord webhook response code {}", code);
        }
      } catch (Exception exception) {
-        Sonar.get0().getLogger().error("Could not send webhook: {}", exception);
+        Sonar.get().getLogger().error("Could not send webhook: {}", exception);
      }
    });
  }

  private static String prepareSerializedContent(final SonarConfiguration.Webhook.@NotNull Embed embed) {
-    final String content = Sonar.get0().getConfig().getWebhook().getContent();
-    final String username = Sonar.get0().getConfig().getWebhook().getUsername();
-    final String avatarUrl = Sonar.get0().getConfig().getWebhook().getAvatarUrl();
+    final String content = Sonar.get().getConfig().getWebhook().getContent();
+    final String username = Sonar.get().getConfig().getWebhook().getUsername();
+    final String avatarUrl = Sonar.get().getConfig().getWebhook().getAvatarUrl();

    int rgb = embed.getR();
    rgb = (rgb << 8) + embed.getG();
@@ -78,8 +78,8 @@ public final class DiscordWebhook {

    final Webhook.EmbedMessage embedMessage = new Webhook.EmbedMessage(
      embed.getTitle(), embed.getDescription(), embed.getTitleUrl(), rgb, new Webhook.Field[0],
-      new Webhook.Footer(Sonar.get0().getConfig().getWebhook().getFooter().getText(),
-        Sonar.get0().getConfig().getWebhook().getFooter().getIconUrl()));
+      new Webhook.Footer(Sonar.get().getConfig().getWebhook().getFooter().getText(),
+        Sonar.get().getConfig().getWebhook().getFooter().getIconUrl()));
    final List<Webhook.EmbedMessage> embeds = Collections.singletonList(embedMessage);

    final Webhook webhook = new Webhook(content, username, avatarUrl, false, embeds);
@@ -11,7 +11,7 @@ allprojects {
  repositories {
    mavenCentral()
    maven(url = "https://repo.jonesdev.xyz/releases/") // Bungee & Velocity proxy module
-    maven(url = "https://repo.alessiodp.com/snapshots/") // libby
+    maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") // libby
  }

  apply(plugin = "java")
@@ -62,7 +62,6 @@ allprojects {
      relocate("org.mariadb", "xyz.jonesdev.sonar.libs.mariadb")
      relocate("org.h2", "xyz.jonesdev.sonar.libs.h2")
      relocate("com.jhlabs", "xyz.jonesdev.sonar.libs.jhlabs")
-      relocate("org.postgresql", "xyz.jonesdev.sonar.libs.postgresql")

      // Exclude unnecessary metadata information
      exclude("META-INF/*/**")
@@ -75,12 +74,6 @@ allprojects {

    compileJava {
      options.encoding = "UTF-8"
-      options.release.set(17)
-    }
-
-    java {
-      toolchain.languageVersion.set(JavaLanguageVersion.of(21))
-      disableAutoTargetJvm()
    }

    jar {
@@ -99,13 +92,16 @@ allprojects {
        attributes["Git-Commit"] = gitCommit
      }
    }
+
+    java.sourceCompatibility = JavaVersion.VERSION_11
+    java.targetCompatibility = JavaVersion.VERSION_11
  }
 }

 tasks {
  // This is a small wrapper tasks to simplify the building process
  register("build-sonar") {
-    val subprojects = listOf("api", "captcha", "common", "bukkit", "bungeecord", "paper", "velocity")
+    val subprojects = listOf("api", "captcha", "common", "bukkit", "bungeecord", "velocity")
    val buildTasks = subprojects.flatMap { listOf("$it:clean", "$it:spotlessApply", "$it:shadowJar") }
    dependsOn(buildTasks)
  }
@@ -8,7 +8,7 @@ bukkit {
  name = rootProject.name
  main = "xyz.jonesdev.sonar.bukkit.SonarBukkitPlugin"
  authors = listOf("Jones Development", "Sonar Contributors")
-  website = "https://sonar.top/discord/"
+  website = "https://jonesdev.xyz/discord/"
  load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
  softDepend = listOf("Geyser-Spigot", "floodgate", "Protocolize", "ProtocolSupport",
    "ViaVersion", "packetevents", "ProtocolLib", "FastLogin")
@@ -32,6 +32,7 @@ dependencies {
  implementation(project(":common"))

  compileOnly(rootProject.libs.spigot)
+  testCompileOnly(rootProject.libs.spigot)

  implementation(rootProject.libs.adventure.platform.bukkit) {
    exclude(module = "adventure-nbt")
@@ -28,8 +28,8 @@ 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.antibot.BukkitInjector;
 import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
+import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
 import xyz.jonesdev.sonar.bukkit.listener.BukkitJoinListener;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

@@ -108,8 +108,8 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
    Objects.requireNonNull(getPlugin().getCommand("sonar")).setExecutor(new BukkitSonarCommand());

    // Try to inject into the server
-    if (BukkitInjector.isLateBindEnabled()) {
-      getPlugin().getServer().getScheduler().runTask(getPlugin(), BukkitInjector::inject);
+    if (FallbackBukkitInjector.isLateBindEnabled()) {
+      getPlugin().getServer().getScheduler().runTask(getPlugin(), FallbackBukkitInjector::inject);
    } else {
      getPlugin().getServer().getPluginManager().registerEvents(new BukkitJoinListener(), getPlugin());
    }
@@ -18,7 +18,7 @@
 package xyz.jonesdev.sonar.bukkit;

 import org.bukkit.plugin.java.JavaPlugin;
-import xyz.jonesdev.sonar.bukkit.antibot.BukkitInjector;
+import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;

 public final class SonarBukkitPlugin extends JavaPlugin {
  private SonarBukkit bootstrap;
@@ -26,8 +26,8 @@ public final class SonarBukkitPlugin extends JavaPlugin {
  @Override
  public void onLoad() {
    // Inject early if late-bind is disabled
-    if (!BukkitInjector.isLateBindEnabled()) {
-      BukkitInjector.inject();
+    if (!FallbackBukkitInjector.isLateBindEnabled()) {
+      FallbackBukkitInjector.inject();
    }
  }

@@ -40,7 +40,7 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new InvocationSource(
      sender instanceof Player ? ((Player) sender).getUniqueId() : null,
-      Sonar.get0().sender(sender),
+      Sonar.get().sender(sender),
      sender::hasPermission);
    // Pass the invocation source and command arguments to our command handler
    handle(invocationSource, args);
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.bukkit.antibot;
+package xyz.jonesdev.sonar.bukkit.fallback;

 import lombok.Getter;

@@ -74,17 +74,7 @@ public enum BukkitServerVersion {
  MINECRAFT_1_21_1,
  MINECRAFT_1_21_2,
  MINECRAFT_1_21_3,
-  MINECRAFT_1_21_4,
-  MINECRAFT_1_21_5,
-  MINECRAFT_1_21_6,
-  MINECRAFT_1_21_7,
-  MINECRAFT_1_21_8,
-  MINECRAFT_1_21_9,
-  MINECRAFT_1_21_10,
-  MINECRAFT_1_21_11,
-  MINECRAFT_26_1,
-  MINECRAFT_26_2,
-  MINECRAFT_26_3;
+  MINECRAFT_1_21_4;

  static final BukkitServerVersion[] REVERSED_VALUES;

@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.bukkit.antibot;
+package xyz.jonesdev.sonar.bukkit.fallback;

 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;
@@ -15,37 +15,37 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.bukkit.antibot;
+package xyz.jonesdev.sonar.bukkit.fallback;

 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.DecoderException;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.InboundHandlerAdapter;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketRegistry;
-import xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket;
-import xyz.jonesdev.sonar.common.protocol.packets.login.LoginStartPacket;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandlerAdapter;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginStartPacket;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

 import java.net.InetSocketAddress;
 import java.util.Objects;

-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INBOUND_HANDLER;
-import static xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket.*;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_INBOUND_HANDLER;
+import static xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket.*;

-final class BukkitInboundHandler extends InboundHandlerAdapter {
+final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
  private static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.MINECRAFT_1_7_2;

-  private SonarPacketRegistry.ProtocolRegistry registry;
+  private FallbackPacketRegistry.ProtocolRegistry registry;

-  BukkitInboundHandler() {
-    updateRegistry(SonarPacketRegistry.HANDSHAKE, DEFAULT_PROTOCOL_VERSION);
+  FallbackBukkitInboundHandler() {
+    updateRegistry(FallbackPacketRegistry.HANDSHAKE, DEFAULT_PROTOCOL_VERSION);

-    super.channelRemovalListener = (pipeline, name, handler) -> {
+    channelRemovalListener = (pipeline, name, handler) -> {
      final ChannelInactiveListener inactiveListener = pipeline.get(ChannelInactiveListener.class);

      if (inactiveListener != null) {
@@ -54,9 +54,9 @@ final class BukkitInboundHandler extends InboundHandlerAdapter {
    };
  }

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

  @Override
@@ -79,7 +79,7 @@ final class BukkitInboundHandler extends InboundHandlerAdapter {
      }

      final int packetId = ProtocolUtil.readVarInt(byteBuf);
-      final SonarPacket packet = registry.createPacket(packetId);
+      final FallbackPacket packet = registry.createPacket(packetId);

      // Skip the packet if it's not registered within Sonar's packet registry
      if (packet == null) {
@@ -119,10 +119,9 @@ final class BukkitInboundHandler extends InboundHandlerAdapter {
            // Let the actual handler know about the handshake packet
            handleHandshake(ctx, handshake.getHostname(), handshake.getProtocolVersionId());
            // Be ready for the next packet (which is supposed to be a login packet)
-            updateRegistry(SonarPacketRegistry.LOGIN, Objects.requireNonNull(protocolVersion));
+            updateRegistry(FallbackPacketRegistry.LOGIN, Objects.requireNonNull(protocolVersion));
            break;
          default:
-            byteBuf.release();
            throw ProtocolUtil.DEBUG ? new DecoderException("Bad handshake intent " + handshake.getIntent())
              : QuietDecoderException.INSTANCE;
        }
@@ -136,9 +135,9 @@ final class BukkitInboundHandler extends InboundHandlerAdapter {
          byteBuf.readerIndex(originalReaderIndex);
          ctx.fireChannelRead(byteBuf.retain());
          // TODO: recode this?
-          final ChannelHandler inboundHandler = ctx.pipeline().remove(SONAR_INBOUND_HANDLER);
-          if (inboundHandler != null && channelRemovalListener != null) {
-            channelRemovalListener.accept(ctx.pipeline(), SONAR_INBOUND_HANDLER, inboundHandler);
+          final ChannelHandler inboundHandler = ctx.pipeline().remove(FALLBACK_INBOUND_HANDLER);
+          if (inboundHandler != null) {
+            channelRemovalListener.accept(ctx.pipeline(), FALLBACK_INBOUND_HANDLER, inboundHandler);
          }
        }, loginStart.getUsername(), socketAddress);
        byteBuf.release();
@@ -147,8 +146,6 @@ final class BukkitInboundHandler extends InboundHandlerAdapter {

      byteBuf.readerIndex(originalReaderIndex);
      ctx.fireChannelRead(byteBuf);
-    } else {
-      ctx.fireChannelRead(msg);
    }
  }
 }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.bukkit.antibot;
+package xyz.jonesdev.sonar.bukkit.fallback;

 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -26,7 +26,7 @@ import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.common.netty.SonarInjectedChannelInitializer;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackInjectedChannelInitializer;
 import xyz.jonesdev.sonar.common.util.exception.ReflectiveOperationException;

 import java.lang.reflect.Field;
@@ -34,8 +34,8 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;

-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INACTIVE_LISTENER;
-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_PACKET_DECODER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_INACTIVE_LISTENER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_DECODER;
 import static xyz.jonesdev.sonar.bukkit.SonarBukkit.INITIALIZE_LISTENER;

 // Check out these links if you want to see some more magic
@@ -43,7 +43,7 @@ import static xyz.jonesdev.sonar.bukkit.SonarBukkit.INITIALIZE_LISTENER;
 // https://github.com/dmulloy2/ProtocolLib/blob/master/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java
 // https://github.com/ViaVersion/ViaVersion/blob/master/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
@UtilityClass
-public class BukkitInjector {
+public class FallbackBukkitInjector {
  private final String LEGACY_NMS_PACKAGE;
  private final String OBC_PACKAGE;

@@ -253,10 +253,10 @@ public class BukkitInjector {

          INITIALIZE_LISTENER.thenAccept(__ -> {
            try {
-              childHandlerField.set(_bootstrap, new SonarInjectedChannelInitializer(originalInitializer,
+              childHandlerField.set(_bootstrap, new FallbackInjectedChannelInitializer(originalInitializer,
                pipeline -> {
-                  pipeline.addAfter("splitter", SONAR_PACKET_DECODER, new BukkitInboundHandler());
-                  pipeline.addFirst(SONAR_INACTIVE_LISTENER, new ChannelInactiveListener());
+                  pipeline.addAfter("splitter", FALLBACK_PACKET_DECODER, new FallbackBukkitInboundHandler());
+                  pipeline.addFirst(FALLBACK_INACTIVE_LISTENER, new ChannelInactiveListener());
                }
              ));
            } catch (IllegalAccessException exception) {
@@ -267,7 +267,7 @@ public class BukkitInjector {
        return;
      }
    } catch (Exception exception) {
-      Sonar.get0().getLogger().error("An error occurred while injecting {}", exception);
+      Sonar.get().getLogger().error("An error occurred while injecting {}", exception);
    }
  }
 }
@@ -24,7 +24,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.bukkit.antibot.BukkitInjector;
+import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
 import xyz.jonesdev.sonar.common.util.FakeChannelUtil;

 import java.lang.invoke.MethodHandle;
@@ -32,7 +32,7 @@ import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_BANDWIDTH;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;

 // https://github.com/ViaVersion/ViaVersion/blob/master/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/JoinListener.java
 public final class BukkitJoinListener implements Listener {
@@ -46,13 +46,13 @@ public final class BukkitJoinListener implements Listener {

  static {
    try {
-      final Method handleMethod = BukkitInjector.getOBCClass("entity.CraftPlayer")
+      final Method handleMethod = FallbackBukkitInjector.getOBCClass("entity.CraftPlayer")
        .getDeclaredMethod("getHandle");
-      final Field listenerField = BukkitInjector.findField(false, handleMethod.getReturnType(),
+      final Field listenerField = FallbackBukkitInjector.findField(false, handleMethod.getReturnType(),
        "PlayerConnection", "ServerGamePacketListenerImpl");
-      final Field networkManagerField = BukkitInjector.findField(true, listenerField.getType(),
+      final Field networkManagerField = FallbackBukkitInjector.findField(true, listenerField.getType(),
        "NetworkManager", "Connection");
-      final Field channelField = BukkitInjector.getFieldAt(networkManagerField.getType(), Channel.class, 0);
+      final Field channelField = FallbackBukkitInjector.getFieldAt(networkManagerField.getType(), Channel.class, 0);

      _handleMethod = MethodHandles.lookup().unreflect(handleMethod);
      _listenerField = MethodHandles.lookup().unreflectGetter(listenerField);
@@ -88,11 +88,11 @@ public final class BukkitJoinListener implements Listener {
      }

      // Close the channel if Sonar's handlers are not found when the PlayerJoinEvent is called
-      if (channel.pipeline().context(SONAR_BANDWIDTH) == null) {
+      if (channel.pipeline().context(FALLBACK_BANDWIDTH) == null) {
        channel.close();
      }
    } catch (Throwable throwable) {
-      Sonar.get0().getLogger().warn("Couldn't find {}: {}", event.getPlayer().getName(), throwable);
+      Sonar.get().getLogger().warn("Couldn't find {}: {}", event.getPlayer().getName(), throwable);
    }
  }
 }
@@ -14,7 +14,11 @@ dependencies {
  implementation(project(":common"))

  compileOnly(rootProject.libs.bungeecord)
+  testCompileOnly(rootProject.libs.bungeecord)

+  implementation(rootProject.libs.adventure.platform.bungee) {
+    exclude(module = "adventure-nbt")
+  }
  implementation(rootProject.libs.bstats.bungee)
  implementation(rootProject.libs.libby.bungee)
 }
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2026 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;
-
-import net.kyori.adventure.audience.Audience;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.kyori.adventure.title.Title;
-import net.md_5.bungee.api.ChatMessageType;
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.chat.ComponentSerializer;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-
-import java.time.Duration;
-
-/**
- * Minimal {@link Audience} implementation backed by the native BungeeCord chat API.
- * <br>
- * BungeeCord does not ship Adventure, so we used to bundle adventure-platform-bungeecord (Adventure 4.x).
- * That conflicted with the Adventure 5.x libraries Sonar loads at runtime, because both end up
- * in the same relocated package. Converting components to JSON and passing them to BungeeCord's own
- * {@link ComponentSerializer} allows us to depend on exactly one Adventure version.
- */
-final class BungeeAudience implements Audience {
-  private final CommandSender sender;
-
-  BungeeAudience(final @NotNull CommandSender sender) {
-    this.sender = sender;
-  }
-
-  @Override
-  public void sendMessage(final @NotNull Component message) {
-    sender.sendMessage(toBungee(message));
-  }
-
-  @Override
-  public void sendActionBar(final @NotNull Component message) {
-    // Only players have an action bar
-    if (sender instanceof ProxiedPlayer player) {
-      player.sendMessage(ChatMessageType.ACTION_BAR, toBungee(message));
-    }
-  }
-
-  @Override
-  public void showTitle(final @NotNull Title title) {
-    // Only players can see titles
-    if (sender instanceof ProxiedPlayer player) {
-      final Title.Times times = title.times();
-      ProxyServer.getInstance().createTitle()
-        .title(toBungee(title.title()))
-        .subTitle(toBungee(title.subtitle()))
-        // Use the same defaults as Title#DEFAULT_TIMES (0.5s, 3.5s, 1s)
-        .fadeIn(times == null ? 10 : toTicks(times.fadeIn()))
-        .stay(times == null ? 70 : toTicks(times.stay()))
-        .fadeOut(times == null ? 20 : toTicks(times.fadeOut()))
-        .send(player);
-    }
-  }
-
-  private static int toTicks(final @NotNull Duration duration) {
-    return (int) (duration.toMillis() / 50L);
-  }
-
-  private @NotNull BaseComponent[] toBungee(final @NotNull Component component) {
-    // Downsample hex colors for clients that do not support them
-    final boolean legacyClient = sender instanceof ProxiedPlayer player
-      && player.getPendingConnection().getVersion() < ProtocolVersion.MINECRAFT_1_16.getProtocol();
-    final GsonComponentSerializer serializer = legacyClient
-      ? GsonComponentSerializer.colorDownsamplingGson()
-      : GsonComponentSerializer.gson();
-    return ComponentSerializer.parse(serializer.serialize(component));
-  }
-}
@@ -20,38 +20,42 @@ 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 net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.bungee.antibot.BungeeInjector;
 import xyz.jonesdev.sonar.bungee.command.BungeeSonarCommand;
+import xyz.jonesdev.sonar.bungee.fallback.FallbackBungeeInjector;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

 import java.util.UUID;

@Getter
 public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
-  public SonarBungee(final @NotNull SonarBungeePlugin plugin, final @NotNull BungeeLibraryManager libraryManager) {
-    super(plugin, SonarPlatform.BUNGEE, plugin.getDataFolder(), libraryManager);
+  public SonarBungee(final @NotNull SonarBungeePlugin plugin) {
+    super(plugin, SonarPlatform.BUNGEE, plugin.getDataFolder(), new BungeeLibraryManager(plugin));
  }

+  /**
+   * Wrapper for BungeeCord audiences
+   */
+  private final BungeeAudiences bungeeAudiences = BungeeAudiences.create(getPlugin());
+
  @Override
  public @Nullable Audience audience(final @Nullable UUID uniqueId) {
    if (uniqueId == null) {
      return null;
    }
-    final ProxiedPlayer player = getPlugin().getServer().getPlayer(uniqueId);
-    return player == null ? null : new BungeeAudience(player);
+    return bungeeAudiences.player(uniqueId);
  }

  @Override
  public @NotNull Audience sender(final @NotNull Object object) {
-    return new BungeeAudience((CommandSender) object);
+    return bungeeAudiences.sender((CommandSender) object);
  }

  /**
@@ -82,10 +86,6 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {

  @Override
  public void enable() {
-    // Add warning because of questionable design choices that haunt me in my dreams.
-    logger.warn("The use of BungeeCord is supported but not condoned.");
-    logger.warn("Consider upgrading to Velocity (https://velocitypowered.com)");
-
    // Initialize bStats.org metrics
    metrics = new Metrics(getPlugin(), getPlatform().getMetricsId());

@@ -103,7 +103,7 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
    getPlugin().getServer().getPluginManager().registerCommand(getPlugin(), new BungeeSonarCommand());

    // Make sure to inject into the server's connection handler
-    BungeeInjector.inject();
+    FallbackBungeeInjector.inject();
  }

  @Override
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2026 Sonar Contributors
+ * Copyright (C) 2025 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
@@ -17,12 +17,9 @@

 package xyz.jonesdev.sonar.bungee;

-import com.alessiodp.libby.BungeeLibraryManager;
 import lombok.Getter;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
-import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.common.boot.LibraryLoader;

@Getter
 public final class SonarBungeePlugin extends Plugin {
@@ -33,13 +30,7 @@ public final class SonarBungeePlugin extends Plugin {
  public void onEnable() {
    server = ProxyServer.getInstance();

-    // HACK:
-    // Adventure is not bundled in the jar, so the libraries have to be on the classpath
-    // before SonarBungee is loaded. The JVM resolves its Adventure types during class verification.
-    final BungeeLibraryManager libraryManager = new BungeeLibraryManager(this);
-    LibraryLoader.loadLibraries(libraryManager, SonarPlatform.BUNGEE);
-
-    bootstrap = new SonarBungee(this, libraryManager);
+    bootstrap = new SonarBungee(this);
    bootstrap.initialize();
  }

@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2025 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.antibot;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelInitializer;
-import lombok.experimental.UtilityClass;
-import lombok.val;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.netty.PipelineUtils;
-import net.md_5.bungee.protocol.channel.BungeeChannelInitializer;
-import org.jetbrains.annotations.NotNull;
-import sun.misc.Unsafe;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.common.netty.SonarInjectedChannelInitializer;
-
-import java.lang.reflect.Field;
-
-import static net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER;
-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_PACKET_HANDLER;
-
-@UtilityClass
-public class BungeeInjector {
-  public void inject() {
-    try {
-      final Field childField;
-
-      try {
-        // This field only exists on BungeeCord build 1908 and below.
-        // See https://github.com/SpigotMC/BungeeCord/pull/3776 for more info.
-        //noinspection all
-        childField = PipelineUtils.class.getField("SERVER_CHILD");
-      } catch (NoSuchFieldException exception) {
-        injectOnModernBungeeCord();
-        return;
-      }
-
-      childField.setAccessible(true);
-      injectOnOldBungeeCord(childField);
-    } catch (Exception exception) {
-      Sonar.get0().getLogger().error("An error occurred while injecting {}", exception);
-    }
-  }
-
-  private static void injectOnOldBungeeCord(final @NotNull Field childField) throws Exception {
-    // Make sure to store the original channel initializer
-    //noinspection unchecked
-    val originalInitializer = (ChannelInitializer<Channel>) childField.get(null);
-    final ChannelInitializer<Channel> injectedInitializer = new SonarInjectedChannelInitializer(
-      originalInitializer, pipeline -> pipeline.addAfter(PACKET_DECODER, SONAR_PACKET_HANDLER,
-      new BungeeInboundHandler()));
-
-    final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
-    unsafeField.setAccessible(true);
-    final Unsafe unsafe = (Unsafe) unsafeField.get(null);
-
-    final Object base = unsafe.staticFieldBase(childField);
-    final long offset = unsafe.staticFieldOffset(childField);
-
-    // Replace the original channel initializer with our new injected initializer
-    unsafe.putObject(base, offset, injectedInitializer);
-  }
-
-  // See https://github.com/SpigotMC/BungeeCord/pull/3787
-  private static void injectOnModernBungeeCord() {
-    // The order is important...
-    final BungeeChannelInitializer original = ProxyServer.getInstance().unsafe().getFrontendChannelInitializer();
-    final BungeeChannelInitializer newInitializer = BungeeChannelInitializer.create(
-      channel -> {
-        // https://github.com/SpigotMC/BungeeCord/pull/3787#issuecomment-2661059876
-        if (!original.getChannelAcceptor().accept(channel)) {
-          return false;
-        }
-        SonarInjectedChannelInitializer.inject(channel,
-          pipeline -> pipeline.addAfter(PACKET_DECODER, SONAR_PACKET_HANDLER,
-            new BungeeInboundHandler()));
-        return true;
-      });
-    ProxyServer.getInstance().unsafe().setFrontendChannelInitializer(newInitializer);
-  }
-}
@@ -38,7 +38,7 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new InvocationSource(
      sender instanceof ProxiedPlayer ? ((ProxiedPlayer) sender).getUniqueId() : null,
-      Sonar.get0().sender(sender),
+      Sonar.get().sender(sender),
      sender::hasPermission);
    // Pass the invocation source and command arguments to our command handler
    handle(invocationSource, args);
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.channel.ChannelHandlerContext;
 import net.md_5.bungee.netty.ChannelWrapper;
@@ -25,16 +25,16 @@ 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.common.InboundHandlerAdapter;
+import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandlerAdapter;
 import xyz.jonesdev.sonar.common.util.exception.ReflectiveOperationException;

 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.net.InetSocketAddress;

-import static xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket.STATUS;
+import static xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket.STATUS;

-final class BungeeInboundHandler extends InboundHandlerAdapter {
+final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {

  private static final MethodHandle CHANNEL_WRAPPER_GETTER;

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2025 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.experimental.UtilityClass;
+import net.md_5.bungee.netty.PipelineUtils;
+import sun.misc.Unsafe;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackInjectedChannelInitializer;
+
+import java.lang.reflect.Field;
+
+import static net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_HANDLER;
+
+@UtilityClass
+public class FallbackBungeeInjector {
+  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> injectedInitializer = new FallbackInjectedChannelInitializer(
+      originalInitializer, pipeline -> pipeline.addAfter(PACKET_DECODER, FALLBACK_PACKET_HANDLER,
+        new FallbackBungeeInboundHandler()));
+
+      final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+      unsafeField.setAccessible(true);
+      final Unsafe unsafe = (Unsafe) unsafeField.get(null);
+
+      final Object base = unsafe.staticFieldBase(childField);
+      final long offset = unsafe.staticFieldOffset(childField);
+
+      // Replace the original channel initializer with our new injected initializer
+      unsafe.putObject(base, offset, injectedInitializer);
+    } catch (Exception exception) {
+      Sonar.get().getLogger().error("An error occurred while injecting {}", exception);
+    }
+  }
+}
@@ -2,6 +2,6 @@ dependencies {
  compileOnly(project(":api"))
  compileOnly(rootProject.libs.imagefilters)

-  testImplementation(project(":api"))
-  testImplementation(rootProject.libs.imagefilters)
+  testCompileOnly(project(":api"))
+  testCompileOnly(rootProject.libs.imagefilters)
 }
@@ -23,7 +23,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
+import xyz.jonesdev.sonar.api.fallback.captcha.CaptchaGenerator;
 import xyz.jonesdev.sonar.captcha.filters.CurvesOverlayFilter;
 import xyz.jonesdev.sonar.captcha.filters.NoiseOverlayFilter;

@@ -49,18 +49,15 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
  private static final Random RANDOM = new Random();
  private static final Color[] COLORS = new Color[4];
  private static final float[] COLOR_FRACTIONS = new float[COLORS.length];
-  static final Font FONT;

  static {
-    FONT = TTFFontProvider.loadFont("/assets/fonts/Kingthings_Trypewriter_2.ttf");
-
-    FBM.setAmount(0.55f + RANDOM.nextFloat(0.15f));
-    FBM.setScale(10 + RANDOM.nextFloat(10));
+    FBM.setAmount(0.6f);
+    FBM.setScale(15);

    SMEAR.setShape(SmearFilter.SQUARES);
    SMEAR.setDensity(0.1f);
    SMEAR.setDistance(0);
-    SMEAR.setMix(0.25f + RANDOM.nextFloat(0.25f));
+    SMEAR.setMix(0.35f);

    // Create fractions based on the number of colors
    for (int i = 0; i < COLOR_FRACTIONS.length; i++) {
@@ -111,12 +108,12 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
  private void applyRandomColorGradient(final @NotNull Graphics2D graphics) {
    // Randomize the colors for the gradient effect
    for (int i = 0; i < COLORS.length; i++) {
-      final float random = 0.8f + RANDOM.nextFloat() * 0.2f;
-      COLORS[i] = Color.getHSBColor(RANDOM.nextFloat(), random * 0.8f, random);
+      final float random = 0.9f + RANDOM.nextFloat() * 0.1f;
+      COLORS[i] = Color.getHSBColor(RANDOM.nextFloat(), random, random);
    }

    // Apply the random gradient effect
-    graphics.setPaint(new RadialGradientPaint(0, 0, width,
+    graphics.setPaint(new LinearGradientPaint(0, 0, width, height,
      COLOR_FRACTIONS, COLORS, MultipleGradientPaint.CycleMethod.REFLECT));
  }

@@ -127,7 +124,8 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {

    for (int i = 0; i < answer.length; i++) {
      // Create a glyph vector for the character with a random font
-      glyphs[i] = FONT.createGlyphVector(ctx, String.valueOf(answer[i]));
+      final Font font = StandardTTFFontProvider.FONTS[RANDOM.nextInt(StandardTTFFontProvider.FONTS.length)];
+      glyphs[i] = font.createGlyphVector(ctx, String.valueOf(answer[i]));
    }

    final double scalingXY = 5 - Math.min(answer.length, 5) * 0.65;
@@ -137,7 +135,7 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
      .mapToDouble(glyph -> glyph.getLogicalBounds().getWidth() * scalingXY - 1)
      .sum();
    double beginX = Math.max(Math.min(width / 2D - totalWidth / 2D, totalWidth), 0);
-    double beginY = (height + TTFFontProvider.STANDARD_FONT_SIZE / 2D) / 2D + scalingXY;
+    double beginY = (height + StandardTTFFontProvider.STANDARD_FONT_SIZE / 2D) / 2D + scalingXY;

    // Draw each glyph one by one
    for (final GlyphVector glyph : glyphs) {
@@ -161,8 +159,8 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
  }

  private void createGlyphOutline(final @NotNull Graphics2D graphics, final @NotNull Shape shape) {
-    final float txy = RANDOM.nextFloat(0.1f, 2f);
-    final float width = RANDOM.nextFloat(0.5f, 2f);
+    final float txy = 1.25f + RANDOM.nextFloat();
+    final float width = 1 + RANDOM.nextFloat();

    // Create a randomly translated and stroked shape based on the original glyph shape
    final AffineTransform translation = AffineTransform.getTranslateInstance(txy, txy);
@@ -17,23 +17,33 @@

 package xyz.jonesdev.sonar.captcha;

+import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;

 import java.awt.*;
 import java.io.InputStream;
 import java.util.Objects;

-public final class TTFFontProvider {
+@UtilityClass
+class StandardTTFFontProvider {
+  private static final String[] FONT_NAMES = {"Kingthings_Trypewriter_2"};
+  static final Font[] FONTS = new Font[FONT_NAMES.length];
  static final int STANDARD_FONT_SIZE = 25;

-  public static Font loadFont(final @NotNull String path) {
+  static {
+    for (int i = 0; i < FONT_NAMES.length; i++) {
+      FONTS[i] = loadFont(String.format("/assets/fonts/%s.ttf", FONT_NAMES[i]));
+    }
+  }
+
+  private static Font loadFont(final @NotNull String path) {
    try (final InputStream inputStream = StandardCaptchaGenerator.class.getResourceAsStream(path)) {
      // Load the font from the TTF file
      final Font customFont = Font.createFont(Font.TRUETYPE_FONT, Objects.requireNonNull(inputStream));
      // Set the font size and style
      return customFont.deriveFont(Font.PLAIN, STANDARD_FONT_SIZE);
    } catch (Exception exception) {
-      throw new IllegalStateException("Error loading font. Does your environment support fonts?", exception);
+      throw new IllegalStateException(exception);
    }
  }
 }
@@ -1,210 +0,0 @@
-/*
- * Copyright (C) 2025 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.captcha.complex;
-
-import lombok.RequiredArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
-import xyz.jonesdev.sonar.captcha.TTFFontProvider;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.font.FontRenderContext;
-import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.QuadCurve2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.Random;
-
-@RequiredArgsConstructor
-public final class ComplexCaptchaGenerator implements CaptchaGenerator {
-  private final File background;
-  private final int width = 128, height = 128;
-  private BufferedImage backgroundImage;
-
-  private static final Font[] FONTS = {
-    TTFFontProvider.loadFont("/assets/fonts/dotness.ttf"), // by http://bythebutterfly.com/
-    TTFFontProvider.loadFont("/assets/fonts/DotMatrix.ttf"),
-  };
-  private static final Random RANDOM = new SecureRandom();
-  private static final double MAX_ROTATION_RADIANS = Math.toRadians(15);
-  private static final int LINE_COUNT = 8;
-  private static final int MIN_LINE_COLOR = 100;
-  private static final int MAX_TEXT_COLOR = 150;
-  private static final int DOT_COUNT = 100;
-
-  private @NotNull BufferedImage createBackgroundImage() {
-    final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
-    final Graphics2D graphics = image.createGraphics();
-    if (background == null) {
-      graphics.setBackground(Color.WHITE);
-      graphics.clearRect(0, 0, image.getWidth(), image.getHeight());
-      return image;
-    }
-    if (backgroundImage == null) {
-      try {
-        backgroundImage = ImageIO.read(background);
-      } catch (IOException exception) {
-        throw new IllegalStateException("Could not read background image", exception);
-      }
-    }
-    graphics.drawImage(backgroundImage, 0, 0, Color.WHITE, null);
-    return image;
-  }
-
-  @Override
-  public @NotNull BufferedImage createImage(char @NotNull [] answer) {
-    final BufferedImage image = createBackgroundImage();
-    final Graphics2D graphics = image.createGraphics();
-
-    final String text = new String(answer);
-    final int padding = 12;
-    final double maxWidth = width - 2D * padding;
-    final double maxHeight = height - 2D * padding;
-
-    graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    graphics.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-
-    final FontRenderContext frc = graphics.getFontRenderContext();
-    float optimalSize = 24;
-    final float trialSize = 100;
-
-    final Rectangle2D trialBounds = FONTS[0].deriveFont(trialSize).getStringBounds(text, frc);
-
-    if (trialBounds.getWidth() > 0 && trialBounds.getHeight() > 0) {
-      final double scaleFactorWidth = maxWidth / trialBounds.getWidth();
-      final double scaleFactorHeight = maxHeight / trialBounds.getHeight();
-      optimalSize = (float) (trialSize * Math.min(scaleFactorWidth, scaleFactorHeight));
-    }
-
-    if (optimalSize < 1f) {
-      optimalSize = 1f;
-    }
-
-    final Font finalFont = FONTS[0].deriveFont(optimalSize);
-    graphics.setFont(finalFont);
-
-    final Rectangle2D fullBounds = finalFont.getStringBounds(text, frc);
-
-    double currentX = (width - fullBounds.getWidth()) / 2D;
-
-    final double baselineY = (height / 2D) - (fullBounds.getHeight() / 2D) - fullBounds.getY();
-    double currentY = baselineY;
-
-    for (final char c : answer) {
-      final Font font = FONTS[RANDOM.nextInt(FONTS.length)].deriveFont(optimalSize);
-      graphics.setFont(font);
-
-      final String character = String.valueOf(c);
-      final Rectangle2D charBounds = font.getStringBounds(character, frc);
-
-      final double charWidth = charBounds.getWidth();
-      final double charHeight = charBounds.getHeight();
-      final double charCenterX = currentX + charWidth / 2D;
-      final double charCenterY = baselineY + charBounds.getY() + charHeight / 2D;
-
-      final Color[] colors = new Color[2 + RANDOM.nextInt(2)];
-      final float[] colorFractions = new float[colors.length];
-      for (int i = 0; i < colors.length; i++) {
-        colors[i] = getRandomTextColor();
-        colorFractions[i] = i / (float) colors.length;
-      }
-
-      graphics.setPaint(new RadialGradientPaint((float) currentX, (float) currentY, (float) charWidth,
-        colorFractions, colors, MultipleGradientPaint.CycleMethod.REFLECT));
-
-      final double rotation = (RANDOM.nextDouble() * 2 * MAX_ROTATION_RADIANS) - MAX_ROTATION_RADIANS;
-
-      final AffineTransform originalTransform = graphics.getTransform();
-
-      graphics.rotate(rotation, charCenterX, charCenterY);
-
-      final TextLayout layout = new TextLayout(character, font, frc);
-
-      final AffineTransform translate = AffineTransform.getTranslateInstance(currentX, currentY);
-      final Shape outline = layout.getOutline(translate);
-      graphics.fill(outline);
-      graphics.setTransform(originalTransform);
-
-      currentX += charWidth;
-      currentY += RANDOM.nextDouble(charHeight / 4) - charHeight / 8;
-    }
-
-    drawNoiseLines(graphics);
-    drawNoiseDots(graphics);
-    graphics.dispose();
-    return image;
-  }
-
-  private @NotNull Color getRandomTextColor() {
-    final int r = Math.min(RANDOM.nextInt(256), MAX_TEXT_COLOR);
-    final int g = Math.min(RANDOM.nextInt(256), MAX_TEXT_COLOR);
-    final int b = Math.min(RANDOM.nextInt(256), MAX_TEXT_COLOR);
-    return new Color(r, g, b, 220);
-  }
-
-  private @NotNull Color getRandomColor() {
-    final int r = Math.max(RANDOM.nextInt(256), MIN_LINE_COLOR);
-    final int g = Math.max(RANDOM.nextInt(256), MIN_LINE_COLOR);
-    final int b = Math.max(RANDOM.nextInt(256), MIN_LINE_COLOR);
-    final int a = Math.max(Math.min(RANDOM.nextInt(256), 200), MIN_LINE_COLOR);
-    return new Color(r, g, b, a);
-  }
-
-  private void drawNoiseLines(final @NotNull Graphics2D graphics) {
-    for (int i = 0; i < LINE_COUNT; i++) {
-      graphics.setColor(getRandomColor());
-      graphics.setStroke(new BasicStroke(1f + RANDOM.nextFloat() * 2f,
-        BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
-
-      if (RANDOM.nextBoolean()) {
-        float x1 = RANDOM.nextInt(width);
-        float y1 = RANDOM.nextInt(height);
-        float ctrlX = RANDOM.nextInt(width);
-        float ctrlY = RANDOM.nextInt(height);
-        float x2 = RANDOM.nextInt(width);
-        float y2 = RANDOM.nextInt(height);
-
-        graphics.draw(new QuadCurve2D.Float(x1, y1, ctrlX, ctrlY, x2, y2));
-      } else {
-        int x1 = RANDOM.nextInt(width);
-        int y1 = RANDOM.nextInt(height);
-        int x2 = RANDOM.nextInt(width);
-        int y2 = RANDOM.nextInt(height);
-
-        graphics.drawLine(x1, y1, x2, y2);
-      }
-    }
-  }
-
-  private void drawNoiseDots(final @NotNull Graphics2D graphics) {
-    for (int i = 0; i < DOT_COUNT; i++) {
-      graphics.setColor(getRandomColor());
-
-      final int x = RANDOM.nextInt(width);
-      final int y = RANDOM.nextInt(height);
-      final int radius = 1 + RANDOM.nextInt(5);
-
-      graphics.fillOval(x, y, radius, radius);
-    }
-  }
-}
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2025 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.captcha.filters;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+@Getter
+@RequiredArgsConstructor
+public final class CircleInverseFilter {
+  private final int amount, minRadius, maxRadiusExpansion;
+
+  private static final Random RANDOM = new Random();
+
+  public void transform(final @NotNull BufferedImage image) {
+    final int minX = image.getWidth() / 4;
+    final int minY = image.getHeight() / 4;
+
+    for (int i = 0; i < amount; i++) {
+      // Generate random position and radius for the circle
+      final float centerX = minX + RANDOM.nextInt(image.getWidth() - minX * 2);
+      final float centerY = minY + RANDOM.nextInt(image.getHeight() - minY * 2);
+      final int radius = minRadius + RANDOM.nextInt(maxRadiusExpansion);
+
+      final Circle circle = new Circle(centerX, centerY, radius);
+      // Draw inverted circle
+      _addInvertedCircle(image, circle);
+    }
+  }
+
+  private static void _addInvertedCircle(final @NotNull BufferedImage bufferedImage,
+                                         final @NotNull Circle circle) {
+    for (int x = 0; x < bufferedImage.getWidth(); x++) {
+      for (int y = 0; y < bufferedImage.getHeight(); y++) {
+        if (isWithinCircle(x, y, circle, circle.radius)) {
+          // Invert colors within the circle
+          final int rgb = bufferedImage.getRGB(x, y);
+          final int invertedRGB = invertColorAndFilter(rgb);
+          bufferedImage.setRGB(x, y, invertedRGB);
+        }
+      }
+    }
+  }
+
+  private static boolean isWithinCircle(final float x, final float y, final @NotNull Circle circle, int radius) {
+    final float distanceX = x - circle.centerX;
+    final float distanceY = y - circle.centerY;
+    return distanceX * distanceX + distanceY * distanceY <= radius * radius;
+  }
+
+  @Getter
+  @RequiredArgsConstructor
+  static final class Circle {
+    private final float centerX;
+    private final float centerY;
+    private final int radius;
+  }
+
+  private static int invertColorAndFilter(final int rgb) {
+    final Color color = new Color(rgb);
+    final int red = Math.max(Color.LIGHT_GRAY.getRed() - color.getRed(), 0);
+    final int green = Math.max(Color.LIGHT_GRAY.getGreen() - color.getGreen(), 0);
+    final int blue = Math.max(Color.LIGHT_GRAY.getBlue() - color.getBlue(), 0);
+    return new Color(red, green, blue).getRGB();
+  }
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2025 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.captcha.filters;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+@Getter
+@RequiredArgsConstructor
+public final class GridOverlayFilter {
+  private final int amount, lineWidth, randomOffset;
+
+  private static final Random RANDOM = new Random();
+
+  public void transform(final @NotNull BufferedImage image,
+                        final @NotNull Graphics2D graphics) {
+    final int spacingX = image.getWidth() / amount + lineWidth;
+    final int spacingY = image.getHeight() / amount + lineWidth;
+    int currentX = spacingX / 2;
+    int currentY = spacingY / 2;
+
+    for (int i = 0; i < amount; i++) {
+      graphics.setStroke(new BasicStroke(lineWidth * 0.5f + lineWidth * RANDOM.nextFloat()));
+      graphics.drawLine(currentX, 0, currentX + RANDOM.nextInt(randomOffset), image.getHeight());
+      graphics.drawLine(0, currentY, image.getWidth(), currentY + RANDOM.nextInt(randomOffset));
+
+      currentX += spacingX + lineWidth;
+      currentY += spacingY + lineWidth;
+    }
+  }
+}
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2025 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.captcha.legacy;
-
-import com.jhlabs.image.*;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
-import xyz.jonesdev.sonar.captcha.filters.NoiseOverlayFilter;
-
-import javax.imageio.ImageIO;
-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.io.File;
-import java.io.IOException;
-import java.util.Objects;
-import java.util.Random;
-
-@Getter
-@RequiredArgsConstructor
-public final class LegacyCaptchaGenerator implements CaptchaGenerator {
-  private static final ScratchFilter SCRATCHES = new ScratchFilter(4);
-  private static final NoiseOverlayFilter NOISE = new NoiseOverlayFilter(1, 7);
-  private static final SmearFilter SMEAR = new SmearFilter();
-  private static final SaturationFilter SATURATION = new SaturationFilter();
-  private static final RippleFilter RIPPLE = new RippleFilter();
-  private static final Random RANDOM = new Random();
-
-  static {
-    RIPPLE.setXAmplitude(0);
-    float yAmplitude = 10 - RANDOM.nextInt(20);
-    if (Math.abs(yAmplitude) < 5) {
-      yAmplitude = yAmplitude >= 0 ? 5 : -5;
-    }
-    RIPPLE.setYAmplitude(yAmplitude);
-
-    SATURATION.setAmount(0.45f + RANDOM.nextFloat() * 0.15f);
-
-    SMEAR.setShape(SmearFilter.CIRCLES);
-    SMEAR.setMix(0.15f);
-    SMEAR.setDensity(0.1f);
-    SMEAR.setDistance(5);
-  }
-
-  private final int width = 128, height = 128;
-  private final @Nullable File background;
-  private @Nullable BufferedImage backgroundImage;
-  private GradientPaint gradient;
-
-  public BufferedImage createCachedBackgroundImage() {
-    // Create a new image buffer with a 3-byte color spectrum
-    BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
-    if (background == null) {
-      if (backgroundImage != null) {
-        return backgroundImage;
-      }
-      // Don't use any special background image
-      image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-      // Fill the entire background image with a noise texture
-      image = new CausticsFilter().filter(image, null);
-      // Adjust the saturation of the randomly generated background noise
-      final SaturationFilter saturationFilter = new SaturationFilter();
-      saturationFilter.setAmount(0.4f + RANDOM.nextFloat() * 0.2f);
-      image = saturationFilter.filter(image, null);
-      // Un-sharpen the background a bit
-      image = new UnsharpFilter().filter(image, null);
-      return image;
-    }
-    // Try to load the image from a file if it doesn't exist yet
-    if (backgroundImage == null) {
-      try {
-        backgroundImage = ImageIO.read(background);
-      } catch (IOException exception) {
-        throw new IllegalStateException("Could not read background image", exception);
-      }
-    }
-    image.createGraphics().drawImage(backgroundImage, 0, 0, Color.WHITE, null);
-    return image;
-  }
-
-  private @NotNull BufferedImage mergeImages(final @NotNull BufferedImage background,
-                                             final @NotNull BufferedImage foreground) {
-    // Get the background image and create a new foreground image
-    final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
-    // Create a new image with transparency for the merged result
-    final Graphics2D graphics = image.createGraphics();
-    // Draw the foreground image on top of the background at specified coordinates
-    graphics.drawImage(background, 0, 0, null);
-    // Set AlphaComposite to handle transparency for the foreground image
-    graphics.setComposite(AlphaComposite.SrcOver);
-    // Draw the foreground image on top of the background at specified coordinates
-    graphics.drawImage(foreground, 0, 0, null);
-    graphics.dispose();
-    return image;
-  }
-
-  @Override
-  public @NotNull BufferedImage createImage(final char @NotNull [] answer) {
-    final Color color0 = Color.getHSBColor(RANDOM.nextFloat(), 1, 1);
-    final Color color1 = Color.getHSBColor(RANDOM.nextFloat(), 1, 0.5f);
-    gradient = new GradientPaint(0, 0, color0, width, height, color1);
-
-    // Get the background image and create a new foreground image
-    BufferedImage foreground = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-    final Graphics2D graphics = foreground.createGraphics();
-
-    final FontRenderContext ctx = graphics.getFontRenderContext();
-    // Change some rendering hints for anti aliasing
-    graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    // Draw characters
-    drawCharacters(graphics, ctx, answer);
-    // Make sure to dispose the graphics after using it
-    graphics.dispose();
-
-    // Apply any given filter to the foreground
-    new BumpFilter().filter(foreground, foreground);
-    SMEAR.filter(foreground, foreground);
-    RIPPLE.filter(foreground, foreground);
-    SCRATCHES.filter(foreground, foreground);
-
-    final BufferedImage merged = mergeImages(createCachedBackgroundImage(), foreground);
-    NOISE.transform(merged);
-    return merged;
-  }
-
-  private void drawCharacters(final @NotNull Graphics2D graphics,
-                              final @NotNull FontRenderContext ctx,
-                              final char[] answer) {
-    // Create font render context
-    final int fontSize = 62 - answer.length * 2;
-    final Font font = new Font(Font.MONOSPACED, Font.PLAIN, fontSize);
-
-    // Calculate string width
-    final double stringWidth = font.getStringBounds(answer, 0, answer.length, ctx).getWidth();
-    // Calculate character positions
-    int beginX = (int) ((width - stringWidth) / 2D + stringWidth / (answer.length * 2.5D));
-    final int beginY = (int) ((height + fontSize / 2D) / 2D);
-    double rotation = 0;
-
-    if (gradient != null) {
-      graphics.setPaint(gradient);
-    }
-
-    // Draw each character one by one
-    for (final char character : answer) {
-      // Create a glyph vector for the character
-      final GlyphVector glyphVector = font.createGlyphVector(ctx, String.valueOf(character));
-      final int visualBoundsWidth = (int) glyphVector.getVisualBounds().getWidth();
-      if (gradient == null) {
-        Objects.requireNonNull(backgroundImage);
-        // Use the inverse color by checking the background image
-        // Then, create a gradient for the text by using the colors
-        final int x0 = Math.min(Math.max(beginX + 5 /* small threshold */, 0), width);
-        final int x1 = Math.min(Math.max(beginX + (int) visualBoundsWidth, 0), width);
-        final int y = beginY + fontSize / 2;
-        final Color color0 = new Color(~backgroundImage.getRGB(x0, y));
-        final Color color1 = new Color(~backgroundImage.getRGB(x1, y));
-        final GradientPaint gradient = new GradientPaint(0, 0, color0, width, height, color1);
-        graphics.setPaint(gradient);
-      }
-
-      // Apply a transformation to the glyph vector using AffineTransform
-      final AffineTransform transformation = AffineTransform.getTranslateInstance(beginX, beginY);
-
-      // Add a bit of randomization to the rotation
-      rotation += Math.toRadians(6 - RANDOM.nextInt(12));
-      transformation.rotate(rotation);
-      transformation.scale(1, 1.25);
-
-      // Draw the glyph to the buffered image
-      final Shape transformedShape = transformation.createTransformedShape(glyphVector.getOutline());
-      graphics.fill(transformedShape);
-      // Add text outline/shadow to confuse an AI's edge detection
-      addTextOutline(graphics, transformedShape);
-      // Update next X position
-      beginX += visualBoundsWidth + 2;
-    }
-  }
-
-  private static void addTextOutline(final @NotNull Graphics2D graphics,
-                                     final @NotNull Shape transformedShape) {
-    // Create a stroked copy of the text and slightly offset/distort it
-    final Shape strokedShape = new BasicStroke().createStrokedShape(transformedShape);
-
-    final double tx = 0.5 + RANDOM.nextDouble();
-    final double ty = 0.5 + RANDOM.nextDouble();
-
-    // Draw the stroked shape
-    final AffineTransform transform = AffineTransform.getTranslateInstance(tx, ty);
-    graphics.fill(transform.createTransformedShape(strokedShape));
-  }
-}
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2025 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.captcha.legacy;
-
-import com.jhlabs.image.TransformFilter;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.jetbrains.annotations.NotNull;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public final class RippleFilter extends TransformFilter {
-  private float xAmplitude, yAmplitude;
-
-  @Override
-  protected void transformInverse(final int x, final int y, final float @NotNull [] out) {
-    final float nx = (float) y / 13f;
-    final float ny = (float) x / 13f;
-    final float fx = (float) Math.sin(nx);
-    final float fy = (float) Math.sin(ny);
-
-    out[0] = (float) x + xAmplitude * fx;
-    out[1] = (float) y + yAmplitude * fy;
-  }
-}
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2025 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.captcha.legacy;
-
-import com.jhlabs.image.AbstractBufferedImageOp;
-import lombok.RequiredArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.util.Random;
-
-@RequiredArgsConstructor
-public final class ScratchFilter extends AbstractBufferedImageOp {
-  private static final Random RANDOM = new Random();
-
-  private final int amount;
-
-  @Override
-  public @NotNull BufferedImage filter(final @NotNull BufferedImage src, final BufferedImage dst) {
-    final Graphics2D graphics = src.createGraphics();
-
-    // Apply some gradient effect on them
-    final Color color0 = Color.getHSBColor(RANDOM.nextFloat(), RANDOM.nextFloat(), 1);
-    final Color color1 = new Color(~color0.getRGB());
-    final GradientPaint gradient = new GradientPaint(0, 0, color0, src.getWidth(), src.getHeight(), color1);
-    graphics.setPaint(gradient);
-
-    final float halfWidth = src.getWidth() * 0.5f;
-
-    for (int i = 0; i < amount; ++i) {
-      final float randomX = src.getWidth() * RANDOM.nextFloat();
-      final float randomY = src.getHeight() * RANDOM.nextFloat();
-      final float amplitude = 6.2831855f * (RANDOM.nextFloat() - 0.5f);
-      final float sin = (float) Math.sin(amplitude) * halfWidth;
-      final float cos = (float) Math.cos(amplitude) * halfWidth;
-      final float x1 = randomX - cos;
-      final float y1 = randomY - sin;
-      final float x2 = randomX + cos;
-      final float y2 = randomY + sin;
-      graphics.drawLine((int) x1, (int) y1, (int) x2, (int) y2);
-    }
-
-    graphics.dispose();
-    return src;
-  }
-}
@@ -1,5 +0,0 @@
-My fonts are free for personal use. You also MAY redistribute the fonts on your website as long as you guve credit to http://bythebutterfly.com as the creator of the fonts. If you are interested in commercial use, please email me at BYTHEBUTTERFLY@GMAIL.COM
-
-Thanks, and enjoy :)
-
-Vanessa
@@ -1,12 +0,0 @@
-Kingthings EULA - (End User License Agreement).
-
-All the fonts currently published on my website (www.kingthingsfonts.co.uk) are free for you to use for any purpose you wish.  Please do not change my original font files (.TTF).
-
-There are some paid-for versions of my fonts (with much enhanced character sets) available from to buy from www.cheapprofonts.com, these contain their own EULA and are not included or implied in this notice.
-
-Please enjoy all your creative work - and if you come up with anything you like, I would appreciate a picture.
-
-Regards
-
-Kevin King
-Exeter, England - February 2009
@@ -16,7 +16,6 @@
 */

 import lombok.experimental.UtilityClass;
-import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
 import xyz.jonesdev.sonar.captcha.StandardCaptchaGenerator;

 import javax.imageio.ImageIO;
@@ -29,7 +28,7 @@ import java.util.Random;
 public class Main {
  public void main(final String... args) throws IOException {
    final Random random = new Random();
-    final CaptchaGenerator standardCaptchaGenerator = new StandardCaptchaGenerator(null);
+    final StandardCaptchaGenerator standardCaptchaGenerator = new StandardCaptchaGenerator(null);

    final long start = System.currentTimeMillis();
    final char[] dictionary = {'a', 'b', 'c', 'd', 'e', 'f'/*, 'g'*/, 'h'/*, 'i'*/, 'j',
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2025 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;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import net.kyori.adventure.text.Component;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.antibot.SonarUser;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.api.event.impl.UserVerifyJoinEvent;
-import xyz.jonesdev.sonar.api.timer.SystemTimer;
-import xyz.jonesdev.sonar.common.netty.MinecraftVarInt21FrameDecoder;
-import xyz.jonesdev.sonar.common.netty.MinecraftVarIntLengthEncoder;
-import xyz.jonesdev.sonar.common.netty.TailExceptionsHandler;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketDecoder;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketEncoder;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketPreparer;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketRegistry;
-import xyz.jonesdev.sonar.common.protocol.packets.play.DisconnectPacket;
-import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
-import xyz.jonesdev.sonar.common.util.ProtocolUtil;
-import xyz.jonesdev.sonar.common.verification.LoginHandler;
-
-import java.net.InetAddress;
-
-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.*;
-
-@Getter
-@ToString(of = {"protocolVersion", "inetAddress", "hostname", "geyser"})
-public final class UserWrapper implements SonarUser {
-  @Accessors(fluent = true)
-  private final Channel channel;
-  private final InetAddress inetAddress;
-  private final ProtocolVersion protocolVersion;
-  private final String fingerprint;
-  private final String username;
-  private final boolean geyser;
-  private final @Nullable String hostname;
-  private final SystemTimer loginTimer;
-  @Setter
-  private boolean forceCaptcha;
-
-  public UserWrapper(final @NotNull ChannelHandlerContext ctx,
-                     final @NotNull InetAddress inetAddress,
-                     final @NotNull ProtocolVersion protocolVersion,
-                     final @NotNull String username,
-                     final @NotNull String fingerprint,
-                     final boolean geyser,
-                     final @Nullable String hostname) {
-    this.channel = ctx.channel();
-    this.inetAddress = inetAddress;
-    this.protocolVersion = protocolVersion;
-    this.username = username;
-    this.fingerprint = fingerprint;
-    this.geyser = geyser;
-    this.hostname = hostname;
-    this.loginTimer = new SystemTimer();
-
-    GlobalSonarStatistics.totalAttemptedVerifications++;
-
-    if (Sonar.get0().getConfig().getVerification().isLogConnections()
-      && (Sonar.get0().getAttackTracker().getCurrentAttack() == null
-      || Sonar.get0().getConfig().getVerification().isLogDuringAttack())) {
-      Sonar.get0().getLogger().info(
-        Sonar.get0().getConfig().getMessagesConfig().getString("verification.logs.connection")
-          .replace("<username>", username)
-          .replace("<ip>", Sonar.get0().getConfig().formatAddress(inetAddress))
-          .replace("<protocol>", protocolVersion.getName()));
-    }
-
-    // Call the VerifyJoinEvent for external API usage
-    Sonar.get0().getEventManager().publish(new UserVerifyJoinEvent(this));
-
-    // Run this in the channel's event loop to avoid issues
-    channel.eventLoop().execute(() -> {
-      // Make sure the channel is still active
-      if (!channel.isActive()) {
-        return;
-      }
-
-      // How? Is there some kind of de-sync or race condition?
-      if (channel.pipeline().context(SONAR_FRAME_ENCODER) != null) {
-        channel.close(); // Nope ¯\_(ツ)_/¯
-        return;
-      }
-
-      // Mark the player as connected by caching them in a map of verifying players
-      Sonar.get0().getAntiBot().getConnected().compute(inetAddress, (__, v) -> true);
-
-      // Replace normal encoder to allow custom packets
-      final SonarPacketEncoder newEncoder = new SonarPacketEncoder(protocolVersion);
-      channel.pipeline().addFirst(SONAR_FRAME_ENCODER, MinecraftVarIntLengthEncoder.INSTANCE);
-      channel.pipeline().addLast(SONAR_PACKET_ENCODER, newEncoder);
-
-      // Replace normal decoder to allow custom packets
-      final SonarPacketDecoder newDecoder = new SonarPacketDecoder(protocolVersion);
-      channel.pipeline().addFirst(SONAR_FRAME_DECODER, new MinecraftVarInt21FrameDecoder());
-      channel.pipeline().addLast(SONAR_PACKET_DECODER, newDecoder);
-
-      // We're sending the LoginSuccess packet now
-      newDecoder.updateRegistry(SonarPacketRegistry.LOGIN);
-      newEncoder.updateRegistry(SonarPacketRegistry.LOGIN);
-      // Send LoginSuccess packet to make the client think they are joining the server
-      write(SonarPacketPreparer.loginSuccess);
-
-      // pre-1.20.2 clients do not have the configuration stage
-      if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
-        newDecoder.updateRegistry(SonarPacketRegistry.GAME);
-        newEncoder.updateRegistry(SonarPacketRegistry.GAME);
-      }
-
-      // Listen for all incoming packets by setting the packet listener
-      newDecoder.setListener(new LoginHandler(this));
-
-      // Make sure to catch all exceptions during the verification
-      channel.pipeline().addLast(SONAR_TAIL_EXCEPTIONS, TailExceptionsHandler.INSTANCE);
-    });
-  }
-
-  @Override
-  public void disconnect(final @NotNull Component reason) {
-    final SonarPacketEncoder encoder = channel.pipeline().get(SonarPacketEncoder.class);
-    final boolean duringLogin = encoder != null && encoder.getPacketRegistry() == SonarPacketRegistry.LOGIN;
-    ProtocolUtil.closeWith(channel, protocolVersion, new DisconnectPacket(reason, duringLogin));
-  }
-}
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.SonarPlatform;

@UtilityClass
-public class LibraryLoader {
-  public void loadLibraries(final @NotNull LibraryManager libraryManager, final @NotNull SonarPlatform platform) {
+class LibraryLoader {
+  void loadLibraries(final @NotNull LibraryManager libraryManager, final @NotNull SonarPlatform platform) {
    libraryManager.addMavenCentral();
    libraryManager.addJitPack();
    libraryManager.loadLibraries(
@@ -47,7 +47,7 @@ public class LibraryLoader {
      Library.builder()
        .groupId("com{}github{}ben-manes{}caffeine")
        .artifactId("caffeine")
-        .version("3.2.3")
+        .version("3.1.8")
        .relocate("com{}github{}benmanes{}caffeine", "xyz{}jonesdev{}sonar{}libs{}caffeine")
        .build(),
      // ORMLite
@@ -68,41 +68,26 @@ public class LibraryLoader {

    // Only load adventure if not on Velocity
    if (platform != SonarPlatform.VELOCITY) {
-      if (platform != SonarPlatform.PAPER) {
-        // BungeeCord does not ship Adventure, and we do not bundle adventure-platform there anymore
-        // (mixing Adventure 4.x and 5.x in the same relocated package causes NoSuchMethodErrors).
-        // Therefore, adventure-api and everything else Adventure needs has to be resolved at runtime.
-        final boolean resolveTransitive = platform == SonarPlatform.BUNGEE;
-        libraryManager.loadLibraries(
-          adventureLibrary("adventure-text-minimessage", resolveTransitive),
-          adventureLibrary("adventure-text-serializer-gson", resolveTransitive),
-          adventureLibrary("adventure-nbt", resolveTransitive)
-        );
-      } else {
-        // On Paper, we only relocate the nbt package since the rest of adventure is bundled with the server.
-        libraryManager.loadLibrary(
-          Library.builder()
-            .groupId("net{}kyori")
-            .artifactId("adventure-nbt")
-            .version("5.2.0")
-            .relocate("net{}kyori{}adventure{}nbt", "xyz{}jonesdev{}sonar{}libs{}kyori{}adventure{}nbt")
-            .build()
-        );
-      }
+      libraryManager.loadLibraries(
+        Library.builder()
+          .groupId("net{}kyori")
+          .artifactId("adventure-text-minimessage")
+          .version("4.13.1") // adventure-platforms hasn't updated in years... Please update! :'(
+          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+          .build(),
+        Library.builder()
+          .groupId("net{}kyori")
+          .artifactId("adventure-text-serializer-gson")
+          .version("4.18.0")
+          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+          .build(),
+        Library.builder()
+          .groupId("net{}kyori")
+          .artifactId("adventure-nbt")
+          .version("4.18.0")
+          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+          .build()
+      );
    }
  }
-
-  private @NotNull Library adventureLibrary(final @NotNull String artifactId, final boolean resolveTransitive) {
-    final Library.Builder builder = Library.builder()
-      .groupId("net{}kyori")
-      .artifactId(artifactId)
-      .version("5.2.0")
-      .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori");
-    if (resolveTransitive) {
-      builder.resolveTransitiveDependencies(true)
-        // Gson is already provided by the proxy, so we must not load another copy
-        .excludeTransitiveDependency("com.google.code.gson", "gson");
-    }
-    return builder.build();
-  }
 }
@@ -36,9 +36,9 @@ import xyz.jonesdev.sonar.api.notification.ActionBarNotificationHandler;
 import xyz.jonesdev.sonar.api.notification.ChatNotificationHandler;
 import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketPreparer;
-import xyz.jonesdev.sonar.common.ratelimit.CaffeineCacheRatelimiter;
-import xyz.jonesdev.sonar.common.ratelimit.NoopCacheRatelimiter;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer;
+import xyz.jonesdev.sonar.common.fallback.ratelimit.CaffeineCacheRatelimiter;
+import xyz.jonesdev.sonar.common.fallback.ratelimit.NoopCacheRatelimiter;
 import xyz.jonesdev.sonar.common.service.ScheduledServiceManager;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
 import xyz.jonesdev.sonar.common.subcommand.*;
@@ -68,13 +68,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
                        final @NotNull File dataDirectory,
                        final @NotNull LibraryManager libraryManager) {
    // Load all libraries before anything else
-    // HACK:
-    // We manually load the libraries on BungeeCord beforehand,
-    // so we skip this call to avoid loading libraries twice.
-    // See SonarBungeePlugin.java#L40
-    if (platform != SonarPlatform.BUNGEE) {
-      LibraryLoader.loadLibraries(libraryManager, platform);
-    }
+    LibraryLoader.loadLibraries(libraryManager, platform);
    this.libraryManager = libraryManager;
    // Check if Netty is up to date
    ProtocolUtil.checkNettyVersion();
@@ -143,26 +137,26 @@ public abstract class SonarBootstrap<T> implements Sonar {

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

    // Update ratelimiter cache
-    getAntiBot().setRatelimiter(getConfig().getVerification().getReconnectDelay() > 0L
+    getFallback().setRatelimiter(getConfig().getVerification().getReconnectDelay() > 0L
      ? new CaffeineCacheRatelimiter(Duration.ofMillis(getConfig().getVerification().getReconnectDelay()))
      : NoopCacheRatelimiter.INSTANCE);

    // Update blacklist cache
    final long blacklistTime = getConfig().getVerification().getBlacklistTime();
-    final boolean blacklistExists = getAntiBot().getBlacklist() != null;
+    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
-      || getAntiBot().getBlacklistTime() != blacklistTime) {
+      || getFallback().getBlacklistTime() != blacklistTime) {
      // Create a new cache with the configured blacklist time
-      getAntiBot().setBlacklist(Caffeine.newBuilder()
+      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
-      getAntiBot().setBlacklistTime(blacklistTime);
+      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.");
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelDuplexHandler;
@@ -29,8 +29,8 @@ import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;

@ChannelHandler.Sharable
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class BandwidthHandler extends ChannelDuplexHandler {
-  public static final ChannelHandler INSTANCE = new BandwidthHandler();
+public final class FallbackBandwidthHandler extends ChannelDuplexHandler {
+  public static final ChannelHandler INSTANCE = new FallbackBandwidthHandler();

  @Override
  public void channelRead(final ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -25,14 +25,13 @@ import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.common.netty.TailExceptionsHandler;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;

 import java.net.InetAddress;
 import java.util.function.Consumer;

@RequiredArgsConstructor
-public final class InboundHandler extends ChannelInboundHandlerAdapter {
+public final class FallbackInboundHandler extends ChannelInboundHandlerAdapter {
  private final Consumer<ChannelPipeline> sonarPipelineInjector;
  @Setter
  @Getter
@@ -56,11 +55,11 @@ public final class InboundHandler extends ChannelInboundHandlerAdapter {
    // Account for this by checking if the inetAddress has been set yet
    if (inetAddress != null) {
      // Remove the IP address from the queue
-      Sonar.get0().getAntiBot().getQueue().getPlayers().compute(inetAddress, (ignored, action) -> {
+      Sonar.get().getFallback().getQueue().getPlayers().compute(inetAddress, (ignored, action) -> {
        // The player is not queued, so we need to remove them from other maps as well
        if (action == null) {
          // Remove the IP address from the connected players, if needed
-          Sonar.get0().getAntiBot().getConnected().compute(inetAddress, (__, v) -> {
+          Sonar.get().getFallback().getConnected().compute(inetAddress, (__, v) -> {
            /*
             * Remove this account from the online players or decrement the number of accounts
             * with the same IP, but only if the player is logging into the backend server.
@@ -68,7 +67,7 @@ public final class InboundHandler extends ChannelInboundHandlerAdapter {
             * we've never actually incremented it in the first place ¯\_(ツ)_/¯
             */
            if (v == null) {
-              Sonar.get0().getAntiBot().getOnline().compute(inetAddress,
+              Sonar.get().getFallback().getOnline().compute(inetAddress,
                (ignored1, count) -> count == null || count <= 1 ? null : count - 1);
            }
            return null;
@@ -86,8 +85,5 @@ public final class InboundHandler extends ChannelInboundHandlerAdapter {
  @Override
  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final Throwable cause) throws Exception {
    ctx.close();
-    if (TailExceptionsHandler.LOG_EXCEPTIONS) {
-      cause.printStackTrace(System.err);
-    }
  }
 }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.channel.*;
 import lombok.AllArgsConstructor;
@@ -23,14 +23,13 @@ import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.api.fingerprint.FingerprintingUtil;
-import xyz.jonesdev.sonar.common.netty.SonarTimeoutHandler;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketEncoder;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketRegistry;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackTimeoutHandler;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketEncoder;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
-import xyz.jonesdev.sonar.common.util.EaglerUtil;
 import xyz.jonesdev.sonar.common.util.GeyserUtil;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;
@@ -40,16 +39,15 @@ import java.net.InetSocketAddress;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.*;
-import static xyz.jonesdev.sonar.common.protocol.SonarPacketPreparer.*;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
+import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;

@AllArgsConstructor
@RequiredArgsConstructor
-public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter {
+public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandlerAdapter {
  protected @Nullable String username;
  protected ProtocolVersion protocolVersion;
-  protected @Nullable String handshakeHostname;
-  protected @Nullable RemovalListener channelRemovalListener;
+  protected RemovalListener channelRemovalListener = RemovalListener.EMPTY;

  /**
   * Validates and handles incoming handshake packets
@@ -66,8 +64,7 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
      throw QuietDecoderException.INSTANCE;
    }
    protocolVersion = ProtocolVersion.fromId(protocol);
-    handshakeHostname = hostname;
-    ctx.pipeline().addFirst(SONAR_BANDWIDTH, BandwidthHandler.INSTANCE);
+    ctx.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
  }

  /**
@@ -97,25 +94,25 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
    this.username = username;

    final InetAddress inetAddress = socketAddress.getAddress();
-    ctx.pipeline().get(InboundHandler.class).setInetAddress(inetAddress);
+    ctx.pipeline().get(FallbackInboundHandler.class).setInetAddress(inetAddress);

-    // Check if Sonar is already verifying a player with the same IP address
-    if (Sonar.get0().getAntiBot().getConnected().containsKey(inetAddress)) {
+    // Check if Fallback is already verifying a player with the same IP address
+    if (Sonar.get().getFallback().getConnected().containsKey(inetAddress)) {
      customDisconnect(ctx.channel(), alreadyVerifying, protocolVersion);
      return;
    }

    // Check if the protocol ID of the player is not allowed to enter the server
-    if (Sonar.get0().getConfig().getVerification().getBlacklistedProtocols().contains(protocolVersion.getProtocol())) {
+    if (Sonar.get().getConfig().getVerification().getBlacklistedProtocols().contains(protocolVersion.getProtocol())) {
      customDisconnect(ctx.channel(), protocolBlacklisted, protocolVersion);
      return;
    }

    final String hostAddress = inetAddress.getHostAddress();
    // Check if the player failed the verification too many times
-    final int limit = Sonar.get0().getConfig().getVerification().getBlacklistThreshold();
+    final int limit = Sonar.get().getConfig().getVerification().getBlacklistThreshold();
    if (limit > 0) {
-      final int score = Sonar.get0().getAntiBot().getBlacklist().asMap().getOrDefault(hostAddress, 0);
+      final int score = Sonar.get().getFallback().getBlacklist().asMap().getOrDefault(hostAddress, 0);
      if (score >= limit) {
        customDisconnect(ctx.channel(), blacklisted, protocolVersion);
        return;
@@ -123,34 +120,27 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
    }

    // Don't continue the verification process if the verification is disabled
-    if (!Sonar.get0().getAntiBot().shouldVerifyNewPlayers()) {
+    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
      initialLogin(ctx.channel(), inetAddress, initialLoginAction);
      return;
    }

    // Completely skip Geyser connections if configured
    final boolean geyser = GeyserUtil.isGeyserConnection(ctx.channel(), socketAddress);
-    if (geyser && !Sonar.get0().getConfig().getVerification().isCheckGeyser()) {
-      initialLogin(ctx.channel(), inetAddress, initialLoginAction);
-      return;
-    }
-
-    // Completely skip EaglercraftX connections if configured
-    if (EaglerUtil.isEaglerConnection(ctx.channel())
-      && !Sonar.get0().getConfig().getVerification().isCheckEagler()) {
+    if (geyser && !Sonar.get().getConfig().getVerification().isCheckGeyser()) {
      initialLogin(ctx.channel(), inetAddress, initialLoginAction);
      return;
    }

    // Make sure we actually have to verify the player
    final String fingerprint = FingerprintingUtil.getFingerprint(username, hostAddress);
-    if (Sonar.get0().getVerifiedPlayerController().getCache().contains(fingerprint)) {
+    if (Sonar.get().getVerifiedPlayerController().getCache().contains(fingerprint)) {
      initialLogin(ctx.channel(), inetAddress, initialLoginAction);
      return;
    }

    // Check if the IP address is currently being rate-limited
-    if (!Sonar.get0().getAntiBot().getRatelimiter().attempt(inetAddress)) {
+    if (!Sonar.get().getFallback().getRatelimiter().attempt(inetAddress)) {
      customDisconnect(ctx.channel(), reconnectedTooFast, protocolVersion);
      return;
    }
@@ -159,7 +149,7 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
    rewriteProtocol(ctx, channelRemovalListener);

    // Queue the connection for further processing
-    Sonar.get0().getAntiBot().getQueue().getPlayers().compute(inetAddress, (__, runnable) -> {
+    Sonar.get().getFallback().getQueue().getPlayers().compute(inetAddress, (__, runnable) -> {
      // Check if the player is already queued since we don't want bots to flood the queue
      if (runnable != null) {
        customDisconnect(ctx.channel(), alreadyQueued, protocolVersion);
@@ -168,8 +158,7 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
      }

      // Create an instance for the user and let the verification handler take over the channel
-      return () -> new UserWrapper(ctx, inetAddress, protocolVersion, username, fingerprint, geyser,
-        handshakeHostname);
+      return () -> new FallbackUserWrapper(ctx, inetAddress, protocolVersion, username, fingerprint, geyser);
    });
  }

@@ -179,47 +168,51 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
  protected final void initialLogin(final @NotNull Channel channel,
                                    final @NotNull InetAddress inetAddress,
                                    final @NotNull Runnable loginPacket) throws Exception {
-    final int maxOnlinePerIp = Sonar.get0().getConfig().getMaxOnlinePerIp();
-    if (maxOnlinePerIp > 0) {
-      final int newCount = Sonar.get0().getAntiBot().getOnline().compute(inetAddress,
-        (__, count) -> count == null ? 1 : count + 1);
-      if (newCount > maxOnlinePerIp) {
-        customDisconnect(channel, tooManyOnlinePerIP, protocolVersion);
-        return;
+    Sonar.get().getFallback().getOnline().compute(inetAddress, (__, count) -> {
+      final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();
+      // Skip the maximum online per IP check if it's disabled in the configuration
+      if (count != null && maxOnlinePerIp > 0) {
+        // Check if the number of online players using the same IP address as
+        // the connecting player is greater than the configured amount
+        if (count >= maxOnlinePerIp) {
+          customDisconnect(channel, tooManyOnlinePerIP, protocolVersion);
+          return count + 1;
+        }
      }
-    }
-    loginPacket.run();
+
+      // Let the server know about the login packet
+      loginPacket.run();
+      // Increment the number of accounts with the same IP
+      return count == null ? 1 : count + 1;
+    });
  }

  /**
   * Removes all pipelines and rewrites them using our custom handlers
   */
  private static void rewriteProtocol(final @NotNull ChannelHandlerContext ctx,
-                                      final @Nullable RemovalListener removalListener) {
+                                      final @NotNull RemovalListener removalListener) {
    for (final Map.Entry<String, ChannelHandler> entry : ctx.pipeline()) {
      // Don't accidentally remove Sonar's handlers
      if (entry.getKey().startsWith("sonar")
        // Don't remove floodgate's pipelines
        || entry.getKey().startsWith("geyser")
        || entry.getKey().startsWith("floodgate")
-        || entry.getKey().startsWith("eagler")
        || entry.getKey().equals("DefaultChannelPipeline$TailContext#0")) {
        continue;
      }
      ctx.pipeline().remove(entry.getValue());
-      if (removalListener != null) {
-        removalListener.accept(ctx.pipeline(), entry.getKey(), entry.getValue());
-      }
+      removalListener.accept(ctx.pipeline(), entry.getKey(), entry.getValue());
    }
    // Add our read/write timeout handler
-    ctx.pipeline().addFirst(SONAR_TIMEOUT, new SonarTimeoutHandler(
-      Sonar.get0().getConfig().getVerification().getReadTimeout(),
-      Sonar.get0().getConfig().getVerification().getWriteTimeout(),
+    ctx.pipeline().addFirst(FALLBACK_TIMEOUT, new FallbackTimeoutHandler(
+      Sonar.get().getConfig().getVerification().getReadTimeout(),
+      Sonar.get().getConfig().getVerification().getWriteTimeout(),
      TimeUnit.MILLISECONDS));
  }

  private static void customDisconnect(final @NotNull Channel channel,
-                                       final @NotNull SonarPacket packet,
+                                       final @NotNull FallbackPacket packet,
                                       final @NotNull ProtocolVersion protocolVersion) {
    if (channel.isActive()) {
      if (channel.eventLoop().inEventLoop()) {
@@ -234,23 +227,23 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
   * Disconnect the player before verification (during login)
   */
  private static void _customDisconnect(final @NotNull Channel channel,
-                                        final @NotNull SonarPacket packet,
+                                        final @NotNull FallbackPacket packet,
                                        final @NotNull ProtocolVersion protocolVersion) {
    // TODO: recode this
    // Remove the connection handler pipeline to completely take over the channel
-    final String handler = Sonar.get0().getPlatform().getConnectionHandler();
+    final String handler = Sonar.get().getPlatform().getConnectionHandler();
    if (channel.pipeline().context(handler) != null) {
      channel.pipeline().remove(handler);
    }
-    final String encoder = Sonar.get0().getPlatform().getEncoder().apply(channel.pipeline());
+    final String encoder = Sonar.get().getPlatform().getEncoder().apply(channel.pipeline());
    final ChannelHandler currentEncoder = channel.pipeline().get(encoder);
    // Close the channel if no encoder exists
    if (currentEncoder != null) {
      // We don't need to update the encoder if it has already been replaced by Sonar
-      if (!(currentEncoder instanceof SonarPacketEncoder)) {
-        final SonarPacketEncoder newEncoder = new SonarPacketEncoder(protocolVersion);
-        newEncoder.updateRegistry(SonarPacketRegistry.LOGIN);
-        channel.pipeline().replace(encoder, SONAR_PACKET_ENCODER, newEncoder);
+      if (!(currentEncoder instanceof FallbackPacketEncoder)) {
+        final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
+        newEncoder.updateRegistry(FallbackPacketRegistry.LOGIN);
+        channel.pipeline().replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
      }
      ProtocolUtil.closeWith(channel, protocolVersion, packet);
    } else {
@@ -263,5 +256,7 @@ public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter
    void accept(final @NotNull ChannelPipeline pipeline,
                final @NotNull String name,
                final @NotNull ChannelHandler handler);
+
+    RemovalListener EMPTY = (pipeline, name, handler) -> {};
  }
 }
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2025 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 lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import net.kyori.adventure.text.Component;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+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.netty.FallbackTailExceptionsHandler;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackVarInt21FrameDecoder;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackVarIntLengthEncoder;
+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.FallbackPreparer;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.DisconnectPacket;
+import xyz.jonesdev.sonar.common.fallback.verification.FallbackPreJoinHandler;
+import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
+import xyz.jonesdev.sonar.common.util.ProtocolUtil;
+
+import java.net.InetAddress;
+
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
+
+@Getter
+@ToString(of = {"protocolVersion", "inetAddress", "geyser"})
+public final class FallbackUserWrapper implements FallbackUser {
+  @Accessors(fluent = true)
+  private final Channel channel;
+  private final InetAddress inetAddress;
+  private final ProtocolVersion protocolVersion;
+  private final String fingerprint;
+  private final String username;
+  private final boolean geyser;
+  private final SystemTimer loginTimer;
+  @Setter
+  private boolean forceCaptcha;
+
+  public FallbackUserWrapper(final @NotNull ChannelHandlerContext ctx,
+                             final @NotNull InetAddress inetAddress,
+                             final @NotNull ProtocolVersion protocolVersion,
+                             final @NotNull String username,
+                             final @NotNull String fingerprint,
+                             final boolean geyser) {
+    this.channel = ctx.channel();
+    this.inetAddress = inetAddress;
+    this.protocolVersion = protocolVersion;
+    this.username = username;
+    this.fingerprint = fingerprint;
+    this.geyser = geyser;
+    this.loginTimer = new SystemTimer();
+
+    GlobalSonarStatistics.totalAttemptedVerifications++;
+
+    if (Sonar.get().getConfig().getVerification().isLogConnections()
+      && (Sonar.get().getAttackTracker().getCurrentAttack() == null
+      || Sonar.get().getConfig().getVerification().isLogDuringAttack())) {
+      Sonar.get().getLogger().info(
+        Sonar.get().getConfig().getMessagesConfig().getString("verification.logs.connection")
+          .replace("<username>", username)
+          .replace("<ip>", Sonar.get().getConfig().formatAddress(inetAddress))
+          .replace("<protocol>", protocolVersion.getName()));
+    }
+
+    // Call the VerifyJoinEvent for external API usage
+    Sonar.get().getEventManager().publish(new UserVerifyJoinEvent(this));
+
+    // Run this in the channel's event loop to avoid issues
+    channel.eventLoop().execute(() -> {
+      // Make sure the channel is still active
+      if (!channel.isActive()) {
+        return;
+      }
+
+      // Mark the player as connected by caching them in a map of verifying players
+      Sonar.get().getFallback().getConnected().compute(inetAddress, (__, v) -> true);
+
+      // Replace normal encoder to allow custom packets
+      final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
+      channel.pipeline().addFirst(FALLBACK_FRAME_ENCODER, FallbackVarIntLengthEncoder.INSTANCE);
+      channel.pipeline().addLast(FALLBACK_PACKET_ENCODER, newEncoder);
+
+      // Replace normal decoder to allow custom packets
+      final FallbackPacketDecoder newDecoder = new FallbackPacketDecoder(protocolVersion);
+      channel.pipeline().addFirst(FALLBACK_FRAME_DECODER, new FallbackVarInt21FrameDecoder());
+      channel.pipeline().addLast(FALLBACK_PACKET_DECODER, newDecoder);
+
+      // We're sending the LoginSuccess packet now
+      newDecoder.updateRegistry(FallbackPacketRegistry.LOGIN);
+      newEncoder.updateRegistry(FallbackPacketRegistry.LOGIN);
+      // Send LoginSuccess packet to make the client think they are joining the server
+      write(FallbackPreparer.loginSuccess);
+
+      // pre-1.20.2 clients do not have the configuration stage
+      if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
+        newDecoder.updateRegistry(FallbackPacketRegistry.GAME);
+        newEncoder.updateRegistry(FallbackPacketRegistry.GAME);
+      }
+
+      // Listen for all incoming packets by setting the packet listener
+      newDecoder.setListener(new FallbackPreJoinHandler(this));
+
+      // Make sure to catch all exceptions during the verification
+      channel.pipeline().addLast(FALLBACK_TAIL_EXCEPTIONS, FallbackTailExceptionsHandler.INSTANCE);
+    });
+  }
+
+  @Override
+  public void disconnect(final @NotNull Component reason) {
+    final FallbackPacketEncoder encoder = channel.pipeline().get(FallbackPacketEncoder.class);
+    final boolean duringLogin = encoder != null && encoder.getPacketRegistry() == FallbackPacketRegistry.LOGIN;
+    ProtocolUtil.closeWith(channel, protocolVersion, new DisconnectPacket(reason, duringLogin));
+  }
+}
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
@@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.common.InboundHandler;
+import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandler;
 import xyz.jonesdev.sonar.common.util.FakeChannelUtil;
 import xyz.jonesdev.sonar.common.util.exception.ReflectiveOperationException;

@@ -33,10 +33,10 @@ import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.function.Consumer;

-import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INBOUND_HANDLER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_INBOUND_HANDLER;

@RequiredArgsConstructor
-public final class SonarInjectedChannelInitializer extends ChannelInitializer<Channel> {
+public final class FallbackInjectedChannelInitializer extends ChannelInitializer<Channel> {
  private static final MethodHandle INIT_CHANNEL_METHOD;

  static {
@@ -53,10 +53,6 @@ public final class SonarInjectedChannelInitializer extends ChannelInitializer<Ch

  @Override
  protected void initChannel(final Channel channel) throws Exception {
-    if (!channel.isActive()) {
-      return;
-    }
-
    // Invoke the original method
    try {
      INIT_CHANNEL_METHOD.invokeExact(originalChannelInitializer, channel);
@@ -64,20 +60,16 @@ public final class SonarInjectedChannelInitializer extends ChannelInitializer<Ch
      throw new ReflectiveOperationException(throwable);
    }

-    inject(channel, sonarPipelineInjector);
-  }
-
-  public static void inject(final @NotNull Channel channel, final Consumer<ChannelPipeline> sonarPipelineInjector) {
    // Inject Sonar's channel handler into the pipeline;
    // Also make sure the player is not a fake player to avoid compatibility issues
    if (channel.isActive() && !FakeChannelUtil.isFakeChannel(channel)) {
-      final InboundHandler inboundHandler = new InboundHandler(sonarPipelineInjector);
+      final FallbackInboundHandler inboundHandler = new FallbackInboundHandler(sonarPipelineInjector);
      // We need to be careful on Bukkit, as the encoder can be different
-      if (Sonar.get0().getPlatform() == SonarPlatform.BUKKIT) {
-        final String encoder = Sonar.get0().getPlatform().getEncoder().apply(channel.pipeline());
-        channel.pipeline().addBefore(encoder, SONAR_INBOUND_HANDLER, inboundHandler);
+      if (Sonar.get().getPlatform() == SonarPlatform.BUKKIT) {
+        final String encoder = Sonar.get().getPlatform().getEncoder().apply(channel.pipeline());
+        channel.pipeline().addBefore(encoder, FALLBACK_INBOUND_HANDLER, inboundHandler);
      } else {
-        channel.pipeline().addFirst(SONAR_INBOUND_HANDLER, inboundHandler);
+        channel.pipeline().addFirst(FALLBACK_INBOUND_HANDLER, inboundHandler);
      }
    }
  }
@@ -15,43 +15,23 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.common.util.ProtocolUtil;

@ChannelHandler.Sharable
-public final class TailExceptionsHandler extends ChannelDuplexHandler {
-  public static final TailExceptionsHandler INSTANCE = new TailExceptionsHandler();
-  // Do not enable unless instructed by support.
-  public static final boolean LOG_EXCEPTIONS = Boolean.getBoolean("sonar.log-netty-exceptions");
+public final class FallbackTailExceptionsHandler extends ChannelDuplexHandler {
+  public static final FallbackTailExceptionsHandler INSTANCE = new FallbackTailExceptionsHandler();

  // We can override the default exceptionCaught method since the server
  // does not have any other pipelines that could handle this error.
  // Additionally, this will also run after our custom decoder.
  @Override
  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final Throwable cause) throws Exception {
-    // If ProtocolUtil#closeWith(...) already queued a graceful write-then-close for
-    // this channel (e.g. VerificationHandler#fail() calls disconnect() and then
-    // throws to unwind), don't race it with a second, immediate close() here. Doing
-    // so can abort the still-in-flight kick/disconnect packet write before it's fully
-    // flushed, so the client only receives a truncated packet instead of our message.
-    // The scheduled close from closeWith() will still run once the write completes.
-    // See: https://github.com/jonesdevelopment/sonar/issues/476
-    if (Boolean.TRUE.equals(ctx.channel().attr(ProtocolUtil.CLOSING).get())) {
-      if (LOG_EXCEPTIONS) {
-        cause.printStackTrace(System.err);
-      }
-      return;
-    }
-
    // Close the channel if we encounter any errors.
    ctx.close();
-    if (LOG_EXCEPTIONS) {
-      cause.printStackTrace(System.err);
-    }
  }
 }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleStateEvent;
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;

 import java.util.concurrent.TimeUnit;

-public final class SonarTimeoutHandler extends IdleStateHandler {
-  public SonarTimeoutHandler(final int readTimeout, final int writeTimeout, final TimeUnit timeUnit) {
+public final class FallbackTimeoutHandler extends IdleStateHandler {
+  public FallbackTimeoutHandler(final int readTimeout, final int writeTimeout, final TimeUnit timeUnit) {
    super(false, readTimeout, writeTimeout, 0L, timeUnit);
  }

@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -29,7 +29,7 @@ import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;
 import java.util.List;

 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java
-public final class MinecraftVarInt21FrameDecoder extends ByteToMessageDecoder {
+public final class FallbackVarInt21FrameDecoder extends ByteToMessageDecoder {

  @Override
  protected void decode(final @NotNull ChannelHandlerContext ctx,
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
@@ -28,8 +28,8 @@ import java.util.List;

 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintLengthEncoder.java
@ChannelHandler.Sharable
-public final class MinecraftVarIntLengthEncoder extends MessageToMessageEncoder<ByteBuf> {
-  public static final MinecraftVarIntLengthEncoder INSTANCE = new MinecraftVarIntLengthEncoder();
+public final class FallbackVarIntLengthEncoder extends MessageToMessageEncoder<ByteBuf> {
+  public static final FallbackVarIntLengthEncoder INSTANCE = new FallbackVarIntLengthEncoder();

  @Override
  protected void encode(final @NotNull ChannelHandlerContext ctx,
@@ -15,14 +15,14 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import lombok.experimental.UtilityClass;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.event.impl.CaptchaGenerationEndEvent;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
-import xyz.jonesdev.sonar.common.protocol.map.MapCaptchaInfo;
-import xyz.jonesdev.sonar.common.protocol.map.MapColorPalette;
+import xyz.jonesdev.sonar.common.fallback.protocol.map.MapCaptchaInfo;
+import xyz.jonesdev.sonar.common.fallback.protocol.map.MapColorPalette;

 import java.awt.image.BufferedImage;
 import java.util.Random;
@@ -44,12 +44,12 @@ public class CaptchaPreparer {
    }

    final SystemTimer timer = new SystemTimer();
-    Sonar.get0().getLogger().info("Asynchronously preparing CAPTCHA answers...");
-    Sonar.get0().getLogger().info("Players will be able to join even if the preparation isn't finished");
+    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 int precomputeAmount = Sonar.get0().getConfig().getVerification().getMap().getPrecomputeAmount();
-    final char[] alphabet = Sonar.get0().getConfig().getVerification().getMap().getAlphabet().toCharArray();
+    final int precomputeAmount = Sonar.get().getConfig().getVerification().getMap().getPrecomputeAmount();
+    final char[] alphabet = Sonar.get().getConfig().getVerification().getMap().getAlphabet().toCharArray();

    preparedAmount = 0;
    cached = new MapCaptchaInfo[precomputeAmount];
@@ -62,13 +62,13 @@ public class CaptchaPreparer {
        for (int j = 0; j < answer.length; j++) {
          answer[j] = alphabet[RANDOM.nextInt(alphabet.length)];
        }
-        final BufferedImage image = Sonar.get0().getAntiBot().getCaptchaGenerator().createImage(answer);
+        final BufferedImage image = Sonar.get().getFallback().getCaptchaGenerator().createImage(answer);
        // Convert and cache converted Minecraft map bytes
        cached[preparedAmount++] = new MapCaptchaInfo(new String(answer), MapColorPalette.imageToBuffer(image));
      }

-      Sonar.get0().getLogger().info("Finished preparing {} CAPTCHA answers ({}s)!", preparedAmount, timer);
-      Sonar.get0().getEventManager().publish(new CaptchaGenerationEndEvent(timer, preparedAmount));
+      Sonar.get().getLogger().info("Finished preparing {} CAPTCHA answers ({}s)!", preparedAmount, timer);
+      Sonar.get().getEventManager().publish(new CaptchaGenerationEndEvent(timer, preparedAmount));
    });
  }

@@ -15,12 +15,12 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;

-public interface SonarPacket {
+public interface FallbackPacket {

  /**
   * Encodes the packet sent by the server
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -24,22 +24,22 @@ import io.netty.handler.codec.DecoderException;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

-import static xyz.jonesdev.sonar.common.protocol.SonarPacketPreparer.maxTotalPacketsSent;
+import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.maxTotalPacketsSent;

@RequiredArgsConstructor
-public final class SonarPacketDecoder extends ChannelInboundHandlerAdapter {
+public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
  private final ProtocolVersion protocolVersion;
-  private SonarPacketRegistry.ProtocolRegistry registry;
+  private FallbackPacketRegistry.ProtocolRegistry registry;
  @Setter
-  private SonarPacketListener listener;
+  private FallbackPacketListener listener;
  private int totalPacketsSent;

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

  @Override
@@ -62,7 +62,7 @@ public final class SonarPacketDecoder extends ChannelInboundHandlerAdapter {

        // Read the packet ID and then create the packet from it
        final int packetId = ProtocolUtil.readVarInt(byteBuf);
-        final SonarPacket packet = registry.createPacket(packetId);
+        final FallbackPacket packet = registry.createPacket(packetId);

        // Skip the packet if it's not registered within Sonar's packet registry
        if (packet == null) {
@@ -98,7 +98,7 @@ public final class SonarPacketDecoder extends ChannelInboundHandlerAdapter {
    }
  }

-  private void checkPacketSize(final int packetSize, final @NotNull SonarPacket packet) throws Exception {
+  private void checkPacketSize(final int packetSize, final @NotNull FallbackPacket packet) throws Exception {
    final int expectedMaxLen = packet.expectedMaxLength(protocolVersion);
    if (expectedMaxLen != -1 && packetSize > expectedMaxLen) {
      throw ProtocolUtil.DEBUG ? new DecoderException("Packet too large: " + packetSize + " max: " + expectedMaxLen)
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -23,27 +23,27 @@ import io.netty.handler.codec.MessageToByteEncoder;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;

@RequiredArgsConstructor
-public final class SonarPacketEncoder extends MessageToByteEncoder<SonarPacket> {
+public final class FallbackPacketEncoder extends MessageToByteEncoder<FallbackPacket> {
  private final ProtocolVersion protocolVersion;
  @Getter
-  private SonarPacketRegistry packetRegistry;
-  private SonarPacketRegistry.ProtocolRegistry protocolRegistry;
+  private FallbackPacketRegistry packetRegistry;
+  private FallbackPacketRegistry.ProtocolRegistry protocolRegistry;

-  public void updateRegistry(final @NotNull SonarPacketRegistry packetRegistry) {
+  public void updateRegistry(final @NotNull FallbackPacketRegistry packetRegistry) {
    this.packetRegistry = packetRegistry;
-    this.protocolRegistry = packetRegistry.getProtocolRegistry(SonarPacketRegistry.Direction.CLIENTBOUND, protocolVersion);
+    this.protocolRegistry = packetRegistry.getProtocolRegistry(FallbackPacketRegistry.Direction.CLIENTBOUND, protocolVersion);
  }

  @Override
  protected void encode(final ChannelHandlerContext ctx,
-                        final @NotNull SonarPacket packet,
+                        final @NotNull FallbackPacket packet,
                        final @NotNull ByteBuf out) throws Exception {
-    final Class<? extends SonarPacket> originalPacket = packet instanceof SonarPacketSnapshot
-      ? ((SonarPacketSnapshot) packet).getOriginalPacketClass() : packet.getClass();
+    final Class<? extends FallbackPacket> originalPacket = packet instanceof FallbackPacketSnapshot
+      ? ((FallbackPacketSnapshot) packet).getOriginalPacketClass() : packet.getClass();
    final int packetId = protocolRegistry.getPacketId(originalPacket);
    ProtocolUtil.writeVarInt(out, packetId);
    packet.encode(out, protocolVersion);
@@ -15,17 +15,17 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import org.jetbrains.annotations.NotNull;

@FunctionalInterface
-public interface SonarPacketListener {
+public interface FallbackPacketListener {

  /**
   * Handles the incoming packet
   *
   * @param packet Packet to handle
   */
-  void handle(final @NotNull SonarPacket packet);
+  void handle(final @NotNull FallbackPacket packet);
 }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.util.collection.IntObjectHashMap;
 import io.netty.util.collection.IntObjectMap;
@@ -23,15 +23,14 @@ import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.protocol.packets.configuration.FinishConfigurationPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.configuration.RegistryDataPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.configuration.UpdateTagsPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket;
-import xyz.jonesdev.sonar.common.protocol.packets.login.LoginAcknowledgedPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.login.LoginStartPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.login.LoginSuccessPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.play.*;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+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.handshake.HandshakePacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledgedPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginStartPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccessPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;

 import java.util.EnumMap;
 import java.util.EnumSet;
@@ -39,10 +38,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;

-import static xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;

 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
-public enum SonarPacketRegistry {
+public enum FallbackPacketRegistry {
  HANDSHAKE {
    {
      serverbound.register(HandshakePacket.class, HandshakePacket::new,
@@ -67,7 +66,7 @@ public enum SonarPacketRegistry {
      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.INSTANCE,
+      clientbound.register(FinishConfigurationPacket.class, FinishConfigurationPacket::new,
        map(0x02, MINECRAFT_1_20_2, true),
        map(0x03, MINECRAFT_1_20_5, true));
      clientbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
@@ -76,16 +75,13 @@ public enum SonarPacketRegistry {
      clientbound.register(RegistryDataPacket.class, RegistryDataPacket::new,
        map(0x05, MINECRAFT_1_20_2, true),
        map(0x07, MINECRAFT_1_20_5, true));
-      clientbound.register(UpdateTagsPacket.class, UpdateTagsPacket::new,
-        map(0x0D, MINECRAFT_1_20_5, true),
-        map(0x0E, MINECRAFT_26_3, true));

      serverbound.register(ClientInformationPacket.class, ClientInformationPacket::new,
        map(0x00, 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.INSTANCE,
+      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,
@@ -95,7 +91,6 @@ public enum SonarPacketRegistry {
  },
  GAME {
    {
-      // minecraft:login
      clientbound.register(JoinGamePacket.class, JoinGamePacket::new,
        map(0x01, MINECRAFT_1_7_2, true),
        map(0x23, MINECRAFT_1_9, true),
@@ -111,12 +106,7 @@ public enum SonarPacketRegistry {
        map(0x28, MINECRAFT_1_19_4, true),
        map(0x29, MINECRAFT_1_20_2, true),
        map(0x2B, MINECRAFT_1_20_5, true),
-        map(0x2C, MINECRAFT_1_21_2, true),
-        map(0x2B, MINECRAFT_1_21_5, true),
-        map(0x30, MINECRAFT_1_21_9, true),
-        map(0x31, MINECRAFT_26_1, true),
-        map(0x32, MINECRAFT_26_3, true));
-      // minecraft:keep_alive
+        map(0x2C, MINECRAFT_1_21_2, true));
      clientbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
        map(0x00, MINECRAFT_1_7_2, true),
        map(0x1F, MINECRAFT_1_9, true),
@@ -132,12 +122,7 @@ public enum SonarPacketRegistry {
        map(0x23, MINECRAFT_1_19_4, true),
        map(0x24, MINECRAFT_1_20_2, true),
        map(0x26, MINECRAFT_1_20_5, true),
-        map(0x27, MINECRAFT_1_21_2, true),
-        map(0x26, MINECRAFT_1_21_5, true),
-        map(0x2B, MINECRAFT_1_21_9, true),
-        map(0x2C, MINECRAFT_26_1, true),
-        map(0x2D, MINECRAFT_26_3, true));
-      // minecraft:disconnect
+        map(0x27, MINECRAFT_1_21_2, true));
      clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
        map(0x40, MINECRAFT_1_7_2, true),
        map(0x1A, MINECRAFT_1_9, true),
@@ -152,10 +137,7 @@ public enum SonarPacketRegistry {
        map(0x17, MINECRAFT_1_19_3, true),
        map(0x1A, MINECRAFT_1_19_4, true),
        map(0x1B, MINECRAFT_1_20_2, true),
-        map(0x1D, MINECRAFT_1_20_5, true),
-        map(0x1C, MINECRAFT_1_21_5, true),
-        map(0x20, MINECRAFT_1_21_9, true));
-      // minecraft:player_position
+        map(0x1D, MINECRAFT_1_20_5, true));
      clientbound.register(SetPlayerPositionRotationPacket.class, SetPlayerPositionRotationPacket::new,
        map(0x08, MINECRAFT_1_7_2, true),
        map(0x2E, MINECRAFT_1_9, true),
@@ -172,12 +154,7 @@ public enum SonarPacketRegistry {
        map(0x3C, MINECRAFT_1_19_4, true),
        map(0x3E, MINECRAFT_1_20_2, true),
        map(0x40, MINECRAFT_1_20_5, true),
-        map(0x42, MINECRAFT_1_21_2, true),
-        map(0x41, MINECRAFT_1_21_5, true),
-        map(0x46, MINECRAFT_1_21_9, true),
-        map(0x48, MINECRAFT_26_1, true),
-        map(0x49, MINECRAFT_26_3, true));
-      // minecraft:player_abilities
+        map(0x42, MINECRAFT_1_21_2, true));
      clientbound.register(PlayerAbilitiesPacket.class, PlayerAbilitiesPacket::new,
        map(0x39, MINECRAFT_1_7_2, true),
        map(0x2B, MINECRAFT_1_9, true),
@@ -194,12 +171,7 @@ public enum SonarPacketRegistry {
        map(0x34, MINECRAFT_1_19_4, true),
        map(0x36, MINECRAFT_1_20_2, true),
        map(0x38, MINECRAFT_1_20_5, true),
-        map(0x3A, MINECRAFT_1_21_2, true),
-        map(0x39, MINECRAFT_1_21_5, true),
-        map(0x3E, MINECRAFT_1_21_9, true),
-        map(0x40, MINECRAFT_26_1, true),
-        map(0x41, MINECRAFT_26_3, true));
-      // minecraft:level_chunk_with_light
+        map(0x3A, MINECRAFT_1_21_2, true));
      clientbound.register(ChunkDataPacket.class, ChunkDataPacket::new,
        map(0x21, MINECRAFT_1_7_2, true),
        map(0x20, MINECRAFT_1_9, true),
@@ -215,12 +187,7 @@ public enum SonarPacketRegistry {
        map(0x24, MINECRAFT_1_19_4, true),
        map(0x25, MINECRAFT_1_20_2, true),
        map(0x27, MINECRAFT_1_20_5, true),
-        map(0x28, MINECRAFT_1_21_2, true),
-        map(0x27, MINECRAFT_1_21_5, true),
-        map(0x2C, MINECRAFT_1_21_9, true),
-        map(0x2D, MINECRAFT_26_1, true),
-        map(0x2E, MINECRAFT_26_3, true));
-      // minecraft:remove_entities
+        map(0x28, MINECRAFT_1_21_2, true));
      clientbound.register(RemoveEntitiesPacket.class, RemoveEntitiesPacket::new,
        map(0x13, MINECRAFT_1_7_2, true),
        map(0x30, MINECRAFT_1_9, true),
@@ -239,12 +206,7 @@ public enum SonarPacketRegistry {
        map(0x3E, MINECRAFT_1_19_4, true),
        map(0x40, MINECRAFT_1_20_2, true),
        map(0x42, MINECRAFT_1_20_5, true),
-        map(0x47, MINECRAFT_1_21_2, true),
-        map(0x46, MINECRAFT_1_21_5, true),
-        map(0x4B, MINECRAFT_1_21_9, true),
-        map(0x4D, MINECRAFT_26_1, true),
-        map(0x4E, MINECRAFT_26_3, true));
-      // minecraft:set_passengers
+        map(0x47, MINECRAFT_1_21_2, true));
      clientbound.register(SetPassengersPacket.class, SetPassengersPacket::new,
        map(0x1B, MINECRAFT_1_7_2, true),
        map(0x40, MINECRAFT_1_9, true),
@@ -260,17 +222,26 @@ public enum SonarPacketRegistry {
        map(0x5B, MINECRAFT_1_20_2, true),
        map(0x5D, MINECRAFT_1_20_3, true),
        map(0x5F, MINECRAFT_1_20_5, true),
-        map(0x65, MINECRAFT_1_21_2, true),
-        map(0x64, MINECRAFT_1_21_5, true),
-        map(0x69, MINECRAFT_1_21_9, true),
-        map(0x6B, MINECRAFT_26_1, true),
-        map(0x6D, MINECRAFT_26_3, true));
-      // minecraft:add_entity
+        map(0x65, MINECRAFT_1_21_2, true));
+      clientbound.register(VehicleMovePacket.class, VehicleMovePacket::new,
+        map(0x29, MINECRAFT_1_9, true),
+        map(0x2B, MINECRAFT_1_13, true),
+        map(0x2C, MINECRAFT_1_14, true),
+        map(0x2D, MINECRAFT_1_15, true),
+        map(0x2C, MINECRAFT_1_16, true),
+        map(0x2B, MINECRAFT_1_16_2, true),
+        map(0x2C, MINECRAFT_1_17, true),
+        map(0x29, MINECRAFT_1_19, true),
+        map(0x2B, MINECRAFT_1_19_1, true),
+        map(0x2A, MINECRAFT_1_19_3, true),
+        map(0x2E, MINECRAFT_1_19_4, true),
+        map(0x2F, MINECRAFT_1_20_2, true),
+        map(0x31, MINECRAFT_1_20_5, true),
+        map(0x33, MINECRAFT_1_21_2, 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));
-      // minecraft:section_blocks_update
      clientbound.register(UpdateSectionBlocksPacket.class, UpdateSectionBlocksPacket::new,
        map(0x22, MINECRAFT_1_7_2, true),
        map(0x10, MINECRAFT_1_9, true),
@@ -286,12 +257,7 @@ public enum SonarPacketRegistry {
        map(0x45, MINECRAFT_1_20_2, true),
        map(0x47, MINECRAFT_1_20_3, true),
        map(0x49, MINECRAFT_1_20_5, true),
-        map(0x4E, MINECRAFT_1_21_2, true),
-        map(0x4D, MINECRAFT_1_21_5, true),
-        map(0x52, MINECRAFT_1_21_9, true),
-        map(0x54, MINECRAFT_26_1, true),
-        map(0x56, MINECRAFT_26_3, true));
-      // minecraft:ping
+        map(0x4E, MINECRAFT_1_21_2, true));
      clientbound.register(TransactionPacket.class, TransactionPacket::new,
        map(0x32, MINECRAFT_1_7_2, true),
        map(0x11, MINECRAFT_1_9, true),
@@ -306,12 +272,7 @@ public enum SonarPacketRegistry {
        map(0x32, MINECRAFT_1_19_4, true),
        map(0x33, MINECRAFT_1_20_2, true),
        map(0x35, MINECRAFT_1_20_5, true),
-        map(0x37, MINECRAFT_1_21_2, true),
-        map(0x36, MINECRAFT_1_21_5, true),
-        map(0x3B, MINECRAFT_1_21_9, true),
-        map(0x3D, MINECRAFT_26_1, true),
-        map(0x3E, MINECRAFT_26_3, true));
-      // minecraft:set_default_spawn_position
+        map(0x37, MINECRAFT_1_21_2, true));
      clientbound.register(SetDefaultSpawnPositionPacket.class, SetDefaultSpawnPositionPacket::new,
        map(0x05, MINECRAFT_1_7_2, true),
        map(0x43, MINECRAFT_1_9, true),
@@ -329,12 +290,7 @@ public enum SonarPacketRegistry {
        map(0x52, MINECRAFT_1_20_2, true),
        map(0x54, MINECRAFT_1_20_3, true),
        map(0x56, MINECRAFT_1_20_5, true),
-        map(0x5B, MINECRAFT_1_21_2, true),
-        map(0x5A, MINECRAFT_1_21_5, true),
-        map(0x5F, MINECRAFT_1_21_9, true),
-        map(0x61, MINECRAFT_26_1, true),
-        map(0x63, MINECRAFT_26_3, true));
-      // minecraft:map_item_data
+        map(0x5B, MINECRAFT_1_21_2, true));
      clientbound.register(MapDataPacket.class, MapDataPacket::new,
        map(0x34, MINECRAFT_1_7_2, true),
        map(0x24, MINECRAFT_1_9, true),
@@ -349,12 +305,7 @@ public enum SonarPacketRegistry {
        map(0x29, MINECRAFT_1_19_4, true),
        map(0x2A, MINECRAFT_1_20_2, true),
        map(0x2C, MINECRAFT_1_20_5, true),
-        map(0x2D, MINECRAFT_1_21_2, true),
-        map(0x2C, MINECRAFT_1_21_5, true),
-        map(0x31, MINECRAFT_1_21_9, true),
-        map(0x33, MINECRAFT_26_1, true),
-        map(0x34, MINECRAFT_26_3, true));
-      // minecraft:container_set_slot
+        map(0x2D, MINECRAFT_1_21_2, true));
      clientbound.register(SetContainerSlotPacket.class, SetContainerSlotPacket::new,
        map(0x2F, MINECRAFT_1_7_2, true),
        map(0x16, MINECRAFT_1_9, true),
@@ -367,9 +318,7 @@ public enum SonarPacketRegistry {
        map(0x13, MINECRAFT_1_19, true),
        map(0x12, MINECRAFT_1_19_3, true),
        map(0x14, MINECRAFT_1_19_4, true),
-        map(0x15, MINECRAFT_1_20_2, true),
-        map(0x14, MINECRAFT_1_21_5, true));
-      // minecraft:set_experience
+        map(0x15, MINECRAFT_1_20_2, true));
      clientbound.register(SetExperiencePacket.class, SetExperiencePacket::new,
        map(0x1F, MINECRAFT_1_7_2, true),
        map(0x3D, MINECRAFT_1_9, true),
@@ -385,12 +334,7 @@ public enum SonarPacketRegistry {
        map(0x58, MINECRAFT_1_20_2, true),
        map(0x5A, MINECRAFT_1_20_3, true),
        map(0x5C, MINECRAFT_1_20_5, true),
-        map(0x61, MINECRAFT_1_21_2, true),
-        map(0x60, MINECRAFT_1_21_5, true),
-        map(0x65, MINECRAFT_1_21_9, true),
-        map(0x67, MINECRAFT_26_1, true),
-        map(0x69, MINECRAFT_26_3, true));
-      // minecraft:system_chat
+        map(0x61, MINECRAFT_1_21_2, true));
      clientbound.register(SystemChatPacket.class, SystemChatPacket::new,
        map(0x02, MINECRAFT_1_7_2, true),
        map(0x0F, MINECRAFT_1_9, true),
@@ -405,27 +349,14 @@ public enum SonarPacketRegistry {
        map(0x67, MINECRAFT_1_20_2, true),
        map(0x69, MINECRAFT_1_20_3, true),
        map(0x6C, MINECRAFT_1_20_5, true),
-        map(0x73, MINECRAFT_1_21_2, true),
-        map(0x72, MINECRAFT_1_21_5, true),
-        map(0x77, MINECRAFT_1_21_9, true),
-        map(0x79, MINECRAFT_26_1, true),
-        map(0x7C, MINECRAFT_26_3, true));
-      // minecraft:game_event
+        map(0x73, MINECRAFT_1_21_2, true));
      clientbound.register(GameEventPacket.class, GameEventPacket::new,
        map(0x20, MINECRAFT_1_20_3, true),
        map(0x22, MINECRAFT_1_20_5, true),
-        map(0x23, MINECRAFT_1_21_2, true),
-        map(0x22, MINECRAFT_1_21_5, true),
-        map(0x26, MINECRAFT_1_21_9, true),
-        map(0x27, MINECRAFT_26_3, true));
-      // minecraft:transfer
+        map(0x23, MINECRAFT_1_21_2, true));
      clientbound.register(TransferPacket.class, TransferPacket::new,
        map(0x73, MINECRAFT_1_20_5, true),
-        map(0x7A, MINECRAFT_1_21_2, true),
-        map(0x7F, MINECRAFT_1_21_9, true),
-        map(0x81, MINECRAFT_26_1, true),
-        map(0x84, MINECRAFT_26_3, true));
-      // minecraft:set_held_slot
+        map(0x7A, MINECRAFT_1_21_2, true));
      clientbound.register(SetHeldItemPacket.class, SetHeldItemPacket::new,
        map(0x09, MINECRAFT_1_7_2, true),
        map(0x37, MINECRAFT_1_9, true),
@@ -443,12 +374,7 @@ public enum SonarPacketRegistry {
        map(0x4F, MINECRAFT_1_20_2, true),
        map(0x51, MINECRAFT_1_20_3, true),
        map(0x53, MINECRAFT_1_20_5, true),
-        map(0x63, MINECRAFT_1_21_2, true),
-        map(0x62, MINECRAFT_1_21_5, true),
-        map(0x67, MINECRAFT_1_21_9, true),
-        map(0x69, MINECRAFT_26_1, true),
-        map(0x6B, MINECRAFT_26_3, true));
-      // minecraft:animate
+        map(0x63, MINECRAFT_1_21_2, true));
      clientbound.register(EntityAnimationPacket.class, EntityAnimationPacket::new,
        map(0x0B, MINECRAFT_1_7_2, true),
        map(0x06, MINECRAFT_1_9, true),
@@ -456,9 +382,7 @@ public enum SonarPacketRegistry {
        map(0x06, MINECRAFT_1_17, true),
        map(0x03, MINECRAFT_1_19, true),
        map(0x04, MINECRAFT_1_19_4, true),
-        map(0x03, MINECRAFT_1_20_2, true),
-        map(0x02, MINECRAFT_1_21_5, true));
-      // minecraft:set_time
+        map(0x03, MINECRAFT_1_20_2, true));
      clientbound.register(UpdateTimePacket.class, UpdateTimePacket::new,
        map(0x03, MINECRAFT_1_7_2, true),
        map(0x44, MINECRAFT_1_9, true),
@@ -476,18 +400,10 @@ public enum SonarPacketRegistry {
        map(0x60, MINECRAFT_1_20_2, true),
        map(0x62, MINECRAFT_1_20_3, true),
        map(0x64, MINECRAFT_1_20_5, true),
-        map(0x6B, MINECRAFT_1_21_2, true),
-        map(0x6A, MINECRAFT_1_21_5, true),
-        map(0x6F, MINECRAFT_1_21_9, true),
-        map(0x71, MINECRAFT_26_1, true),
-        map(0x73, MINECRAFT_26_3, true));
+        map(0x6B, MINECRAFT_1_21_2, true));

-      // minecraft:client_tick_end
      serverbound.register(ClientTickEndPacket.class, ClientTickEndPacket::new,
-        map(0x0B, MINECRAFT_1_21_2, false),
-        map(0x0C, MINECRAFT_1_21_6, false),
-        map(0x0D, MINECRAFT_26_1, false));
-      // minecraft:set_carried_item
+        map(0x0B, MINECRAFT_1_21_2, false));
      serverbound.register(SetHeldItemPacket.class, SetHeldItemPacket::new,
        map(0x09, MINECRAFT_1_7_2, false),
        map(0x17, MINECRAFT_1_9, false),
@@ -502,11 +418,7 @@ public enum SonarPacketRegistry {
        map(0x2C, MINECRAFT_1_20_3, false),
        map(0x2F, MINECRAFT_1_20_5, false),
        map(0x31, MINECRAFT_1_21_2, false),
-        map(0x33, MINECRAFT_1_21_4, false),
-        map(0x34, MINECRAFT_1_21_6, false),
-        map(0x35, MINECRAFT_26_1, false),
-        map(0x36, MINECRAFT_26_3, false));
-      // minecraft:paddle_boat
+        map(0x33, MINECRAFT_1_21_4, false));
      serverbound.register(PaddleBoatPacket.class, PaddleBoatPacket::new,
        map(0x11, MINECRAFT_1_9, false),
        map(0x12, MINECRAFT_1_12, false),
@@ -522,10 +434,7 @@ public enum SonarPacketRegistry {
        map(0x1B, MINECRAFT_1_20_2, false),
        map(0x1C, MINECRAFT_1_20_3, false),
        map(0x1F, MINECRAFT_1_20_5, false),
-        map(0x21, MINECRAFT_1_21_2, false),
-        map(0x22, MINECRAFT_1_21_6, false),
-        map(0x23, MINECRAFT_26_1, false));
-      // minecraft:player_input
+        map(0x21, MINECRAFT_1_21_2, false));
      serverbound.register(PlayerInputPacket.class, PlayerInputPacket::new,
        map(0x0C, MINECRAFT_1_7_2, false),
        map(0x15, MINECRAFT_1_9, false),
@@ -542,10 +451,7 @@ public enum SonarPacketRegistry {
        map(0x23, MINECRAFT_1_20_3, false),
        map(0x26, MINECRAFT_1_20_5, false),
        map(0x28, MINECRAFT_1_21_2, false),
-        map(0x29, MINECRAFT_1_21_4, false),
-        map(0x2A, MINECRAFT_1_21_6, false),
-        map(0x2B, MINECRAFT_26_1, false));
-      // minecraft:move_vehicle
+        map(0x29, MINECRAFT_1_21_4, false));
      serverbound.register(VehicleMovePacket.class, VehicleMovePacket::new,
        map(0x10, MINECRAFT_1_9, false),
        map(0x11, MINECRAFT_1_12, false),
@@ -561,10 +467,7 @@ public enum SonarPacketRegistry {
        map(0x1A, MINECRAFT_1_20_2, false),
        map(0x1B, MINECRAFT_1_20_3, false),
        map(0x1E, MINECRAFT_1_20_5, false),
-        map(0x20, MINECRAFT_1_21_2, false),
-        map(0x21, MINECRAFT_1_21_6, false),
-        map(0x22, MINECRAFT_26_1, false));
-      // minecraft:chat
+        map(0x20, MINECRAFT_1_21_2, false));
      serverbound.register(SystemChatPacket.class, SystemChatPacket::new,
        map(0x01, MINECRAFT_1_7_2, false),
        map(0x02, MINECRAFT_1_9, false),
@@ -575,10 +478,7 @@ public enum SonarPacketRegistry {
        map(0x05, MINECRAFT_1_19_1, false),
        map(0x05, MINECRAFT_1_19_3, false),
        map(0x06, MINECRAFT_1_20_5, false),
-        map(0x07, MINECRAFT_1_21_2, false),
-        map(0x08, MINECRAFT_1_21_6, false),
-        map(0x09, MINECRAFT_26_1, false));
-      // minecraft:keep_alive
+        map(0x07, MINECRAFT_1_21_2, false));
      serverbound.register(KeepAlivePacket.class, KeepAlivePacket::new,
        map(0x00, MINECRAFT_1_7_2, false),
        map(0x0B, MINECRAFT_1_9, false),
@@ -595,10 +495,7 @@ public enum SonarPacketRegistry {
        map(0x14, MINECRAFT_1_20_2, false),
        map(0x15, MINECRAFT_1_20_3, false),
        map(0x18, MINECRAFT_1_20_5, false),
-        map(0x1A, MINECRAFT_1_21_2, false),
-        map(0x1B, MINECRAFT_1_21_6, false),
-        map(0x1C, MINECRAFT_26_1, false));
-      // minecraft:client_information
+        map(0x1A, MINECRAFT_1_21_2, false));
      serverbound.register(ClientInformationPacket.class, ClientInformationPacket::new,
        map(0x15, MINECRAFT_1_7_2, false),
        map(0x04, MINECRAFT_1_9, false),
@@ -611,10 +508,7 @@ public enum SonarPacketRegistry {
        map(0x08, MINECRAFT_1_19_4, false),
        map(0x09, MINECRAFT_1_20_2, false),
        map(0x0A, MINECRAFT_1_20_5, false),
-        map(0x0C, MINECRAFT_1_21_2, false),
-        map(0x0D, MINECRAFT_1_21_6, false),
-        map(0x0E, MINECRAFT_26_1, false));
-      // minecraft:custom_payload
+        map(0x0C, MINECRAFT_1_21_2, false));
      serverbound.register(PluginMessagePacket.class, PluginMessagePacket::new,
        map(0x17, MINECRAFT_1_7_2, false),
        map(0x09, MINECRAFT_1_9, false),
@@ -629,10 +523,7 @@ public enum SonarPacketRegistry {
        map(0x0D, MINECRAFT_1_19_4, false),
        map(0x0F, MINECRAFT_1_20_2, false),
        map(0x12, MINECRAFT_1_21, false),
-        map(0x14, MINECRAFT_1_21_2, false),
-        map(0x15, MINECRAFT_1_21_6, false),
-        map(0x16, MINECRAFT_26_1, false));
-      // minecraft:move_player_status_only
+        map(0x14, MINECRAFT_1_21_2, false));
      serverbound.register(SetPlayerOnGround.class, SetPlayerOnGround::new,
        map(0x03, MINECRAFT_1_7_2, false),
        map(0x0F, MINECRAFT_1_9, false),
@@ -649,10 +540,7 @@ public enum SonarPacketRegistry {
        map(0x19, MINECRAFT_1_20_2, false),
        map(0x1A, MINECRAFT_1_20_3, false),
        map(0x1D, MINECRAFT_1_20_5, false),
-        map(0x1F, MINECRAFT_1_21_2, false),
-        map(0x20, MINECRAFT_1_21_6, false),
-        map(0x21, MINECRAFT_26_1, false));
-      // minecraft:move_player_pos
+        map(0x1F, MINECRAFT_1_21_2, false));
      serverbound.register(SetPlayerPositionPacket.class, SetPlayerPositionPacket::new,
        map(0x04, MINECRAFT_1_7_2, false),
        map(0x0C, MINECRAFT_1_9, false),
@@ -669,10 +557,7 @@ public enum SonarPacketRegistry {
        map(0x16, MINECRAFT_1_20_2, false),
        map(0x17, MINECRAFT_1_20_3, false),
        map(0x1A, MINECRAFT_1_20_5, false),
-        map(0x1C, MINECRAFT_1_21_2, false),
-        map(0x1D, MINECRAFT_1_21_6, false),
-        map(0x1E, MINECRAFT_26_1, false));
-      // minecraft:move_player_rot
+        map(0x1C, MINECRAFT_1_21_2, false));
      serverbound.register(SetPlayerRotationPacket.class, SetPlayerRotationPacket::new,
        map(0x05, MINECRAFT_1_7_2, false),
        map(0x0E, MINECRAFT_1_9, false),
@@ -689,10 +574,7 @@ public enum SonarPacketRegistry {
        map(0x18, MINECRAFT_1_20_2, false),
        map(0x19, MINECRAFT_1_20_3, false),
        map(0x1C, MINECRAFT_1_20_5, false),
-        map(0x1E, MINECRAFT_1_21_2, false),
-        map(0x1F, MINECRAFT_1_21_6, false),
-        map(0x20, MINECRAFT_26_1, false));
-      // minecraft:move_player_pos_rot
+        map(0x1E, MINECRAFT_1_21_2, false));
      serverbound.register(SetPlayerPositionRotationPacket.class, SetPlayerPositionRotationPacket::new,
        map(0x06, MINECRAFT_1_7_2, false),
        map(0x0D, MINECRAFT_1_9, false),
@@ -709,13 +591,9 @@ public enum SonarPacketRegistry {
        map(0x17, MINECRAFT_1_20_2, false),
        map(0x18, MINECRAFT_1_20_3, false),
        map(0x1B, MINECRAFT_1_20_5, false),
-        map(0x1D, MINECRAFT_1_21_2, false),
-        map(0x1E, MINECRAFT_1_21_6, false),
-        map(0x1F, MINECRAFT_26_1, false));
-      // minecraft:accept_teleportation
+        map(0x1D, MINECRAFT_1_21_2, false));
      serverbound.register(ConfirmTeleportationPacket.class, ConfirmTeleportationPacket::new,
        map(0x00, MINECRAFT_1_9, false));
-      // minecraft:pong
      serverbound.register(TransactionPacket.class, TransactionPacket::new,
        map(0x0F, MINECRAFT_1_7_2, false),
        map(0x05, MINECRAFT_1_9, false),
@@ -732,10 +610,7 @@ public enum SonarPacketRegistry {
        map(0x24, MINECRAFT_1_20_3, false),
        map(0x27, MINECRAFT_1_20_5, false),
        map(0x29, MINECRAFT_1_21_2, false),
-        map(0x2B, MINECRAFT_1_21_4, false),
-        map(0x2C, MINECRAFT_1_21_6, false),
-        map(0x2D, MINECRAFT_26_1, false));
-      // minecraft:swing
+        map(0x2B, MINECRAFT_1_21_4, false));
      serverbound.register(AnimationPacket.class, AnimationPacket::new,
        map(0x0A, MINECRAFT_1_7_2, false),
        map(0x1A, MINECRAFT_1_9, false),
@@ -750,11 +625,7 @@ public enum SonarPacketRegistry {
        map(0x33, MINECRAFT_1_20_3, false),
        map(0x36, MINECRAFT_1_20_5, false),
        map(0x38, MINECRAFT_1_21_2, false),
-        map(0x3A, MINECRAFT_1_21_4, false),
-        map(0x3B, MINECRAFT_1_21_5, false),
-        map(0x3C, MINECRAFT_1_21_6, false),
-        map(0x3F, MINECRAFT_26_1, false),
-        map(0x2E, MINECRAFT_26_3, false));
+        map(0x3A, MINECRAFT_1_21_4, false));
    }
  };

@@ -766,8 +637,8 @@ public enum SonarPacketRegistry {
    CLIENTBOUND
  }

-  public SonarPacketRegistry.ProtocolRegistry getProtocolRegistry(final Direction direction,
-                                                                  final ProtocolVersion version) {
+  public FallbackPacketRegistry.ProtocolRegistry getProtocolRegistry(final Direction direction,
+                                                                     final ProtocolVersion version) {
    return (direction == Direction.SERVERBOUND ? serverbound : clientbound).getProtocolRegistry(version);
  }

@@ -790,9 +661,9 @@ public enum SonarPacketRegistry {
      return registry;
    }

-    private <T extends SonarPacket> void register(final @NotNull Class<T> clazz,
-                                                  final @NotNull Supplier<T> supplier,
-                                                  final PacketMapping @NotNull ... mappings) {
+    private <T extends FallbackPacket> void register(final @NotNull Class<T> clazz,
+                                                     final @NotNull Supplier<T> supplier,
+                                                     final PacketMapping @NotNull ... mappings) {
      if (mappings.length == 0) {
        throw new IllegalArgumentException("At least one mapping must be provided.");
      }
@@ -837,17 +708,17 @@ public enum SonarPacketRegistry {
  @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
  public static class ProtocolRegistry {
    private final ProtocolVersion protocolVersion;
-    private final IntObjectMap<Supplier<? extends SonarPacket>> packetIdToSupplier =
+    private final IntObjectMap<Supplier<? extends FallbackPacket>> packetIdToSupplier =
      new IntObjectHashMap<>(16, 0.5f);
-    private final Map<Class<? extends SonarPacket>, Integer> packetClassToId =
+    private final Map<Class<? extends FallbackPacket>, Integer> packetClassToId =
      new HashMap<>(16, 0.5f);

-    public SonarPacket createPacket(final int packetId) {
+    public FallbackPacket createPacket(final int packetId) {
      final var supplier = packetIdToSupplier.get(packetId);
      return supplier == null ? null : supplier.get();
    }

-    public int getPacketId(final @NotNull Class<? extends SonarPacket> clazz) {
+    public int getPacketId(final @NotNull Class<? extends FallbackPacket> clazz) {
      final int packetId = packetClassToId.getOrDefault(clazz, -1);
      if (packetId == -1) {
        throw new IllegalArgumentException("Could not find packet ID for " + clazz.getSimpleName());
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -25,20 +25,20 @@ import io.netty.util.collection.IntObjectMap;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

-import static xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion.ID_TO_PROTOCOL_CONSTANT;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.ID_TO_PROTOCOL_CONSTANT;

 // https://github.com/Nan1t/NanoLimbo/blob/main/src/main/java/ua/nanit/limbo/protocol/PacketSnapshot.java
-public final class SonarPacketSnapshot implements SonarPacket {
+public final class FallbackPacketSnapshot implements FallbackPacket {
  private final IntObjectMap<Integer> mappings = new IntObjectHashMap<>(ID_TO_PROTOCOL_CONSTANT.size());
  private final IntObjectMap<byte[]> cachedBytes = new IntObjectHashMap<>(ID_TO_PROTOCOL_CONSTANT.size());
  @Getter
-  private final Class<? extends SonarPacket> originalPacketClass;
+  private final Class<? extends FallbackPacket> originalPacketClass;

-  public SonarPacketSnapshot(final @NotNull SonarPacket originalPacket) {
+  public FallbackPacketSnapshot(final @NotNull FallbackPacket originalPacket) {
    this.originalPacketClass = originalPacket.getClass();

    final IntObjectMap<Integer> hashedData = new IntObjectHashMap<>(ID_TO_PROTOCOL_CONSTANT.size());
@@ -50,7 +50,7 @@ public final class SonarPacketSnapshot implements SonarPacket {
        try {
          originalPacket.encode(byteBuf, protocolVersion);
        } catch (Throwable throwable) {
-          Sonar.get0().getLogger().error("Could not encode packet {} for version {}: {}",
+          Sonar.get().getLogger().error("Could not encode packet {} for version {}: {}",
            originalPacket, protocolVersion, throwable);
          break;
        }
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2025 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 lombok.experimental.UtilityClass;
+import net.kyori.adventure.nbt.CompoundBinaryTag;
+import net.kyori.adventure.nbt.IntBinaryTag;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.event.impl.CaptchaGenerationStartEvent;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.captcha.StandardCaptchaGenerator;
+import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockType;
+import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockUpdate;
+import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry;
+import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionType;
+import xyz.jonesdev.sonar.common.fallback.protocol.entity.EntityType;
+import xyz.jonesdev.sonar.common.fallback.protocol.item.ItemType;
+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 xyz.jonesdev.sonar.common.util.ComponentHolder;
+
+import java.util.Random;
+import java.util.UUID;
+
+@UtilityClass
+public class FallbackPreparer {
+  private final Random RANDOM = new Random();
+
+  public static final int PLAYER_ENTITY_ID = RANDOM.nextInt();
+  public static final int VEHICLE_ENTITY_ID = RANDOM.nextInt();
+
+  public static final BlockType[] POSSIBLE_BLOCK_TYPES = BlockType.values();
+  public final FallbackPacket[] BLOCKS_PACKETS = new FallbackPacket[POSSIBLE_BLOCK_TYPES.length];
+
+  public final int BLOCKS_PER_ROW = 8; // 8 * 8 = 64 (vanilla protocol maximum)
+  public final int SPAWN_X_POSITION = 16 / 2; // middle of the chunk
+  public final int SPAWN_Z_POSITION = 16 / 2; // middle of the chunk
+  public final int PLATFORM_Y_POSITION = 1 + RANDOM.nextInt(255); // 255 is the maximum Y position
+  public final int IN_AIR_Y_POSITION = 3000 + RANDOM.nextInt(500); // Random high altitude
+
+  public final int FIRST_TELEPORT_ID = RANDOM.nextInt();
+  public final int SECOND_TELEPORT_ID = RANDOM.nextInt();
+  public final int PRE_JOIN_KEEP_ALIVE_ID = RANDOM.nextInt();
+
+  private final int MAP_SLOT = RANDOM.nextInt(9);
+
+  public static final FallbackPacket CAPTCHA_SET_CONTAINER_SLOT = new SetContainerSlotPacket(
+    0, 36 + MAP_SLOT, 1, ItemType.FILLED_MAP, CompoundBinaryTag.builder()
+    .put("map", IntBinaryTag.intBinaryTag(0)) // map id
+    .build());
+  public final static FallbackPacket CAPTCHA_HELD_ITEM_SLOT = new SetHeldItemPacket(MAP_SLOT);
+  public final FallbackPacket DEFAULT_ABILITIES = new PlayerAbilitiesPacket(0x00, 0, 0);
+  public final FallbackPacket NO_MOVE_ABILITIES = new PlayerAbilitiesPacket(0x02, 0, 0);
+  public final FallbackPacket NO_MOVE_ABILITIES_BEDROCK = new PlayerAbilitiesPacket(0x06, 0, 0);
+  public final FallbackPacket CAPTCHA_POSITION = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
+    SPAWN_X_POSITION, 10000, SPAWN_Z_POSITION, 0, 90, 0, 0, false, false, true));
+  public final FallbackPacket EMPTY_CHUNK_DATA = new FallbackPacketSnapshot(new ChunkDataPacket(0, 0));
+  public final FallbackPacket FINISH_CONFIGURATION = new FinishConfigurationPacket();
+  public final FallbackPacket PRE_JOIN_KEEP_ALIVE = new FallbackPacketSnapshot(new KeepAlivePacket(PRE_JOIN_KEEP_ALIVE_ID));
+  public final FallbackPacket[] REGISTRY_SYNC_1_20 = new FallbackPacket[] {
+    new FallbackPacketSnapshot(new RegistryDataPacket(DimensionRegistry.CODEC_1_20, null, null))};
+  public final FallbackPacket[] REGISTRY_SYNC_1_20_5 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_20_5);
+  public final FallbackPacket[] REGISTRY_SYNC_1_21 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21);
+  public final FallbackPacket[] REGISTRY_SYNC_1_21_2 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_2);
+  public final FallbackPacket[] REGISTRY_SYNC_1_21_4 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_4);
+  public final FallbackPacket START_WRITING_CHUNKS = new GameEventPacket(13, 0);
+  public final static FallbackPacket INVALID_HELD_ITEM_SLOT = new SetHeldItemPacket(-1);
+  public final FallbackPacket RANDOM_KEEP_ALIVE = new FallbackPacketSnapshot(new KeepAlivePacket(RANDOM.nextInt()));
+  public static final FallbackPacket SPAWN_BOAT_ENTITY = new FallbackPacketSnapshot(new SpawnEntityPacket(
+    VEHICLE_ENTITY_ID, EntityType.BOAT, SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION,
+    0, 0, 0, 0));
+  public static final FallbackPacket SPAWN_MINECART_ENTITY = new FallbackPacketSnapshot(new SpawnEntityPacket(
+    VEHICLE_ENTITY_ID, EntityType.MINECART, SPAWN_X_POSITION, IN_AIR_Y_POSITION - 16, SPAWN_Z_POSITION,
+    0, 0, 0, 0));
+  public static final FallbackPacket REMOVE_VEHICLE = new RemoveEntitiesPacket(VEHICLE_ENTITY_ID);
+  public static final FallbackPacket SET_VEHICLE_PASSENGERS = new FallbackPacketSnapshot(
+    new SetPassengersPacket(VEHICLE_ENTITY_ID, PLAYER_ENTITY_ID));
+
+  public FallbackPacket loginSuccess;
+  public FallbackPacket welcomeMessage;
+  public FallbackPacket enterCodeMessage;
+  public FallbackPacket incorrectCaptcha;
+  public static FallbackPacket joinGame;
+  public FallbackPacket defaultSpawnPosition;
+  public FallbackPacket spawnPosition;
+  public FallbackPacket fallStartPosition;
+  public FallbackPacket fallStartPositionLegacy;
+  public static FallbackPacket transferToOrigin;
+  public FallbackPacket blacklisted;
+  public FallbackPacket alreadyQueued;
+  public FallbackPacket alreadyVerifying;
+  public FallbackPacket reconnectedTooFast;
+  public FallbackPacket protocolBlacklisted;
+  public FallbackPacket unsupportedVersion;
+  public FallbackPacket tooManyOnlinePerIP;
+  public FallbackPacket[] xpCountdown;
+  public FallbackPacket updateTime;
+
+  public static int maxMovementTick, dynamicSpawnYPosition, maxTotalPacketsSent;
+
+  @SuppressWarnings("ResultOfMethodCallIgnored")
+  public void prepare() {
+    // Preload the packet registry to avoid CPU/RAM issues on 1st connection
+    Sonar.get().getLogger().info("Preloading all registered packets...");
+    FallbackPacketRegistry.values();
+
+    // Prepare LoginSuccess packet with capped username to 16 characters
+    final UUID uuid = UUID.randomUUID();
+    String username = Sonar.get().getConfig().getGeneralConfig().getString("verification.cached-username");
+    if (username.length() > 16) {
+      username = username.substring(0, 16);
+    }
+    loginSuccess = new FallbackPacketSnapshot(new LoginSuccessPacket(uuid, username, true));
+
+    // Prepare JoinGame packet
+    joinGame = new FallbackPacketSnapshot(new JoinGamePacket(PLAYER_ENTITY_ID,
+      Sonar.get().getConfig().getVerification().getGamemode().getId(),
+      -1, 0, 0,
+      RANDOM.nextInt(3), 1, 0, 0,
+      new String[]{"lol"}, "lol", "flat",
+      DimensionType.OVERWORLD, RANDOM.nextLong() & 1337,
+      false, true, false,
+      false, false, false, true));
+
+    // Prepare the gravity check
+    maxMovementTick = Sonar.get().getConfig().getVerification().getGravity().getMaxMovementTicks();
+
+    double motionY = 0, fallDistance = 0;
+
+    for (int i = 0; i < maxMovementTick; i++) {
+      motionY = (motionY - 0.1) * 0.98f;
+      fallDistance += Math.abs(motionY);
+    }
+
+    // Set the dynamic block and collide Y position based on the maximum fall distance
+    dynamicSpawnYPosition = PLATFORM_Y_POSITION + (int) Math.ceil(fallDistance);
+    defaultSpawnPosition = new FallbackPacketSnapshot(new SetDefaultSpawnPositionPacket(
+      SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION));
+    spawnPosition = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
+      SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION,
+      0, 0, FIRST_TELEPORT_ID, 0, false, false, true));
+    fallStartPosition = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
+      SPAWN_X_POSITION, dynamicSpawnYPosition - IN_AIR_Y_POSITION, SPAWN_Z_POSITION,
+      0, -90, SECOND_TELEPORT_ID, 1 << 1, false, false, true));
+    fallStartPositionLegacy = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
+      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION,
+      0, -90, 0, 0, false, false, true));
+
+    // Prepare collision platform positions
+    final int length = BLOCKS_PER_ROW / 2;
+    for (int i = 0; i < BLOCKS_PACKETS.length; i++) {
+      final BlockUpdate[] blocks = 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 BlockUpdate.BlockPosition position = new BlockUpdate.BlockPosition(
+            x + length, PLATFORM_Y_POSITION, z + length, 0, 0);
+          blocks[index++] = new BlockUpdate(position, POSSIBLE_BLOCK_TYPES[i]);
+        }
+      }
+      BLOCKS_PACKETS[i] = new FallbackPacketSnapshot(new UpdateSectionBlocksPacket(0, 0, blocks));
+    }
+
+    // Prepare disconnect packets during login
+    blacklisted = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getBlacklisted(), true));
+    alreadyVerifying = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getAlreadyVerifying(), true));
+    alreadyQueued = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getAlreadyQueued(), true));
+    protocolBlacklisted = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getProtocolBlacklisted(), true));
+    reconnectedTooFast = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getTooFastReconnect(), true));
+    unsupportedVersion = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getVerification().getUnsupportedVersion(), true));
+    tooManyOnlinePerIP = new FallbackPacketSnapshot(new DisconnectPacket(Sonar.get().getConfig().getTooManyOnlinePerIp(), true));
+
+    // Prepare transfer packet
+    if (Sonar.get().getConfig().getGeneralConfig().getBoolean("verification.transfer.enabled")) {
+      transferToOrigin = new FallbackPacketSnapshot(new TransferPacket(
+        Sonar.get().getConfig().getGeneralConfig().getString("verification.transfer.destination-host"),
+        Sonar.get().getConfig().getGeneralConfig().getInt("verification.transfer.destination-port")));
+    } else {
+      transferToOrigin = null;
+    }
+
+    // Prepare update time packet
+    final int timeOfDay = Sonar.get().getConfig().getVerification().getTimeOfDay();
+    if (timeOfDay != 1000) {
+      updateTime = new UpdateTimePacket(0L, timeOfDay, false);
+    } else {
+      updateTime = null;
+    }
+
+    // If the welcome message is empty, we don't need to send a message to the player
+    final String welcome = Sonar.get().getConfig().getMessagesConfig().getString("verification.welcome");
+    if (welcome.isEmpty()) {
+      welcomeMessage = null;
+    } else {
+      welcomeMessage = new FallbackPacketSnapshot(new SystemChatPacket(new ComponentHolder(
+        MiniMessage.miniMessage().deserialize(welcome,
+          Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())))));
+    }
+
+    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER
+      || Sonar.get().getConfig().getVerification().getGravity().isCaptchaOnFail()) {
+      // Prepare CAPTCHA messages
+      enterCodeMessage = new FallbackPacketSnapshot(new SystemChatPacket(new ComponentHolder(
+        MiniMessage.miniMessage().deserialize(
+          Sonar.get().getConfig().getMessagesConfig().getString("verification.captcha.enter"),
+          Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())))));
+      incorrectCaptcha = new FallbackPacketSnapshot(new SystemChatPacket(new ComponentHolder(
+        MiniMessage.miniMessage().deserialize(
+          Sonar.get().getConfig().getMessagesConfig().getString("verification.captcha.incorrect"),
+          Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())))));
+
+      // 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, 0));
+      }
+
+      // Update the CAPTCHA generator if necessary
+      final CaptchaGenerationStartEvent generationStartEvent = new CaptchaGenerationStartEvent(
+        Sonar.get().getFallback().getCaptchaGenerator());
+      Sonar.get().getEventManager().publish(generationStartEvent);
+
+      if (generationStartEvent.getCaptchaGenerator() == null
+        || generationStartEvent.getCaptchaGenerator() instanceof StandardCaptchaGenerator) {
+        Sonar.get().getFallback().setCaptchaGenerator(new StandardCaptchaGenerator(
+          Sonar.get().getConfig().getVerification().getMap().getBackgroundImage()));
+      } else {
+        Sonar.get().getLogger().info("Custom CAPTCHA generator detected, skipping reinitialization.");
+      }
+
+      // Prepare CAPTCHA answers
+      CaptchaPreparer.prepare();
+    } else {
+      // Throw away if not needed
+      enterCodeMessage = null;
+      incorrectCaptcha = null;
+      xpCountdown = null;
+      Sonar.get().getFallback().setCaptchaGenerator(null);
+    }
+
+    maxTotalPacketsSent = maxMovementTick + 2
+      + (xpCountdown == null ? 0 : xpCountdown.length) * 20 + 5
+      + Sonar.get().getConfig().getVerification().getVehicle().getMinimumPackets() * 4
+      + Sonar.get().getConfig().getVerification().getMap().getMaxTries()
+      + 150 /* some arbitrary leeway */;
+  }
+
+  public static FallbackPacket[] getRegistryPackets(final @NotNull ProtocolVersion protocolVersion) {
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_4)) {
+      return REGISTRY_SYNC_1_21_4;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_2)) {
+      return REGISTRY_SYNC_1_21_2;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21)) {
+      return REGISTRY_SYNC_1_21;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_20_5)) {
+      return REGISTRY_SYNC_1_20_5;
+    }
+    return REGISTRY_SYNC_1_20;
+  }
+}
@@ -15,15 +15,15 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;

 import java.util.function.Function;

-import static xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;

 // TODO: load mappings from a separate file
@Getter
@@ -34,6 +34,7 @@ public enum BlockType {
  // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
  // - https://pokechu22.github.io/Burger/
  // - https://github.com/ViaVersion/Mappings/tree/main/mappings
+  //STONE(protocolVersion -> 1, 1),
  ENCHANTMENT_TABLE(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
      return 116;
@@ -71,19 +72,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 7619;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 8163;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 8173;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 9250;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 9451;
-    }
-    return 11185;
+    return 8163;
  }, protocolVersion -> (double) 0.75f),
  TRAPDOOR(protocolVersion -> {
    // We have to use wooden trapdoors for 1.7 since 1.7 doesn't have iron trapdoors
@@ -129,19 +118,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 10749;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 11293;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 11303;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 12380;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 12582;
-    }
-    return 14429;
+    return 11293;
  }, protocolVersion -> 0.1875),
  END_PORTAL_FRAME(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -180,19 +157,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 7644;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 8185;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 8195;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 9272;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 9473;
-    }
-    return 11207;
+    return 8185;
  }, protocolVersion -> 0.8125),
  DAYLIGHT_SENSOR(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -234,19 +199,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 9462;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 10006;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 10016;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 11093;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 11295;
-    }
-    return 13062;
+    return 10006;
  }, protocolVersion -> 0.375),
  COBBLESTONE_WALL(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -285,19 +238,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 8152;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 8696;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 8706;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 9783;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 9984;
-    }
-    return 11726;
+    return 8696;
  }, protocolVersion -> 1.5),
  STONE_SLABS(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -339,19 +280,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 11566;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 12110;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 12120;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 13197;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 13399;
-    }
-    return 15252;
+    return 12110;
  }, protocolVersion -> 0.5),
  WHITE_CARPET(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_12_2)) {
@@ -393,19 +322,7 @@ public enum BlockType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 11063;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 11607;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 11617;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 12694;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 12896;
-    }
-    return 14743;
+    return 11607;
  }, protocolVersion -> protocolVersion.compareTo(MINECRAFT_1_8) < 0 ? 0 : 0.0625);

  private final Function<ProtocolVersion, Integer> id;
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.protocol.dimension;
+package xyz.jonesdev.sonar.common.fallback.protocol.dimension;

 import lombok.experimental.UtilityClass;
 import net.kyori.adventure.nbt.BinaryTagIO;
@@ -39,14 +39,6 @@ public final class DimensionRegistry {
  public final CompoundBinaryTag CODEC_1_21;
  public final CompoundBinaryTag CODEC_1_21_2;
  public final CompoundBinaryTag CODEC_1_21_4;
-  public final CompoundBinaryTag CODEC_1_21_5;
-  public final CompoundBinaryTag CODEC_1_21_11;
-  public final CompoundBinaryTag CODEC_26_1;
-  public final CompoundBinaryTag CODEC_26_2;
-  public final CompoundBinaryTag CODEC_26_3;
-  public final CompoundBinaryTag TAGS_26_1;
-  public final CompoundBinaryTag TAGS_26_2;
-  public final CompoundBinaryTag TAGS_26_3;

  static {
    CODEC_1_16 = getCodec("codec_1_16.nbt");
@@ -60,21 +52,13 @@ public final class DimensionRegistry {
    CODEC_1_21 = getCodec("codec_1_21.nbt");
    CODEC_1_21_2 = getCodec("codec_1_21_2.nbt");
    CODEC_1_21_4 = getCodec("codec_1_21_4.nbt");
-    CODEC_1_21_5 = getCodec("codec_1_21_5.nbt");
-    CODEC_1_21_11 = getCodec("codec_1_21_11.nbt");
-    CODEC_26_1 = getCodec("codec_26_1.nbt");
-    CODEC_26_2 = getCodec("codec_26_2.nbt");
-    CODEC_26_3 = getCodec("codec_26_3.nbt");
-    TAGS_26_1 = getCodec("tags_26_1.nbt");
-    TAGS_26_2 = getCodec("tags_26_2.nbt");
-    TAGS_26_3 = getCodec("tags_26_3.nbt");
  }

  private @NotNull CompoundBinaryTag getCodec(final @NotNull String fileName) {
    try (final InputStream inputStream = Sonar.class.getResourceAsStream("/assets/codecs/" + fileName)) {
      return BinaryTagIO.unlimitedReader().read(Objects.requireNonNull(inputStream), BinaryTagIO.Compression.GZIP);
    } catch (Throwable throwable) {
-      Sonar.get0().getLogger().error("Could not load mappings for {}: {}", fileName, throwable);
+      Sonar.get().getLogger().error("Could not load mappings for {}: {}", fileName, throwable);
      throw new IllegalStateException(throwable);
    }
  }
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.protocol.dimension;
+package xyz.jonesdev.sonar.common.fallback.protocol.dimension;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -24,9 +24,7 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
 public enum DimensionType {
  OVERWORLD("minecraft:overworld", 0, 0),
-  @Deprecated
  THE_NETHER("minecraft:the_nether", -1, 1),
-  @Deprecated
  THE_END("minecraft:the_end", 1, 2);

  private final String key;
@@ -15,15 +15,15 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.protocol.entity;
+package xyz.jonesdev.sonar.common.fallback.protocol.entity;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;

 import java.util.function.Function;

-import static xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;

 // TODO: load mappings from a separate file
@Getter
@@ -58,19 +58,7 @@ public enum EntityType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 85;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_5)) {
-      return 84;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 85;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_9)) {
-      return 87;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 89;
-    }
-    return 90;
+    return 84;
  }),
  MINECART(protocolVersion -> {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_13_2)) {
@@ -106,19 +94,7 @@ public enum EntityType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 82;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_5)) {
-      return 81;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 82;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_9)) {
-      return 84;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 85;
-    }
-    return 86;
+    return 81;
  });

  private final Function<ProtocolVersion, Integer> id;
@@ -15,15 +15,15 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.protocol.item;
+package xyz.jonesdev.sonar.common.fallback.protocol.item;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;

 import java.util.function.Function;

-import static xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;

 // TODO: load mappings from a separate file
@Getter
@@ -73,43 +73,8 @@ public enum ItemType {
    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_2)) {
      return 1022;
    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 1031;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_5)) {
-      return 1042;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
-      return 1059;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 1104;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_1)) {
-      return 1105;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 1133;
-    }
-    return 1238;
-  }, protocolVersion -> {
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21)) {
-      return 26;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
-      return 36;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_9)) {
-      return 37;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_11)) {
-      return 44;
-    }
-    if (protocolVersion.lessThanOrEquals(MINECRAFT_26_2)) {
-      return 46;
-    }
-    return 48;
-  });
+    return 1031;
+  }, protocolVersion -> protocolVersion.greaterThanOrEquals(MINECRAFT_1_21_2) ? 36 : 26);

  private final Function<ProtocolVersion, Integer> id;
  private final Function<ProtocolVersion, Integer> components;
@@ -15,21 +15,21 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.protocol.map;
+package xyz.jonesdev.sonar.common.fallback.protocol.map;

 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.antibot.SonarUser;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
-import xyz.jonesdev.sonar.common.protocol.packets.play.MapDataPacket;
+import xyz.jonesdev.sonar.api.fallback.FallbackUser;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.MapDataPacket;

@Getter
 public final class MapCaptchaInfo {
  private final String answer;

-  private final SonarPacket[] legacy;
-  private final SonarPacket modern;
+  private final FallbackPacket[] legacy;
+  private final FallbackPacket modern;

  public MapCaptchaInfo(final @NotNull String answer, final byte @NotNull [] buffer) {
    this.answer = answer;
@@ -39,7 +39,7 @@ public final class MapCaptchaInfo {
    for (int i = 0; i < buffer.length; i++) {
      grid[i & Byte.MAX_VALUE][i >> 7] = buffer[i];
    }
-    this.legacy = new SonarPacket[grid.length];
+    this.legacy = new FallbackPacket[grid.length];
    for (int i = 0; i < grid.length; i++) {
      this.legacy[i] = new MapDataPacket(grid[i], i, 0, 0, true);
    }
@@ -48,10 +48,10 @@ public final class MapCaptchaInfo {
    this.modern = new MapDataPacket(buffer, 0, 0, 0, true);
  }

-  public void delayedWrite(final @NotNull SonarUser user) {
+  public void delayedWrite(final @NotNull FallbackUser user) {
    if (user.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_8)) {
      // 1.7.2-1.7.10 needs separate packets for each axis
-      for (final SonarPacket packet : legacy) {
+      for (final FallbackPacket packet : legacy) {
        user.delayedWrite(packet);
      }
      return;
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.protocol.map;
+package xyz.jonesdev.sonar.common.fallback.protocol.map;

 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
@@ -15,17 +15,13 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;

-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class FinishConfigurationPacket implements SonarPacket {
-  public static final FinishConfigurationPacket INSTANCE = new FinishConfigurationPacket();
+public final class FinishConfigurationPacket implements FallbackPacket {

  @Override
  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import lombok.*;
@@ -23,9 +23,9 @@ 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.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
-import xyz.jonesdev.sonar.common.protocol.SonarPacketSnapshot;
+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 xyz.jonesdev.sonar.common.util.ProtocolUtil;

 import java.util.ArrayList;
@@ -34,7 +34,7 @@ import java.util.List;
@Getter
@NoArgsConstructor
@AllArgsConstructor
-public final class RegistryDataPacket implements SonarPacket {
+public final class RegistryDataPacket implements FallbackPacket {
  private CompoundBinaryTag tag;
  private String type;
  private List<RegistryDataPacket.Bundle> bundles;
@@ -50,7 +50,7 @@ public final class RegistryDataPacket implements SonarPacket {
      for (final RegistryDataPacket.Bundle bundle : bundles) {
        ProtocolUtil.writeString(byteBuf, bundle.getName());
        // Write the bundle tag
-        final BinaryTag tag = bundle.getTag();
+        final CompoundBinaryTag tag = bundle.getTag();
        if (tag != null) {
          byteBuf.writeBoolean(true);
          ProtocolUtil.writeBinaryTag(byteBuf, protocolVersion, tag);
@@ -66,16 +66,17 @@ public final class RegistryDataPacket implements SonarPacket {
    throw new UnsupportedOperationException();
  }

-  public static SonarPacket @NotNull [] of(final @NotNull CompoundBinaryTag rootTag) {
-    final SonarPacket[] packets = new SonarPacket[rootTag.size()];
+  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.get("element")));
+        // CompoundBinaryTag#getCompound(String) will return an empty compound tag when not exist.
+        bundles.add(new Bundle(tag.getString("name"), tag.get("element") == null ? null : tag.getCompound("element")));
      }
-      packets[index++] = new SonarPacketSnapshot(new RegistryDataPacket(rootTag, type, bundles));
+      packets[index++] = new FallbackPacketSnapshot(new RegistryDataPacket(rootTag, type, bundles));
    }
    return packets;
  }
@@ -85,6 +86,6 @@ public final class RegistryDataPacket implements SonarPacket {
  public static class Bundle {
    @NotNull String name;
    // In the protocol, it is able to be null
-    @Nullable BinaryTag tag;
+    @Nullable CompoundBinaryTag tag;
  }
 }
@@ -15,18 +15,18 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
 import lombok.Getter;
 import lombok.ToString;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;

@Getter
@ToString(of = {"protocolVersionId", "hostname", "port"})
-public final class HandshakePacket implements SonarPacket {
+public final class HandshakePacket implements FallbackPacket {
  private int protocolVersionId;
  private String hostname;
  private int port;
@@ -15,13 +15,13 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

 import io.netty.buffer.ByteBuf;
-import xyz.jonesdev.sonar.api.antibot.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.protocol.SonarPacket;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;

-public final class LoginAcknowledgedPacket implements SonarPacket {
+public final class LoginAcknowledgedPacket implements FallbackPacket {

  @Override
  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
Author	SHA1	Message	Date
Jones	5828d664b1	Merge remote-tracking branch 'origin/main' into feat/full-registries	2025-01-15 19:36:50 +01:00
Jones	01a8c0a632	Use 1.21-1.21.4 codecs from the previous commit	2025-01-11 19:21:44 +01:00
Jones	457efcd821	Apply SIMPLE_BIOME filter on 1.18.2-1.21.4 codecs	2025-01-11 17:47:29 +01:00
Jones	95c9206d6e	Merge remote-tracking branch 'origin/main' into feat/full-registries	2025-01-11 14:25:11 +01:00
Akkariin	179ca1ebe8	Registries fixes & Fixed some unexpected behavior about mods. (#430 ) * Fix 1.20.5 + viafabricplus * Update registries	2025-01-09 16:31:46 +01:00
Jones	d66b1afd35	Optimize 1.20-1.21.4 codecs	2025-01-08 18:23:20 +01:00
Jones	c411cd5e39	Fix codec nbt loading error	2025-01-08 18:23:11 +01:00
Jones	eb73ad5be6	Fix 1.18.2-1.19.1 registries	2025-01-08 18:05:09 +01:00
Jones	9aee6be6a7	Add full registries to fix compatibility issues	2025-01-08 17:53:58 +01:00