Release 2.1.4 (#375 )

General code style improvements and API fixes
Quieten decoder exceptions to improve performance (#373 )
2026-11-05 09:20:15 -05:00 · 2024-09-03 16:29:22 +02:00 · 2024-08-31 19:11:55 +02:00 · 2024-08-31 13:57:41 +02:00 · 2024-08-31 13:49:32 +02:00 · 2024-08-31 13:22:39 +02:00
188 changed files with 1781 additions and 1424 deletions
@@ -14,7 +14,7 @@ allprojects {
  }

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

  dependencies {
    compileOnly(rootProject.libs.lombok)
@@ -48,8 +48,8 @@ allprojects {
      relocate("com.github.benmanes.caffeine", "xyz.jonesdev.sonar.libs.caffeine")
      relocate("com.mysql", "xyz.jonesdev.sonar.libs.mysql")
      relocate("org.mariadb", "xyz.jonesdev.sonar.libs.mariadb")
-      relocate("xyz.jonesdev.capja", "xyz.jonesdev.sonar.libs.capja")
      relocate("org.h2", "xyz.jonesdev.sonar.libs.h2")
+      relocate("com.jhlabs", "xyz.jonesdev.sonar.libs.jhlabs")

      // Exclude unnecessary metadata information
      exclude("META-INF/*/**")
@@ -1,4 +1,3 @@
-org.gradle.daemon=false
 group=xyz.jonesdev.sonar
-version=2.1.0
+version=2.1.4
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.
@@ -2,12 +2,15 @@
 netty = "4.1.112.Final"
 adventure = "4.17.0"
 adventure-platform = "4.3.4"
-bstats = "3.0.2"
+bstats = "3.0.3"
 libby = "2.0.0-SNAPSHOT"
+pluginyml = "0.6.0"

 [plugins]
 indra-git = "net.kyori.indra.git:3.1.3"
-shadow = "io.github.goooler.shadow:8.1.8"
+shadow = "com.gradleup.shadow:8.3.0"
+pluginyml-bungee = { id = "net.minecrell.plugin-yml.bungee", version.ref = "pluginyml" }
+pluginyml-bukkit = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }

 [libraries]
 netty = { module = "io.netty:netty-all", version.ref = "netty" }
@@ -23,12 +26,12 @@ libby-velocity = { module = "com.alessiodp.libby:libby-velocity", version.ref =
 bstats-bungee = { module = "org.bstats:bstats-bungeecord", version.ref = "bstats" }
 bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
 bstats-velocity = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
+imagefilters = "com.jhlabs:filters:2.0.235-1"
 caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.8"
-annotations = "org.jetbrains:annotations:24.0.1"
+annotations = "org.jetbrains:annotations:24.1.0"
 simpleyaml = "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 ormlite = "com.j256.ormlite:ormlite-jdbc:6.1"
 lombok = "org.projectlombok:lombok:1.18.34"
-capja = "xyz.jonesdev:capja:1.0.3"
 bungeecord = "net.md_5:bungeecord-proxy:master-SNAPSHOT"
 velocity = "com.velocitypowered:velocity-proxy:3.3.0-SNAPSHOT"
 # We have to use 1.8.8 for backwards compatibility
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -1,6 +1,6 @@
 rootProject.name = "Sonar"

-sequenceOf("api", "bukkit", "bungee", "common", "velocity").forEach {
+sequenceOf("api", "captcha", "common", "bukkit", "bungee", "velocity").forEach {
  val path = "sonar-$it"
  val project = ":$it"

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,17 +21,17 @@ import net.kyori.adventure.audience.Audience;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.attack.AttackTracker;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
-import xyz.jonesdev.sonar.api.controller.VerifiedPlayerController;
+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;
 import xyz.jonesdev.sonar.api.statistics.SonarStatistics;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
-import xyz.jonesdev.sonar.api.verbose.Notification;
-import xyz.jonesdev.sonar.api.verbose.Verbose;
+import xyz.jonesdev.sonar.api.tracker.AttackTracker;

 import java.text.DecimalFormat;
 import java.util.UUID;
@@ -41,7 +41,7 @@ public interface Sonar {

  /**
   * Since we want to use Adventure on every server platform,
-   * we have to use their platform module to support BungeeCord and Bukkit
+   * we have to use their platform module to support BungeeCord and Bukkit.
   */
  @ApiStatus.Internal
  @Nullable Audience audience(final @Nullable UUID uniqueId);
@@ -49,14 +49,8 @@ public interface Sonar {
  @ApiStatus.Internal
  @NotNull Audience sender(final @NotNull Object object);

-  /**
-   * @return The platform the plugin is being run on
-   */
  @NotNull SonarPlatform getPlatform();

-  /**
-   * @return A small wrapper for the plugin logger so we can use the logger everywhere
-   */
  @NotNull LoggerWrapper getLogger();

  @NotNull SonarConfiguration getConfig();
@@ -65,29 +59,20 @@ public interface Sonar {

  VerifiedPlayerController getVerifiedPlayerController();

-  @NotNull Verbose getVerboseHandler();
+  @NotNull ActionBarNotificationHandler getActionBarNotificationHandler();

-  @NotNull Notification getNotificationHandler();
+  @NotNull ChatNotificationHandler getChatNotificationHandler();

  @NotNull SystemTimer getLaunchTimer();

  @NotNull SonarStatistics getStatistics();

-  /**
-   * Set a custom verbose handler
-   */
  @SuppressWarnings("unused")
-  void setVerboseHandler(final @NotNull Verbose verboseHandler);
+  void setActionBarNotificationHandler(final @NotNull ActionBarNotificationHandler notificationHandler);

-  /**
-   * Set a custom notification handler
-   */
  @SuppressWarnings("unused")
-  void setNotificationHandler(final @NotNull Notification notificationHandler);
+  void setChatNotificationHandler(final @NotNull ChatNotificationHandler notificationHandler);

-  /**
-   * Reloads the entire plugin
-   */
  void reload();

  @NotNull
@@ -97,19 +82,16 @@ public interface Sonar {

  @NotNull
  default SonarEventManager getEventManager() {
-    // We don't want anyone else to create a new instance.
    return SonarEventManager.INSTANCE;
  }

  @NotNull
  default AttackTracker getAttackTracker() {
-    // We don't want anyone else to create a new instance.
    return AttackTracker.INSTANCE;
  }

  @NotNull
  default Fallback getFallback() {
-    // We don't want anyone else to create a new instance.
    return Fallback.INSTANCE;
  }

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,21 +26,15 @@ import java.util.function.Function;
@Getter
@RequiredArgsConstructor
 public enum SonarPlatform {
-  BUKKIT("Bukkit", 19110,
-    pipeline -> pipeline.context("outbound_config") != null ? "outbound_config" : "encoder",
-    pipeline -> "packet_handler"),
-  BUNGEE("BungeeCord", 19109,
-    pipeline -> "packet-encoder",
-    pipeline -> "inbound-boss"),
-  VELOCITY("Velocity", 19107,
-    pipeline -> "minecraft-encoder",
-    pipeline -> "handler");
+  BUKKIT("Bukkit", 19110, "packet_handler",
+    pipeline -> pipeline.context("outbound_config") != null ? "outbound_config" : "encoder"),
+  BUNGEE("BungeeCord", 19109, "inbound-boss",
+    pipeline -> "packet-encoder"),
+  VELOCITY("Velocity", 19107, "handler",
+    pipeline -> "minecraft-encoder");

  private final String displayName;
-  /**
-   * bStats service ID for the respective Sonar platform
-   */
  private final int metricsId;
-  private final Function<ChannelPipeline, String> encoderFunction;
-  private final Function<ChannelPipeline, String> handlerFunction;
+  private final String connectionHandler;
+  private final Function<ChannelPipeline, String> encoder;
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -19,21 +19,20 @@ package xyz.jonesdev.sonar.api;

 import lombok.experimental.UtilityClass;
 import org.jetbrains.annotations.NotNull;
-
-import java.util.Objects;
+import xyz.jonesdev.sonar.api.exception.AlreadyInitializedException;

@UtilityClass
 public class SonarSupplier {
-  private Sonar sonar;
+  private Sonar _sonar;

-  public void set(final @NotNull Sonar s) {
-    if (sonar != null) {
-      throw new AlreadyInitializedException();
+  public void set(final @NotNull Sonar instance) {
+    if (_sonar != null) {
+      throw new AlreadyInitializedException("Sonar is already initialized");
    }
-    sonar = Objects.requireNonNull(s);
+    _sonar = instance;
  }

  public @NotNull Sonar get() {
-    return sonar;
+    return _sonar;
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,6 @@ public final class SonarVersion {
    this.formatted = version + " (" + gitCommit + ")";
  }

-  // Taken from
  // https://github.com/PaperMC/Velocity/pull/1336/
  private static @NotNull Manifest getManifest() {
    final String classLocation = "/" + Sonar.class.getName().replace(".", "/") + ".class";
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;

 import java.util.UUID;
 import java.util.function.Predicate;
@@ -34,23 +33,12 @@ public final class InvocationSource {
  private final Predicate<String> permissionFunction;

  /**
-   * @return True, if {@link InvocationSource#uuid} is not null
-   * @apiNote This indicates a player as a player will always have a UUID
+   * @return true if {@link InvocationSource#uuid} is not null
   */
  public boolean isPlayer() {
    return uuid != null;
  }

-  /**
-   * Sends a message to the command executor
-   *
-   * @apiNote We should probably use cached components...
-   * (See {@link InvocationSource#sendMessage(Component)})
-   */
-  public void sendMessage(final String legacy) {
-    sendMessage(MiniMessage.miniMessage().deserialize(legacy));
-  }
-
  /**
   * Sends a message to the command executor
   */
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,34 +25,15 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
 public @interface SubcommandInfo {
-
-  /**
-   * @return Name of the subcommand
-   */
  String name();

-  /**
-   * @return Aliases of the subcommand
-   */
  String[] aliases() default {};

-  /**
-   * @return Arguments of the subcommand
-   */
  String[] arguments() default {};

-  /**
-   * @return Whether the subcommands requires arguments
-   */
  boolean argumentsRequired() default true;

-  /**
-   * @return Whether the subcommands can only be executed by a player
-   */
  boolean onlyPlayers() default false;

-  /**
-   * @return Whether the subcommands can only be executed by console
-   */
  boolean onlyConsole() default false;
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -27,10 +27,10 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
+import xyz.jonesdev.sonar.api.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.ormlite.H2DatabaseTypeAdapter;
-import xyz.jonesdev.sonar.api.ormlite.MariaDbDatabaseTypeAdapter;
-import xyz.jonesdev.sonar.api.ormlite.MysqlDatabaseTypeAdapter;
 import xyz.jonesdev.sonar.api.webhook.DiscordWebhook;

 import java.io.File;
@@ -191,33 +191,23 @@ public final class SonarConfiguration {
    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.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.scratches = generalConfig.getBoolean("verification.checks.map-captcha.effects.scratches");
-    verification.map.ripple = generalConfig.getBoolean("verification.checks.map-captcha.effects.ripple");
-    verification.map.bump = generalConfig.getBoolean("verification.checks.map-captcha.effects.bump");
-
-    verification.map.distortion.enabled = generalConfig.getBoolean("verification.checks.map-captcha.effects.distortion.enabled");
-    verification.map.distortion.shape = generalConfig.getInt("verification.checks.map-captcha.effects.distortion.shape");
-    verification.map.distortion.distance = generalConfig.getInt("verification.checks.map-captcha.effects.distortion.distance");
-    verification.map.distortion.density = (float) generalConfig.getYaml().getDouble("verification.checks.map-captcha.effects.distortion.density");
-    verification.map.distortion.mix = (float) generalConfig.getYaml().getDouble("verification.checks.map-captcha.effects.distortion.mix");
-
-    final String backgroundImagePath = generalConfig.getString("verification.checks.map-captcha.background");
-    if (!backgroundImagePath.isEmpty()) {
-      verification.map.backgroundImage = new File(pluginFolder, backgroundImagePath);
-      if (!verification.map.backgroundImage.exists()) {
-        Sonar.get().getLogger().error("The background image does not exist! Please check the configuration.");
-      }
-    } else {
-      verification.map.backgroundImage = null;
-    }
-
-    verification.map.autoColor = generalConfig.getBoolean("verification.checks.map-captcha.auto-color");
-    verification.map.precomputeAmount = clamp(generalConfig.getInt("verification.checks.map-captcha.precompute"), 1, 1000);
+    verification.map.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.dictionary = generalConfig.getString("verification.checks.map-captcha.dictionary");
+    verification.map.alphabet = generalConfig.getString("verification.checks.map-captcha.alphabet");
+    verification.map.backgroundImage = null;
+
+    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);
+      }
+    }

    verification.brand.enabled = generalConfig.getBoolean("verification.checks.client-brand.enabled");
    verification.brand.validRegex = Pattern.compile(generalConfig.getString("verification.checks.client-brand.valid-regex"));
@@ -327,8 +317,8 @@ public final class SonarConfiguration {
    return output;
  }

-  public String formatAddress(final InetAddress inetAddress) {
-    return logPlayerAddresses ? inetAddress.toString() : "/<ip address withheld>";
+  public @NotNull String formatAddress(final @NotNull InetAddress inetAddress) {
+    return logPlayerAddresses ? inetAddress.getHostAddress() : "<ip address withheld>";
  }

  @Getter
@@ -392,26 +382,11 @@ public final class SonarConfiguration {
    @Getter
    public static final class Map {
      private Timing timing;
-      private boolean scratches;
-      private boolean ripple;
-      private boolean bump;
-      private File backgroundImage;
-      private boolean autoColor;
      private int precomputeAmount;
      private int maxDuration;
      private int maxTries;
-      private String dictionary;
-
-      private Smear distortion = new Smear();
-
-      @Getter
-      public static final class Smear {
-        private boolean enabled;
-        private int shape;
-        private int distance;
-        private float density;
-        private float mix;
-      }
+      private String alphabet;
+      private InputStream backgroundImage;
    }

    @Getter
@@ -425,6 +400,7 @@ public final class SonarConfiguration {
    @Getter
    public static final class Vehicle {
      private boolean enabled;
+      private int minimumPackets;
    }

    @Getter
@@ -489,21 +465,21 @@ public final class SonarConfiguration {
        Library.builder()
          .groupId("com{}mysql")
          .artifactId("mysql-connector-j")
-          .version("8.4.0")
+          .version("9.0.0")
          .relocate("com{}mysql", "xyz{}jonesdev{}sonar{}libs{}mysql")
          .build()),
      MARIADB("MariaDB", "jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseTypeAdapter(),
        Library.builder()
          .groupId("org{}mariadb{}jdbc")
          .artifactId("mariadb-java-client")
-          .version("3.4.0")
+          .version("3.4.1")
          .relocate("org{}mariadb", "xyz{}jonesdev{}sonar{}libs{}mariadb")
          .build()),
      H2("H2", "jdbc:h2:file:%s", new H2DatabaseTypeAdapter(),
        Library.builder()
          .groupId("com{}h2database")
          .artifactId("h2")
-          .version("2.1.214")
+          .version("2.2.220")
          .relocate("org{}h2", "xyz{}jonesdev{}sonar{}libs{}h2")
          .build()),
      NONE("None", null, null, null);
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.controller;
+package xyz.jonesdev.sonar.api.database.controller;

 import com.alessiodp.libby.LibraryManager;
 import com.j256.ormlite.dao.Dao;
@@ -31,8 +31,8 @@ import org.jetbrains.annotations.Range;
 import org.jetbrains.annotations.Unmodifiable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.database.model.VerifiedPlayer;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.api.model.VerifiedPlayer;

 import java.io.File;
 import java.sql.SQLException;
@@ -74,10 +74,8 @@ public final class VerifiedPlayerController {

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

-    // Don't establish a database connection if the type is NONE
    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
      LOGGER.warn("Configure a database to save verified players.");
      return;
@@ -92,7 +90,6 @@ public final class VerifiedPlayerController {
      libraryManager.loadLibrary(cachedDatabaseType.getDatabaseDriver());
      cachedDatabaseType.setDownloaded(true);
    }
-    // Make sure to actually register the loader, so we can use it
    cachedDatabaseType.getDatabaseType().loadDriver();

    try {
@@ -120,10 +117,12 @@ public final class VerifiedPlayerController {
      // Create database table
      try {
        TableUtils.createTableIfNotExists(connectionSource, VerifiedPlayer.class);
-      } catch (SQLException exception) {
-        // 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.
+      } 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);
@@ -249,7 +248,7 @@ public final class VerifiedPlayerController {
      }

      try {
-        dao.create(player);
+        dao.createIfNotExists(player);
      } catch (SQLException exception) {
        LOGGER.error("Error trying to add entry: {}", exception);
      }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.model;
+package xyz.jonesdev.sonar.api.database.model;

 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
@@ -63,7 +63,7 @@ public final class VerifiedPlayer {
  public VerifiedPlayer(final @NotNull InetAddress inetAddress,
                        final @NotNull UUID playerUuid,
                        final long timestamp) {
-    this(inetAddress.toString(), playerUuid, timestamp);
+    this(inetAddress.getHostAddress(), playerUuid, timestamp);
  }

  public VerifiedPlayer(final @NotNull String inetAddress,
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.ormlite;
+package xyz.jonesdev.sonar.api.database.ormlite;

 import com.j256.ormlite.jdbc.db.H2DatabaseType;
 import org.jetbrains.annotations.NotNull;
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.ormlite;
+package xyz.jonesdev.sonar.api.database.ormlite;

 import com.j256.ormlite.jdbc.db.MariaDbDatabaseType;
 import org.jetbrains.annotations.NotNull;
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.ormlite;
+package xyz.jonesdev.sonar.api.database.ormlite;

 import com.j256.ormlite.jdbc.db.MysqlDatabaseType;
 import org.jetbrains.annotations.NotNull;
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -35,12 +35,9 @@ public final class SonarEventManager {
  private static final Collection<SonarEventListener> EVENT_LISTENERS = new Vector<>(0);
  private static final ExecutorService EVENT_SERVICE = Executors.newSingleThreadExecutor();

-  /**
-   * Publishes the given event to all listeners
-   */
  @ApiStatus.Internal
  public void publish(final @NotNull SonarEvent event) {
-    // Don't post a task if there are no listeners
+    // Don't post an event if there are no listeners
    if (EVENT_LISTENERS.isEmpty()) {
      return;
    }
@@ -61,11 +58,13 @@ public final class SonarEventManager {
   * Registers one (or more) event listeners
   *
   * @param listeners One (or more) listeners to register
-   * @see #unregisterListener(SonarEventListener...) Unregister an event listener
+   * @see #unregisterListener(SonarEventListener[]) Unregister an event listener
   */
  @SuppressWarnings("unused") // External API usage
-  public synchronized void registerListener(final @NotNull SonarEventListener... listeners) {
-    EVENT_LISTENERS.addAll(Arrays.asList(listeners));
+  public void registerListener(final @NotNull SonarEventListener... listeners) {
+    synchronized (EVENT_LISTENERS) {
+      EVENT_LISTENERS.addAll(Arrays.asList(listeners));
+    }
  }

  /**
@@ -73,10 +72,12 @@ public final class SonarEventManager {
   *
   * @param listeners One (or more) listeners to unregister
   * @apiNote This does not have any effect if the given listeners are not registered
-   * @see #registerListener(SonarEventListener...) Register an event listener
+   * @see #registerListener(SonarEventListener[]) Register an event listener
   */
  @SuppressWarnings("unused") // External API usage
-  public synchronized void unregisterListener(final @NotNull SonarEventListener... listeners) {
-    EVENT_LISTENERS.removeAll(Arrays.asList(listeners));
+  public void unregisterListener(final @NotNull SonarEventListener... listeners) {
+    synchronized (EVENT_LISTENERS) {
+      EVENT_LISTENERS.removeAll(Arrays.asList(listeners));
+    }
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@ package xyz.jonesdev.sonar.api.event.impl;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import xyz.jonesdev.sonar.api.attack.AttackTracker;
 import xyz.jonesdev.sonar.api.event.SonarEvent;
+import xyz.jonesdev.sonar.api.tracker.AttackTracker;

@Getter
@ToString
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.api.exception;
+
+import org.jetbrains.annotations.NotNull;
+
+public final class AlreadyInitializedException extends RuntimeException {
+  public AlreadyInitializedException(final @NotNull String message) {
+    super(message);
+  }
+
+  public Throwable fillInStackTrace() {
+    return this;
+  }
+}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,9 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api;
+package xyz.jonesdev.sonar.api.exception;
+
+import xyz.jonesdev.sonar.api.Sonar;

 public final class ReflectiveOperationException extends RuntimeException {
  public ReflectiveOperationException(final Throwable throwable) {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@ import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.api.fallback.captcha.CaptchaGenerator;
+import xyz.jonesdev.sonar.api.fallback.ratelimit.Ratelimiter;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;

 import java.net.InetAddress;
@@ -42,12 +44,15 @@ public final class Fallback {
  private final ConcurrentMap<InetAddress, Byte> connected = new ConcurrentHashMap<>(128);
  // Cache of all blacklisted IP addresses to ensure each entry can expire after the given time
  @Setter
-  private Cache<InetAddress, Byte> blacklist;
+  private Cache<String, Integer> blacklist;
  @Setter
  private long blacklistTime;
+  @Setter
+  private CaptchaGenerator captchaGenerator;

  private final @NotNull FallbackQueue queue = new FallbackQueue();
-  private final @NotNull FallbackRatelimiter ratelimiter = new FallbackRatelimiter();
+  @Setter
+  private Ratelimiter<InetAddress> ratelimiter;

  private final LoggerWrapper logger = new LoggerWrapper() {

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.api.fallback;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.jetbrains.annotations.NotNull;
-
-import java.net.InetAddress;
-
-@Setter
-@NoArgsConstructor(access = AccessLevel.PROTECTED)
-public final class FallbackRatelimiter {
-  private long timeout;
-  private Cache<InetAddress, Long> attemptCache;
-  @Getter
-  private Cache<InetAddress, Integer> failCountCache;
-
-  /**
-   * Attempts to rate-limit the client
-   *
-   * @param inetAddress IP address of the player
-   * @return Whether the player is allowed to verify
-   */
-  public boolean attempt(final @NotNull InetAddress inetAddress) {
-    final long expectedTimestamp = System.currentTimeMillis() + timeout;
-    // Check if the time since the last join has not exceeded the timeout
-    // The idea for this check was Taken from Velocity
-    final long last = attemptCache.get(inetAddress, result -> expectedTimestamp);
-    return expectedTimestamp == last;
-  }
-
-  /**
-   * Checks if the player is failing verifications too often
-   * Increments the number of times this user has failed the verification
-   *
-   * @param inetAddress IP address of the player
-   * @param count       Count of previously failed verifications
-   */
-  public void incrementFails(final @NotNull InetAddress inetAddress, final int count) {
-    // Make sure to remove the old values from the cache
-    if (count > 0) {
-      failCountCache.invalidate(inetAddress);
-    }
-    failCountCache.put(inetAddress, count + 1);
-  }
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,11 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.command.subcommand.argument;
+package xyz.jonesdev.sonar.api.fallback.captcha;

-public @interface Argument {
+import java.awt.image.BufferedImage;

-  /**
-   * @return Returns the name of the argument
-   */
-  String value();
+@FunctionalInterface
+public interface CaptchaGenerator {
+  BufferedImage createImage(final char[] answer);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,11 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

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

-final class AlreadyInitializedException extends RuntimeException {
+import org.jetbrains.annotations.NotNull;
+
+@FunctionalInterface
+public interface Ratelimiter<T> {
+  boolean attempt(final @NotNull T t);
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,6 @@ public interface LoggerWrapper {

  void error(final String message, final Object... args);

-  // Taken from
  // https://github.com/j256/ormlite-core/blob/master/src/main/java/com/j256/ormlite/logger/Logger.java
  String ARG_STRING = "{}";
  int ARG_STRING_LENGTH = ARG_STRING.length();
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.verbose;
+package xyz.jonesdev.sonar.api.notification;

 import lombok.Getter;
 import net.kyori.adventure.audience.Audience;
@@ -23,21 +23,21 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.attack.AttackTracker;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
+import xyz.jonesdev.sonar.api.tracker.AttackTracker;

 import java.util.UUID;

 import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
-import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;
+import static xyz.jonesdev.sonar.api.profiler.SimpleProcessProfiler.*;
 import static xyz.jonesdev.sonar.api.timer.SystemTimer.DATE_FORMATTER;

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

  @Override
-  public void observe() {
+  public void handleNotification() {
    // Don't prepare component if there are no subscribers
    if (subscribers.isEmpty()) {
      return;
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.verbose;
+package xyz.jonesdev.sonar.api.notification;

 import lombok.Getter;
 import net.kyori.adventure.audience.Audience;
@@ -29,13 +29,13 @@ import java.util.List;
 import java.util.UUID;

 import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
-import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;
+import static xyz.jonesdev.sonar.api.profiler.SimpleProcessProfiler.*;

@Getter
-public final class Notification extends Observable {
+public final class ChatNotificationHandler extends NotificationHandler {

  @Override
-  public void observe() {
+  public void handleNotification() {
    // Don't prepare component if there are no subscribers
    if (subscribers.isEmpty()) {
      return;
@@ -74,7 +74,7 @@ public final class Notification extends Observable {
    }

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

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

-package xyz.jonesdev.sonar.api.verbose;
+package xyz.jonesdev.sonar.api.notification;

 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
@@ -25,10 +25,10 @@ import java.util.UUID;
 import java.util.Vector;

@Getter
-public abstract class Observable {
+public abstract class NotificationHandler {
  protected final @NotNull Collection<UUID> subscribers = new Vector<>(0);

-  public abstract void observe();
+  public abstract void handleNotification();

  /**
   * @param uuid UUID of the player
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.jvm;
+package xyz.jonesdev.sonar.api.profiler;

 import com.sun.management.OperatingSystemMXBean;
 import lombok.experimental.UtilityClass;
@@ -24,7 +24,7 @@ import java.lang.management.ManagementFactory;
 import java.text.DecimalFormat;

@UtilityClass
-public class JVMProcessInformation {
+public class SimpleProcessProfiler {
  private final Runtime RUNTIME = Runtime.getRuntime();
  private final OperatingSystemMXBean MX = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
  private final char[] MEMORY_UNITS = {'K', 'M', 'G', 'T', 'P', 'E'};
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.api.attack;
+package xyz.jonesdev.sonar.api.tracker;

 import lombok.*;
 import org.jetbrains.annotations.Nullable;
@@ -27,12 +27,13 @@ import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.util.Optional;

-import static xyz.jonesdev.sonar.api.jvm.JVMProcessInformation.*;
+import static xyz.jonesdev.sonar.api.profiler.SimpleProcessProfiler.*;

@Getter
@NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class AttackTracker {
  public static final AttackTracker INSTANCE = new AttackTracker();
+
  private @Nullable AttackStatistics currentAttack;
  private int attackThreshold;

@@ -68,7 +69,7 @@ public final class AttackTracker {
        currentAttack.successfulVerifications = Sonar.get().getVerifiedPlayerController().estimatedSize();
        currentAttack.failedVerifications = Sonar.get().getStatistics().getTotalFailedVerifications();
        Sonar.get().getEventManager().publish(new AttackDetectedEvent());
-        Sonar.get().getNotificationHandler().observe();
+        Sonar.get().getChatNotificationHandler().handleNotification();
      } else {
        // Reset attack timer if we're still under attack
        currentAttack.timer.reset();
@@ -143,11 +144,9 @@ public final class AttackTracker {

        // Reset the attack status
        currentAttack = null;
-        // Reset threshold
        attackThreshold = 0;
      }
    } else {
-      // Reset threshold
      attackThreshold = 0;
    }
  }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -56,8 +56,7 @@ public final class DiscordWebhook {
          outputStream.write(serializedContent.getBytes(StandardCharsets.UTF_8));
        }

-        // Warn the user if the connection might've not been successful
-        // I don't know why Discord doesn't respond with OK, but I guess this should be fine
+        // 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);
@@ -1,7 +1,7 @@
 import net.minecrell.pluginyml.bukkit.BukkitPluginDescription

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

 bukkit {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -120,8 +120,8 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {

  @Override
  public void disable() {
+    // Make sure to properly stop the metrics
    if (metrics != null) {
-      // Make sure to properly shutdown bStats metrics
      metrics.shutdown();
    }
  }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
      sender::hasPermission);
    // Pass the invocation source and command arguments to our command handler
    handle(invocationSource, args);
-    return true; // Valid
+    return true;
  }

  @Override
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package xyz.jonesdev.sonar.bukkit.fallback;

 import io.netty.buffer.ByteBufAllocator;
@@ -7,6 +24,7 @@ import io.netty.util.AttributeKey;
 import io.netty.util.concurrent.EventExecutor;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;

 import java.net.SocketAddress;
 import java.util.HashSet;
@@ -16,7 +34,7 @@ public final class ChannelInactiveListener extends ChannelInboundHandlerAdapter
  private final Set<ChannelInboundHandler> handlers = new HashSet<>();

  @Override
-  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+  public void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
    final ProxiedChannelHandlerContext proxy = new ProxiedChannelHandlerContext(ctx);
    for (final ChannelInboundHandler handler : handlers) {
      try {
@@ -28,9 +46,9 @@ public final class ChannelInactiveListener extends ChannelInboundHandlerAdapter
    super.channelInactive(ctx);
  }

-  public void add(ChannelHandler handler) {
-    if (handler instanceof ChannelInboundHandler) {
-      handlers.add((ChannelInboundHandler) handler);
+  public void add(final @NotNull ChannelHandler channelHandler) {
+    if (channelHandler instanceof ChannelInboundHandler) {
+      handlers.add((ChannelInboundHandler) channelHandler);
    }
  }

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ package xyz.jonesdev.sonar.bukkit.fallback;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.CorruptedFrameException;
+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;
@@ -28,14 +28,15 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginStartPacket;
+import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

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

-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_INACTIVE_LISTENER;
 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;

 final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
@@ -44,7 +45,7 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
    updateRegistry(FallbackPacketRegistry.HANDSHAKE, DEFAULT_PROTOCOL_VERSION);

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

      if (inactiveListener != null) {
        inactiveListener.add(handler);
@@ -66,8 +67,11 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
    if (msg instanceof ByteBuf) {
      final ByteBuf byteBuf = (ByteBuf) msg;

-      // Reset the reader index, so we can read the content
-      // Make sure to store the original reader index
+      /*
+       * Reset the reader index, so we can read the content;
+       * We also have to make sure to store the original reader index.
+       * We do this to 'spoof' the packet state - we want to read it without the server knowing.
+       */
      final int originalReaderIndex = byteBuf.readerIndex();
      byteBuf.readerIndex(0);

@@ -82,7 +86,6 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {

      // Skip the packet if it's not registered within Sonar's packet registry
      if (packet == null) {
-        // Release the ByteBuf to avoid memory leaks
        byteBuf.release();
        return;
      }
@@ -91,27 +94,27 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
        // Try to decode the packet for the given protocol version
        packet.decode(byteBuf, protocolVersion == null ? DEFAULT_PROTOCOL_VERSION : protocolVersion);
      } catch (Throwable throwable) {
-        // Release the ByteBuf to avoid memory leaks
        byteBuf.release();
-        throw new CorruptedFrameException("Failed to decode packet");
+        throw DEBUG ? new DecoderException(throwable) : QuietDecoderException.INSTANCE;
      }

      // Check if the packet still has bytes left after we decoded it
      if (byteBuf.isReadable()) {
-        // Release the ByteBuf to avoid memory leaks
        byteBuf.release();
-        throw new CorruptedFrameException("Could not read packet to end");
+        throw DEBUG ? new DecoderException("Could not read packet to end") : QuietDecoderException.INSTANCE;
      }

-      // Useful resources:
-      // https://wiki.vg/Protocol#Handshaking
-      // https://wiki.vg/Protocol#Login
+      /*
+       * Useful resources:
+       * https://wiki.vg/Protocol#Handshaking
+       * https://wiki.vg/Protocol#Login
+       */
      if (packet instanceof HandshakePacket) {
        final HandshakePacket handshake = (HandshakePacket) packet;
        switch (handshake.getIntent()) {
          case STATUS:
            // We don't care about server pings or transfers; remove the handler
-            ctx.channel().pipeline().remove(this);
+            ctx.pipeline().remove(this);
            break;
          case LOGIN:
          case TRANSFER:
@@ -121,23 +124,22 @@ final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
            updateRegistry(FallbackPacketRegistry.LOGIN, Objects.requireNonNull(protocolVersion));
            break;
          default:
-            throw new CorruptedFrameException("Unknown handshake intent " + handshake.getIntent());
+            throw DEBUG ? new DecoderException("Bad intent " + handshake.getIntent()) : QuietDecoderException.INSTANCE;
        }
      } else if (packet instanceof LoginStartPacket) {
        final LoginStartPacket loginStart = (LoginStartPacket) packet;
        final InetSocketAddress socketAddress = (InetSocketAddress) ctx.channel().remoteAddress();
        // We've done our job - deject this pipeline
-        ctx.channel().pipeline().remove(this);
+        ctx.pipeline().remove(this);
        // Let Sonar process the login packet
        handleLogin(ctx.channel(), ctx, () -> {
          byteBuf.readerIndex(originalReaderIndex);
          ctx.fireChannelRead(byteBuf.retain());
-          final ChannelHandler inboundHandler = ctx.channel().pipeline().remove(FALLBACK_INBOUND_HANDLER);
+          final ChannelHandler inboundHandler = ctx.pipeline().remove(FALLBACK_INBOUND_HANDLER);
          if (inboundHandler != null) {
            channelRemovalListener.accept(ctx.pipeline(), FALLBACK_INBOUND_HANDLER, inboundHandler);
          }
        }, loginStart.getUsername(), socketAddress);
-        // Release the ByteBuf to avoid memory leaks
        byteBuf.release();
        return;
      }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,10 +25,8 @@ import lombok.Getter;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.fallback.FallbackPipelines;
-import xyz.jonesdev.sonar.bukkit.SonarBukkit;
+import xyz.jonesdev.sonar.api.exception.ReflectiveOperationException;
 import xyz.jonesdev.sonar.common.fallback.netty.FallbackInjectedChannelInitializer;

 import java.lang.reflect.Field;
@@ -36,7 +34,9 @@ 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.bukkit.SonarBukkit.INITIALIZE_LISTENER;

 // Check out these links if you want to see some more magic
 // https://github.com/retrooper/packetevents/blob/2.0/spigot/src/main/java/io/github/retrooper/packetevents/util/SpigotReflectionUtil.java
@@ -196,8 +196,7 @@ public class FallbackBukkitInjector {
      for (int i = 0; i < 2; i++) {
        final Field field = getFieldAt(SERVER_CONNECTION_CLASS, List.class, i);

-        // Check if the field has the correct generic type;
-        // We need this field to be List<ChannelFuture>
+        // Check if the field has the correct generic type; We need this field to be List<ChannelFuture>
        if (!field.getGenericType().getTypeName().contains(ChannelFuture.class.getName())) {
          continue;
        }
@@ -235,27 +234,29 @@ public class FallbackBukkitInjector {
          childHandlerField.setAccessible(true);
          final var originalInitializer = (ChannelInitializer<Channel>) childHandlerField.get(bootstrap);

-          ChannelHandler finalBootstrap = bootstrap;
+          /*
+           * Inject our own channel initializer into the original field
+           * If the plugin is not fully enabled but executes the injection,
+           * put an initializer to close the new connection automatically.
+           */
+          if (!INITIALIZE_LISTENER.isDone()) {
+            childHandlerField.set(bootstrap, new ChannelInitializer<>() {

-          // Inject our own channel initializer into the original field
-          // If the plugin is not fully enabled but executes the injection,
-          // put an initializer to close the new connection automatically.
-          if (!SonarBukkit.INITIALIZE_LISTENER.isDone()) {
-            final ChannelInitializer<Channel> initializer = new ChannelInitializer<>() {
              @Override
-              protected void initChannel(Channel channel) {
+              protected void initChannel(final @NotNull Channel channel) {
                channel.close();
              }
-            };
-            childHandlerField.set(finalBootstrap, initializer);
+            });
          }

-          SonarBukkit.INITIALIZE_LISTENER.thenAccept(v -> {
+          final ChannelHandler _bootstrap = bootstrap;
+
+          INITIALIZE_LISTENER.thenAccept(__ -> {
            try {
-              childHandlerField.set(finalBootstrap, new FallbackInjectedChannelInitializer(originalInitializer,
+              childHandlerField.set(_bootstrap, new FallbackInjectedChannelInitializer(originalInitializer,
                pipeline -> {
                  pipeline.addAfter("splitter", FALLBACK_PACKET_DECODER, new FallbackBukkitInboundHandler());
-                  pipeline.addFirst(FallbackPipelines.FALLBACK_INACTIVE_LISTENER, new ChannelInactiveListener());
+                  pipeline.addFirst(FALLBACK_INACTIVE_LISTENER, new ChannelInactiveListener());
                }
              ));
            } catch (IllegalAccessException exception) {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@ 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.common.util.FakeChannelUtil;

 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -33,14 +34,13 @@ import java.lang.reflect.Method;

 import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;

-// Taken from
 // https://github.com/ViaVersion/ViaVersion/blob/master/bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/JoinListener.java
 public final class BukkitJoinListener implements Listener {
-  private static MethodHandle handleMethod;
+  private static MethodHandle _handleMethod;
  // ServerGamePacketListenerImpl aka. PlayerConnection
-  private static MethodHandle packetListenerField;
-  private static MethodHandle managerField;
-  private static MethodHandle channelField;
+  private static MethodHandle _listenerField;
+  private static MethodHandle _networkManagerField;
+  private static MethodHandle _channelField;

  private static boolean initialized;

@@ -50,14 +50,14 @@ public final class BukkitJoinListener implements Listener {
        .getDeclaredMethod("getHandle");
      final Field listenerField = FallbackBukkitInjector.findField(false, handleMethod.getReturnType(),
        "PlayerConnection", "ServerGamePacketListenerImpl");
-      final Field managerField = FallbackBukkitInjector.findField(true, listenerField.getType(),
+      final Field networkManagerField = FallbackBukkitInjector.findField(true, listenerField.getType(),
        "NetworkManager", "Connection");
-      final Field channelField = FallbackBukkitInjector.getFieldAt(managerField.getType(), Channel.class, 0);
+      final Field channelField = FallbackBukkitInjector.getFieldAt(networkManagerField.getType(), Channel.class, 0);

-      BukkitJoinListener.handleMethod = MethodHandles.lookup().unreflect(handleMethod);
-      packetListenerField = MethodHandles.lookup().unreflectGetter(listenerField);
-      BukkitJoinListener.managerField = MethodHandles.lookup().unreflectGetter(managerField);
-      BukkitJoinListener.channelField = MethodHandles.lookup().unreflectGetter(channelField);
+      _handleMethod = MethodHandles.lookup().unreflect(handleMethod);
+      _listenerField = MethodHandles.lookup().unreflectGetter(listenerField);
+      _networkManagerField = MethodHandles.lookup().unreflectGetter(networkManagerField);
+      _channelField = MethodHandles.lookup().unreflectGetter(channelField);
      initialized = true;
    } catch (Exception exception) {
      initialized = false;
@@ -66,22 +66,33 @@ public final class BukkitJoinListener implements Listener {

  @EventHandler(priority = EventPriority.HIGHEST)
  public void handle(final @NotNull PlayerJoinEvent event) {
+    // Make sure the player is not an NPC
    if (!initialized || event.getPlayer().hasMetadata("NPC")) {
      return;
    }

    try {
-      final Object handle = handleMethod.invoke(event.getPlayer());
-      final Object listener = packetListenerField.invoke(handle);
-      final Object networkManager = managerField.invoke(listener);
-      final Channel channel = (Channel) channelField.invoke(networkManager);
+      final Object handle = _handleMethod.invoke(event.getPlayer());
+      final Object listener = _listenerField.invoke(handle);
+      final Object networkManager = _networkManagerField.invoke(listener);
+      final Channel channel = (Channel) _channelField.invoke(networkManager);
+
+      // Don't continue if the channel isn't found or if the channel is inactive
+      if (channel == null || !channel.isActive()) {
+        return;
+      }
+
+      // Make sure the player is not a fake player
+      if (FakeChannelUtil.isFakeChannel(channel)) {
+        return;
+      }

      // Close the channel if Sonar's handlers are not found when the PlayerJoinEvent is called
-      if (channel != null && channel.isActive() && channel.pipeline().context(FALLBACK_BANDWIDTH) == null) {
+      if (channel.pipeline().context(FALLBACK_BANDWIDTH) == null) {
        channel.close();
      }
    } catch (Throwable throwable) {
-      Sonar.get().getLogger().warn("Failed to the channel for {}: {}", event.getPlayer().getName(), throwable);
+      Sonar.get().getLogger().warn("Couldn't find {}: {}", event.getPlayer().getName(), throwable);
    }
  }
 }
@@ -1,5 +1,5 @@
 plugins {
-  id("net.minecrell.plugin-yml.bungee") version "0.6.0" apply true
+  alias(libs.plugins.pluginyml.bungee) apply true
 }

 bungee {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -108,8 +108,8 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {

  @Override
  public void disable() {
+    // Make sure to properly stop the metrics
    if (metrics != null) {
-      // Make sure to properly shutdown bStats metrics
      metrics.shutdown();
    }
  }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,13 +26,15 @@ import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.LoginRequest;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
+import xyz.jonesdev.sonar.api.exception.ReflectiveOperationException;
 import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandlerAdapter;

 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;
+
 final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {

  private static final MethodHandle CHANNEL_WRAPPER_GETTER;
@@ -48,20 +50,20 @@ final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {

  @Override
  public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
-    // Intercept any packets processed by BungeeCord
    if (msg instanceof PacketWrapper) {
      final PacketWrapper packetWrapper = (PacketWrapper) msg;
      final DefinedPacket wrappedPacket = packetWrapper.packet;
-      // Don't handle any invalid packets
+      // 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;
-          handleHandshake(channel, handshake.getHost(), handshake.getProtocolVersion());
          // We don't care about server pings; remove the handler
-            if (handshake.getRequestedProtocol() == 1) {
-            ctx.channel().pipeline().remove(this);
+          if (handshake.getRequestedProtocol() == STATUS) {
+            ctx.pipeline().remove(this);
+          } else {
+            handleHandshake(channel, handshake.getHost(), handshake.getProtocolVersion());
          }
        }
        // Intercept any server login packet by the client
@@ -77,7 +79,7 @@ final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {
          }
          final InetSocketAddress socketAddress = (InetSocketAddress) channelWrapper.getRemoteAddress();
          // We've done our job - deject this pipeline
-          ctx.channel().pipeline().remove(this);
+          ctx.pipeline().remove(this);
          // Make sure to mark this packet as released
          packetWrapper.trySingleRelease();
          // Let Sonar process the login packet
@@ -86,7 +88,6 @@ final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {
        }
      }
    }
-    // Make sure to let the server handle the rest
    ctx.fireChannelRead(msg);
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -47,12 +47,10 @@ public class FallbackBungeeInjector {
      unsafeField.setAccessible(true);
      final Unsafe unsafe = (Unsafe) unsafeField.get(null);

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

-      // Replace the original channel initializer
+      // Replace the original channel initializer with our new injected initializer
      unsafe.putObject(base, offset, injectedInitializer);
    } catch (Exception exception) {
      Sonar.get().getLogger().error("An error occurred while injecting {}", exception);
@@ -0,0 +1,10 @@
+dependencies {
+  compileOnly(project(":api"))
+  compileOnly(rootProject.libs.imagefilters)
+
+  testCompileOnly(project(":api"))
+  testCompileOnly(rootProject.libs.imagefilters)
+}
+
+java.sourceCompatibility = JavaVersion.VERSION_11
+java.targetCompatibility = JavaVersion.VERSION_11
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.captcha;
+
+import com.jhlabs.image.FBMFilter;
+import com.jhlabs.image.SmearFilter;
+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.captcha.filters.CurvesOverlayFilter;
+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.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 {
+  private static final CurvesOverlayFilter CURVES = new CurvesOverlayFilter(3);
+  //private static final CircleInverseFilter CIRCLES = new CircleInverseFilter(1, 30, 10);
+  private static final NoiseOverlayFilter NOISE = new NoiseOverlayFilter(1, 20);
+  private static final SmearFilter SMEAR = new SmearFilter();
+  private static final FBMFilter FBM = new FBMFilter();
+  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 {
+    FBM.setAmount(0.6f);
+    FBM.setScale(15);
+
+    SMEAR.setShape(SmearFilter.SQUARES);
+    SMEAR.setDensity(0.1f);
+    SMEAR.setDistance(0);
+    SMEAR.setMix(0.35f);
+
+    // Create fractions based on the number of colors
+    for (int i = 0; i < COLOR_FRACTIONS.length; i++) {
+      COLOR_FRACTIONS[i] = (float) i / (COLOR_FRACTIONS.length - 1);
+    }
+  }
+
+  private final int width, height;
+  private final @Nullable InputStream background;
+  private BufferedImage backgroundImage;
+
+  @Override
+  public @NotNull BufferedImage createImage(final char[] answer) {
+    final BufferedImage image = createBackgroundImage();
+    final Graphics2D graphics = image.createGraphics();
+    graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+    // Draw characters and other effects on the image
+    applyRandomColorGradient(graphics);
+    drawCharacters(graphics, answer);
+    CURVES.transform(image, graphics);
+    NOISE.transform(image);
+    //SMEAR.filter(image, image);
+    //CIRCLES.transform(image); // TODO: check if the text is still easy to read after this
+    // Make sure to dispose the graphics instance
+    graphics.dispose();
+    return image;
+  }
+
+  private @NotNull BufferedImage createBackgroundImage() {
+    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);
+    }
+  }
+
+  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);
+    }
+
+    // Apply the random gradient effect
+    graphics.setPaint(new LinearGradientPaint(0, 0, width, height,
+      COLOR_FRACTIONS, COLORS, MultipleGradientPaint.CycleMethod.REFLECT));
+  }
+
+  private void drawCharacters(final @NotNull Graphics2D graphics,
+                              final char @NotNull [] answer) {
+    final FontRenderContext ctx = graphics.getFontRenderContext();
+    final GlyphVector[] glyphs = new GlyphVector[answer.length];
+
+    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]));
+    }
+
+    final double scalingXY = 5 - Math.min(answer.length, 5) * 0.65;
+
+    // Calculate first X and Y positions
+    final double totalWidth = Arrays.stream(glyphs)
+      .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;
+
+    // Draw each glyph one by one
+    for (final GlyphVector glyph : glyphs) {
+      final AffineTransform transformation = AffineTransform.getTranslateInstance(beginX, beginY);
+      // Shear the glyph by a random amount
+      final double shearXY = Math.sin(beginX + beginY) / 6;
+      transformation.shear(shearXY, shearXY);
+      // Scale the glyph to perfectly fit the image
+      transformation.scale(scalingXY, scalingXY);
+      // Draw the glyph to the buffered image
+      final Shape transformedShape = transformation.createTransformedShape(glyph.getOutline());
+      graphics.fill(transformedShape);
+      // Draw a random outline around the glyph
+      if (RANDOM.nextFloat() < 0.25f) {
+        createGlyphOutline(graphics, transformedShape);
+      }
+      // Make sure the next glyph isn't drawn at the same position
+      beginX += glyph.getVisualBounds().getWidth() * scalingXY + 2;
+      beginY += -10 + RANDOM.nextFloat() * 20;
+    }
+  }
+
+  private void createGlyphOutline(final @NotNull Graphics2D graphics, final @NotNull Shape shape) {
+    final float txy = 1.25f + RANDOM.nextFloat();
+    final float width = 1 + RANDOM.nextFloat();
+
+    // Create a randomly translated and stroked shape based on the original glyph shape
+    final AffineTransform translation = AffineTransform.getTranslateInstance(txy, txy);
+    final Shape strokedShape = new BasicStroke(width).createStrokedShape(shape);
+
+    graphics.fill(translation.createTransformedShape(strokedShape));
+  }
+}
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.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];
+  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) {
+    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);
+    }
+  }
+}
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2023-2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.captcha.filters;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+@Getter
+@RequiredArgsConstructor
+public final class CircleInverseFilter {
+  private final int amount, minRadius, maxRadiusExpansion;
+
+  private static final Random RANDOM = new Random();
+
+  public void transform(final @NotNull BufferedImage image) {
+    final int minX = image.getWidth() / 4;
+    final int minY = image.getHeight() / 4;
+
+    for (int i = 0; i < amount; i++) {
+      // Generate random position and radius for the circle
+      final float centerX = minX + RANDOM.nextInt(image.getWidth() - minX * 2);
+      final float centerY = minY + RANDOM.nextInt(image.getHeight() - minY * 2);
+      final int radius = minRadius + RANDOM.nextInt(maxRadiusExpansion);
+
+      final Circle circle = new Circle(centerX, centerY, radius);
+      // Draw inverted circle
+      _addInvertedCircle(image, circle);
+    }
+  }
+
+  private static void _addInvertedCircle(final @NotNull BufferedImage bufferedImage,
+                                         final @NotNull Circle circle) {
+    for (int x = 0; x < bufferedImage.getWidth(); x++) {
+      for (int y = 0; y < bufferedImage.getHeight(); y++) {
+        if (isWithinCircle(x, y, circle, circle.radius)) {
+          // Invert colors within the circle
+          final int rgb = bufferedImage.getRGB(x, y);
+          final int invertedRGB = invertColorAndFilter(rgb);
+          bufferedImage.setRGB(x, y, invertedRGB);
+        }
+      }
+    }
+  }
+
+  private static boolean isWithinCircle(final float x, final float y, final @NotNull Circle circle, int radius) {
+    final float distanceX = x - circle.centerX;
+    final float distanceY = y - circle.centerY;
+    return distanceX * distanceX + distanceY * distanceY <= radius * radius;
+  }
+
+  @Getter
+  @RequiredArgsConstructor
+  static final class Circle {
+    private final float centerX;
+    private final float centerY;
+    private final int radius;
+  }
+
+  private static int invertColorAndFilter(final int rgb) {
+    final Color color = new Color(rgb);
+    final int red = Math.max(Color.LIGHT_GRAY.getRed() - color.getRed(), 0);
+    final int green = Math.max(Color.LIGHT_GRAY.getGreen() - color.getGreen(), 0);
+    final int blue = Math.max(Color.LIGHT_GRAY.getBlue() - color.getBlue(), 0);
+    return new Color(red, green, blue).getRGB();
+  }
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.captcha.filters;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.awt.geom.CubicCurve2D;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+@Getter
+@RequiredArgsConstructor
+public final class CurvesOverlayFilter {
+  private final int amount;
+
+  private static final Random RANDOM = new Random();
+
+  public void transform(final @NotNull BufferedImage image,
+                        final @NotNull Graphics2D graphics) {
+    // Randomize the stroke width
+    graphics.setStroke(new BasicStroke(1 + RANDOM.nextFloat()));
+
+    final int halfWidth = image.getWidth() / 2;
+
+    for (int i = 0; i < amount; ++i) {
+      final float randomX = image.getWidth() * RANDOM.nextFloat();
+      final float randomY = image.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;
+      // Control points for the cubic curve
+      final float ctrlX1 = randomX + sin / 2;
+      final float ctrlY1 = randomY - cos / 2;
+      final float ctrlX2 = randomX - sin / 2;
+      final float ctrlY2 = randomY + cos / 2;
+      // Draw a cubic curve instead of a straight line
+      graphics.draw(new CubicCurve2D.Float(x1, y1, ctrlX1, ctrlY1, ctrlX2, ctrlY2, x2, y2));
+    }
+  }
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.captcha.filters;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+@Getter
+@RequiredArgsConstructor
+public final class GridOverlayFilter {
+  private final int amount, lineWidth, randomOffset;
+
+  private static final Random RANDOM = new Random();
+
+  public void transform(final @NotNull BufferedImage image,
+                        final @NotNull Graphics2D graphics) {
+    final int spacingX = image.getWidth() / amount + lineWidth;
+    final int spacingY = image.getHeight() / amount + lineWidth;
+    int currentX = spacingX / 2;
+    int currentY = spacingY / 2;
+
+    for (int i = 0; i < amount; i++) {
+      graphics.setStroke(new BasicStroke(lineWidth * 0.5f + lineWidth * RANDOM.nextFloat()));
+      graphics.drawLine(currentX, 0, currentX + RANDOM.nextInt(randomOffset), image.getHeight());
+      graphics.drawLine(0, currentY, image.getWidth(), currentY + RANDOM.nextInt(randomOffset));
+
+      currentX += spacingX + lineWidth;
+      currentY += spacingY + lineWidth;
+    }
+  }
+}
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.captcha.filters;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.image.BufferedImage;
+import java.util.Random;
+
+@Getter
+@RequiredArgsConstructor
+public final class NoiseOverlayFilter {
+  private final float density, amount;
+
+  private static final Random RANDOM = new Random();
+
+  private int randomGaussian(int x) {
+    x += (int) (RANDOM.nextGaussian() * amount);
+    return Math.max(Math.min(x, 0xff), 0);
+  }
+
+  public void transform(final @NotNull BufferedImage image) {
+    for (int x = 0; x < image.getWidth(); x++) {
+      for (int y = 0; y < image.getHeight(); y++) {
+        if (RANDOM.nextFloat() <= density) {
+          final int rgb = image.getRGB(x, y);
+          int r = (rgb >> 16) & 0xff;
+          int g = (rgb >> 8) & 0xff;
+          int b = rgb & 0xff;
+          r = randomGaussian(r);
+          g = randomGaussian(g);
+          b = randomGaussian(b);
+          image.setRGB(x, y, (r << 16) | (g << 8) | b);
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import lombok.experimental.UtilityClass;
+import xyz.jonesdev.sonar.captcha.StandardCaptchaGenerator;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+
+@UtilityClass
+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 long start = System.currentTimeMillis();
+    final char[] dictionary = {'a', 'b', 'c', 'd', 'e', 'f'/*, 'g'*/, 'h'/*, 'i'*/, 'j',
+      'k', 'm', 'n', 'o', 'p'/*, 'q'*/, 'r', 's', 't', 'u'/*, 'v', 'w'*/, 'x', 'y', 'z'};
+
+    // Generate image
+    final int amount = 1;
+    for (int i = 0; i < amount; i++) {
+      final char[] answer = new char[3 + random.nextInt(2)];
+      for (int j = 0; j < answer.length; j++) {
+        answer[j] = dictionary[random.nextInt(dictionary.length)];
+      }
+      final BufferedImage bufferedImage = standardCaptchaGenerator.createImage(answer);
+
+      // Save image
+      ImageIO.write(bufferedImage, "png", new File(i + ".png"));
+    }
+    System.out.println("Took " + (System.currentTimeMillis() - start) + "ms to generate " + amount + " image(s)");
+  }
+}
@@ -1,9 +1,7 @@
 dependencies {
  compileOnly(project(":api"))
-
+  implementation(project(":captcha"))
  compileOnly(rootProject.libs.adventure.nbt)
-
-  implementation(rootProject.libs.capja)
 }

 java.sourceCompatibility = JavaVersion.VERSION_11
@@ -40,12 +40,12 @@ class LibraryLoader {
      Library.builder()
        .groupId("com{}google{}code{}gson")
        .artifactId("gson")
-        .version("2.10.1")
+        .version("2.11.0")
        .relocate("com{}google{}gson", "xyz{}jonesdev{}sonar{}libs{}gson")
        .build(),
      // Caffeine
      Library.builder()
-        .groupId("com.github.ben-manes.caffeine")
+        .groupId("com{}github{}ben-manes{}caffeine")
        .artifactId("caffeine")
        .version("3.1.8")
        .relocate("com{}github{}benmanes{}caffeine", "xyz{}jonesdev{}sonar{}libs{}caffeine")
@@ -56,6 +56,13 @@ class LibraryLoader {
        .artifactId("ormlite-jdbc")
        .version("6.1")
        .relocate("com{}j256{}ormlite", "xyz{}jonesdev{}sonar{}libs{}ormlite")
+        .build(),
+      // JHLabs image filters
+      Library.builder()
+        .groupId("com{}jhlabs")
+        .artifactId("filters")
+        .version("2.0.235-1")
+        .relocate("com{}jhlabs", "xyz{}jonesdev{}sonar{}libs{}jhlabs")
        .build()
    );

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -31,29 +31,32 @@ import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.SonarSupplier;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
-import xyz.jonesdev.sonar.api.controller.VerifiedPlayerController;
+import xyz.jonesdev.sonar.api.database.controller.VerifiedPlayerController;
+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.api.verbose.Notification;
-import xyz.jonesdev.sonar.api.verbose.Verbose;
 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.statistics.GlobalSonarStatistics;
-import xyz.jonesdev.sonar.common.subcommands.*;
+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
 public abstract class SonarBootstrap<T> implements Sonar {
  private T plugin;
  @Setter
-  private Verbose verboseHandler;
+  private ActionBarNotificationHandler actionBarNotificationHandler;
  @Setter
-  private Notification notificationHandler;
+  private ChatNotificationHandler chatNotificationHandler;
  private SonarConfiguration config;
  private VerifiedPlayerController verifiedPlayerController;
  private final LibraryManager libraryManager;
@@ -69,7 +72,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
    // Load all libraries before anything else
    LibraryLoader.loadLibraries(libraryManager, platform);
    this.libraryManager = libraryManager;
-    // Check if Netty is up-to-date
+    // Check if Netty is up to date
    ProtocolUtil.checkNettyVersion();
    // Set the Sonar API
    SonarSupplier.set(this);
@@ -78,11 +81,11 @@ public abstract class SonarBootstrap<T> implements Sonar {
    this.platform = platform;
    // Load the rest of the components
    this.statistics = new GlobalSonarStatistics();
-    this.verboseHandler = new Verbose();
-    this.notificationHandler = new Notification();
+    this.actionBarNotificationHandler = new ActionBarNotificationHandler();
+    this.chatNotificationHandler = new ChatNotificationHandler();
    this.config = new SonarConfiguration(dataDirectory);
-    this.subcommandRegistry = new SubcommandRegistry();
    // Register all subcommands
+    this.subcommandRegistry = new SubcommandRegistry();
    this.subcommandRegistry.register(
      new BlacklistCommand(),
      new VerifiedCommand(),
@@ -151,15 +154,10 @@ public abstract class SonarBootstrap<T> implements Sonar {
    getLogger().info("Taking cached snapshots of all packets...");
    FallbackPreparer.prepare();

-    // Update ratelimiter caches
-    getFallback().getRatelimiter().setAttemptCache(Caffeine.newBuilder()
-      .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getReconnectDelay()))
-      .ticker(Ticker.systemTicker())
-      .build());
-    getFallback().getRatelimiter().setFailCountCache(Caffeine.newBuilder()
-      .expireAfterWrite(Duration.ofMillis(getConfig().getVerification().getRememberTime()))
-      .ticker(Ticker.systemTicker())
-      .build());
+    // Update ratelimiter cache
+    getFallback().setRatelimiter(getConfig().getVerification().getReconnectDelay() > 0L
+      ? new CaffeineCacheRatelimiter(getConfig().getVerification().getReconnectDelay(), TimeUnit.MILLISECONDS)
+      : NoopCacheRatelimiter.INSTANCE);

    // Update blacklist cache
    final long blacklistTime = getConfig().getVerification().getBlacklistTime();
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.jetbrains.annotations.NotNull;

-import static xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics.INCOMING;
-import static xyz.jonesdev.sonar.common.statistics.CachedBandwidthStatistics.OUTGOING;
+import static xyz.jonesdev.sonar.common.statistics.BandwidthStatistics.INCOMING;
+import static xyz.jonesdev.sonar.common.statistics.BandwidthStatistics.OUTGOING;

@ChannelHandler.Sharable
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,21 +18,18 @@
 package xyz.jonesdev.sonar.common.fallback;

 import io.netty.channel.*;
-import io.netty.handler.codec.CorruptedFrameException;
 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.fallback.Fallback;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.fallback.netty.FallbackVarInt21FrameDecoder;
-import xyz.jonesdev.sonar.common.fallback.netty.FallbackVarInt21FrameEncoder;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketEncoder;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
 import xyz.jonesdev.sonar.common.util.GeyserUtil;
+import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -53,8 +50,6 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
  protected ProtocolVersion protocolVersion;
  protected RemovalListener channelRemovalListener = RemovalListener.EMPTY;

-  protected static final Fallback FALLBACK = Sonar.get().getFallback();
-
  /**
   * Validates and handles incoming handshake packets
   *
@@ -66,11 +61,11 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
                                       final int protocol) throws Exception {
    // Check if the hostname is invalid
    if (hostname.isEmpty()) {
-      throw new CorruptedFrameException("Hostname is empty");
+      throw QuietDecoderException.INSTANCE;
    }
    // Check if the player has already sent a handshake packet
    if (protocolVersion != null) {
-      throw new CorruptedFrameException("Already sent handshake");
+      throw QuietDecoderException.INSTANCE;
    }
    // Store the protocol version
    protocolVersion = ProtocolVersion.fromId(protocol);
@@ -93,13 +88,13 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
                                   final @NotNull InetSocketAddress socketAddress) throws Exception {
    // Check if the player has already sent a login packet
    if (this.username != null) {
-      throw new CorruptedFrameException("Already sent login");
+      throw QuietDecoderException.INSTANCE;
    }
    // Connections from unknown protocol versions will be discarded
    // as this is the safest way of handling unwanted connections
    if (protocolVersion.isUnknown()) {
      // Sonar does not support snapshots or Minecraft versions older than 1.7.2
-      throw new CorruptedFrameException("Unknown protocol version");
+      throw QuietDecoderException.INSTANCE;
    }
    // Increase joins per second for the action bar verbose
    GlobalSonarStatistics.countLogin();
@@ -107,15 +102,10 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
    this.username = username;
    final FallbackInboundHandler inboundHandler = channel.pipeline().get(FallbackInboundHandler.class);
    Objects.requireNonNull(inboundHandler).setInetAddress(socketAddress.getAddress());
-
-    // Check the blacklist here since we cannot let the player "ghost join"
-    if (FALLBACK.getBlacklist().asMap().containsKey(inboundHandler.getInetAddress())) {
-      customDisconnect(channel, protocolVersion, blacklisted);
-      return;
-    }
+    final String hostAddress = socketAddress.getAddress().getHostAddress();

    // Check if Fallback is already verifying a player with the same IP address
-    if (FALLBACK.getConnected().containsKey(inboundHandler.getInetAddress())) {
+    if (Sonar.get().getFallback().getConnected().containsKey(inboundHandler.getInetAddress())) {
      customDisconnect(channel, protocolVersion, alreadyVerifying);
      return;
    }
@@ -127,6 +117,14 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
      return;
    }

+    // Check if the player failed the verification too many times
+    final int score = Sonar.get().getFallback().getBlacklist().asMap().getOrDefault(hostAddress, 0);
+    final int limit = Sonar.get().getConfig().getVerification().getBlacklistThreshold();
+    if (score >= limit) {
+      customDisconnect(channel, protocolVersion, blacklisted);
+      return;
+    }
+
    // Don't continue the verification process if the verification is disabled
    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
      initialLogin(ctx, inboundHandler.getInetAddress(), loginPacket);
@@ -143,13 +141,13 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
    // Make sure we actually have to verify the player
    final String offlineUuidString = "OfflinePlayer:" + username;
    final UUID offlineUuid = UUID.nameUUIDFromBytes(offlineUuidString.getBytes(StandardCharsets.UTF_8));
-    if (Sonar.get().getVerifiedPlayerController().has(inboundHandler.getInetAddress().toString(), offlineUuid)) {
+    if (Sonar.get().getVerifiedPlayerController().has(hostAddress, offlineUuid)) {
      initialLogin(ctx, inboundHandler.getInetAddress(), loginPacket);
      return;
    }

    // Check if the IP address is currently being rate-limited
-    if (!FALLBACK.getRatelimiter().attempt(inboundHandler.getInetAddress())) {
+    if (!Sonar.get().getFallback().getRatelimiter().attempt(inboundHandler.getInetAddress())) {
      customDisconnect(channel, protocolVersion, reconnectedTooFast);
      return;
    }
@@ -158,7 +156,7 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
    rewriteProtocol(ctx, channelRemovalListener);

    // Queue the connection for further processing
-    FALLBACK.getQueue().getPlayers().compute(inboundHandler.getInetAddress(), (inetAddress, runnable) -> {
+    Sonar.get().getFallback().getQueue().getPlayers().compute(inboundHandler.getInetAddress(), (inetAddress, runnable) -> {
      // Check if the player is already queued since we don't want bots to flood the queue
      if (runnable != null) {
        customDisconnect(channel, protocolVersion, alreadyQueued);
@@ -201,14 +199,11 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
      ctx.pipeline().remove(entry.getValue());
      removalListener.accept(ctx.pipeline(), entry.getKey(), entry.getValue());
    }
-    // Add our custom pipelines
-    ctx.pipeline()
-      .addFirst(FALLBACK_FRAME_ENCODER, FallbackVarInt21FrameEncoder.INSTANCE)
-      .addFirst(FALLBACK_TIMEOUT, new FallbackTimeoutHandler(
-        Sonar.get().getConfig().getVerification().getReadTimeout(),
-        Sonar.get().getConfig().getVerification().getWriteTimeout(),
-        TimeUnit.MILLISECONDS))
-      .addFirst(FALLBACK_FRAME_DECODER, new FallbackVarInt21FrameDecoder());
+    // Add our read/write timeout handler
+    ctx.pipeline().addFirst(FALLBACK_TIMEOUT, new FallbackTimeoutHandler(
+      Sonar.get().getConfig().getVerification().getReadTimeout(),
+      Sonar.get().getConfig().getVerification().getWriteTimeout(),
+      TimeUnit.MILLISECONDS));
  }

  /**
@@ -222,14 +217,14 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
                                    final @NotNull InetAddress inetAddress,
                                    final @NotNull Runnable loginPacket) throws Exception {
    // Increment the number of accounts with the same IP
-    FALLBACK.getOnline().compute(inetAddress, (k, v) -> v == null ? 1 : v + 1);
+    Sonar.get().getFallback().getOnline().compute(inetAddress, (k, v) -> v == null ? 1 : v + 1);

    final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();
    // Skip the maximum online per IP check if it's disabled in the configuration
    if (maxOnlinePerIp > 0) {
      // Check if the number of online players using the same IP address as
      // the connecting player is greater than the configured amount
-      final int onlinePerIp = FALLBACK.getOnline().getOrDefault(inetAddress, 0);
+      final int onlinePerIp = Sonar.get().getFallback().getOnline().getOrDefault(inetAddress, 0);
      if (onlinePerIp >= maxOnlinePerIp) {
        customDisconnect(ctx.channel(), protocolVersion, tooManyOnlinePerIP);
        return;
@@ -240,7 +235,6 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
    loginPacket.run();
  }

-
  /**
   * Disconnect the player before verification (during login)
   * by replacing the encoder before running the method.
@@ -252,26 +246,28 @@ public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandle
  private void customDisconnect(final @NotNull Channel channel,
                                final @NotNull ProtocolVersion protocolVersion,
                                final @NotNull FallbackPacket packet) {
-    if (channel.eventLoop().inEventLoop()) {
-      _customDisconnect(channel, protocolVersion, packet);
-    } else {
-      channel.eventLoop().execute(() -> _customDisconnect(channel, protocolVersion, packet));
+    if (channel.isActive()) {
+      if (channel.eventLoop().inEventLoop()) {
+        _customDisconnect(channel, protocolVersion, packet);
+      } else {
+        channel.eventLoop().execute(() -> _customDisconnect(channel, protocolVersion, packet));
+      }
    }
  }

  private void _customDisconnect(final @NotNull Channel channel,
                                 final @NotNull ProtocolVersion protocolVersion,
                                 final @NotNull FallbackPacket packet) {
-    // Remove the main pipeline to completely take over the channel
-    final String handler = Sonar.get().getPlatform().getHandlerFunction().apply(channel.pipeline());
+    // Remove the connection handler pipeline to completely take over the channel
+    final String handler = Sonar.get().getPlatform().getConnectionHandler();
    if (channel.pipeline().context(handler) != null) {
      channel.pipeline().remove(handler);
    }
-    final String encoder = Sonar.get().getPlatform().getEncoderFunction().apply(channel.pipeline());
+    final String encoder = Sonar.get().getPlatform().getEncoder().apply(channel.pipeline());
    final ChannelHandler currentEncoder = channel.pipeline().get(encoder);
-    // Close the channel if no decoder exists
+    // Close the channel if no encoder exists
    if (currentEncoder != null) {
-      // We don't need to update the encoder if it's already present
+      // We don't need to update the encoder if it has already been replaced by Sonar
      if (!(currentEncoder instanceof FallbackPacketEncoder)) {
        final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
        channel.pipeline().replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ public final class FallbackTimeoutHandler extends IdleStateHandler {
  }

  @Override
-  protected void channelIdle(final ChannelHandlerContext ctx,
+  protected void channelIdle(final @NotNull ChannelHandlerContext ctx,
                             final @NotNull 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package xyz.jonesdev.sonar.common.fallback;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelPipeline;
-import io.netty.handler.codec.CorruptedFrameException;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -34,12 +33,15 @@ import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
 import xyz.jonesdev.sonar.common.fallback.netty.FallbackTailExceptionsHandler;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackVarInt21FrameDecoder;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackVarInt21FrameEncoder;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketDecoder;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketEncoder;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.DisconnectPacket;
 import xyz.jonesdev.sonar.common.fallback.session.FallbackLoginSessionHandler;
 import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
+import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

 import java.net.InetAddress;
 import java.util.UUID;
@@ -87,20 +89,16 @@ public final class FallbackUserWrapper implements FallbackUser {

  @Override
  public void hijack(final @NotNull String username, final @NotNull UUID offlineUuid) {
-    // The player has joined the verification
    GlobalSonarStatistics.totalAttemptedVerifications++;

-    if (Sonar.get().getConfig().getVerification().isLogConnections()) {
-      // Only log the processing message if the server isn't under attack.
-      // We let the user override this through the configuration.
-      if (Sonar.get().getAttackTracker().getCurrentAttack() == null
-        || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
-        Sonar.get().getFallback().getLogger().info(
-          Sonar.get().getConfig().getMessagesConfig().getString("verification.logs.connection")
-            .replace("<username>", username)
-            .replace("<ip>", Sonar.get().getConfig().formatAddress(inetAddress))
-            .replace("<protocol>", String.valueOf(protocolVersion.getProtocol())));
-      }
+    if (Sonar.get().getConfig().getVerification().isLogConnections()
+      && (Sonar.get().getAttackTracker().getCurrentAttack() == null
+      || Sonar.get().getConfig().getVerification().isLogDuringAttack())) {
+      Sonar.get().getFallback().getLogger().info(
+        Sonar.get().getConfig().getMessagesConfig().getString("verification.logs.connection")
+          .replace("<username>", username)
+          .replace("<ip>", Sonar.get().getConfig().formatAddress(inetAddress))
+          .replace("<protocol>", String.valueOf(protocolVersion.getProtocol())));
    }

    // Call the VerifyJoinEvent for external API usage
@@ -118,6 +116,7 @@ public final class FallbackUserWrapper implements FallbackUser {

      // Replace normal encoder to allow custom packets
      final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
+      pipeline.addFirst(FALLBACK_FRAME_ENCODER, FallbackVarInt21FrameEncoder.INSTANCE);
      pipeline.addLast(FALLBACK_PACKET_ENCODER, newEncoder);

      // Send LoginSuccess packet to make the client think they are joining the server
@@ -128,6 +127,7 @@ public final class FallbackUserWrapper implements FallbackUser {

      // Replace normal decoder to allow custom packets
      final FallbackPacketDecoder fallbackPacketDecoder = new FallbackPacketDecoder(protocolVersion);
+      pipeline.addFirst(FALLBACK_FRAME_DECODER, new FallbackVarInt21FrameDecoder());
      pipeline.addLast(FALLBACK_PACKET_DECODER, fallbackPacketDecoder);
      // Listen for all incoming packets by setting the packet listener
      fallbackPacketDecoder.setListener(new FallbackLoginSessionHandler(this, username));
@@ -139,10 +139,10 @@ public final class FallbackUserWrapper implements FallbackUser {

  @Override
  public void fail(final @NotNull String reason) {
+    GlobalSonarStatistics.totalFailedVerifications++;
+
    disconnect(Sonar.get().getConfig().getVerification().getVerificationFailed());

-    // Only log the failed message if the server isn't currently under attack.
-    // However, we let the user override this through the configuration.
    final boolean shouldLog = Sonar.get().getAttackTracker().getCurrentAttack() == null
      || Sonar.get().getConfig().getVerification().isLogDuringAttack();

@@ -154,49 +154,40 @@ public final class FallbackUserWrapper implements FallbackUser {
          .replace("<reason>", reason));
    }

-    // Increment number of total failed verifications
-    GlobalSonarStatistics.totalFailedVerifications++;
-
    // Call the VerifyFailedEvent for external API usage
    Sonar.get().getEventManager().publish(new UserVerifyFailedEvent(this, reason));

    // Use a label, so we can easily add more code beneath this method in the future
    blacklist: {
      // Check if the player has too many failed attempts
-      final int blacklistThreshold = Sonar.get().getConfig().getVerification().getBlacklistThreshold();
+      final int limit = Sonar.get().getConfig().getVerification().getBlacklistThreshold();
      // The user is allowed to disable the blacklist entirely by setting the threshold to 0
-      if (blacklistThreshold <= 0) break blacklist;
+      if (limit <= 0) break blacklist;

-      // Use 1 as the default amount of fails since we haven't cached anything yet
-      final int fails = Sonar.get().getFallback().getRatelimiter().getFailCountCache().get(inetAddress, ignored -> 1);
-      // Now we simply need to check if the threshold is reached
-      if (fails < blacklistThreshold) {
-        // Make sure we increment the number of fails
-        Sonar.get().getFallback().getRatelimiter().incrementFails(inetAddress, fails);
-        break blacklist;
-      }
+      final String hostAddress = inetAddress.getHostAddress();
+      final int score = Sonar.get().getFallback().getBlacklist().get(hostAddress, __ -> 0);
+      final int newScore = score + 1;
+
+      Sonar.get().getFallback().getBlacklist().put(hostAddress, newScore);
+
+      // The player hasn't been blacklisted yet, so skip this iteration
+      if (newScore < limit) break blacklist;
+
+      GlobalSonarStatistics.totalBlacklistedPlayers++;

      // Call the BotBlacklistedEvent for external API usage
      Sonar.get().getEventManager().publish(new UserBlacklistedEvent(this));

-      // Increment number of total blacklisted players
-      GlobalSonarStatistics.totalBlacklistedPlayers++;
-
-      Sonar.get().getFallback().getBlacklist().put(getInetAddress(), (byte) 0);
-
      if (shouldLog) {
        Sonar.get().getFallback().getLogger().info(
          Sonar.get().getConfig().getMessagesConfig().getString("verification.logs.blacklisted")
            .replace("<ip>", Sonar.get().getConfig().formatAddress(getInetAddress()))
            .replace("<protocol>", String.valueOf(getProtocolVersion().getProtocol())));
      }
-
-      // Invalidate the cached entry to ensure memory safety
-      Sonar.get().getFallback().getRatelimiter().getFailCountCache().invalidate(inetAddress);
    }

    // Throw an exception to avoid further code execution
-    throw new CorruptedFrameException();
+    throw QuietDecoderException.INSTANCE;
  }

  /**
@@ -207,18 +198,16 @@ public final class FallbackUserWrapper implements FallbackUser {
  public static void closeWith(final @NotNull Channel channel,
                               final @NotNull ProtocolVersion protocolVersion,
                               final @NotNull Object msg) {
-    if (channel.isActive()) {
-      if (protocolVersion.compareTo(MINECRAFT_1_8) < 0
-        && protocolVersion.compareTo(MINECRAFT_1_7_2) >= 0) {
-        channel.eventLoop().execute(() -> {
-          channel.config().setAutoRead(false);
-          channel.eventLoop().schedule(() -> {
-            channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
-          }, 250L, TimeUnit.MILLISECONDS);
-        });
-      } else {
-        channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
-      }
+    if (protocolVersion.compareTo(MINECRAFT_1_8) < 0
+      && protocolVersion.compareTo(MINECRAFT_1_7_2) >= 0) {
+      channel.eventLoop().execute(() -> {
+        channel.config().setAutoRead(false);
+        channel.eventLoop().schedule(() -> {
+          channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
+        }, 250L, TimeUnit.MILLISECONDS);
+      });
+    } else {
+      channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
    }
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,15 +18,15 @@
 package xyz.jonesdev.sonar.common.fallback.netty;

 import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
 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.util.FakeChannelUtil;

 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -60,12 +60,13 @@ public final class FallbackInjectedChannelInitializer extends ChannelInitializer
      throw new ReflectiveOperationException(throwable);
    }

-    // Inject Sonar's channel handler into the pipeline
-    if (channel.isActive()) {
-      final ChannelHandler inboundHandler = new FallbackInboundHandler(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);
      // 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().getEncoderFunction().apply(channel.pipeline());
+        final String encoder = Sonar.get().getPlatform().getEncoder().apply(channel.pipeline());
        channel.pipeline().addBefore(encoder, FALLBACK_INBOUND_HANDLER, inboundHandler);
      } else {
        channel.pipeline().addFirst(FALLBACK_INBOUND_HANDLER, inboundHandler);
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package xyz.jonesdev.sonar.common.fallback.netty;
 import io.netty.util.ByteProcessor;
 import lombok.Getter;

-// Taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/VarintByteDecoder.java
@Getter
 final class FallbackVarInt21ByteDecoder implements ByteProcessor {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,11 @@ package xyz.jonesdev.sonar.common.fallback.netty;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
-import io.netty.handler.codec.CorruptedFrameException;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

 import java.util.List;

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

@@ -58,7 +57,7 @@ public final class FallbackVarInt21FrameDecoder extends ByteToMessageDecoder {

      if (readVarInt < 0) {
        in.clear();
-        throw new CorruptedFrameException("Invalid VarInt length " + readVarInt);
+        throw QuietDecoderException.INSTANCE;
      } else if (readVarInt == 0) {
        // Skip over the empty packet(s) and ignore it
        in.readerIndex(end + 1);
@@ -71,7 +70,7 @@ public final class FallbackVarInt21FrameDecoder extends ByteToMessageDecoder {
      }
    } else if (reader.getResult() == FallbackVarInt21ByteDecoder.DecodeResult.TOO_BIG) {
      in.clear();
-      throw new CorruptedFrameException("Too big VarInt " + reader.getReadVarInt());
+      throw QuietDecoderException.INSTANCE;
    }
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@ import org.jetbrains.annotations.NotNull;
 import static xyz.jonesdev.sonar.common.util.ProtocolUtil.varIntBytes;
 import static xyz.jonesdev.sonar.common.util.ProtocolUtil.writeVarInt;

-// Taken from
 // 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> {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,15 +20,17 @@ package xyz.jonesdev.sonar.common.fallback.protocol;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.DecoderException;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.util.exception.QuietDecoderException;

 import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_20_2;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.Direction.SERVERBOUND;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.GAME;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.LOGIN;
+import static xyz.jonesdev.sonar.common.util.ProtocolUtil.DEBUG;
 import static xyz.jonesdev.sonar.common.util.ProtocolUtil.readVarInt;

 public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
@@ -76,12 +78,12 @@ public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
          // Try to decode the packet for the given protocol version
          packet.decode(byteBuf, protocolVersion);
        } catch (Throwable throwable) {
-          throw new CorruptedFrameException("Failed to decode packet");
+          throw DEBUG ? new DecoderException(throwable) : QuietDecoderException.INSTANCE;
        }

        // Check if the packet still has bytes left after we decoded it
        if (byteBuf.isReadable()) {
-          throw new CorruptedFrameException("Could not read packet to end");
+          throw DEBUG ? new DecoderException("Could not read packet to end") : QuietDecoderException.INSTANCE;
        }

        // Let our verification handler process the packet
@@ -102,12 +104,12 @@ public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
                               final @NotNull FallbackPacket packet) throws Exception {
    final int expectedMaxLen = packet.expectedMaxLength(byteBuf, protocolVersion);
    if (expectedMaxLen != -1 && byteBuf.readableBytes() > expectedMaxLen) {
-      throw new CorruptedFrameException("Packet too large");
+      throw DEBUG ? new DecoderException("Packet too large") : QuietDecoderException.INSTANCE;
    }

    final int expectedMinLen = packet.expectedMinLength(byteBuf, protocolVersion);
    if (expectedMinLen != -1 && byteBuf.readableBytes() < expectedMinLen) {
-      throw new CorruptedFrameException("Packet too small");
+      throw DEBUG ? new DecoderException("Packet too small") : QuietDecoderException.INSTANCE;
    }
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,6 @@ import java.util.function.Supplier;

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

-// Mostly taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
 public enum FallbackPacketRegistry {
  HANDSHAKE {
@@ -454,6 +453,54 @@ public enum FallbackPacketRegistry {
        map(0x0D, MINECRAFT_1_19_4, false),
        map(0x0F, MINECRAFT_1_20_2, false),
        map(0x12, MINECRAFT_1_21, false));
+      serverbound.register(SetPlayerOnGround.class, SetPlayerOnGround::new,
+        map(0x03, MINECRAFT_1_7_2, false),
+        map(0x0F, MINECRAFT_1_9, false),
+        map(0x0D, MINECRAFT_1_12, false),
+        map(0x0C, MINECRAFT_1_12_1, false),
+        map(0x0F, MINECRAFT_1_13, false),
+        map(0x14, MINECRAFT_1_14, false),
+        map(0x15, MINECRAFT_1_16, false),
+        map(0x14, MINECRAFT_1_17, false),
+        map(0x16, MINECRAFT_1_19, false),
+        map(0x17, MINECRAFT_1_19_1, false),
+        map(0x16, MINECRAFT_1_19_3, false),
+        map(0x17, MINECRAFT_1_19_4, false),
+        map(0x19, MINECRAFT_1_20_2, false),
+        map(0x1A, MINECRAFT_1_20_3, false),
+        map(0x1D, MINECRAFT_1_20_5, false));
+      serverbound.register(SetPlayerPositionPacket.class, SetPlayerPositionPacket::new,
+        map(0x04, MINECRAFT_1_7_2, false),
+        map(0x0C, MINECRAFT_1_9, false),
+        map(0x0E, MINECRAFT_1_12, false),
+        map(0x0D, MINECRAFT_1_12_1, false),
+        map(0x10, MINECRAFT_1_13, false),
+        map(0x11, MINECRAFT_1_14, false),
+        map(0x12, MINECRAFT_1_16, false),
+        map(0x11, MINECRAFT_1_17, false),
+        map(0x13, MINECRAFT_1_19, false),
+        map(0x14, MINECRAFT_1_19_1, false),
+        map(0x13, MINECRAFT_1_19_3, false),
+        map(0x14, MINECRAFT_1_19_4, false),
+        map(0x16, MINECRAFT_1_20_2, false),
+        map(0x17, MINECRAFT_1_20_3, false),
+        map(0x1A, MINECRAFT_1_20_5, false));
+      serverbound.register(SetPlayerRotationPacket.class, SetPlayerRotationPacket::new,
+        map(0x05, MINECRAFT_1_7_2, false),
+        map(0x0E, MINECRAFT_1_9, false),
+        map(0x10, MINECRAFT_1_12, false),
+        map(0x0F, MINECRAFT_1_12_1, false),
+        map(0x12, MINECRAFT_1_13, false),
+        map(0x13, MINECRAFT_1_14, false),
+        map(0x14, MINECRAFT_1_16, false),
+        map(0x13, MINECRAFT_1_17, false),
+        map(0x15, MINECRAFT_1_19, false),
+        map(0x16, MINECRAFT_1_19_1, false),
+        map(0x15, MINECRAFT_1_19_3, false),
+        map(0x16, MINECRAFT_1_19_4, false),
+        map(0x18, MINECRAFT_1_20_2, false),
+        map(0x19, MINECRAFT_1_20_3, false),
+        map(0x1C, MINECRAFT_1_20_5, false));
      serverbound.register(SetPlayerPositionRotationPacket.class, SetPlayerPositionRotationPacket::new,
        map(0x06, MINECRAFT_1_7_2, false),
        map(0x0D, MINECRAFT_1_9, false),
@@ -472,38 +519,6 @@ public enum FallbackPacketRegistry {
        map(0x1B, MINECRAFT_1_20_5, false));
      serverbound.register(ConfirmTeleportationPacket.class, ConfirmTeleportationPacket::new,
        map(0x00, MINECRAFT_1_9, false));
-      serverbound.register(SetPlayerPositionPacket.class, SetPlayerPositionPacket::new,
-        map(0x04, MINECRAFT_1_7_2, false),
-        map(0x0C, MINECRAFT_1_9, false),
-        map(0x0E, MINECRAFT_1_12, false),
-        map(0x0D, MINECRAFT_1_12_1, false),
-        map(0x10, MINECRAFT_1_13, false),
-        map(0x11, MINECRAFT_1_14, false),
-        map(0x12, MINECRAFT_1_16, false),
-        map(0x11, MINECRAFT_1_17, false),
-        map(0x13, MINECRAFT_1_19, false),
-        map(0x14, MINECRAFT_1_19_1, false),
-        map(0x13, MINECRAFT_1_19_3, false),
-        map(0x14, MINECRAFT_1_19_4, false),
-        map(0x16, MINECRAFT_1_20_2, false),
-        map(0x17, MINECRAFT_1_20_3, false),
-        map(0x1A, MINECRAFT_1_20_5, false));
-      serverbound.register(SetPlayerOnGround.class, SetPlayerOnGround::new,
-        map(0x03, MINECRAFT_1_7_2, false),
-        map(0x0F, MINECRAFT_1_9, false),
-        map(0x0D, MINECRAFT_1_12, false),
-        map(0x0C, MINECRAFT_1_12_1, false),
-        map(0x0F, MINECRAFT_1_13, false),
-        map(0x14, MINECRAFT_1_14, false),
-        map(0x15, MINECRAFT_1_16, false),
-        map(0x14, MINECRAFT_1_17, false),
-        map(0x16, MINECRAFT_1_19, false),
-        map(0x17, MINECRAFT_1_19_1, false),
-        map(0x16, MINECRAFT_1_19_3, false),
-        map(0x17, MINECRAFT_1_19_4, false),
-        map(0x19, MINECRAFT_1_20_2, false),
-        map(0x1A, MINECRAFT_1_20_3, false),
-        map(0x1D, MINECRAFT_1_20_5, false));
      serverbound.register(TransactionPacket.class, TransactionPacket::new,
        map(0x0F, MINECRAFT_1_7_2, false),
        map(0x05, MINECRAFT_1_9, false),
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ import java.util.Map;

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

-// Mostly taken from
 // https://github.com/Nan1t/NanoLimbo/blob/main/src/main/java/ua/nanit/limbo/protocol/PacketSnapshot.java
@Getter
 public final class FallbackPacketSnapshot implements FallbackPacket {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
+import xyz.jonesdev.sonar.captcha.StandardCaptchaGenerator;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockType;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockUpdate;
 import xyz.jonesdev.sonar.common.fallback.protocol.captcha.CaptchaPreparer;
@@ -108,9 +109,6 @@ public class FallbackPreparer {
  public double[] preparedCachedYMotions;
  public double maxFallDistance;

-  // CAPTCHA
-  public final CaptchaPreparer MAP_INFO_PREPARER = new CaptchaPreparer();
-
  // XP packets
  public FallbackPacket[] xpCountdown;

@@ -198,7 +196,7 @@ public class FallbackPreparer {
      // Prepare CAPTCHA messages
      enterCodeMessage = new FallbackPacketSnapshot(new SystemChatPacket(new ComponentHolder(
        MiniMessage.miniMessage().deserialize(
-          Sonar.get().getConfig().getMessagesConfig().getString("verification.captcha.enter-code"),
+          Sonar.get().getConfig().getMessagesConfig().getString("verification.captcha.enter"),
          Placeholder.component("prefix", Sonar.get().getConfig().getPrefix())))));
      incorrectCaptcha = new FallbackPacketSnapshot(new SystemChatPacket(new ComponentHolder(
        MiniMessage.miniMessage().deserialize(
@@ -210,16 +208,26 @@ public class FallbackPreparer {

      for (int i = 0; i < xpCountdown.length; i++) {
        final float bar = (float) i / xpCountdown.length;
-        xpCountdown[i] = new FallbackPacketSnapshot(new SetExperiencePacket(bar, i, i));
+        xpCountdown[i] = new FallbackPacketSnapshot(new SetExperiencePacket(bar, i, 0));
+      }
+
+      // Update the CAPTCHA generator if necessary
+      if (Sonar.get().getFallback().getCaptchaGenerator() == null
+        || Sonar.get().getFallback().getCaptchaGenerator() instanceof StandardCaptchaGenerator) {
+        Sonar.get().getFallback().setCaptchaGenerator(new StandardCaptchaGenerator(128, 128,
+          Sonar.get().getConfig().getVerification().getMap().getBackgroundImage()));
+      } else {
+        Sonar.get().getLogger().info("Custom CAPTCHA generator detected, skipping reinitialization.");
      }

      // Prepare CAPTCHA answers
-      MAP_INFO_PREPARER.prepare();
+      CaptchaPreparer.prepare();
    } else {
      // Throw away if not needed
      enterCodeMessage = null;
      incorrectCaptcha = null;
      xpCountdown = null;
+      Sonar.get().getFallback().setCaptchaGenerator(null);
    }
  }
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,99 +17,52 @@

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

-import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.capja.SimpleCaptchaGenerator;
-import xyz.jonesdev.capja.filter.SimpleRippleFilter;
-import xyz.jonesdev.capja.filter.SimpleScratchFilter;
-import xyz.jonesdev.capja.libs.jhlabs.image.AbstractBufferedImageOp;
-import xyz.jonesdev.capja.libs.jhlabs.image.BumpFilter;
-import xyz.jonesdev.capja.libs.jhlabs.image.SmearFilter;
+import lombok.experimental.UtilityClass;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.config.SonarConfiguration;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;

-import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadLocalRandom;

-public final class CaptchaPreparer {
-  private static final ExecutorService PREPARATION_SERVICE = Executors.newSingleThreadExecutor();
-  private static final Random RANDOM = new Random();
+@UtilityClass
+public class CaptchaPreparer {
+  private final ExecutorService PREPARATION_SERVICE = Executors.newSingleThreadExecutor();
+  private final Random RANDOM = new Random();

  private MapCaptchaInfo[] cached;
  private int preparedAmount;

  public void prepare() {
    // Make sure we're not preparing when Sonar is already preparing answers
-    if (cached != null && preparedAmount != cached.length) return;
-    preparedAmount = 0;
+    if (cached != null && preparedAmount != cached.length) {
+      return;
+    }

    final SystemTimer timer = new SystemTimer();
    Sonar.get().getLogger().info("Asynchronously preparing CAPTCHA answers...");
    Sonar.get().getLogger().info("Players will be able to join even if the preparation isn't finished");

    // Prepare cache
-    final SonarConfiguration.Verification.Map config = Sonar.get().getConfig().getVerification().getMap();
-    cached = new MapCaptchaInfo[config.getPrecomputeAmount()];
+    final int precomputeAmount = Sonar.get().getConfig().getVerification().getMap().getPrecomputeAmount();
+    final char[] alphabet = Sonar.get().getConfig().getVerification().getMap().getAlphabet().toCharArray();
+
+    preparedAmount = 0;
+    cached = new MapCaptchaInfo[precomputeAmount];

    // Prepare everything asynchronously
    PREPARATION_SERVICE.execute(() -> {
-      // Create the images using capja
-      final @Nullable File backgroundImage = Sonar.get().getConfig().getVerification().getMap().getBackgroundImage();
-      final SimpleCaptchaGenerator generator = new SimpleCaptchaGenerator(128, 128, backgroundImage);
-      final char[] dictionary = config.getDictionary().toCharArray();
-
-      // Prepare the filters for the CAPTCHA
-      final List<AbstractBufferedImageOp> filters = new ArrayList<>();
-      if (Sonar.get().getConfig().getVerification().getMap().isScratches()) {
-        filters.add(new SimpleScratchFilter(5));
-      }
-      if (Sonar.get().getConfig().getVerification().getMap().isRipple()) {
-        final SimpleRippleFilter rippleFilter = new SimpleRippleFilter();
-        rippleFilter.setXAmplitude(0);
-        float yAmplitude = 10 - ThreadLocalRandom.current().nextInt(20);
-        if (Math.abs(yAmplitude) < 3) {
-          yAmplitude = yAmplitude >= 0 ? 3 : -3;
-        }
-        rippleFilter.setYAmplitude(yAmplitude);
-        filters.add(rippleFilter);
-      }
-      if (Sonar.get().getConfig().getVerification().getMap().getDistortion().isEnabled()) {
-        final SmearFilter smearFilter = new SmearFilter();
-        smearFilter.setShape(Sonar.get().getConfig().getVerification().getMap().getDistortion().getShape());
-        smearFilter.setMix(Sonar.get().getConfig().getVerification().getMap().getDistortion().getMix());
-        smearFilter.setDensity(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDensity());
-        smearFilter.setDistance(Sonar.get().getConfig().getVerification().getMap().getDistortion().getDistance());
-        filters.add(smearFilter);
-      }
-      if (Sonar.get().getConfig().getVerification().getMap().isBump()) {
-        filters.add(new BumpFilter());
-      }
-
-      for (preparedAmount = 0; preparedAmount < config.getPrecomputeAmount(); preparedAmount++) {
-        if (!Sonar.get().getConfig().getVerification().getMap().isAutoColor()) {
-          // Generate a random gradient color if automatic coloring is disabled
-          final Color color0 = Color.getHSBColor((float) Math.random(), 1, 1);
-          final Color color1 = Color.getHSBColor((float) Math.random(), 1, 0.5f);
-          final GradientPaint gradient = new GradientPaint(0, 0, color0,
-            generator.getWidth(), generator.getHeight(), color1);
-          generator.setGradient(gradient);
-        }
+      for (preparedAmount = 0; preparedAmount < precomputeAmount;) {
        // Generate CAPTCHA answer
-        final char[] answer = new char[5];
+        final char[] answer = new char[3 + RANDOM.nextInt(2)];
        for (int j = 0; j < answer.length; j++) {
-          answer[j] = dictionary[ThreadLocalRandom.current().nextInt(dictionary.length)];
+          answer[j] = alphabet[RANDOM.nextInt(alphabet.length)];
        }
-        final BufferedImage image = generator.createImage(answer, filters);
+        final BufferedImage image = Sonar.get().getFallback().getCaptchaGenerator().createImage(answer);
        // Convert and cache converted Minecraft map bytes
        final int[] buffer = MapColorPalette.getBufferFromImage(image);
-        cached[preparedAmount] = new MapCaptchaInfo(new String(answer), buffer);
+        cached[preparedAmount++] = new MapCaptchaInfo(new String(answer), buffer);
      }

      Sonar.get().getLogger().info("Finished preparing {} CAPTCHA answers ({}s)!", preparedAmount, timer);
@@ -117,7 +70,7 @@ public final class CaptchaPreparer {
  }

  public boolean isCaptchaAvailable() {
-    return cached != null && cached[0] != null;
+    return preparedAmount > 0 && cached != null && cached[0] != null;
  }

  public MapCaptchaInfo getRandomCaptcha() {
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Sonar Contributors
+ * Copyright (C) 2024 Sonar Contributors
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,10 +26,10 @@ import java.awt.image.BufferedImage;
 public class MapColorPalette {
  // https://minecraft.wiki/w/Map_item_format#Full_color_tables
  public static final int[] COLOR_MAP = {
-    -16777216,
-    -16777216,
-    -16777216,
-    -16777216,
+    -1,
+    -1,
+    -1,
+    -1,
    -10912473,
    -9594576,
    -8408520,
Author	SHA1	Message	Date
Jones	87e768da0e	Release 2.1.4 (#375 )	2024-09-03 16:29:22 +02:00
Jones	daa773bff1	General code style improvements and API fixes	2024-08-31 19:11:55 +02:00
Jones	1e43835d0b	Quieten decoder exceptions to improve performance (#373 ) * fix: use QuietDecoderException unless debug is enabled * fix(bukkit): allow for more debug in the decoder	2024-08-31 13:57:41 +02:00
Jones	efb8b3cd39	Don't handle the handshake for server pings	2024-08-31 13:49:32 +02:00
Jones	540899e92c	Fix UserBlacklistedEvent not being called	2024-08-31 13:22:39 +02:00
Jones	ef6140d47f	Fix wrong usage for getting the blacklist score	2024-08-30 22:12:29 +02:00
Jones	27ca5a8368	Merge `failCountCache` and `blacklist` into one	2024-08-30 22:11:34 +02:00
Jones	1a43242c24	Clean up some inconsistent code style	2024-08-30 21:17:26 +02:00
Jones	65eeec6e17	Optimize login check order/priority	2024-08-30 21:17:14 +02:00
Jones	d8e4dbd6cf	Use host address instead of raw InetAddress	2024-08-30 21:12:03 +02:00
Jones	32973e674f	Move ratelimiter implementations to the `common` module	2024-08-30 20:44:14 +02:00
Jones	05fa6de119	Fix some Java naming convention violations	2024-08-30 13:15:16 +02:00
Jones	cf0f4e0b96	Code style improvements and micro-optimizations	2024-08-30 12:47:34 +02:00
Jones	0ae3c6c67b	Remove unnecessary `ctx.channel()` calls	2024-08-30 12:37:25 +02:00
Jones	aae564d16c	Fix missing parentheses potentially causing problems	2024-08-29 18:38:16 +02:00
Jones	f6338ba844	Recode the join rate-limiter	2024-08-29 18:29:48 +02:00
Jones	d892645779	Reduce usage of `channel.isActive()`	2024-08-29 18:14:09 +02:00
Jones	def40be5c0	Release 2.1.3 (#369 )	2024-08-28 15:33:53 +02:00
Jones	d4bdf86fcb	Fix NullPointerException	2024-08-28 15:28:10 +02:00
Jones	e6c3dc9d2b	Release 2.1.2 (#368 )	2024-08-28 13:06:04 +02:00
Jones	a3e98e5e51	Recode CAPTCHA generation (#367 ) * feat: fully recode CAPTCHA generation * style: remove unused explicit cast * fix(captcha): increase color brightness of second gradient * style: fix some comments * chore: fix copyright headers * refactor: move ttf font loading into separate class * style: fix some comments * refactor(captcha): move to array for glyphs * feat(captcha): recode color gradient algorithm * fix(captcha): only randomize stroke width once * feat(captcha): re-add custom background support * feat(fallback): optimize pre-queue process * chore: minor code improvements * feat: update messages for new CAPTCHA * fix: use 0 for total experience in SetExp packet * feat(captcha): [wip] circle inverse filter * fix(captcha): make expected CAPTCHA answer lowercase * feat: use (actually legal-to-use) typewriter font * feat: add NoiseOverlayFilter * feat: automatically adapt the font scale * feat(captcha): improve text positioning and coloring * feat(captcha): add optional SmearOverlayFilter * feat(captcha): add random glyph outlines * fix: set debug image generation amount to 1 * refactor: use JHLab's smear filter * style: correct some spelling mistakes in comments * fix: let the system decide the random seed	2024-08-28 12:01:41 +02:00
Jones	769d1f2ddb	Bump h2databases from 2.1.214 to 2.2.220	2024-08-27 17:36:53 +02:00
Jones	f977ae4fe5	Bump mysql-connector-j from 8.4.0 to 9.0.0	2024-08-27 17:33:44 +02:00
Jones	9b11c4c1e0	Bump mariadb-java-client from 3.4.0 to 3.4.1	2024-08-27 17:30:16 +02:00
Jones	44afb98b3c	Fix Bedrock false positive with rotation packets	2024-08-27 17:06:28 +02:00
Jones	1e246472cc	Bump Gradle from 8.9 to 8.10	2024-08-27 14:57:48 +02:00
Jones	77ee422c64	Fix Bedrock false flagging the vehicle speed check	2024-08-27 14:04:27 +02:00
dependabot[bot]	756d7e1f89	Bump bstats from 3.0.2 to 3.0.3 (#364 ) Bumps `bstats` from 3.0.2 to 3.0.3. Updates `org.bstats:bstats-bungeecord` from 3.0.2 to 3.0.3 - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.2...v3.0.3) Updates `org.bstats:bstats-bukkit` from 3.0.2 to 3.0.3 - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.2...v3.0.3) Updates `org.bstats:bstats-velocity` from 3.0.2 to 3.0.3 - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.2...v3.0.3) --- updated-dependencies: - dependency-name: org.bstats:bstats-bungeecord dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.bstats:bstats-bukkit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.bstats:bstats-velocity 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>	2024-08-26 14:13:16 +02:00
Jones	2ac4b7aad3	Don't create duplicate entries in database	2024-08-24 14:49:30 +02:00
Jones	5726e2d3d2	Exempt fake (spoofed) players from being checked	2024-08-20 17:04:00 +02:00
Jones	7aea5754a9	Enable `org.gradle.daemon` to speed up build times	2024-08-18 16:40:45 +02:00
Jones	c10adc37be	Move `net.minecrell.plugin-yml` to version catalog	2024-08-18 16:35:50 +02:00
Jones	465d81cbc2	Release 2.1.1 (#363 )	2024-08-16 14:53:10 +02:00
Michel Elkenwaat	0152e45190	Log client brand and locale if invalid	2024-08-14 19:25:37 +02:00
Michel Elkenwaat	029f7920d0	Update copyright header	2024-08-13 20:41:03 +02:00
Michel Elkenwaat	0f5184297c	Fix incorrect usage of libby since https://github.com/jonesdevelopment/sonar/commit/55030c5073b845a900de444d3724790f29450f66	2024-08-12 18:42:19 +02:00
Michel Elkenwaat	d15b3c86ad	Bump com.google.code.gson:gson from 2.10.1 to 2.11.0	2024-08-12 18:35:44 +02:00
Michel Elkenwaat	0a26cebaa5	Use updated shadow plugin (https://github.com/GradleUp/shadow/issues/908 )	2024-08-12 17:59:34 +02:00
dependabot[bot]	16cf92cd17	Bump org.jetbrains:annotations from 24.0.1 to 24.1.0 (#362 ) Bumps [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) from 24.0.1 to 24.1.0. - [Release notes](https://github.com/JetBrains/java-annotations/releases) - [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/java-annotations/compare/24.0.1...24.1.0) --- updated-dependencies: - dependency-name: org.jetbrains:annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-08-12 02:33:18 +02:00
Michel Elkenwaat	2bac0458dd	Use rotation packets to improve the vehicle check	2024-08-11 20:00:41 +02:00
Michel Elkenwaat	de9bb44bd0	Add `verification.checks.vehicle.minimum-packets` to config	2024-08-11 19:44:02 +02:00