Exclude CODEOWNERS from language statistics

Bumps [io.netty:netty-all](https://github.com/netty/netty) from 4.2.14.Final to 4.2.15.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.2.14.Final...netty-4.2.15.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-all
  dependency-version: 4.2.15.Final
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.editorconfig

@@ -7,7 +7,7 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.java,*.kt}]
+[*.java]
 ij_java_wrap_long_lines = true
 
 [{*.md,*.yml}]

.gitattributes

@@ -22,3 +22,4 @@
 
 # Common build-tool wrapper scripts ('.cmd' versions are handled by 'Common.gitattributes')
 gradlew         text eol=lf
+.gitea/CODEOWNERS linguist-detectable=false

.gitea/CODEOWNERS

@@ -0,0 +1,3 @@
+# Pull requests request review from the eligible staff team(s).
+# One approval from either an Admin or Developer satisfies branch protection.
+*   @trueog/Admins @trueog/Developers

.github/CONTRIBUTING.md

@@ -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://jonesdev.xyz/discord).
+joining the [Discord](https://sonar.top/discord).
 
 ## Contributing Guidelines:
 
 1. Fork the repository and create a new branch for your contribution.
-2. Follow the coding guidelines for your code.
+2. Adhere to the Coding Guidelines and LLM Guidelines.
 3. Test your code before committing and pushing it.
 4. Use [semantic](https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716) commit messages for your commits.
 
@@ -17,6 +17,17 @@ joining the [Discord](https://jonesdev.xyz/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.

.github/ISSUE_TEMPLATE/config.yml

@@ -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://jonesdev.xyz/discord/
+    url: https://sonar.top/discord/
     about: If you have any further questions, please feel free to join the Discord server and open a ticket.

.github/README.md

@@ -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://jonesdev.xyz/discord)
+  [![](https://img.shields.io/discord/923308209769426994.svg?logo=discord)](https://sonar.top/discord)
   [![](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
   <br>
   <!-- Quick navigation -->
@@ -21,11 +21,18 @@
   |
   [Pull Requests](https://github.com/jonesdevelopment/sonar/pulls)
   |
-  [Discord](https://jonesdev.xyz/discord)
+  [Discord](https://sonar.top/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
@@ -46,7 +53,16 @@ Sonar also protects against spambot attacks since it queues the incoming connect
 
 ### 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://jonesdev.xyz/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://sonar.top/discord/).
+
+## Sponsors
+If you are interested in sponsoring this project, please contact me via [Discord](https://sonar.top/discord/).
+
+### 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).

.github/SECURITY.md

@@ -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 contact@jonesdev.xyz.
+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.
 
 ## Acknowledgments
 

.github/workflows/gradle.yml

@@ -9,9 +9,9 @@ name: Sonar CI
 
 on:
   push:
-    branches: [ "main", "dev" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "main", "dev" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read
@@ -21,13 +21,44 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
-      with:
-        arguments: build-sonar
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Build with Gradle
+        run: ./gradlew build-sonar
+
+      - 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 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

HEADER

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) ${YEAR} Sonar Contributors
+ * 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
@@ -14,3 +14,4 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+

api/build.gradle.kts

@@ -9,5 +9,8 @@ dependencies {
   compileOnly(rootProject.libs.annotations)
 }
 
-java.sourceCompatibility = JavaVersion.VERSION_11
-java.targetCompatibility = JavaVersion.VERSION_11
+tasks {
+  shadowJar {
+    archiveFileName = "sonar-api-${rootProject.version}.jar"
+  }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,22 +49,68 @@ 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")
@@ -73,30 +119,67 @@ public interface Sonar {
   @SuppressWarnings("unused")
   void setChatNotificationHandler(final @NotNull ChatNotificationHandler notificationHandler);
 
+  /**
+   * Reloads the Sonar configuration.
+   */
   void reload();
 
-  @NotNull
-  default SonarVersion getVersion() {
+  /**
+   * Gets the current version of Sonar.
+   *
+   * @return The {@link SonarVersion} instance.
+   */
+  @NotNull default SonarVersion getVersion() {
     return SonarVersion.INSTANCE;
   }
 
-  @NotNull
-  default SonarEventManager getEventManager() {
+  /**
+   * Gets the event manager for Sonar.
+   *
+   * @return The {@link SonarEventManager} instance.
+   */
+  @NotNull default SonarEventManager getEventManager() {
     return SonarEventManager.INSTANCE;
   }
 
-  @NotNull
-  default AttackTracker getAttackTracker() {
+  /**
+   * Gets the attack tracker for Sonar.
+   *
+   * @return The {@link AttackTracker} instance.
+   */
+  @NotNull default AttackTracker getAttackTracker() {
     return AttackTracker.INSTANCE;
   }
 
-  @NotNull
-  default Fallback getFallback() {
-    return Fallback.INSTANCE;
+  /**
+   * Gets the anti-bot handler for Sonar.
+   *
+   * @return The {@link AntiBot} instance.
+   */
+  @NotNull default AntiBot getAntiBot() {
+    return AntiBot.INSTANCE;
   }
 
-  @NotNull
-  static Sonar get() {
+  /**
+   * 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;
+  }
 }

api/src/main/java/xyz/jonesdev/sonar/api/SonarPlatform.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -30,6 +30,8 @@ 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");
 

api/src/main/java/xyz/jonesdev/sonar/api/SonarSupplier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -19,20 +19,22 @@ package xyz.jonesdev.sonar.api;
 
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.exception.AlreadyInitializedException;
 
 @UtilityClass
 public class SonarSupplier {
-  private Sonar _sonar;
+  Sonar sonar;
 
-  public void set(final @NotNull Sonar instance) {
-    if (_sonar != null) {
-      throw new AlreadyInitializedException("Sonar is already initialized");
+  public void set(final @NotNull Sonar _sonar) {
+    if (sonar != null) {
+      throw new IllegalStateException("Sonar is already initialized");
     }
-    _sonar = instance;
+    sonar = _sonar;
   }
 
-  public @NotNull Sonar get() {
-    return _sonar;
+  public Sonar get() {
+    if (sonar == null) {
+      throw new IllegalStateException("Sonar is not initialized yet");
+    }
+    return sonar;
   }
 }

api/src/main/java/xyz/jonesdev/sonar/api/SonarVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/antibot/AntiBot.java

@@ -0,0 +1,64 @@
+/*
+ * 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;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import lombok.AccessLevel;
+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 java.net.InetAddress;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class AntiBot {
+  public static final AntiBot INSTANCE = new AntiBot();
+
+  private final ConcurrentMap<InetAddress, Integer> online = new ConcurrentHashMap<>(128);
+  private final ConcurrentMap<InetAddress, Boolean> connected = new ConcurrentHashMap<>(256);
+  private final LoginQueue queue = new LoginQueue();
+  @Setter
+  private Cache<String, Integer> blacklist;
+  @Setter
+  private long blacklistTime;
+  @Setter
+  private CaptchaGenerator captchaGenerator;
+  @Setter
+  private Ratelimiter<InetAddress> ratelimiter;
+
+  public boolean shouldVerifyNewPlayers() {
+    return shouldPerform(Sonar.get0().getConfig().getVerification().getTiming());
+  }
+
+  public boolean shouldPerformCaptcha() {
+    return shouldPerform(Sonar.get0().getConfig().getVerification().getMap().getTiming());
+  }
+
+  public 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);
+  }
+}

api/src/main/java/xyz/jonesdev/sonar/api/antibot/ChannelPipelines.java

@@ -0,0 +1,31 @@
+/*
+ * 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";
+}

api/src/main/java/xyz/jonesdev/sonar/api/antibot/LoginQueue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.api.fallback;
+package xyz.jonesdev.sonar.api.antibot;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -23,8 +23,6 @@ import lombok.RequiredArgsConstructor;
 import xyz.jonesdev.sonar.api.Sonar;
 
 import java.net.InetAddress;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
@@ -32,27 +30,24 @@ import java.util.concurrent.Executors;
 
 @Getter
 @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-public final class FallbackQueue {
+public final class LoginQueue {
   // 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);
 
-  private final ConcurrentMap<InetAddress, Runnable> players = new ConcurrentHashMap<>(
-    128, 0.75f, Runtime.getRuntime().availableProcessors());
+  private final ConcurrentMap<InetAddress, Runnable> players = new ConcurrentHashMap<>(512);
 
   public void poll() {
-    final int maxQueuePolls = Sonar.get().getConfig().getQueue().getMaxQueuePolls();
-    int index = 0;
-
-    // Iterate through the map and process up to maxQueuePolls entries
+    final int maxQueuePolls = Math.min(players.size(), Sonar.get0().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
-    final Iterator<Map.Entry<InetAddress, Runnable>> iterator = players.entrySet().iterator();
-    while (iterator.hasNext() && index++ < maxQueuePolls) {
-      // Run the cached runnable
-      final Map.Entry<InetAddress, Runnable> entry = iterator.next();
-      QUEUE_EXECUTOR.execute(entry.getValue());
-      // Remove runnable from the map
-      iterator.remove();
-    }
+    QUEUE_EXECUTOR.execute(() -> {
+      final var iterator = players.entrySet().iterator();
+      for (int index = 0; index < maxQueuePolls && iterator.hasNext(); index++) {
+        iterator.next().getValue().run();
+        iterator.remove();
+      }
+    });
   }
 }

api/src/main/java/xyz/jonesdev/sonar/api/antibot/SonarUser.java

@@ -0,0 +1,83 @@
+/*
+ * 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.api.antibot;
+
+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.timer.SystemTimer;
+
+import java.net.InetAddress;
+
+public interface SonarUser {
+  @NotNull Channel channel();
+
+  @NotNull InetAddress getInetAddress();
+
+  @NotNull ProtocolVersion getProtocolVersion();
+
+  @NotNull SystemTimer getLoginTimer();
+
+  @NotNull String getFingerprint();
+
+  @NotNull String getUsername();
+
+  boolean isForceCaptcha();
+
+  void setForceCaptcha(final boolean isForceCaptcha);
+
+  boolean isGeyser();
+
+  @Nullable String getHostname();
+
+  /**
+   * Disconnect the player during/after verification
+   * using our custom Disconnect packet.
+   *
+   * @param reason      Disconnect message component
+   */
+  void disconnect(final @NotNull Component reason);
+
+  /**
+   * Sends a packet/message to the player
+   *
+   * @param msg Message to send to the player
+   */
+  default void write(final @NotNull Object msg) {
+    if (channel().isActive()) {
+      channel().writeAndFlush(msg, channel().voidPromise());
+    } else {
+      ReferenceCountUtil.release(msg);
+    }
+  }
+
+  /**
+   * Queues a buffered message that will be
+   * sent once all messages are flushed.
+   */
+  default void delayedWrite(final @NotNull Object msg) {
+    if (channel().isActive()) {
+      channel().write(msg, channel().voidPromise());
+    } else {
+      ReferenceCountUtil.release(msg);
+    }
+  }
+}

api/src/main/java/xyz/jonesdev/sonar/api/antibot/captcha/CaptchaGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 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,11 +15,17 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.api.fallback.captcha;
+package xyz.jonesdev.sonar.api.antibot.captcha;
+
+import org.jetbrains.annotations.NotNull;
 
 import java.awt.image.BufferedImage;
 
 @FunctionalInterface
 public interface CaptchaGenerator {
-  BufferedImage createImage(final char[] answer);
+
+  /**
+   * Generates a {@link java.awt.image.BufferedImage} that shows the answer to the CAPTCHA
+   */
+  @NotNull BufferedImage createImage(final char @NotNull [] answer);
 }

api/src/main/java/xyz/jonesdev/sonar/api/antibot/protocol/ProtocolVersion.java

@@ -0,0 +1,125 @@
+/*
+ * 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.protocol;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Getter
+@RequiredArgsConstructor
+public enum ProtocolVersion {
+  UNKNOWN(-1, "Unknown"),
+  MINECRAFT_1_7_2(4, "1.7.2"),
+  MINECRAFT_1_7_6(5, "1.7.6"),
+  MINECRAFT_1_8(47, "1.8"),
+  MINECRAFT_1_9(107, "1.9"),
+  MINECRAFT_1_9_1(108, "1.9.1"),
+  MINECRAFT_1_9_2(109, "1.9.2"),
+  MINECRAFT_1_9_4(110, "1.9.3"),
+  MINECRAFT_1_10(210, "1.10"),
+  MINECRAFT_1_11(315, "1.11"),
+  MINECRAFT_1_11_1(316, "1.11.1"),
+  MINECRAFT_1_12(335, "1.12"),
+  MINECRAFT_1_12_1(338, "1.12.1"),
+  MINECRAFT_1_12_2(340, "1.12.2"),
+  MINECRAFT_1_13(393, "1.13"),
+  MINECRAFT_1_13_1(401, "1.13.1"),
+  MINECRAFT_1_13_2(404, "1.13.2"),
+  MINECRAFT_1_14(477, "1.14"),
+  MINECRAFT_1_14_1(480, "1.14.1"),
+  MINECRAFT_1_14_2(485, "1.14.2"),
+  MINECRAFT_1_14_3(490, "1.14.3"),
+  MINECRAFT_1_14_4(498, "1.14.4"),
+  MINECRAFT_1_15(573, "1.15"),
+  MINECRAFT_1_15_1(575, "1.15.1"),
+  MINECRAFT_1_15_2(578, "1.15.2"),
+  MINECRAFT_1_16(735, "1.16"),
+  MINECRAFT_1_16_1(736, "1.16.1"),
+  MINECRAFT_1_16_2(751, "1.16.2"),
+  MINECRAFT_1_16_3(753, "1.16.3"),
+  MINECRAFT_1_16_4(754, "1.16.4"),
+  MINECRAFT_1_17(755, "1.17"),
+  MINECRAFT_1_17_1(756, "1.17.1"),
+  MINECRAFT_1_18(757, "1.18"),
+  MINECRAFT_1_18_2(758, "1.18.2"),
+  MINECRAFT_1_19(759, "1.19"),
+  MINECRAFT_1_19_1(760, "1.19.1"),
+  MINECRAFT_1_19_3(761, "1.19.3"),
+  MINECRAFT_1_19_4(762, "1.19.4"),
+  MINECRAFT_1_20(763, "1.20"),
+  MINECRAFT_1_20_2(764, "1.20.2"),
+  MINECRAFT_1_20_3(765, "1.20.3"),
+  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");
+
+  private final int protocol;
+  private final String name;
+
+  public static final ProtocolVersion LATEST_VERSION;
+  public static final Map<Integer, ProtocolVersion> ID_TO_PROTOCOL_CONSTANT;
+
+  static {
+    final Map<Integer, ProtocolVersion> versions = new HashMap<>();
+
+    for (final ProtocolVersion version : values()) {
+      versions.putIfAbsent(version.protocol, version);
+    }
+
+    ID_TO_PROTOCOL_CONSTANT = versions;
+    LATEST_VERSION = values()[values().length - 1];
+  }
+
+  public static ProtocolVersion fromId(final int protocol) {
+    return ID_TO_PROTOCOL_CONSTANT.getOrDefault(protocol, UNKNOWN);
+  }
+
+  public boolean greaterThan(final ProtocolVersion that) {
+    return compareTo(that) > 0;
+  }
+
+  public boolean greaterThanOrEquals(final ProtocolVersion that) {
+    return compareTo(that) >= 0;
+  }
+
+  public boolean lessThan(final ProtocolVersion that) {
+    return compareTo(that) < 0;
+  }
+
+  public boolean lessThanOrEquals(final ProtocolVersion that) {
+    return compareTo(that) <= 0;
+  }
+
+  public boolean inBetween(final ProtocolVersion first, final ProtocolVersion last) {
+    return compareTo(first) >= 0 && compareTo(last) <= 0;
+  }
+
+  public boolean isUnknown() {
+    return this == UNKNOWN;
+  }
+}

api/src/main/java/xyz/jonesdev/sonar/api/antibot/ratelimit/Ratelimiter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.api.fallback.ratelimit;
+package xyz.jonesdev.sonar.api.antibot.ratelimit;
 
 import org.jetbrains.annotations.NotNull;
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/command/SonarCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -26,20 +26,19 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
+import xyz.jonesdev.sonar.api.update.UpdateChecker;
 
 import java.util.*;
 
-import static java.util.Collections.emptyList;
-
 public interface SonarCommand {
-  List<String> TAB_SUGGESTIONS = new ArrayList<>();
-
-  Map<String, List<String>> ARG_TAB_SUGGESTIONS = new HashMap<>();
+  Map<Integer, List<String>> TAB_SUGGESTIONS = new LinkedHashMap<>();
 
   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")) {
-      source.sendMessage(Sonar.get().getConfig().getNoPermission());
+      if (Sonar.get0().getConfig().getNoPermission() != null) {
+        source.sendMessage(Sonar.get0().getConfig().getNoPermission());
+      }
       return;
     }
 
@@ -47,7 +46,7 @@ public interface SonarCommand {
 
     if (args.length > 0) {
       // Search subcommand if command arguments are present
-      subcommand = Sonar.get().getSubcommandRegistry().getSubcommands().stream()
+      subcommand = Sonar.get0().getSubcommandRegistry().getSubcommands().stream()
         .filter(sub -> sub.getInfo().name().equalsIgnoreCase(args[0])
           || Arrays.stream(sub.getInfo().aliases()).anyMatch(alias -> alias.equalsIgnoreCase(args[0])))
         .findFirst();
@@ -58,30 +57,37 @@ public interface SonarCommand {
       if (!command.getInfo().onlyConsole()
         && !source.getPermissionFunction().test(command.getPermission())) {
         source.sendMessage(MiniMessage.miniMessage().deserialize(
-          Sonar.get().getConfig().getMessagesConfig().getString("commands.subcommand-no-permission"),
-          Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
+          Sonar.get0().getConfig().getMessagesConfig().getString("commands.subcommand-no-permission"),
+          Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
           Placeholder.unparsed("permission", command.getPermission())));
         return;
       }
       // Invoke subcommand
       command.invoke(source, args);
     }, () -> {
+      final UpdateChecker.CheckResult checkResult = UpdateChecker.getLastCheckResult();
+      Component version = Component.text(Sonar.get0().getVersion().getFormatted());
+      if (checkResult.getConfigKey() != null) {
+        version = version.append(MiniMessage.miniMessage().deserialize(
+          Sonar.get0().getConfig().getMessagesConfig().getString("commands.main." + checkResult.getConfigKey())));
+      }
+
       // Print standard help message
       source.sendMessage(MiniMessage.miniMessage().deserialize(
         String.join("<newline>",
-          Sonar.get().getConfig().getMessagesConfig().getStringList("commands.main.header")),
-        Placeholder.unparsed("version", Sonar.get().getVersion().getFormatted()),
-        Placeholder.unparsed("platform", Sonar.get().getPlatform().getDisplayName()),
+          Sonar.get0().getConfig().getMessagesConfig().getStringList("commands.main.header")),
+        Placeholder.component("version", version),
+        Placeholder.unparsed("platform", Sonar.get0().getPlatform().getDisplayName()),
         Placeholder.unparsed("copyright-year", String.valueOf(Calendar.getInstance().get(Calendar.YEAR)))));
 
       final Component yes = MiniMessage.miniMessage().deserialize(
-        Sonar.get().getConfig().getMessagesConfig().getString("commands.main.tick"));
+        Sonar.get0().getConfig().getMessagesConfig().getString("commands.main.tick"));
       final Component no = MiniMessage.miniMessage().deserialize(
-        Sonar.get().getConfig().getMessagesConfig().getString("commands.main.cross"));
+        Sonar.get0().getConfig().getMessagesConfig().getString("commands.main.cross"));
 
-      Sonar.get().getSubcommandRegistry().getSubcommands().forEach(command -> {
+      Sonar.get0().getSubcommandRegistry().getSubcommands().forEach(command -> {
         source.sendMessage(MiniMessage.miniMessage().deserialize(
-          Sonar.get().getConfig().getMessagesConfig().getString("commands.main.subcommands"),
+          Sonar.get0().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()),
@@ -94,30 +100,29 @@ public interface SonarCommand {
     });
   }
 
-  static void prepareCachedMessages() {
-    // Don't re-cache tab suggestions
-    if (!TAB_SUGGESTIONS.isEmpty()) return;
-    // Cache tab suggestions
-    for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-      TAB_SUGGESTIONS.add(subcommand.getInfo().name());
-      if (subcommand.getInfo().aliases().length > 0) {
-        TAB_SUGGESTIONS.addAll(Arrays.asList(subcommand.getInfo().aliases()));
-      }
-      final List<String> arguments = Arrays.asList(subcommand.getInfo().arguments());
-      ARG_TAB_SUGGESTIONS.put(subcommand.getInfo().name(), arguments);
-      for (final String alias : subcommand.getInfo().aliases()) {
-        ARG_TAB_SUGGESTIONS.put(alias, arguments);
+  static void prepareCachedTabSuggestions() {
+    if (TAB_SUGGESTIONS.isEmpty()) {
+      final List<String> subcommandsAndAliases = new ArrayList<>();
+      for (final Subcommand subcommand : Sonar.get0().getSubcommandRegistry().getSubcommands()) {
+        subcommandsAndAliases.add(subcommand.getInfo().name());
+
+        final List<String> arguments = Arrays.asList(subcommand.getInfo().arguments());
+        TAB_SUGGESTIONS.put(subcommand.getInfo().name().hashCode(), arguments);
+
+        for (final String alias : subcommand.getInfo().aliases()) {
+          subcommandsAndAliases.add(alias);
+          TAB_SUGGESTIONS.put(alias.hashCode(), arguments);
+        }
       }
+      TAB_SUGGESTIONS.put(-1, subcommandsAndAliases);
     }
   }
 
   default List<String> getCachedTabSuggestions(final String @NotNull [] arguments) {
-    if (arguments.length <= 1) {
-      return TAB_SUGGESTIONS;
-    } else if (arguments.length == 2) {
-      final String subcommandName = arguments[0].toLowerCase();
-      return ARG_TAB_SUGGESTIONS.getOrDefault(subcommandName, emptyList());
+    if (arguments.length <= 2) {
+      final int subcommandHash = arguments.length <= 1 ? -1 : arguments[0].toLowerCase().hashCode();
+      return TAB_SUGGESTIONS.getOrDefault(subcommandHash, Collections.emptyList());
     }
-    return emptyList();
+    return Collections.emptyList();
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -23,7 +23,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 
 import java.util.Objects;
@@ -49,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.get().getConfig().getMessagesConfig().getString("commands.invalid-ip-address"),
-        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())));
+        Sonar.get0().getConfig().getMessagesConfig().getString("commands.invalid-ip-address"),
+        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix())));
       return null;
     }
     return raw;
@@ -62,8 +61,8 @@ public abstract class Subcommand {
 
   protected final void incorrectUsage(final @NotNull InvocationSource invocationSource, final String usage) {
     invocationSource.sendMessage(MiniMessage.miniMessage().deserialize(
-      Sonar.get().getConfig().getMessagesConfig().getString("commands.incorrect-usage"),
-      Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
+      Sonar.get0().getConfig().getMessagesConfig().getString("commands.incorrect-usage"),
+      Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
       Placeholder.unparsed("subcommand-usage", usage)));
   }
 
@@ -71,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.get().getConfig().getMessagesConfig().getString("commands.player-only"),
-        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())));
+        Sonar.get0().getConfig().getMessagesConfig().getString("commands.player-only"),
+        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix())));
       return;
     }
 
     // Check if the subcommand can only be executed though console
     if (info.onlyConsole() && invocationSource.isPlayer()) {
       invocationSource.sendMessage(MiniMessage.miniMessage().deserialize(
-        Sonar.get().getConfig().getMessagesConfig().getString("commands.console-only"),
-        Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())));
+        Sonar.get0().getConfig().getMessagesConfig().getString("commands.console-only"),
+        Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix())));
       return;
     }
 
@@ -91,13 +90,13 @@ public abstract class Subcommand {
     }
 
     // Execute the sub command from the invocation source with the given arguments
-    execute(new CommandInvocation(invocationSource, arguments));
+    execute(invocationSource, arguments);
   }
 
   public final @NotNull String getDescription() {
     final String path = String.format("commands.%s.description", info.name());
-    return Objects.requireNonNull(Sonar.get().getConfig().getMessagesConfig().getString(path));
+    return Objects.requireNonNull(Sonar.get0().getConfig().getMessagesConfig().getString(path));
   }
 
-  protected abstract void execute(final @NotNull CommandInvocation invocation);
+  protected abstract void execute(final @NotNull InvocationSource source, final String @NotNull [] args);
 }

api/src/main/java/xyz/jonesdev/sonar/api/command/subcommand/SubcommandInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/command/subcommand/SubcommandRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/config/Language.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -140,6 +140,7 @@ public enum Language {
   FA("Persian"),
   PL("Polish"),
   PT("Portuguese"),
+  PT_BR("Brazilian Portuguese", "pt-br"),
   PS("Pushto"),
   QU("Quechua"),
   RM("Raeto-Romance"),
@@ -203,7 +204,18 @@ 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) {
-    return Language.valueOf(code.toUpperCase());
+    for (final Language language : values()) {
+      if (language.code.equalsIgnoreCase(code)) {
+        return language;
+      }
+    }
+    // Fallback to English
+    return EN;
   }
 }

api/src/main/java/xyz/jonesdev/sonar/api/config/SimpleYamlConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,6 +21,7 @@ import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.simpleyaml.configuration.MemorySection;
 import org.simpleyaml.configuration.file.YamlFile;
+import xyz.jonesdev.sonar.api.Sonar;
 
 import java.io.File;
 import java.io.InputStream;
@@ -31,8 +32,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import static xyz.jonesdev.sonar.api.config.SonarConfiguration.LOGGER;
-
 @Getter
 public final class SimpleYamlConfig {
   private final File file;
@@ -90,7 +89,7 @@ public final class SimpleYamlConfig {
 
   public int getInt(final String path) {
     if (!yaml.contains(path)) {
-      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
       return 0;
     }
     return yaml.getInt(path);
@@ -98,7 +97,7 @@ public final class SimpleYamlConfig {
 
   public boolean getBoolean(final String path) {
     if (!yaml.contains(path)) {
-      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
       return false;
     }
     return yaml.getBoolean(path);
@@ -106,7 +105,7 @@ public final class SimpleYamlConfig {
 
   public @NotNull String getString(final String path) {
     if (!yaml.contains(path)) {
-      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
       return "";
     }
     final Object object = yaml.get(path);
@@ -118,7 +117,7 @@ public final class SimpleYamlConfig {
 
   public List<String> getStringList(final String path) {
     if (!yaml.contains(path)) {
-      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
       return new ArrayList<>(0);
     }
     return yaml.getStringList(path);
@@ -126,7 +125,7 @@ public final class SimpleYamlConfig {
 
   public List<Integer> getIntList(final String path) {
     if (!yaml.contains(path)) {
-      LOGGER.warn("Could not find {} in {}.", path, file.getName());
+      Sonar.get0().getLogger().warn("Could not find {} in {}.", path, file.getName());
       return new ArrayList<>(0);
     }
     return yaml.getIntegerList(path);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -30,7 +30,7 @@ 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.logger.LoggerWrapper;
+import xyz.jonesdev.sonar.api.database.ormlite.PostgresDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.webhook.DiscordWebhook;
 
 import java.io.File;
@@ -52,24 +52,6 @@ public final class SonarConfiguration {
   @Getter
   private Language language;
 
-  static final LoggerWrapper LOGGER = new LoggerWrapper() {
-
-    @Override
-    public void info(final String message, final Object... args) {
-      Sonar.get().getLogger().info("[config] " + message, args);
-    }
-
-    @Override
-    public void warn(final String message, final Object... args) {
-      Sonar.get().getLogger().warn("[config] " + message, args);
-    }
-
-    @Override
-    public void error(final String message, final Object... args) {
-      Sonar.get().getLogger().error("[config] " + message, args);
-    }
-  };
-
   public SonarConfiguration(final @NotNull File pluginFolder) {
     this.pluginFolder = pluginFolder;
     this.messagesConfig = new SimpleYamlConfig(new File(pluginFolder, "messages.yml"));
@@ -85,14 +67,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) {
-        LOGGER.error("Cannot check for custom language (is the file missing?)");
+        Sonar.get0().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) {
-        LOGGER.error("Error copying file: {}", exception);
+        Sonar.get0().getLogger().error("Error copying file: {}", exception);
         return DEFAULT_FALLBACK_LANGUAGE;
       }
     }
@@ -106,13 +88,13 @@ public final class SonarConfiguration {
         // Try parsing the property as a language
         return Language.fromCode(property);
       } catch (Throwable throwable) {
-        LOGGER.error("Could not find requested language: {}", throwable);
-        LOGGER.error("You can view a full list of valid language codes here:");
-        LOGGER.error("https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes");
-        LOGGER.error("If a translation does not exist yet, Sonar will use English (en).");
+        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).");
       }
     } catch (IOException exception) {
-      LOGGER.error("Error reading language file: {}", exception);
+      Sonar.get0().getLogger().error("Error reading language file: {}", exception);
     }
     return DEFAULT_FALLBACK_LANGUAGE;
   }
@@ -131,13 +113,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
-        LOGGER.info("Using system language ({}) for translations.", language);
+        Sonar.get0().getLogger().info("Using system language ({}) for translations.", language);
       } catch (Exception exception) {
-        LOGGER.warn("Could not use system language for translations.");
-        LOGGER.warn("Using default language ({}) for translations.", language);
+        Sonar.get0().getLogger().warn("Could not use system language for translations.");
+        Sonar.get0().getLogger().warn("Using default language ({}) for translations.", language);
       }
     } else {
-      LOGGER.info("Using custom language ({}) for translations.", language);
+      Sonar.get0().getLogger().info("Using custom language ({}) for translations.", language);
     }
 
     // Load all configurations
@@ -158,7 +140,7 @@ public final class SonarConfiguration {
 
     // General settings
     logPlayerAddresses = generalConfig.getBoolean("general.log-player-addresses");
-    maxOnlinePerIp = clamp(generalConfig.getInt("general.max-online-per-ip"), 0, 99);
+    maxOnlinePerIp = clamp(generalConfig.getInt("general.max-online-per-ip"), -1, 99);
 
     // Attack tracker
     minPlayersForAttack = clamp(generalConfig.getInt("attack-tracker.min-players-for-attack"), 2, 1024);
@@ -177,35 +159,37 @@ 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) {
-      LOGGER.warn(" ");
-      LOGGER.warn("You have set the verification timing to 'NEVER'.");
-      LOGGER.warn("Sonar will NOT perform the bot verification at all, therefore making it useless.");
-      LOGGER.warn("It is highly suggested to set this option to either 'DURING_ATTACK' or 'ALWAYS'.");
-      LOGGER.warn("Please only edit this option if you really know what you are doing.");
-      LOGGER.warn(" ");
+      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(" ");
     }
 
-    verification.gravity.enabled = generalConfig.getBoolean("verification.checks.gravity.enabled");
-    verification.gravity.checkCollisions = generalConfig.getBoolean("verification.checks.collision.enabled");
+    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.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.enabled = generalConfig.getBoolean("verification.checks.vehicle.enabled");
+    verification.vehicle.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.vehicle.timing"));
     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 = generalConfig.getInt("verification.checks.map-captcha.max-tries");
+    verification.map.maxTries = clamp(generalConfig.getInt("verification.checks.map-captcha.max-tries"), 1, 100);
     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()) {
-      try (final InputStream inputStream = new FileInputStream(backgroundPath)) {
-        verification.map.backgroundImage = inputStream;
-      } catch (IOException exception) {
-        Sonar.get().getLogger().error("Could not find background image", exception);
+      final File backgroundFile = new File(pluginFolder, backgroundPath);
+      if (backgroundFile.exists()) {
+        verification.map.backgroundImage = backgroundFile;
+      } else {
+        Sonar.get0().getLogger().error("Could not find background image {}", backgroundFile.getAbsolutePath());
       }
     }
 
@@ -213,17 +197,18 @@ public final class SonarConfiguration {
     verification.brand.validRegex = Pattern.compile(generalConfig.getString("verification.checks.client-brand.valid-regex"));
     verification.brand.maxLength = generalConfig.getInt("verification.checks.client-brand.max-length");
 
+    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.maxLoginPackets = clamp(generalConfig.getInt("verification.checks.max-login-packets"), 128, 8192);
 
     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);
@@ -238,16 +223,12 @@ public final class SonarConfiguration {
     webhook.content = webhookConfig.getString("webhook.content");
     webhook.footer.text = webhookConfig.getString("webhook.embed.footer.text");
     webhook.footer.iconUrl = webhookConfig.getString("webhook.embed.footer.icon-url");
-
-    final String realEmbedPath = "webhook.embed";
-    final String embedPath = realEmbedPath + ".";
-
-    webhook.embed.title = webhookConfig.getString(embedPath + "title");
-    webhook.embed.titleUrl = webhookConfig.getString(embedPath + "title-url");
-    webhook.embed.description = String.join("\n", webhookConfig.getStringList(embedPath + "description"));
-    webhook.embed.r = webhookConfig.getInt(embedPath + "color.red");
-    webhook.embed.g = webhookConfig.getInt(embedPath + "color.green");
-    webhook.embed.b = webhookConfig.getInt(embedPath + "color.blue");
+    webhook.embed.title = webhookConfig.getString("webhook.embed.title");
+    webhook.embed.titleUrl = webhookConfig.getString("webhook.embed.title-url");
+    webhook.embed.description = String.join("\n", webhookConfig.getStringList("webhook.embed.description"));
+    webhook.embed.r = webhookConfig.getInt("webhook.embed.color.red");
+    webhook.embed.g = webhookConfig.getInt("webhook.embed.color.green");
+    webhook.embed.b = webhookConfig.getInt("webhook.embed.color.blue");
 
     if (!webhook.url.isEmpty()) {
       if (webhook.username.isEmpty()) {
@@ -261,12 +242,23 @@ public final class SonarConfiguration {
 
     // Messages
     prefix = MiniMessage.miniMessage().deserialize(messagesConfig.getString("prefix"));
-    noPermission = MiniMessage.miniMessage().deserialize(messagesConfig.getString("commands.no-permission"),
-      Placeholder.component("prefix", prefix));
 
-    SonarCommand.prepareCachedMessages();
+    final String noPermissionMessage = messagesConfig.getString("commands.no-permission");
+    if (noPermissionMessage.isEmpty()) {
+      noPermission = null;
+    } else {
+      noPermission = MiniMessage.miniMessage().deserialize(noPermissionMessage,
+        Placeholder.component("prefix", prefix));
+    }
 
-    supportUrl = messagesConfig.getString("support-url");
+    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).");
+    }
     header = MiniMessage.miniMessage().deserialize(
       String.join("<newline>", messagesConfig.getStringList("header")),
       Placeholder.unparsed("support-url", supportUrl),
@@ -278,6 +270,7 @@ public final class SonarConfiguration {
 
     tooManyOnlinePerIp = deserializeDisconnectMessage("too-many-online-per-ip");
     verification.currentlyPreparing = deserializeDisconnectMessage("verification.currently-preparing");
+    verification.unsupportedVersion = deserializeDisconnectMessage("verification.unsupported-version");
     verification.tooFastReconnect = deserializeDisconnectMessage("verification.too-fast-reconnect");
     verification.alreadyVerifying = deserializeDisconnectMessage("verification.already-verifying");
     verification.alreadyQueued = deserializeDisconnectMessage("verification.already-queued");
@@ -303,7 +296,7 @@ public final class SonarConfiguration {
     final String resourceName = url + "/" + language.getCode() + ".yml";
     URL result = Sonar.class.getResource("/assets/" + resourceName);
     if (result == null) {
-      LOGGER.warn("Could not find " + resourceName + "! Using en.yml!");
+      Sonar.get0().getLogger().warn("Could not find " + resourceName + "! Using en.yml!");
       result = Objects.requireNonNull(Sonar.class.getResource("/assets/" + url + "/en.yml"));
     }
     return result;
@@ -312,7 +305,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.get().getLogger().warn("Clamped configuration value {} to {}", v, output);
+      Sonar.get0().getLogger().warn("Clamped configuration value {} to {}", v, output);
     }
     return output;
   }
@@ -386,20 +379,21 @@ public final class SonarConfiguration {
       private int maxDuration;
       private int maxTries;
       private String alphabet;
-      private InputStream backgroundImage;
+      private File backgroundImage;
+      private boolean placeInOffhand;
     }
 
     @Getter
     public static final class Gravity {
-      private boolean enabled;
-      private boolean checkCollisions;
+      private Timing timing;
+      private Timing collisionTiming;
       private boolean captchaOnFail;
       private int maxMovementTicks;
     }
 
     @Getter
     public static final class Vehicle {
-      private boolean enabled;
+      private Timing timing;
       private int minimumPackets;
     }
 
@@ -427,16 +421,17 @@ 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 maxLoginPackets;
     private int readTimeout;
     private int writeTimeout;
+    private int maxPacketCount;
     private int reconnectDelay;
     private int rememberTime;
     private int blacklistTime;
@@ -452,6 +447,7 @@ public final class SonarConfiguration {
     private Component blacklisted;
     private Component protocolBlacklisted;
     private Component currentlyPreparing;
+    private Component unsupportedVersion;
   }
 
   @Getter
@@ -461,14 +457,14 @@ public final class SonarConfiguration {
     @Getter
     @RequiredArgsConstructor
     public enum Type {
-      MYSQL("MySQL", "jdbc:mysql://%s:%d/%s", new MysqlDatabaseTypeAdapter(),
+      MYSQL("MySQL", "jdbc:mysql://%s:%d/%s%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", new MariaDbDatabaseTypeAdapter(),
+      MARIADB("MariaDB", "jdbc:mariadb://%s:%d/%s%s", new MariaDbDatabaseTypeAdapter(),
         Library.builder()
           .groupId("org{}mariadb{}jdbc")
           .artifactId("mariadb-java-client")
@@ -482,6 +478,13 @@ 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;
@@ -489,7 +492,7 @@ public final class SonarConfiguration {
       private final DatabaseType databaseType;
       private final Library databaseDriver;
       @Setter
-      private boolean downloaded;
+      private boolean loaded;
     }
 
     private Type type;

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

@@ -0,0 +1,258 @@
+/*
+ * 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.database.controller;
+
+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;
+import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Range;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.database.model.VerifiedPlayer;
+import xyz.jonesdev.sonar.api.fingerprint.FingerprintingUtil;
+
+import java.io.File;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public final class VerifiedPlayerController {
+  @Getter
+  private final Set<String> cache = Collections.synchronizedSet(new HashSet<>());
+  private @Nullable ConnectionSource connectionSource;
+  private Dao<VerifiedPlayer, Integer> dao;
+  private QueryBuilder<VerifiedPlayer, Integer> queryBuilder;
+  @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();
+    cachedDatabaseType = database.getType();
+
+    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
+      Sonar.get0().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 {}",
+        cachedDatabaseType.getDatabaseType().getDatabaseName(),
+        cachedDatabaseType.getDatabaseDriver().getVersion());
+      libraryManager.loadLibrary(cachedDatabaseType.getDatabaseDriver());
+      cachedDatabaseType.setLoaded(true);
+    }
+
+    try {
+      final String jdbcURL;
+
+      // 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"));
+        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");
+      }
+
+      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());
+
+      try {
+        TableUtils.createTableIfNotExists(connectionSource, VerifiedPlayer.class);
+      } catch (SQLException ignored) {
+        /*
+         * This is caused by a duplicate index;
+         * I know this isn't the best method of handling it,
+         * but I don't know how else I could address this issue.
+         */
+      }
+
+      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
+      updateService.execute(() -> {
+        if (connectionSource != null) {
+          try {
+            // Make sure to clear all outdated entries first
+            clearOld(maximumAge, false);
+            // Add all entries from the database to the cache
+            dao.queryForAll().forEach(verifiedPlayer -> cache.add(verifiedPlayer.getFingerprint()));
+          } catch (SQLException exception) {
+            exception.printStackTrace(System.err);
+          }
+        }
+      });
+    } catch (SQLException exception) {
+      exception.printStackTrace(System.err);
+    }
+  }
+
+  /**
+   * Closes the connection if instantiated
+   */
+  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) {
+        exception.printStackTrace(System.err);
+      }
+      // Make sure not to reuse a closed connection
+      connectionSource = null;
+    }
+  }
+
+  /**
+   * Clear all old entries using the given timestamp
+   */
+  public void clearOld(final @Range(from = 1, to = 365) int maximumAge,
+                       final boolean removeExisting) throws SQLException {
+    final long timestamp = Instant.now().minus(maximumAge, ChronoUnit.DAYS).getEpochSecond() * 1000L;
+
+    final List<VerifiedPlayer> oldEntries = queryBuilder.where()
+      .lt("timestamp", new Timestamp(timestamp))
+      .query();
+
+    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.",
+        oldEntries.size(), maximumAge);
+    }
+  }
+
+  /**
+   * First, remove the player from the local cache and then,
+   * secondly, asynchronously add the player to the database.
+   *
+   * @param fingerprint Fingerprint of the verified player
+   */
+  public void remove(final @NotNull String fingerprint) {
+    cache.remove(fingerprint);
+
+    // Don't try to update the column if the database type is NONE
+    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
+      return;
+    }
+
+    updateService.execute(() -> {
+      if (connectionSource != null) {
+        try {
+          final List<VerifiedPlayer> verifiedPlayer = queryBuilder.where()
+            .eq("fingerprint", fingerprint)
+            .query();
+
+          if (verifiedPlayer != null) {
+            for (final VerifiedPlayer player : verifiedPlayer) {
+              dao.delete(player);
+            }
+          }
+        } catch (SQLException exception) {
+          exception.printStackTrace(System.err);
+        }
+      }
+    });
+  }
+
+  /**
+   * Creates a new VerifiedPlayer model from the given username, host address, and timestamp
+   */
+  public void add(final @NotNull String username, final @NotNull String hostAddress, final long timestamp) {
+    final String fingerprint = FingerprintingUtil.getFingerprint(username, hostAddress);
+    // Add a new VerifiedPlayer object from the given parameters to the database
+    add(new VerifiedPlayer(fingerprint, timestamp));
+  }
+
+  /**
+   * Caches the player locally and then adds the player to the database
+   */
+  public void add(final @NotNull VerifiedPlayer player) {
+    cache.add(player.getFingerprint());
+
+    // Don't try to update the column if the database type is NONE
+    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
+      return;
+    }
+
+    updateService.execute(() -> {
+      if (connectionSource != null) {
+        try {
+          dao.createIfNotExists(player);
+        } catch (SQLException exception) {
+          exception.printStackTrace(System.err);
+        }
+      }
+    });
+  }
+
+  /**
+   * Clear the local cache, and, if the database type is set,
+   * remove the table from the database.
+   */
+  public void clearAll() {
+    cache.clear();
+
+    // Delete the entire table from the database, if necessary
+    if (connectionSource != null
+      && cachedDatabaseType != SonarConfiguration.Database.Type.NONE) {
+      try {
+        dao.deleteBuilder().delete();
+      } catch (SQLException exception) {
+        exception.printStackTrace(System.err);
+      }
+    }
+  }
+}

api/src/main/java/xyz/jonesdev/sonar/api/database/model/VerifiedPlayer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -25,34 +25,23 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.jetbrains.annotations.NotNull;
 
-import java.net.InetAddress;
 import java.sql.Timestamp;
-import java.util.UUID;
 
 @Getter
 @ToString
+@DatabaseTable(tableName = "sonar_fingerprints")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@DatabaseTable(tableName = "sonar_verified_players")
 public final class VerifiedPlayer {
   @SuppressWarnings("unused")
   @DatabaseField(generatedId = true)
   private int id;
 
   @DatabaseField(
-    columnName = "ip_address",
+    columnName = "fingerprint",
     canBeNull = false,
-    uniqueIndexName = "ip_address_player_uuid_idx",
-    width = 16
+    width = 48
   )
-  private String inetAddress;
-
-  @DatabaseField(
-    columnName = "player_uuid",
-    canBeNull = false,
-    uniqueIndexName = "ip_address_player_uuid_idx",
-    width = 36
-  )
-  private UUID playerUuid;
+  private String fingerprint;
 
   @DatabaseField(
     columnName = "timestamp",
@@ -60,17 +49,9 @@ public final class VerifiedPlayer {
   )
   private Timestamp timestamp;
 
-  public VerifiedPlayer(final @NotNull InetAddress inetAddress,
-                        final @NotNull UUID playerUuid,
+  public VerifiedPlayer(final @NotNull String fingerprint,
                         final long timestamp) {
-    this(inetAddress.getHostAddress(), playerUuid, timestamp);
-  }
-
-  public VerifiedPlayer(final @NotNull String inetAddress,
-                        final @NotNull UUID playerUuid,
-                        final long timestamp) {
-    this.inetAddress = inetAddress;
-    this.playerUuid = playerUuid;
+    this.fingerprint = fingerprint;
     this.timestamp = new Timestamp(timestamp);
   }
 }

api/src/main/java/xyz/jonesdev/sonar/api/database/ormlite/H2DatabaseTypeAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/database/ormlite/PostgresDatabaseTypeAdapter.java

@@ -0,0 +1,14 @@
+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"};
+  }
+}

api/src/main/java/xyz/jonesdev/sonar/api/event/SonarEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/event/SonarEventListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,13 +17,13 @@
 
 package xyz.jonesdev.sonar.api.event;
 
+import org.jetbrains.annotations.NotNull;
+
 @FunctionalInterface
 public interface SonarEventListener {
 
   /**
-   * Handles the publishing of an event
-   *
-   * @param event [Cancellable] Sonar event
+   * Handles the publishing of an event through Sonar's API
    */
-  void handle(final SonarEvent event);
+  void handle(final @NotNull SonarEvent event);
 }

api/src/main/java/xyz/jonesdev/sonar/api/event/SonarEventManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -47,7 +47,7 @@ public final class SonarEventManager {
         try {
           eventListener.handle(event);
         } catch (Throwable throwable) {
-          Sonar.get().getLogger().error("Could not pass {} to listener: {}",
+          Sonar.get0().getLogger().error("Could not pass {} to listener: {}",
             event.getClass().getSimpleName(), throwable);
         }
       }

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/AttackDetectedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/AttackMitigatedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/CaptchaGenerationEndEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,18 +15,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.protocol.dimension;
+package xyz.jonesdev.sonar.api.event.impl;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import net.kyori.adventure.nbt.CompoundBinaryTag;
+import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.timer.SystemTimer;
 
 @Getter
 @ToString
 @RequiredArgsConstructor
-public final class DimensionInfo {
-  private final String identifier;
-  private final int id;
-  private final CompoundBinaryTag tag;
+public final class CaptchaGenerationEndEvent implements SonarEvent {
+  private final SystemTimer timer;
+  private final int amountGenerated;
 }

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/CaptchaGenerationStartEvent.java

@@ -0,0 +1,31 @@
+/*
+ * 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.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;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public final class CaptchaGenerationStartEvent implements SonarEvent {
+  private CaptchaGenerator captchaGenerator;
+}

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/UserBlacklistedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -20,14 +20,12 @@ package xyz.jonesdev.sonar.api.event.impl;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.jetbrains.annotations.ApiStatus;
+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 {
-  @ApiStatus.Experimental
-  private final FallbackUser user;
+  private final SonarUser user;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,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 FallbackUser user;
+  private final @NotNull SonarUser user;
   private final @NotNull String reason;
 }

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/UserVerifyJoinEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -20,13 +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 String username;
-  private final FallbackUser user;
+  private final SonarUser user;
 }

api/src/main/java/xyz/jonesdev/sonar/api/event/impl/UserVerifySuccessEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -20,17 +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;
-
-import java.util.UUID;
 
 @Getter
 @ToString
 @RequiredArgsConstructor
 public final class UserVerifySuccessEvent implements SonarEvent {
-  private final String username;
-  private final UUID offlineUuid;
-  private final FallbackUser user;
-  private final long timeTakenToVerify;
+  private final SonarUser user;
 }

api/src/main/java/xyz/jonesdev/sonar/api/fingerprint/FingerprintingUtil.java

@@ -0,0 +1,38 @@
+/*
+ * 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.fingerprint;
+
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+
+@UtilityClass
+public class FingerprintingUtil {
+
+  /**
+   * Returns a hex string representing a hash of the username and IP address
+   */
+  public @NotNull String getFingerprint(final @NotNull String username,
+                                        final @NotNull String hostAddress) {
+    final int hash0 = username.hashCode();
+    final int hash1 = hostAddress.hashCode();
+    final int combined = hash0 + hash1;
+    return Integer.toHexString(hash0 >> 4)
+      + Integer.toHexString(combined << 2)
+      + Integer.toHexString(hash1 >> 4);
+  }
+}

api/src/main/java/xyz/jonesdev/sonar/api/logger/LoggerWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/notification/ActionBarNotificationHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -33,8 +33,8 @@ import static xyz.jonesdev.sonar.api.profiler.SimpleProcessProfiler.*;
 import static xyz.jonesdev.sonar.api.timer.SystemTimer.DATE_FORMATTER;
 
 @Getter
-public final class ActionBarNotificationHandler extends NotificationHandler {
-  private int animationIndex;
+public class ActionBarNotificationHandler extends NotificationHandler {
+  protected int animationIndex;
 
   @Override
   public void handleNotification() {
@@ -44,29 +44,31 @@ public final class ActionBarNotificationHandler extends NotificationHandler {
     }
 
     // Prepare the action bar verbose
-    final AttackTracker.AttackStatistics attackStatistics = Sonar.get().getAttackTracker().getCurrentAttack();
+    final AttackTracker.AttackStatistics attackStatistics = Sonar.get0().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.get().getConfig().getMessagesConfig().getString("verbose.layout.normal")
-        : Sonar.get().getConfig().getMessagesConfig().getString("verbose.layout.attack"),
-      Placeholder.component("prefix", Sonar.get().getConfig().getPrefix()),
+        ? Sonar.get0().getConfig().getMessagesConfig().getString("verbose.layout.normal")
+        : Sonar.get0().getConfig().getMessagesConfig().getString("verbose.layout.attack"),
+      Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
       Placeholder.unparsed("attack-duration", attackDuration),
       Placeholder.unparsed("animation", nextAnimation()),
-      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().getCurrentIncomingBandwidthFormatted()),
-      Placeholder.unparsed("outgoing-traffic", Sonar.get().getStatistics().getCurrentOutgoingBandwidthFormatted()),
-      Placeholder.unparsed("incoming-traffic-ttl", Sonar.get().getStatistics().getTotalIncomingBandwidthFormatted()),
-      Placeholder.unparsed("outgoing-traffic-ttl", Sonar.get().getStatistics().getTotalOutgoingBandwidthFormatted()),
+      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("used-memory", formatMemory(getUsedMemory())),
       Placeholder.unparsed("free-memory", formatMemory(getFreeMemory())),
       Placeholder.unparsed("total-memory", formatMemory(getTotalMemory())),
@@ -74,7 +76,7 @@ public final class ActionBarNotificationHandler extends NotificationHandler {
 
     // Send the action bar to all online players
     for (final UUID subscriber : subscribers) {
-      final Audience audience = Sonar.get().audience(subscriber);
+      final Audience audience = Sonar.get0().audience(subscriber);
       if (audience == null) continue;
 
       // Send the action bar to all online subscribers
@@ -83,7 +85,7 @@ public final class ActionBarNotificationHandler extends NotificationHandler {
   }
 
   public String nextAnimation() {
-    final var animations = Sonar.get().getConfig().getVerboseAnimation();
+    final var animations = Sonar.get0().getConfig().getVerboseAnimation();
     final int nextIndex = ++animationIndex % animations.size();
     return animations.toArray(new String[0])[nextIndex];
   }

api/src/main/java/xyz/jonesdev/sonar/api/notification/ChatNotificationHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -43,30 +43,30 @@ public final class ChatNotificationHandler extends NotificationHandler {
 
     // Prepare the chat notification
     final Component notificationTitle = MiniMessage.miniMessage().deserialize(
-      Sonar.get().getConfig().getMessagesConfig().getString("notifications.title"));
+      Sonar.get0().getConfig().getMessagesConfig().getString("notifications.title"));
     final Component notificationSubtitle = MiniMessage.miniMessage().deserialize(
-      Sonar.get().getConfig().getMessagesConfig().getString("notifications.subtitle"));
+      Sonar.get0().getConfig().getMessagesConfig().getString("notifications.subtitle"));
     final Title title = Title.title(notificationTitle, notificationSubtitle);
 
-    final List<String> chatNotification = Sonar.get().getConfig().getMessagesConfig().getStringList("notifications.chat");
+    final List<String> chatNotification = Sonar.get0().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.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().getCurrentIncomingBandwidthFormatted()),
-        Placeholder.unparsed("outgoing-traffic", Sonar.get().getStatistics().getCurrentOutgoingBandwidthFormatted()),
-        Placeholder.unparsed("incoming-traffic-ttl", Sonar.get().getStatistics().getTotalIncomingBandwidthFormatted()),
-        Placeholder.unparsed("outgoing-traffic-ttl", Sonar.get().getStatistics().getTotalOutgoingBandwidthFormatted()),
+        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.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.get().getChatNotificationHandler().getSubscribers()) {
-      final Audience audience = Sonar.get().audience(subscriber);
+    for (final UUID subscriber : Sonar.get0().getChatNotificationHandler().getSubscribers()) {
+      final Audience audience = Sonar.get0().audience(subscriber);
       if (audience == null) continue;
 
       // Send the message to all online subscribers

api/src/main/java/xyz/jonesdev/sonar/api/notification/NotificationHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/profiler/SimpleProcessProfiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

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

@@ -0,0 +1,53 @@
+/*
+ * 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.statistics;
+
+@SuppressWarnings("unused")
+public interface SonarStatistics {
+  long getConnectionsPerSecond();
+
+  long getLoginsPerSecond();
+
+  long getCurrentIncomingBandwidth();
+
+  long getCurrentOutgoingBandwidth();
+
+  long getTotalIncomingBandwidth();
+
+  long getTotalOutgoingBandwidth();
+
+  String getPerSecondIncomingBandwidthFormatted();
+
+  String getPerSecondOutgoingBandwidthFormatted();
+
+  int getTotalPlayersJoined();
+
+  int getTotalPlayersVerified();
+
+  int getTotalSuccessfulVerifications();
+
+  int getTotalFailedVerifications();
+
+  long getCurrentAttemptedVerifications();
+
+  int getTotalAttemptedVerifications();
+
+  long getCurrentBlacklistSize();
+
+  long getTotalBlacklistSize();
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

api/src/main/java/xyz/jonesdev/sonar/api/tracker/AttackTracker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -52,10 +52,10 @@ public final class AttackTracker {
   }
 
   public void checkIfUnderAttack() {
-    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();
+    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();
 
     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.get().getVerifiedPlayerController().estimatedSize();
-        currentAttack.failedVerifications = Sonar.get().getStatistics().getTotalFailedVerifications();
-        Sonar.get().getEventManager().publish(new AttackDetectedEvent());
-        Sonar.get().getChatNotificationHandler().handleNotification();
+        currentAttack.successfulVerifications = Sonar.get0().getVerifiedPlayerController().getCache().size();
+        currentAttack.failedVerifications = Sonar.get0().getStatistics().getTotalFailedVerifications();
+        Sonar.get0().getEventManager().publish(new AttackDetectedEvent());
+        Sonar.get0().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.get().getStatistics().getConnectionsPerSecond();
+      final long connectionsPerSecond = Sonar.get0().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.get().getConfig().getMinAttackDuration()
-        && currentAttack.timer.delay() > Sonar.get().getConfig().getAttackCooldownDelay()) {
+      if (currentAttack.duration.delay() > Sonar.get0().getConfig().getMinAttackDuration()
+        && currentAttack.timer.delay() > Sonar.get0().getConfig().getAttackCooldownDelay()) {
         // The current attack has stopped
-        Sonar.get().getEventManager().publish(new AttackMitigatedEvent(currentAttack));
+        Sonar.get0().getEventManager().publish(new AttackMitigatedEvent(currentAttack));
 
-        if (++attackThreshold > Sonar.get().getConfig().getMinAttackThreshold()) {
+        if (++attackThreshold > Sonar.get0().getConfig().getMinAttackThreshold()) {
           // Post webhook to Discord
-          Optional.ofNullable(Sonar.get().getConfig().getWebhook().getDiscordWebhook())
+          Optional.ofNullable(Sonar.get0().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.get().getFallback().getBlacklist().estimatedSize();
+              final long blacklisted = Sonar.get0().getAntiBot().getBlacklist().estimatedSize();
               // Calculate during-attack-statistics using their deltas
-              final long totalVerified = Sonar.get().getVerifiedPlayerController().estimatedSize();
+              final long totalVerified = Sonar.get0().getVerifiedPlayerController().getCache().size();
               final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);
-              final long totalFailed = Sonar.get().getStatistics().getTotalFailedVerifications();
+              final long totalFailed = Sonar.get0().getStatistics().getTotalFailedVerifications();
               final long failed = Math.max(totalFailed - currentAttack.failedVerifications, 0);
 
               webhook.post(() -> {
-                final SonarConfiguration.Webhook.Embed config = Sonar.get().getConfig().getWebhook().getEmbed();
+                final SonarConfiguration.Webhook.Embed config = Sonar.get0().getConfig().getWebhook().getEmbed();
                 final String description = config.getDescription()
                   .replace("<start-timestamp>", startTimestamp)
                   .replace("<end-timestamp>", endTimestamp)

api/src/main/java/xyz/jonesdev/sonar/api/update/UpdateChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,14 +15,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.update;
+package xyz.jonesdev.sonar.api.update;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
 
 import javax.net.ssl.HttpsURLConnection;
 import java.io.BufferedReader;
@@ -36,24 +37,8 @@ import java.util.concurrent.Executors;
 @UtilityClass
 public class UpdateChecker {
   private final ExecutorService ASYNC_EXECUTOR = Executors.newSingleThreadExecutor();
-
-  private final LoggerWrapper LOGGER = new LoggerWrapper() {
-
-    @Override
-    public void info(final String message, final Object... args) {
-      Sonar.get().getLogger().info("[update-checker] " + message, args);
-    }
-
-    @Override
-    public void warn(final String message, final Object... args) {
-      Sonar.get().getLogger().warn("[update-checker] " + message, args);
-    }
-
-    @Override
-    public void error(final String message, final Object... args) {
-      Sonar.get().getLogger().error("[update-checker] " + message, args);
-    }
-  };
+  @Getter
+  private CheckResult lastCheckResult = CheckResult.UNRESOLVED;
 
   public void checkForUpdates() {
     ASYNC_EXECUTOR.execute(() -> {
@@ -63,20 +48,25 @@ 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.get().getVersion().getVersion());
+        final int convertedCurrentVersion = convertVersion(Sonar.get0().getVersion().getVersion());
 
         if (convertedCurrentVersion < convertedLatestVersion) {
-          LOGGER.warn("A new version of Sonar is available: {}", latestStableRelease);
-          LOGGER.warn("Please make sure to update to the latest version to ensure stability and security:");
-          LOGGER.warn("https://github.com/jonesdevelopment/sonar/releases/tag/{}", latestStableRelease);
-        } else if (convertedCurrentVersion > convertedLatestVersion || !Sonar.get().getVersion().getGitBranch().equals("main")) {
-          LOGGER.warn("You are currently using an unreleased version of Sonar!");
-          LOGGER.warn("The contributors of Sonar are not responsible for any damage done by using an unstable version");
-        } else {
-          LOGGER.info("You are currently using the latest stable release of Sonar!");
+          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");
+          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");
+          lastCheckResult = CheckResult.UNSTABLE_VERSION;
+        } else if (lastCheckResult != CheckResult.LATEST_VERSION) {
+          Sonar.get0().getLogger().info("You are currently using the latest stable release of Sonar!");
+          lastCheckResult = CheckResult.LATEST_VERSION;
         }
       } catch (Throwable throwable) {
-        LOGGER.warn("Unable to retrieve version information: {}", throwable);
+        Sonar.get0().getLogger().warn("Failed to check for updates (is your firewall set up properly?): {}",
+          throwable);
+        lastCheckResult = CheckResult.API_ERROR;
       }
     });
   }
@@ -118,4 +108,16 @@ public class UpdateChecker {
     final int patch = Integer.parseInt(convertedParts[2]);
     return convertedMajor + convertedMinor + patch; // sum the converted version parts
   }
+
+  @Getter
+  @RequiredArgsConstructor
+  public enum CheckResult {
+    API_ERROR("api-error"),
+    OUTDATED_VERSION("outdated-version"),
+    UNSTABLE_VERSION("unstable-version"),
+    LATEST_VERSION(null),
+    UNRESOLVED(null);
+
+    private final String configKey;
+  }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -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.get().getLogger().warn("Unexpected Discord webhook response code {}", code);
+          Sonar.get0().getLogger().warn("Unexpected Discord webhook response code {}", code);
         }
       } catch (Exception exception) {
-        Sonar.get().getLogger().error("Could not send webhook: {}", exception);
+        Sonar.get0().getLogger().error("Could not send webhook: {}", exception);
       }
     });
   }
 
   private static String prepareSerializedContent(final SonarConfiguration.Webhook.@NotNull Embed embed) {
-    final String content = Sonar.get().getConfig().getWebhook().getContent();
-    final String username = Sonar.get().getConfig().getWebhook().getUsername();
-    final String avatarUrl = Sonar.get().getConfig().getWebhook().getAvatarUrl();
+    final String content = Sonar.get0().getConfig().getWebhook().getContent();
+    final String username = Sonar.get0().getConfig().getWebhook().getUsername();
+    final String avatarUrl = Sonar.get0().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.get().getConfig().getWebhook().getFooter().getText(),
-        Sonar.get().getConfig().getWebhook().getFooter().getIconUrl()));
+      new Webhook.Footer(Sonar.get0().getConfig().getWebhook().getFooter().getText(),
+        Sonar.get0().getConfig().getWebhook().getFooter().getIconUrl()));
     final List<Webhook.EmbedMessage> embeds = Collections.singletonList(embedMessage);
 
     final Webhook webhook = new Webhook(content, username, avatarUrl, false, embeds);

build.gradle.kts

@@ -3,18 +3,20 @@ import net.kyori.indra.git.IndraGitExtension
 plugins {
   java
   alias(libs.plugins.shadow)
-  alias(libs.plugins.indra.git) apply true
+  alias(libs.plugins.indra.git)
+  alias(libs.plugins.spotless)
 }
 
 allprojects {
   repositories {
     mavenCentral()
     maven(url = "https://repo.jonesdev.xyz/releases/") // Bungee & Velocity proxy module
-    maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/") // libby
+    maven(url = "https://repo.alessiodp.com/snapshots/") // libby
   }
 
   apply(plugin = "java")
   apply(plugin = "com.gradleup.shadow")
+  apply(plugin = "com.diffplug.spotless")
 
   dependencies {
     compileOnly(rootProject.libs.lombok)
@@ -31,6 +33,16 @@ allprojects {
     compileOnly(rootProject.libs.libby.core)
   }
 
+  spotless {
+    java {
+      endWithNewline()
+      formatAnnotations()
+      removeUnusedImports()
+      trimTrailingWhitespace()
+      indentWithSpaces(2)
+    }
+  }
+
   tasks {
     shadowJar {
       // Set the file name of the shadowed jar
@@ -50,6 +62,7 @@ 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/*/**")
@@ -80,14 +93,17 @@ 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", "common", "bukkit", "bungee", "velocity")
-    val buildTasks = subprojects.flatMap { listOf("$it:clean", "$it:shadowJar") }
+    val subprojects = listOf("api", "captcha", "common", "bukkit", "bungeecord", "paper", "velocity")
+    val buildTasks = subprojects.flatMap { listOf("$it:clean", "$it:spotlessApply", "$it:shadowJar") }
     dependsOn(buildTasks)
   }
 }

bukkit/build.gradle.kts

@@ -8,7 +8,7 @@ bukkit {
   name = rootProject.name
   main = "xyz.jonesdev.sonar.bukkit.SonarBukkitPlugin"
   authors = listOf("Jones Development", "Sonar Contributors")
-  website = "https://jonesdev.xyz/discord/"
+  website = "https://sonar.top/discord/"
   load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
   softDepend = listOf("Geyser-Spigot", "floodgate", "Protocolize", "ProtocolSupport",
     "ViaVersion", "packetevents", "ProtocolLib", "FastLogin")
@@ -32,7 +32,6 @@ dependencies {
   implementation(project(":common"))
 
   compileOnly(rootProject.libs.spigot)
-  testCompileOnly(rootProject.libs.spigot)
 
   implementation(rootProject.libs.adventure.platform.bukkit) {
     exclude(module = "adventure-nbt")
@@ -46,6 +45,3 @@ tasks {
     relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori")
   }
 }
-
-java.sourceCompatibility = JavaVersion.VERSION_11
-java.targetCompatibility = JavaVersion.VERSION_11

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -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 (FallbackBukkitInjector.isLateBindEnabled()) {
-      getPlugin().getServer().getScheduler().runTask(getPlugin(), FallbackBukkitInjector::inject);
+    if (BukkitInjector.isLateBindEnabled()) {
+      getPlugin().getServer().getScheduler().runTask(getPlugin(), BukkitInjector::inject);
     } else {
       getPlugin().getServer().getPluginManager().registerEvents(new BukkitJoinListener(), getPlugin());
     }

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/SonarBukkitPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -18,7 +18,7 @@
 package xyz.jonesdev.sonar.bukkit;
 
 import org.bukkit.plugin.java.JavaPlugin;
-import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
+import xyz.jonesdev.sonar.bukkit.antibot.BukkitInjector;
 
 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 (!FallbackBukkitInjector.isLateBindEnabled()) {
-      FallbackBukkitInjector.inject();
+    if (!BukkitInjector.isLateBindEnabled()) {
+      BukkitInjector.inject();
     }
   }
 

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/BukkitInboundHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,36 +15,37 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.bukkit.fallback;
+package xyz.jonesdev.sonar.bukkit.antibot;
 
 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.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.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.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.fallback.FallbackPipelines.FALLBACK_INBOUND_HANDLER;
-import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.Direction.SERVERBOUND;
-import static xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket.*;
-import static xyz.jonesdev.sonar.common.util.ProtocolUtil.DEBUG;
-import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readVarInt;
+import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INBOUND_HANDLER;
+import static xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket.*;
 
-final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
+final class BukkitInboundHandler extends InboundHandlerAdapter {
+  private static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.MINECRAFT_1_7_2;
 
-  FallbackBukkitInboundHandler() {
-    updateRegistry(FallbackPacketRegistry.HANDSHAKE, DEFAULT_PROTOCOL_VERSION);
+  private SonarPacketRegistry.ProtocolRegistry registry;
 
-    channelRemovalListener = (pipeline, name, handler) -> {
+  BukkitInboundHandler() {
+    updateRegistry(SonarPacketRegistry.HANDSHAKE, DEFAULT_PROTOCOL_VERSION);
+
+    super.channelRemovalListener = (pipeline, name, handler) -> {
       final ChannelInactiveListener inactiveListener = pipeline.get(ChannelInactiveListener.class);
 
       if (inactiveListener != null) {
@@ -53,17 +54,13 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
     };
   }
 
-  private FallbackPacketRegistry.ProtocolRegistry registry;
-
-  private static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.MINECRAFT_1_7_2;
-
-  public void updateRegistry(final @NotNull FallbackPacketRegistry registry,
+  public void updateRegistry(final @NotNull SonarPacketRegistry registry,
                              final @NotNull ProtocolVersion protocolVersion) {
-    this.registry = registry.getProtocolRegistry(SERVERBOUND, protocolVersion);
+    this.registry = registry.getProtocolRegistry(SonarPacketRegistry.Direction.SERVERBOUND, protocolVersion);
   }
 
   @Override
-  public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
+  public void channelRead(final @NotNull ChannelHandlerContext ctx, final Object msg) throws Exception {
     if (msg instanceof ByteBuf) {
       final ByteBuf byteBuf = (ByteBuf) msg;
 
@@ -81,8 +78,8 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
         return;
       }
 
-      final int packetId = readVarInt(byteBuf);
-      final FallbackPacket packet = registry.createPacket(packetId);
+      final int packetId = ProtocolUtil.readVarInt(byteBuf);
+      final SonarPacket packet = registry.createPacket(packetId);
 
       // Skip the packet if it's not registered within Sonar's packet registry
       if (packet == null) {
@@ -95,13 +92,14 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
         packet.decode(byteBuf, protocolVersion == null ? DEFAULT_PROTOCOL_VERSION : protocolVersion);
       } catch (Throwable throwable) {
         byteBuf.release();
-        throw DEBUG ? new DecoderException(throwable) : QuietDecoderException.INSTANCE;
+        throw ProtocolUtil.DEBUG ? new DecoderException(throwable) : QuietDecoderException.INSTANCE;
       }
 
       // Check if the packet still has bytes left after we decoded it
       if (byteBuf.isReadable()) {
         byteBuf.release();
-        throw DEBUG ? new DecoderException("Could not read packet to end") : QuietDecoderException.INSTANCE;
+        throw ProtocolUtil.DEBUG ? new DecoderException("Could not read packet to end ("
+          + byteBuf.readableBytes() + " bytes left)") : QuietDecoderException.INSTANCE;
       }
 
       /*
@@ -119,12 +117,14 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
           case LOGIN:
           case TRANSFER:
             // Let the actual handler know about the handshake packet
-            handleHandshake(ctx.channel(), handshake.getHostname(), handshake.getProtocolVersionId());
+            handleHandshake(ctx, handshake.getHostname(), handshake.getProtocolVersionId());
             // Be ready for the next packet (which is supposed to be a login packet)
-            updateRegistry(FallbackPacketRegistry.LOGIN, Objects.requireNonNull(protocolVersion));
+            updateRegistry(SonarPacketRegistry.LOGIN, Objects.requireNonNull(protocolVersion));
             break;
           default:
-            throw DEBUG ? new DecoderException("Bad intent " + handshake.getIntent()) : QuietDecoderException.INSTANCE;
+            byteBuf.release();
+            throw ProtocolUtil.DEBUG ? new DecoderException("Bad handshake intent " + handshake.getIntent())
+              : QuietDecoderException.INSTANCE;
         }
       } else if (packet instanceof LoginStartPacket) {
         final LoginStartPacket loginStart = (LoginStartPacket) packet;
@@ -132,12 +132,13 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
         // We've done our job - deject this pipeline
         ctx.pipeline().remove(this);
         // Let Sonar process the login packet
-        handleLogin(ctx.channel(), ctx, () -> {
+        handleLogin(ctx, () -> {
           byteBuf.readerIndex(originalReaderIndex);
           ctx.fireChannelRead(byteBuf.retain());
-          final ChannelHandler inboundHandler = ctx.pipeline().remove(FALLBACK_INBOUND_HANDLER);
-          if (inboundHandler != null) {
-            channelRemovalListener.accept(ctx.pipeline(), FALLBACK_INBOUND_HANDLER, inboundHandler);
+          // 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);
           }
         }, loginStart.getUsername(), socketAddress);
         byteBuf.release();
@@ -146,6 +147,8 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
 
       byteBuf.readerIndex(originalReaderIndex);
       ctx.fireChannelRead(byteBuf);
+    } else {
+      ctx.fireChannelRead(msg);
     }
   }
 }

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/BukkitInjector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.bukkit.fallback;
+package xyz.jonesdev.sonar.bukkit.antibot;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -26,16 +26,16 @@ import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.exception.ReflectiveOperationException;
-import xyz.jonesdev.sonar.common.fallback.netty.FallbackInjectedChannelInitializer;
+import xyz.jonesdev.sonar.common.netty.SonarInjectedChannelInitializer;
+import xyz.jonesdev.sonar.common.util.exception.ReflectiveOperationException;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
 
-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.api.antibot.ChannelPipelines.SONAR_INACTIVE_LISTENER;
+import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_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 FallbackBukkitInjector {
+public class BukkitInjector {
   private final String LEGACY_NMS_PACKAGE;
   private final String OBC_PACKAGE;
 
@@ -253,10 +253,10 @@ public class FallbackBukkitInjector {
 
           INITIALIZE_LISTENER.thenAccept(__ -> {
             try {
-              childHandlerField.set(_bootstrap, new FallbackInjectedChannelInitializer(originalInitializer,
+              childHandlerField.set(_bootstrap, new SonarInjectedChannelInitializer(originalInitializer,
                 pipeline -> {
-                  pipeline.addAfter("splitter", FALLBACK_PACKET_DECODER, new FallbackBukkitInboundHandler());
-                  pipeline.addFirst(FALLBACK_INACTIVE_LISTENER, new ChannelInactiveListener());
+                  pipeline.addAfter("splitter", SONAR_PACKET_DECODER, new BukkitInboundHandler());
+                  pipeline.addFirst(SONAR_INACTIVE_LISTENER, new ChannelInactiveListener());
                 }
               ));
             } catch (IllegalAccessException exception) {
@@ -267,7 +267,7 @@ public class FallbackBukkitInjector {
         return;
       }
     } catch (Exception exception) {
-      Sonar.get().getLogger().error("An error occurred while injecting {}", exception);
+      Sonar.get0().getLogger().error("An error occurred while injecting {}", exception);
     }
   }
 }

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/BukkitServerVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.bukkit.fallback;
+package xyz.jonesdev.sonar.bukkit.antibot;
 
 import lombok.Getter;
 
@@ -70,7 +70,19 @@ public enum BukkitServerVersion {
   MINECRAFT_1_20_4,
   MINECRAFT_1_20_5,
   MINECRAFT_1_20_6,
-  MINECRAFT_1_21;
+  MINECRAFT_1_21,
+  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;
 
   static final BukkitServerVersion[] REVERSED_VALUES;
 

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/ChannelInactiveListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.bukkit.fallback;
+package xyz.jonesdev.sonar.bukkit.antibot;
 
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.*;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -27,10 +27,9 @@ import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 
+import java.util.Collections;
 import java.util.List;
 
-import static java.util.Collections.emptyList;
-
 public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, SonarCommand {
 
   @Override
@@ -41,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.get().sender(sender),
+      Sonar.get0().sender(sender),
       sender::hasPermission);
     // Pass the invocation source and command arguments to our command handler
     handle(invocationSource, args);
@@ -54,9 +53,6 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
                                     final String commandAlias,
                                     final String @NotNull [] args) {
     // Do not allow tab completion if the player does not have the required permission
-    if (!sender.hasPermission("sonar.command")) {
-      return emptyList();
-    }
-    return getCachedTabSuggestions(args);
+    return sender.hasPermission("sonar.command") ? getCachedTabSuggestions(args) : Collections.emptyList();
   }
 }

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/listener/BukkitJoinListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -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.fallback.FallbackBukkitInjector;
+import xyz.jonesdev.sonar.bukkit.antibot.BukkitInjector;
 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.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
+import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_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 = FallbackBukkitInjector.getOBCClass("entity.CraftPlayer")
+      final Method handleMethod = BukkitInjector.getOBCClass("entity.CraftPlayer")
         .getDeclaredMethod("getHandle");
-      final Field listenerField = FallbackBukkitInjector.findField(false, handleMethod.getReturnType(),
+      final Field listenerField = BukkitInjector.findField(false, handleMethod.getReturnType(),
         "PlayerConnection", "ServerGamePacketListenerImpl");
-      final Field networkManagerField = FallbackBukkitInjector.findField(true, listenerField.getType(),
+      final Field networkManagerField = BukkitInjector.findField(true, listenerField.getType(),
         "NetworkManager", "Connection");
-      final Field channelField = FallbackBukkitInjector.getFieldAt(networkManagerField.getType(), Channel.class, 0);
+      final Field channelField = BukkitInjector.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(FALLBACK_BANDWIDTH) == null) {
+      if (channel.pipeline().context(SONAR_BANDWIDTH) == null) {
         channel.close();
       }
     } catch (Throwable throwable) {
-      Sonar.get().getLogger().warn("Couldn't find {}: {}", event.getPlayer().getName(), throwable);
+      Sonar.get0().getLogger().warn("Couldn't find {}: {}", event.getPlayer().getName(), throwable);
     }
   }
 }

bungeecord/build.gradle.kts

@@ -14,7 +14,6 @@ dependencies {
   implementation(project(":common"))
 
   compileOnly(rootProject.libs.bungeecord)
-  testCompileOnly(rootProject.libs.bungeecord)
 
   implementation(rootProject.libs.adventure.platform.bungee) {
     exclude(module = "adventure-nbt")
@@ -26,8 +25,7 @@ dependencies {
 tasks {
   shadowJar {
     relocate("net.kyori", "xyz.jonesdev.sonar.libs.kyori")
+
+    archiveFileName = "Sonar-Bungee.jar" // Hardcode a shortened version of the name
   }
 }
-
-java.sourceCompatibility = JavaVersion.VERSION_11
-java.targetCompatibility = JavaVersion.VERSION_11

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -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.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;
@@ -86,6 +86,10 @@ 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 +107,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
-    FallbackBungeeInjector.inject();
+    BungeeInjector.inject();
   }
 
   @Override

bungeecord/src/main/java/xyz/jonesdev/sonar/bungee/SonarBungeePlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

bungeecord/src/main/java/xyz/jonesdev/sonar/bungee/antibot/BungeeInboundHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,9 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.bungee.fallback;
+package xyz.jonesdev.sonar.bungee.antibot;
 
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.netty.HandlerBoss;
@@ -26,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.api.exception.ReflectiveOperationException;
-import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandlerAdapter;
+import xyz.jonesdev.sonar.common.InboundHandlerAdapter;
+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.fallback.protocol.packets.handshake.HandshakePacket.STATUS;
+import static xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket.STATUS;
 
-final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {
+final class BungeeInboundHandler extends InboundHandlerAdapter {
 
   private static final MethodHandle CHANNEL_WRAPPER_GETTER;
 
@@ -49,42 +48,42 @@ final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {
   }
 
   @Override
-  public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
+  public void channelRead(final @NotNull ChannelHandlerContext ctx, final Object msg) throws Exception {
     if (msg instanceof PacketWrapper) {
       final PacketWrapper packetWrapper = (PacketWrapper) msg;
       final DefinedPacket wrappedPacket = packetWrapper.packet;
       // Skip any unknown or invalid packets
       if (wrappedPacket != null) {
-        final Channel channel = ctx.channel();
-        // Intercept any handshake packet by the client
         if (wrappedPacket instanceof Handshake) {
           final Handshake handshake = (Handshake) wrappedPacket;
           // We don't care about server pings; remove the handler
           if (handshake.getRequestedProtocol() == STATUS) {
             ctx.pipeline().remove(this);
           } else {
-            handleHandshake(channel, handshake.getHost(), handshake.getProtocolVersion());
+            handleHandshake(ctx, handshake.getHost(), handshake.getProtocolVersion());
           }
-        }
-        // Intercept any server login packet by the client
-        else if (wrappedPacket instanceof LoginRequest) {
+        } else if (wrappedPacket instanceof LoginRequest) {
           // Make sure to use the potentially modified, real IP
           final LoginRequest loginRequest = (LoginRequest) wrappedPacket;
-          final HandlerBoss handlerBoss = channel.pipeline().get(HandlerBoss.class);
-          final ChannelWrapper channelWrapper;
-          try {
-            channelWrapper = (ChannelWrapper) CHANNEL_WRAPPER_GETTER.invokeExact(handlerBoss);
-          } catch (final Throwable throwable) {
-            throw new ReflectiveOperationException(throwable);
+          final HandlerBoss handlerBoss = ctx.pipeline().get(HandlerBoss.class);
+          // This might sometimes happen if the client unexpectedly disconnects
+          if (handlerBoss != null) {
+            // Get the real IP address of the player through the channel wrapper
+            final ChannelWrapper channelWrapper;
+            try {
+              channelWrapper = (ChannelWrapper) CHANNEL_WRAPPER_GETTER.invokeExact(handlerBoss);
+            } catch (final Throwable throwable) {
+              throw new ReflectiveOperationException(throwable);
+            }
+            // We've done our job - deject this pipeline
+            ctx.pipeline().remove(this);
+            // Make sure to mark this packet as released
+            packetWrapper.trySingleRelease();
+            // Let Sonar process the login packet
+            final InetSocketAddress socketAddress = (InetSocketAddress) channelWrapper.getRemoteAddress();
+            handleLogin(ctx, () -> ctx.fireChannelRead(msg), loginRequest.getData(), socketAddress);
+            return;
           }
-          final InetSocketAddress socketAddress = (InetSocketAddress) channelWrapper.getRemoteAddress();
-          // We've done our job - deject this pipeline
-          ctx.pipeline().remove(this);
-          // Make sure to mark this packet as released
-          packetWrapper.trySingleRelease();
-          // Let Sonar process the login packet
-          handleLogin(channel, ctx, () -> ctx.fireChannelRead(msg), loginRequest.getData(), socketAddress);
-          return;
         }
       }
     }

bungeecord/src/main/java/xyz/jonesdev/sonar/bungee/antibot/BungeeInjector.java

@@ -0,0 +1,96 @@
+/*
+ * 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);
+  }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -26,7 +26,7 @@ import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 
-import static java.util.Collections.emptyList;
+import java.util.Collections;
 
 public final class BungeeSonarCommand extends Command implements TabExecutor, SonarCommand {
   public BungeeSonarCommand() {
@@ -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.get().sender(sender),
+      Sonar.get0().sender(sender),
       sender::hasPermission);
     // Pass the invocation source and command arguments to our command handler
     handle(invocationSource, args);
@@ -47,9 +47,6 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
   @Override
   public Iterable<String> onTabComplete(final @NotNull CommandSender sender, final String @NotNull [] args) {
     // Do not allow tab completion if the player does not have the required permission
-    if (!sender.hasPermission("sonar.command")) {
-      return emptyList();
-    }
-    return getCachedTabSuggestions(args);
+    return sender.hasPermission("sonar.command") ? getCachedTabSuggestions(args) : Collections.emptyList();
   }
 }

captcha/build.gradle.kts

@@ -0,0 +1,7 @@
+dependencies {
+  compileOnly(project(":api"))
+  compileOnly(rootProject.libs.imagefilters)
+
+  testImplementation(project(":api"))
+  testImplementation(rootProject.libs.imagefilters)
+}

captcha/src/main/java/xyz/jonesdev/sonar/captcha/StandardCaptchaGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -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.fallback.captcha.CaptchaGenerator;
+import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
 import xyz.jonesdev.sonar.captcha.filters.CurvesOverlayFilter;
 import xyz.jonesdev.sonar.captcha.filters.NoiseOverlayFilter;
 
@@ -33,15 +33,11 @@ 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.io.InputStream;
 import java.util.Arrays;
 import java.util.Random;
 
-import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR;
-import static xyz.jonesdev.sonar.captcha.StandardTTFFontProvider.FONTS;
-import static xyz.jonesdev.sonar.captcha.StandardTTFFontProvider.STANDARD_FONT_SIZE;
-
 @Getter
 @RequiredArgsConstructor
 public final class StandardCaptchaGenerator implements CaptchaGenerator {
@@ -53,8 +49,11 @@ 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.6f);
     FBM.setScale(15);
 
@@ -69,12 +68,12 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
     }
   }
 
-  private final int width, height;
-  private final @Nullable InputStream background;
-  private BufferedImage backgroundImage;
+  private final int width = 128, height = 128;
+  private final @Nullable File background;
+  private @Nullable BufferedImage backgroundImage;
 
   @Override
-  public @NotNull BufferedImage createImage(final char[] answer) {
+  public @NotNull BufferedImage createImage(final char @NotNull [] answer) {
     final BufferedImage image = createBackgroundImage();
     final Graphics2D graphics = image.createGraphics();
     graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -91,27 +90,33 @@ public final class StandardCaptchaGenerator implements CaptchaGenerator {
   }
 
   private @NotNull BufferedImage createBackgroundImage() {
+    // Create a new image buffer with a 3-byte color spectrum
+    final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
     if (background == null) {
-      final BufferedImage image = new BufferedImage(width, height, TYPE_3BYTE_BGR);
       // Fill the entire image with a noise texture
       return FBM.filter(image, image);
     }
-    try {
-      return backgroundImage == null ? backgroundImage = ImageIO.read(background) : backgroundImage;
-    } catch (IOException exception) {
-      throw new IllegalStateException("Could not read background image", exception);
+    // 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 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.9f + RANDOM.nextFloat() * 0.1f;
-      COLORS[i] = Color.getHSBColor(RANDOM.nextFloat(), random, random);
+      COLORS[i] = Color.getHSBColor(RANDOM.nextFloat(), random * 0.8f, random);
     }
 
     // Apply the random gradient effect
-    graphics.setPaint(new LinearGradientPaint(0, 0, width, height,
+    graphics.setPaint(new RadialGradientPaint(0, 0, width,
       COLOR_FRACTIONS, COLORS, MultipleGradientPaint.CycleMethod.REFLECT));
   }
 
@@ -122,8 +127,7 @@ 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
-      final Font font = FONTS[RANDOM.nextInt(FONTS.length)];
-      glyphs[i] = font.createGlyphVector(ctx, String.valueOf(answer[i]));
+      glyphs[i] = FONT.createGlyphVector(ctx, String.valueOf(answer[i]));
     }
 
     final double scalingXY = 5 - Math.min(answer.length, 5) * 0.65;
@@ -133,7 +137,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 + STANDARD_FONT_SIZE / 2D) / 2D + scalingXY;
+    double beginY = (height + TTFFontProvider.STANDARD_FONT_SIZE / 2D) / 2D + scalingXY;
 
     // Draw each glyph one by one
     for (final GlyphVector glyph : glyphs) {

captcha/src/main/java/xyz/jonesdev/sonar/captcha/TTFFontProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,33 +17,23 @@
 
 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;
 
-@UtilityClass
-class StandardTTFFontProvider {
-  private static final String[] FONT_NAMES = {"Kingthings_Trypewriter_2"};
-  static final Font[] FONTS = new Font[FONT_NAMES.length];
+public final class TTFFontProvider {
   static final int STANDARD_FONT_SIZE = 25;
 
-  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) {
+  public 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(exception);
+      throw new IllegalStateException("Error loading font. Does your environment support fonts?", exception);
     }
   }
 }

captcha/src/main/java/xyz/jonesdev/sonar/captcha/complex/ComplexCaptchaGenerator.java

@@ -0,0 +1,210 @@
+/*
+ * 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);
+    }
+  }
+}

captcha/src/main/java/xyz/jonesdev/sonar/captcha/filters/CurvesOverlayFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

captcha/src/main/java/xyz/jonesdev/sonar/captcha/filters/NoiseOverlayFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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

captcha/src/main/java/xyz/jonesdev/sonar/captcha/legacy/LegacyCaptchaGenerator.java

@@ -0,0 +1,212 @@
+/*
+ * 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));
+  }
+}

captcha/src/main/java/xyz/jonesdev/sonar/captcha/legacy/RippleFilter.java

@@ -0,0 +1,44 @@
+/*
+ * 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;
+  }
+}

captcha/src/main/java/xyz/jonesdev/sonar/captcha/legacy/ScratchFilter.java

@@ -0,0 +1,62 @@
+/*
+ * 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;
+  }
+}

captcha/src/main/resources/assets/fonts/dotness.txt

@@ -0,0 +1,5 @@
+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

captcha/src/main/resources/assets/fonts/kingthingsEULA.txt

@@ -0,0 +1,12 @@
+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

captcha/src/test/java/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -16,7 +16,8 @@
  */
 
 import lombok.experimental.UtilityClass;
-import xyz.jonesdev.sonar.captcha.StandardCaptchaGenerator;
+import xyz.jonesdev.sonar.api.antibot.captcha.CaptchaGenerator;
+import xyz.jonesdev.sonar.captcha.complex.ComplexCaptchaGenerator;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -28,7 +29,7 @@ import java.util.Random;
 public class Main {
   public void main(final String... args) throws IOException {
     final Random random = new Random();
-    final StandardCaptchaGenerator standardCaptchaGenerator = new StandardCaptchaGenerator(128, 128, null);
+    final CaptchaGenerator standardCaptchaGenerator = new ComplexCaptchaGenerator(null);
 
     final long start = System.currentTimeMillis();
     final char[] dictionary = {'a', 'b', 'c', 'd', 'e', 'f'/*, 'g'*/, 'h'/*, 'i'*/, 'j',

common/build.gradle.kts

@@ -3,6 +3,3 @@ dependencies {
   implementation(project(":captcha"))
   compileOnly(rootProject.libs.adventure.nbt)
 }
-
-java.sourceCompatibility = JavaVersion.VERSION_11
-java.targetCompatibility = JavaVersion.VERSION_11

common/src/main/java/xyz/jonesdev/sonar/common/BandwidthHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback;
+package xyz.jonesdev.sonar.common;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelDuplexHandler;
@@ -25,37 +25,30 @@ import io.netty.channel.ChannelPromise;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.NotNull;
-
-import static xyz.jonesdev.sonar.common.statistics.BandwidthStatistics.INCOMING;
-import static xyz.jonesdev.sonar.common.statistics.BandwidthStatistics.OUTGOING;
+import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
 
 @ChannelHandler.Sharable
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class FallbackBandwidthHandler extends ChannelDuplexHandler {
-  public static final ChannelHandler INSTANCE = new FallbackBandwidthHandler();
+public final class BandwidthHandler extends ChannelDuplexHandler {
+  public static final ChannelHandler INSTANCE = new BandwidthHandler();
 
   @Override
-  public void channelRead(final @NotNull ChannelHandlerContext ctx,
-                          final @NotNull Object msg) throws Exception {
-    // We can only get the size of a message if it's a ByteBuf
+  public void channelRead(final ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
     if (msg instanceof ByteBuf) {
       // Increment the incoming traffic by the number of readable bytes
-      INCOMING.increment(((ByteBuf) msg).readableBytes());
+      final int readableBytes = ((ByteBuf) msg).readableBytes();
+      GlobalSonarStatistics.perSecondIncomingTraffic += readableBytes;
     }
-    // Make sure to let the server handle the rest
     ctx.fireChannelRead(msg);
   }
 
   @Override
-  public void write(final @NotNull ChannelHandlerContext ctx,
-                    final @NotNull Object msg,
-                    final ChannelPromise promise) throws Exception {
-    // We can only get the size of a message if it's a ByteBuf
+  public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise promise) throws Exception {
     if (msg instanceof ByteBuf) {
       // Increment the outgoing traffic by the number of readable bytes
-      OUTGOING.increment(((ByteBuf) msg).readableBytes());
+      final int readableBytes = ((ByteBuf) msg).readableBytes();
+      GlobalSonarStatistics.perSecondOutgoingTraffic += readableBytes;
     }
-    // Make sure to let the server handle the rest
     ctx.write(msg, promise);
   }
 }

common/src/main/java/xyz/jonesdev/sonar/common/InboundHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback;
+package xyz.jonesdev.sonar.common;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -25,13 +25,14 @@ 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 FallbackInboundHandler extends ChannelInboundHandlerAdapter {
+public final class InboundHandler extends ChannelInboundHandlerAdapter {
   private final Consumer<ChannelPipeline> sonarPipelineInjector;
   @Setter
   @Getter
@@ -41,7 +42,7 @@ public final class FallbackInboundHandler extends ChannelInboundHandlerAdapter {
   public void channelActive(final @NotNull ChannelHandlerContext ctx) throws Exception {
     // Increase connections per second for the action bar verbose
     GlobalSonarStatistics.countConnection();
-    // Make sure to let the server handle the rest
+    // Make sure to let the server handle this
     ctx.fireChannelActive();
     // Add the packet handler pipeline
     sonarPipelineInjector.accept(ctx.pipeline());
@@ -49,26 +50,44 @@ public final class FallbackInboundHandler extends ChannelInboundHandlerAdapter {
 
   @Override
   public void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+    // Make sure to let the server handle this
+    ctx.fireChannelInactive();
     // The player can disconnect without sending the login packet first
     // Account for this by checking if the inetAddress has been set yet
     if (inetAddress != null) {
-      // Remove the IP address from the connected players
-      Sonar.get().getFallback().getConnected().compute(inetAddress, (k, v) -> null);
       // Remove the IP address from the queue
-      Sonar.get().getFallback().getQueue().getPlayers().compute(inetAddress, (k, v) -> null);
-      // Remove this account from the online players or decrement the number of accounts with the same IP
-      Sonar.get().getFallback().getOnline().compute(inetAddress, (k, v) -> v == null || v <= 1 ? null : v - 1);
+      Sonar.get0().getAntiBot().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) -> {
+            /*
+             * 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.
+             * We don't need to decrement the count if the player was just verified since
+             * we've never actually incremented it in the first place ¯\_(ツ)_/¯
+             */
+            if (v == null) {
+              Sonar.get0().getAntiBot().getOnline().compute(inetAddress,
+                (ignored1, count) -> count == null || count <= 1 ? null : count - 1);
+            }
+            return null;
+          });
+        }
+        return null;
+      });
     }
-    // Make sure to let the server handle the rest
-    ctx.fireChannelInactive();
   }
 
-  // We can override the default exceptionCaught method since this handler
-  // will run before the connection knows that there has been an error.
+  /*
+   * We can override the default exceptionCaught method since this handler
+   * will run before the connection knows that there has been an error.
+   */
   @Override
-  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx,
-                              final @NotNull Throwable cause) throws Exception {
-    // Close the channel if we encounter any errors.
+  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final Throwable cause) throws Exception {
     ctx.close();
+    if (TailExceptionsHandler.LOG_EXCEPTIONS) {
+      cause.printStackTrace(System.err);
+    }
   }
 }

common/src/main/java/xyz/jonesdev/sonar/common/InboundHandlerAdapter.java

@@ -0,0 +1,267 @@
+/*
+ * 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.*;
+import lombok.AllArgsConstructor;
+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.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.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;
+
+import java.net.InetAddress;
+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.*;
+
+@AllArgsConstructor
+@RequiredArgsConstructor
+public abstract class InboundHandlerAdapter extends ChannelInboundHandlerAdapter {
+  protected @Nullable String username;
+  protected ProtocolVersion protocolVersion;
+  protected @Nullable String handshakeHostname;
+  protected @Nullable RemovalListener channelRemovalListener;
+
+  /**
+   * Validates and handles incoming handshake packets
+   */
+  protected final void handleHandshake(final @NotNull ChannelHandlerContext ctx,
+                                       final @NotNull String hostname,
+                                       final int protocol) throws Exception {
+    // Check if the hostname is invalid
+    if (hostname.isEmpty()) {
+      throw QuietDecoderException.INSTANCE;
+    }
+    // Check if the player has already sent a handshake packet
+    if (protocolVersion != null) {
+      throw QuietDecoderException.INSTANCE;
+    }
+    protocolVersion = ProtocolVersion.fromId(protocol);
+    handshakeHostname = hostname;
+    ctx.pipeline().addFirst(SONAR_BANDWIDTH, BandwidthHandler.INSTANCE);
+  }
+
+  /**
+   * Validates and handles incoming login packets
+   */
+  protected final void handleLogin(final @NotNull ChannelHandlerContext ctx,
+                                   final @NotNull Runnable initialLoginAction,
+                                   final @NotNull String username,
+                                   final @NotNull InetSocketAddress socketAddress) throws Exception {
+    // Count every single attempted login
+    GlobalSonarStatistics.countLogin();
+    // Ensure that the player sent a handshake packet
+    if (protocolVersion == null) {
+      throw QuietDecoderException.INSTANCE;
+    }
+    // Connections from unknown protocol versions will be discarded
+    // as this is the safest way of handling unwanted connections.
+    // Sonar does not support snapshots or Minecraft versions older than 1.7.2
+    if (protocolVersion.isUnknown()) {
+      customDisconnect(ctx.channel(), unsupportedVersion, ProtocolVersion.MINECRAFT_1_7_2);
+      return;
+    }
+    // Ensure that the player has not sent a login packet yet
+    if (this.username != null) {
+      throw QuietDecoderException.INSTANCE;
+    }
+    this.username = username;
+
+    final InetAddress inetAddress = socketAddress.getAddress();
+    ctx.pipeline().get(InboundHandler.class).setInetAddress(inetAddress);
+
+    // Check if Sonar is already verifying a player with the same IP address
+    if (Sonar.get0().getAntiBot().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())) {
+      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();
+    if (limit > 0) {
+      final int score = Sonar.get0().getAntiBot().getBlacklist().asMap().getOrDefault(hostAddress, 0);
+      if (score >= limit) {
+        customDisconnect(ctx.channel(), blacklisted, protocolVersion);
+        return;
+      }
+    }
+
+    // Don't continue the verification process if the verification is disabled
+    if (!Sonar.get0().getAntiBot().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()) {
+      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)) {
+      initialLogin(ctx.channel(), inetAddress, initialLoginAction);
+      return;
+    }
+
+    // Check if the IP address is currently being rate-limited
+    if (!Sonar.get0().getAntiBot().getRatelimiter().attempt(inetAddress)) {
+      customDisconnect(ctx.channel(), reconnectedTooFast, protocolVersion);
+      return;
+    }
+
+    // Remove all other pipelines that could still mess up something
+    rewriteProtocol(ctx, channelRemovalListener);
+
+    // Queue the connection for further processing
+    Sonar.get0().getAntiBot().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);
+        // Remove other instances of this IP address from the queue
+        return null;
+      }
+
+      // 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);
+    });
+  }
+
+  /**
+   * Executes the maximum accounts per IP limit check before letting the player join
+   */
+  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;
+      }
+    }
+    loginPacket.run();
+  }
+
+  /**
+   * Removes all pipelines and rewrites them using our custom handlers
+   */
+  private static void rewriteProtocol(final @NotNull ChannelHandlerContext ctx,
+                                      final @Nullable 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());
+      }
+    }
+    // Add our read/write timeout handler
+    ctx.pipeline().addFirst(SONAR_TIMEOUT, new SonarTimeoutHandler(
+      Sonar.get0().getConfig().getVerification().getReadTimeout(),
+      Sonar.get0().getConfig().getVerification().getWriteTimeout(),
+      TimeUnit.MILLISECONDS));
+  }
+
+  private static void customDisconnect(final @NotNull Channel channel,
+                                       final @NotNull SonarPacket packet,
+                                       final @NotNull ProtocolVersion protocolVersion) {
+    if (channel.isActive()) {
+      if (channel.eventLoop().inEventLoop()) {
+        _customDisconnect(channel, packet, protocolVersion);
+      } else {
+        channel.eventLoop().execute(() -> _customDisconnect(channel, packet, protocolVersion));
+      }
+    }
+  }
+
+  /**
+   * Disconnect the player before verification (during login)
+   */
+  private static void _customDisconnect(final @NotNull Channel channel,
+                                        final @NotNull SonarPacket 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();
+    if (channel.pipeline().context(handler) != null) {
+      channel.pipeline().remove(handler);
+    }
+    final String encoder = Sonar.get0().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);
+      }
+      ProtocolUtil.closeWith(channel, protocolVersion, packet);
+    } else {
+      channel.close();
+    }
+  }
+
+  @FunctionalInterface
+  public interface RemovalListener {
+    void accept(final @NotNull ChannelPipeline pipeline,
+                final @NotNull String name,
+                final @NotNull ChannelHandler handler);
+  }
+}

common/src/main/java/xyz/jonesdev/sonar/common/UserWrapper.java

@@ -0,0 +1,148 @@
+/*
+ * 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));
+  }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -47,7 +47,7 @@ class LibraryLoader {
       Library.builder()
         .groupId("com{}github{}ben-manes{}caffeine")
         .artifactId("caffeine")
-        .version("3.1.8")
+        .version("3.2.3")
         .relocate("com{}github{}benmanes{}caffeine", "xyz{}jonesdev{}sonar{}libs{}caffeine")
         .build(),
       // ORMLite
@@ -68,26 +68,38 @@ class LibraryLoader {
 
     // Only load adventure if not on Velocity
     if (platform != SonarPlatform.VELOCITY) {
-      libraryManager.loadLibraries(
-        Library.builder()
-          .groupId("net{}kyori")
-          .artifactId("adventure-text-minimessage")
-          .version("4.17.0")
-          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
-          .build(),
-        Library.builder()
-          .groupId("net{}kyori")
-          .artifactId("adventure-text-serializer-gson")
-          .version("4.17.0")
-          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
-          .build(),
-        Library.builder()
-          .groupId("net{}kyori")
-          .artifactId("adventure-nbt")
-          .version("4.17.0")
-          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
-          .build()
-      );
+      if (platform != SonarPlatform.PAPER) {
+        libraryManager.loadLibraries(
+          Library.builder()
+            .groupId("net{}kyori")
+            .artifactId("adventure-text-minimessage")
+            .version("4.21.0")
+            .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+            .build(),
+          Library.builder()
+            .groupId("net{}kyori")
+            .artifactId("adventure-text-serializer-gson")
+            .version("4.21.0")
+            .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+            .build(),
+          Library.builder()
+            .groupId("net{}kyori")
+            .artifactId("adventure-nbt")
+            .version("4.21.0")
+            .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+            .build()
+        );
+      } 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("4.21.0")
+            .relocate("net{}kyori{}adventure{}nbt", "xyz{}jonesdev{}sonar{}libs{}kyori{}adventure{}nbt")
+            .build()
+        );
+      }
     }
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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
@@ -36,18 +36,16 @@ 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.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.SonarServiceManager;
+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.service.ScheduledServiceManager;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
 import xyz.jonesdev.sonar.common.subcommand.*;
-import xyz.jonesdev.sonar.common.update.UpdateChecker;
 import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 
 import java.io.File;
 import java.time.Duration;
-import java.util.concurrent.TimeUnit;
 
 @Getter
 @RequiredArgsConstructor
@@ -99,13 +97,6 @@ public abstract class SonarBootstrap<T> implements Sonar {
   }
 
   public final void initialize() {
-    // Check if the branch is not the main branch to warn about unstable versions
-    if (!getVersion().getGitBranch().equals("main")) {
-      getLogger().warn("You are currently using an unofficial experimental branch.");
-      getLogger().warn("It is highly recommended to use the latest stable release of Sonar:");
-      getLogger().warn("https://github.com/jonesdevelopment/sonar/releases");
-    }
-
     getLogger().info("Successfully booted in {}s!", launchTimer);
     getLogger().info("Initializing shared components...");
 
@@ -121,7 +112,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
 
       // Start threads
       getLogger().info("Starting all managed threads...");
-      SonarServiceManager.start();
+      ScheduledServiceManager.start();
 
       // Done
       getLogger().info("Done ({}s)!", launchTimer);
@@ -129,12 +120,6 @@ public abstract class SonarBootstrap<T> implements Sonar {
       // An error has occurred
       getLogger().error("An error has occurred while launching Sonar: {}", throwable);
       throwable.printStackTrace(System.err);
-      return; // Do not check for updates if the launch failed
-    }
-
-    // Check if a new version has been released if enabled in the configuration
-    if (Sonar.get().getConfig().getGeneralConfig().getBoolean("general.check-for-updates")) {
-      UpdateChecker.checkForUpdates();
     }
   }
 
@@ -152,26 +137,26 @@ public abstract class SonarBootstrap<T> implements Sonar {
 
     // Prepare cached packets
     getLogger().info("Taking cached snapshots of all packets...");
-    FallbackPreparer.prepare();
+    SonarPacketPreparer.prepare();
 
     // Update ratelimiter cache
-    getFallback().setRatelimiter(getConfig().getVerification().getReconnectDelay() > 0L
-      ? new CaffeineCacheRatelimiter(getConfig().getVerification().getReconnectDelay(), TimeUnit.MILLISECONDS)
+    getAntiBot().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 = getFallback().getBlacklist() != null;
+    final boolean blacklistExists = getAntiBot().getBlacklist() != null;
     // Make sure the blacklist is only set when we need it to prevent data loss
     if (!blacklistExists // Make sure we create a new cache if it doesn't exist yet
-      || getFallback().getBlacklistTime() != blacklistTime) {
+      || getAntiBot().getBlacklistTime() != blacklistTime) {
       // Create a new cache with the configured blacklist time
-      getFallback().setBlacklist(Caffeine.newBuilder()
+      getAntiBot().setBlacklist(Caffeine.newBuilder()
         .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getBlacklistTime()))
         .ticker(Ticker.systemTicker())
         .build());
       // Store the new blacklist time, so we don't have to reset the blacklist every reload
-      getFallback().setBlacklistTime(blacklistTime);
+      getAntiBot().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.");
@@ -190,7 +175,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
     // Initialize the shutdown process
     getLogger().info("Starting shutdown process...");
     // Interrupt threads
-    SonarServiceManager.stop();
+    ScheduledServiceManager.stop();
     // Close database connection if present
     if (verifiedPlayerController != null) {
       verifiedPlayerController.close();

common/src/main/java/xyz/jonesdev/sonar/common/netty/MinecraftVarInt21FrameDecoder.java

@@ -0,0 +1,121 @@
+/*
+ * 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.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.ByteToMessageDecoder;
+import io.netty.handler.codec.DecoderException;
+import io.netty.util.ByteProcessor;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.common.util.ProtocolUtil;
+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 {
+
+  @Override
+  protected void decode(final @NotNull ChannelHandlerContext ctx,
+                        final @NotNull ByteBuf byteBuf,
+                        final @NotNull List<Object> out) throws Exception {
+    if (!ctx.channel().isActive()) {
+      byteBuf.clear();
+      return;
+    }
+
+    // Skip any runs of 0x00 we might find
+    final int packetStart = byteBuf.forEachByte(ByteProcessor.FIND_NON_NUL);
+    if (packetStart == -1) {
+      byteBuf.clear();
+      return;
+    }
+    byteBuf.readerIndex(packetStart);
+
+    // Try to read the length of the packet
+    byteBuf.markReaderIndex();
+    final int preIndex = byteBuf.readerIndex();
+    final int length = readRawVarInt21(byteBuf);
+    if (preIndex == byteBuf.readerIndex()) {
+      return;
+    }
+    if (length <= 0) {
+      throw ProtocolUtil.DEBUG ? new DecoderException("Bad VarInt length: " + length) : QuietDecoderException.INSTANCE;
+    }
+
+    if (byteBuf.readableBytes() < length) {
+      byteBuf.resetReaderIndex();
+    } else {
+      out.add(byteBuf.readRetainedSlice(length));
+    }
+  }
+
+  private static int readRawVarInt21(final @NotNull ByteBuf byteBuf) {
+    if (byteBuf.readableBytes() < 4) {
+      return readRawVarIntSmallBuffer(byteBuf);
+    }
+
+    // take the last three bytes and check if any of them have the high bit set
+    final int wholeOrMore = byteBuf.getIntLE(byteBuf.readerIndex());
+    final int atStop = ~wholeOrMore & 0x808080;
+    if (atStop == 0) {
+      throw ProtocolUtil.DEBUG ? new DecoderException("VarInt too big") : QuietDecoderException.INSTANCE;
+    }
+
+    final int bitsToKeep = Integer.numberOfTrailingZeros(atStop) + 1;
+    byteBuf.skipBytes(bitsToKeep >> 3);
+
+    // https://github.com/netty/netty/pull/14050#issuecomment-2107750734
+    int preservedBytes = wholeOrMore & (atStop ^ (atStop - 1));
+
+    // https://github.com/netty/netty/pull/14050#discussion_r1597896639
+    preservedBytes = (preservedBytes & 0x007F007F) | ((preservedBytes & 0x00007F00) >> 1);
+    preservedBytes = (preservedBytes & 0x00003FFF) | ((preservedBytes & 0x3FFF0000) >> 2);
+    return preservedBytes;
+  }
+
+  private static int readRawVarIntSmallBuffer(final @NotNull ByteBuf byteBuf) {
+    if (!byteBuf.isReadable()) {
+      return 0;
+    }
+    byteBuf.markReaderIndex();
+
+    byte tmp = byteBuf.readByte();
+    if (tmp >= 0) {
+      return tmp;
+    }
+    int result = tmp & 0x7F;
+    if (!byteBuf.isReadable()) {
+      byteBuf.resetReaderIndex();
+      return 0;
+    }
+    if ((tmp = byteBuf.readByte()) >= 0) {
+      return result | tmp << 7;
+    }
+    result |= (tmp & 0x7F) << 7;
+    if (!byteBuf.isReadable()) {
+      byteBuf.resetReaderIndex();
+      return 0;
+    }
+    if ((tmp = byteBuf.readByte()) >= 0) {
+      return result | tmp << 14;
+    }
+    return result | (tmp & 0x7F) << 14;
+  }
+}

common/src/main/java/xyz/jonesdev/sonar/common/netty/MinecraftVarIntLengthEncoder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,35 +15,33 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.netty;
+package xyz.jonesdev.sonar.common.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.MessageToByteEncoder;
+import io.netty.handler.codec.MessageToMessageEncoder;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.common.util.ProtocolUtil;
 
-import static xyz.jonesdev.sonar.common.util.ProtocolUtil.varIntBytes;
-import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;
+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 FallbackVarInt21FrameEncoder extends MessageToByteEncoder<ByteBuf> {
-  public static final FallbackVarInt21FrameEncoder INSTANCE = new FallbackVarInt21FrameEncoder();
+public final class MinecraftVarIntLengthEncoder extends MessageToMessageEncoder<ByteBuf> {
+  public static final MinecraftVarIntLengthEncoder INSTANCE = new MinecraftVarIntLengthEncoder();
 
   @Override
   protected void encode(final @NotNull ChannelHandlerContext ctx,
-                        final @NotNull ByteBuf msg,
-                        final @NotNull ByteBuf out) throws Exception {
-    writeVarInt(out, msg.readableBytes());
-    out.writeBytes(msg);
-  }
+                        final @NotNull ByteBuf byteBuf,
+                        final @NotNull List<Object> out) throws Exception {
+    final int readableBytes = byteBuf.readableBytes();
+    final int length = ProtocolUtil.varIntBytes(readableBytes);
 
-  @Override
-  protected ByteBuf allocateBuffer(final @NotNull ChannelHandlerContext ctx,
-                                   final @NotNull ByteBuf msg,
-                                   final boolean preferDirect) throws Exception {
-    final int anticipatedRequiredCapacity = varIntBytes(msg.readableBytes()) + msg.readableBytes();
-    return ctx.alloc().buffer(anticipatedRequiredCapacity);
+    final ByteBuf lenBuf = ctx.alloc().buffer(length);
+
+    ProtocolUtil.writeVarInt(lenBuf, readableBytes);
+    out.add(lenBuf);
+    out.add(byteBuf.retain());
   }
 }

common/src/main/java/xyz/jonesdev/sonar/common/netty/SonarInjectedChannelInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.netty;
+package xyz.jonesdev.sonar.common.netty;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelInitializer;
@@ -24,19 +24,19 @@ import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.api.exception.ReflectiveOperationException;
-import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandler;
+import xyz.jonesdev.sonar.common.InboundHandler;
 import xyz.jonesdev.sonar.common.util.FakeChannelUtil;
+import xyz.jonesdev.sonar.common.util.exception.ReflectiveOperationException;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.function.Consumer;
 
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_INBOUND_HANDLER;
+import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INBOUND_HANDLER;
 
 @RequiredArgsConstructor
-public final class FallbackInjectedChannelInitializer extends ChannelInitializer<Channel> {
+public final class SonarInjectedChannelInitializer extends ChannelInitializer<Channel> {
   private static final MethodHandle INIT_CHANNEL_METHOD;
 
   static {
@@ -53,6 +53,10 @@ public final class FallbackInjectedChannelInitializer extends ChannelInitializer
 
   @Override
   protected void initChannel(final Channel channel) throws Exception {
+    if (!channel.isActive()) {
+      return;
+    }
+
     // Invoke the original method
     try {
       INIT_CHANNEL_METHOD.invokeExact(originalChannelInitializer, channel);
@@ -60,16 +64,20 @@ public final class FallbackInjectedChannelInitializer extends ChannelInitializer
       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 FallbackInboundHandler inboundHandler = new FallbackInboundHandler(sonarPipelineInjector);
+      final InboundHandler inboundHandler = new InboundHandler(sonarPipelineInjector);
       // We need to be careful on Bukkit, as the encoder can be different
-      if (Sonar.get().getPlatform() == SonarPlatform.BUKKIT) {
-        final String encoder = Sonar.get().getPlatform().getEncoder().apply(channel.pipeline());
-        channel.pipeline().addBefore(encoder, FALLBACK_INBOUND_HANDLER, inboundHandler);
+      if (Sonar.get0().getPlatform() == SonarPlatform.BUKKIT) {
+        final String encoder = Sonar.get0().getPlatform().getEncoder().apply(channel.pipeline());
+        channel.pipeline().addBefore(encoder, SONAR_INBOUND_HANDLER, inboundHandler);
       } else {
-        channel.pipeline().addFirst(FALLBACK_INBOUND_HANDLER, inboundHandler);
+        channel.pipeline().addFirst(SONAR_INBOUND_HANDLER, inboundHandler);
       }
     }
   }

common/src/main/java/xyz/jonesdev/sonar/common/netty/SonarTimeoutHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback;
+package xyz.jonesdev.sonar.common.netty;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleStateEvent;
@@ -24,14 +24,14 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.concurrent.TimeUnit;
 
-public final class FallbackTimeoutHandler extends IdleStateHandler {
-  public FallbackTimeoutHandler(final int readTimeout, final int writeTimeout, final TimeUnit timeUnit) {
-    super(readTimeout, writeTimeout, 0L, timeUnit);
+public final class SonarTimeoutHandler extends IdleStateHandler {
+  public SonarTimeoutHandler(final int readTimeout, final int writeTimeout, final TimeUnit timeUnit) {
+    super(false, readTimeout, writeTimeout, 0L, timeUnit);
   }
 
   @Override
   protected void channelIdle(final @NotNull ChannelHandlerContext ctx,
-                             final @NotNull IdleStateEvent idleStateEvent) throws Exception {
+                             final IdleStateEvent idleStateEvent) throws Exception {
     // The netty (default) ReadTimeoutHandler would normally just throw an Exception
     // The default ReadTimeoutHandler does only check for the boolean 'closed' and
     // still throws the Exception even if the channel is closed

common/src/main/java/xyz/jonesdev/sonar/common/netty/TailExceptionsHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 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,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.jonesdev.sonar.common.fallback.netty;
+package xyz.jonesdev.sonar.common.netty;
 
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandler;
@@ -23,16 +23,20 @@ import io.netty.channel.ChannelHandlerContext;
 import org.jetbrains.annotations.NotNull;
 
 @ChannelHandler.Sharable
-public final class FallbackTailExceptionsHandler extends ChannelDuplexHandler {
-  public static final FallbackTailExceptionsHandler INSTANCE = new FallbackTailExceptionsHandler();
+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");
 
   // 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 @NotNull Throwable cause) throws Exception {
+  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final Throwable cause) throws Exception {
     // Close the channel if we encounter any errors.
     ctx.close();
+    if (LOG_EXCEPTIONS) {
+      cause.printStackTrace(System.err);
+    }
   }
 }