Release 2.1.2 (#368 )

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 13:06:04 +02:00 · 2024-08-28 12:01:41 +02:00 · 2024-08-27 17:36:53 +02:00 · 2024-08-27 17:33:44 +02:00 · 2024-08-27 17:30:16 +02:00 · 2024-08-27 17:06:28 +02:00
187 changed files with 3685 additions and 1666 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,3 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.38
+version=2.1.2
 description=A lightweight, effective, and easy-to-use anti-bot plugin for Velocity, BungeeCord, and Bukkit.
@@ -1,13 +1,16 @@
 [versions]
 netty = "4.1.112.Final"
 adventure = "4.17.0"
-adventure-platform = "4.3.3"
-bstats = "3.0.2"
+adventure-platform = "4.3.4"
+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" }
@@ -16,8 +19,6 @@ adventure-serializer = { module = "net.kyori:adventure-text-serializer-gson", ve
 adventure-nbt = { module = "net.kyori:adventure-nbt", version.ref = "adventure" }
 adventure-platform-bukkit = { module = "net.kyori:adventure-platform-bukkit", version.ref = "adventure-platform" }
 adventure-platform-bungee = { module = "net.kyori:adventure-platform-bungeecord", version.ref = "adventure-platform" }
-adventure-platform-facet = { module = "net.kyori:adventure-platform-facet", version.ref = "adventure-platform" }
-adventure-platform-api = { module = "net.kyori:adventure-platform-api", version.ref = "adventure-platform" }
 libby-core = { module = "com.alessiodp.libby:libby-core", version.ref = "libby" }
 libby-bungee = { module = "com.alessiodp.libby:libby-bungee", version.ref = "libby" }
 libby-bukkit = { module = "com.alessiodp.libby:libby-bukkit", version.ref = "libby" }
@@ -25,11 +26,13 @@ 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.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 for backwards compatibility
+# We have to use 1.8.8 for backwards compatibility
 spigot = "org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT"
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.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"

@@ -3,11 +3,10 @@ repositories {
 }

 dependencies {
-  compileOnly("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
+  compileOnly(rootProject.libs.simpleyaml) {
    exclude(group = "org.yaml")
  }
-
-  compileOnly("org.jetbrains:annotations:24.0.1")
+  compileOnly(rootProject.libs.annotations)
 }

 java.sourceCompatibility = JavaVersion.VERSION_11
@@ -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
@@ -46,6 +46,9 @@ public interface Sonar {
  @ApiStatus.Internal
  @Nullable Audience audience(final @Nullable UUID uniqueId);

+  @ApiStatus.Internal
+  @NotNull Audience sender(final @NotNull Object object);
+
  /**
   * @return The platform the plugin is being run on
   */
@@ -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,19 +17,30 @@

 package xyz.jonesdev.sonar.api;

+import io.netty.channel.ChannelPipeline;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

+import java.util.function.Function;
+
@Getter
@RequiredArgsConstructor
 public enum SonarPlatform {
-  BUKKIT("Bukkit", 19110),
-  BUNGEE("BungeeCord", 19109),
-  VELOCITY("Velocity", 19107);
+  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");

  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;
 }
@@ -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
@@ -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
@@ -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,7 @@ import lombok.Getter;
 import org.jetbrains.annotations.NotNull;

@Getter
-enum Language {
+public enum Language {
  SYSTEM("system"),
  AB("Abkhazian"),
  AA("Afar"),
@@ -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,6 +17,7 @@

 package xyz.jonesdev.sonar.api.config;

+import com.alessiodp.libby.Library;
 import com.j256.ormlite.db.DatabaseType;
 import lombok.*;
 import net.kyori.adventure.text.Component;
@@ -48,6 +49,8 @@ public final class SonarConfiguration {
  private final SimpleYamlConfig generalConfig, messagesConfig, webhookConfig;
  @Getter
  private final File languageFile, pluginFolder;
+  @Getter
+  private Language language;

  static final LoggerWrapper LOGGER = new LoggerWrapper() {

@@ -121,27 +124,27 @@ public final class SonarConfiguration {
    }

    // Generate the language file and check what it's set to
-    Language preferredLanguage = getPreferredLanguage();
-    if (preferredLanguage == Language.SYSTEM) {
+    language = getPreferredLanguage();
+    if (language == Language.SYSTEM) {
      try {
        // Try using the system language to determine the language file
        final String property = System.getProperty("user.language", "en");
-        preferredLanguage = Language.fromCode(property);
+        language = Language.fromCode(property);
        // Make sure the user knows that we're using the system language for translations
-        LOGGER.info("Using system language ({}) for translations.", preferredLanguage);
+        LOGGER.info("Using system language ({}) for translations.", language);
      } catch (Exception exception) {
        LOGGER.warn("Could not use system language for translations.");
-        LOGGER.warn("Using default language ({}) for translations.", preferredLanguage);
+        LOGGER.warn("Using default language ({}) for translations.", language);
      }
    } else {
-      LOGGER.info("Using custom language ({}) for translations.", preferredLanguage);
+      LOGGER.info("Using custom language ({}) for translations.", language);
    }

    // Load all configurations
    try {
-      generalConfig.load(getAsset("config", preferredLanguage));
-      messagesConfig.load(getAsset("messages", preferredLanguage));
-      webhookConfig.load(getAsset("webhook", preferredLanguage));
+      generalConfig.load(getAsset("config", language));
+      messagesConfig.load(getAsset("messages", language));
+      webhookConfig.load(getAsset("webhook", language));
    } catch (Exception exception) {
      throw new IllegalStateException("Error loading configuration", exception);
    }
@@ -155,7 +158,7 @@ public final class SonarConfiguration {

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

    // Attack tracker
    minPlayersForAttack = clamp(generalConfig.getInt("attack-tracker.min-players-for-attack"), 2, 1024);
@@ -165,12 +168,6 @@ public final class SonarConfiguration {

    // Database
    database.type = Database.Type.valueOf(generalConfig.getString("database.type").toUpperCase());
-    database.filename = generalConfig.getString("database.filename");
-    database.host = generalConfig.getString("database.host");
-    database.port = generalConfig.getInt("database.port");
-    database.name = generalConfig.getString("database.name");
-    database.username = generalConfig.getString("database.username");
-    database.password = generalConfig.getString("database.password");
    database.maximumAge = clamp(generalConfig.getInt("database.maximum-age"), 1, 365);

    // Queue
@@ -189,44 +186,34 @@ public final class SonarConfiguration {
    }

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

-    verification.vehicle.timing = Verification.Timing.valueOf(generalConfig.getString("verification.checks.vehicle.timing"));
+    verification.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"));
    verification.brand.maxLength = generalConfig.getInt("verification.checks.client-brand.max-length");

+    verification.gamemode = Verification.Gamemode.valueOf(generalConfig.getString("verification.gamemode"));
    verification.validNameRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-name-regex"));
    verification.validLocaleRegex = Pattern.compile(generalConfig.getString("verification.checks.valid-locale-regex"));
    verification.maxLoginPackets = clamp(generalConfig.getInt("verification.checks.max-login-packets"), 128, 8192);
@@ -241,8 +228,6 @@ public final class SonarConfiguration {
    verification.rememberTime = clamp(generalConfig.getInt("verification.remember-time"), 0, 86400000);
    verification.blacklistTime = clamp(generalConfig.getInt("verification.blacklist-time"), 0, 86400000);
    verification.blacklistThreshold = clamp(generalConfig.getInt("verification.blacklist-threshold"), 0, 100);
-    verification.whitelistedProtocols.clear();
-    verification.whitelistedProtocols.addAll(generalConfig.getIntList("verification.whitelisted-protocols"));
    verification.blacklistedProtocols.clear();
    verification.blacklistedProtocols.addAll(generalConfig.getIntList("verification.blacklisted-protocols"));

@@ -397,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
@@ -424,25 +394,13 @@ public final class SonarConfiguration {
      private boolean enabled;
      private boolean checkCollisions;
      private boolean captchaOnFail;
-      private Gamemode gamemode;
      private int maxMovementTicks;
-
-      @Getter
-      @RequiredArgsConstructor
-      public enum Gamemode {
-        SURVIVAL(0),
-        CREATIVE(1),
-        ADVENTURE(2),
-        // Keep this for backwards compatibility
-        SPECTATOR(2);
-
-        private final int id;
-      }
    }

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

    @Getter
@@ -452,6 +410,23 @@ public final class SonarConfiguration {
      private Pattern validRegex;
    }

+    private Gamemode gamemode;
+
+    @Getter
+    @RequiredArgsConstructor
+    public enum Gamemode {
+      NOT_SET(-1),
+      SURVIVAL(0),
+      CREATIVE(1),
+      ADVENTURE(2);
+
+      private final int id;
+
+      public boolean isSurvivalOrAdventure() {
+        return this == SURVIVAL || this == ADVENTURE;
+      }
+    }
+
    private boolean checkGeyser;
    private boolean logConnections;
    private boolean logDuringAttack;
@@ -466,7 +441,6 @@ public final class SonarConfiguration {
    private int rememberTime;
    private int blacklistTime;
    private int blacklistThreshold;
-    private final Collection<Integer> whitelistedProtocols = new HashSet<>(0);
    private final Collection<Integer> blacklistedProtocols = new HashSet<>(0);

    private Component tooFastReconnect;
@@ -487,22 +461,38 @@ public final class SonarConfiguration {
    @Getter
    @RequiredArgsConstructor
    public enum Type {
-      MYSQL("jdbc:mysql://%s:%d/%s", new MysqlDatabaseTypeAdapter()),
-      MARIADB("jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseTypeAdapter()),
-      H2("jdbc:h2:file:%s", new H2DatabaseTypeAdapter()),
-      NONE(null, null);
+      MYSQL("MySQL", "jdbc:mysql://%s:%d/%s", new MysqlDatabaseTypeAdapter(),
+        Library.builder()
+          .groupId("com{}mysql")
+          .artifactId("mysql-connector-j")
+          .version("9.0.0")
+          .relocate("com{}mysql", "xyz{}jonesdev{}sonar{}libs{}mysql")
+          .build()),
+      MARIADB("MariaDB", "jdbc:mariadb://%s:%d/%s", new MariaDbDatabaseTypeAdapter(),
+        Library.builder()
+          .groupId("org{}mariadb{}jdbc")
+          .artifactId("mariadb-java-client")
+          .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.2.220")
+          .relocate("org{}h2", "xyz{}jonesdev{}sonar{}libs{}h2")
+          .build()),
+      NONE("None", null, null, null);

+      private final String displayName;
      private final String connectionString;
      private final DatabaseType databaseType;
+      private final Library databaseDriver;
+      @Setter
+      private boolean downloaded;
    }

    private Type type;
-    private String filename;
-    private String host;
-    private int port;
-    private String name;
-    private String username;
-    private String password;
    private int maximumAge;
  }

@@ -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,6 +17,7 @@

 package xyz.jonesdev.sonar.api.controller;

+import com.alessiodp.libby.LibraryManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
@@ -71,7 +72,7 @@ public final class VerifiedPlayerController {
  @Getter
  private final @NotNull SonarConfiguration.Database.Type cachedDatabaseType;

-  public 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();
@@ -82,22 +83,39 @@ public final class VerifiedPlayerController {
      return;
    }

-    database.getType().getDatabaseType().loadDriver();
+    // Make sure to only download the driver once
+    if (!cachedDatabaseType.isDownloaded()) {
+      LOGGER.info("Downloading {} driver version {}",
+        cachedDatabaseType.getDatabaseType().getDatabaseName(),
+        cachedDatabaseType.getDatabaseDriver().getVersion());
+      // Download and load the driver for the current database
+      libraryManager.loadLibrary(cachedDatabaseType.getDatabaseDriver());
+      cachedDatabaseType.setDownloaded(true);
+    }
+    // Make sure to actually register the loader, so we can use it
+    cachedDatabaseType.getDatabaseType().loadDriver();

    try {
-      String jdbcURL = String.format(database.getType().getConnectionString(),
-        database.getHost(), database.getPort(), database.getName());
+      final String jdbcURL;

      // H2 has a different JDBC URL layout
      // https://www.codejava.net/java-se/jdbc/connect-to-h2-database-examples
      if (cachedDatabaseType == SonarConfiguration.Database.Type.H2) {
        final File file = new File(Sonar.get().getConfig().getPluginFolder(),
-          Sonar.get().getConfig().getDatabase().getFilename());
-        jdbcURL = String.format(database.getType().getConnectionString(), file.getAbsolutePath());
+          Sonar.get().getConfig().getGeneralConfig().getString("database.filename"));
+        jdbcURL = String.format(cachedDatabaseType.getConnectionString(), file.getAbsolutePath());
+      } else {
+        // Normal JDBC URL layout for MySQL/MariaDB/...
+        jdbcURL = String.format(cachedDatabaseType.getConnectionString(),
+          Sonar.get().getConfig().getGeneralConfig().getString("database.host"),
+          Sonar.get().getConfig().getGeneralConfig().getInt("database.port"),
+          Sonar.get().getConfig().getGeneralConfig().getString("database.name"));
      }

      connectionSource = new JdbcPooledConnectionSource(jdbcURL,
-        database.getUsername(), database.getPassword(), database.getType().getDatabaseType());
+        Sonar.get().getConfig().getGeneralConfig().getString("database.username"),
+        Sonar.get().getConfig().getGeneralConfig().getString("database.password"),
+        cachedDatabaseType.getDatabaseType());

      // Create database table
      try {
@@ -231,7 +249,7 @@ public final class VerifiedPlayerController {
      }

      try {
-        dao.create(player);
+        dao.createIfNotExists(player);
      } catch (SQLException exception) {
        LOGGER.error("Error trying to add entry: {}", exception);
      }
@@ -253,37 +271,44 @@ public final class VerifiedPlayerController {
   *
   * @return Estimated size of the local cache
   */
-  public synchronized int estimatedSize() {
-    /*
-     * TODO: Work on this
-     * return MAP.values().stream()
-     *   .mapToInt(Collection::size)
-     *   .sum();
-     */
+  public int estimatedSize() {
    return cache.size();
  }

  /**
-   * @return List of UUIDs associated with one IP address
+   * Returns the sum of verified IP addresses
+   * and their respective collection of UUIDs
+   *
+   * @return Exact size of all total verified players
+   */
+  @Deprecated
+  public synchronized int exactSize() {
+    return cache.values().stream()
+      .mapToInt(Collection::size)
+      .sum();
+  }
+
+  /**
+   * @return {@link java.util.Collection} of UUIDs associated with an IP address
   */
  public @Unmodifiable Collection<UUID> getUUIDs(final @NotNull String inetAddress) {
    return cache.getOrDefault(inetAddress, Collections.emptyList());
  }

  /**
-   * Clear the local cache, and then if the database type is set,
+   * Clear the local cache, and, if the database type is set,
   * remove the table from the database.
   */
-  public void clearAll() {
-    try {
-      cache.clear();
+  public synchronized void clearAll() {
+    cache.clear();

-      // Only update the column if the database type is not NONE
-      if (cachedDatabaseType != SonarConfiguration.Database.Type.NONE) {
+    // Delete the entire table from the database, if necessary
+    if (cachedDatabaseType != SonarConfiguration.Database.Type.NONE) {
+      try {
        dao.deleteBuilder().delete();
+      } catch (SQLException exception) {
+        LOGGER.error("Error trying to clear entries: {}", exception);
      }
-    } catch (SQLException exception) {
-      LOGGER.error("Error trying to clear entries: {}", 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
@@ -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
@@ -17,7 +17,6 @@

 package xyz.jonesdev.sonar.api.event.impl;

-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -26,7 +25,6 @@ import xyz.jonesdev.sonar.api.event.SonarEvent;

@Getter
@ToString
-@EqualsAndHashCode
@RequiredArgsConstructor
 public final class AttackMitigatedEvent implements SonarEvent {
  private final AttackTracker.AttackStatistics attackStatistics;
@@ -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,7 +17,6 @@

 package xyz.jonesdev.sonar.api.event.impl;

-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -27,7 +26,6 @@ import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
-@EqualsAndHashCode
@RequiredArgsConstructor
 public final class UserBlacklistedEvent implements SonarEvent {
  @ApiStatus.Experimental
@@ -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,7 +17,6 @@

 package xyz.jonesdev.sonar.api.event.impl;

-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -27,7 +26,6 @@ import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
-@EqualsAndHashCode
@RequiredArgsConstructor
 public final class UserVerifyFailedEvent implements SonarEvent {
  private final @NotNull FallbackUser user;
@@ -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,7 +17,6 @@

 package xyz.jonesdev.sonar.api.event.impl;

-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -26,7 +25,6 @@ import xyz.jonesdev.sonar.api.fallback.FallbackUser;

@Getter
@ToString
-@EqualsAndHashCode
@RequiredArgsConstructor
 public final class UserVerifyJoinEvent implements SonarEvent {
  private final String username;
@@ -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,7 +17,6 @@

 package xyz.jonesdev.sonar.api.event.impl;

-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -28,7 +27,6 @@ import java.util.UUID;

@Getter
@ToString
-@EqualsAndHashCode
@RequiredArgsConstructor
 public final class UserVerifySuccessEvent implements SonarEvent {
  private final String username;
@@ -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 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.logger.LoggerWrapper;

 import java.net.InetAddress;
@@ -45,6 +46,8 @@ public final class Fallback {
  private Cache<InetAddress, Byte> blacklist;
  @Setter
  private long blacklistTime;
+  @Setter
+  private CaptchaGenerator captchaGenerator;

  private final @NotNull FallbackQueue queue = new FallbackQueue();
  private final @NotNull FallbackRatelimiter ratelimiter = new FallbackRatelimiter();
@@ -75,10 +78,6 @@ public final class Fallback {
    return shouldPerform(Sonar.get().getConfig().getVerification().getMap().getTiming());
  }

-  public boolean shouldPerformVehicleCheck() {
-    return shouldPerform(Sonar.get().getConfig().getVerification().getVehicle().getTiming());
-  }
-
  private static boolean shouldPerform(final SonarConfiguration.Verification.Timing timing) {
    return timing == SonarConfiguration.Verification.Timing.ALWAYS
      || (timing == SonarConfiguration.Verification.Timing.DURING_ATTACK
@@ -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,8 +18,14 @@
 package xyz.jonesdev.sonar.api.fallback;

 public interface FallbackPipelines {
-  String FALLBACK_HANDLER = "sonar-fallback-handler";
-  String FALLBACK_PACKET_ENCODER = "sonar-fallback-encoder";
-  String FALLBACK_PACKET_DECODER = "sonar-fallback-decoder";
-  String FALLBACK_BANDWIDTH = "sonar-fallback-bandwidth";
+  String FALLBACK_INACTIVE_LISTENER = "sonar-inactive-listener";
+  String FALLBACK_INBOUND_HANDLER = "sonar-inbound-handler";
+  String FALLBACK_FRAME_DECODER = "sonar-frame-decoder";
+  String FALLBACK_FRAME_ENCODER = "sonar-frame-encoder";
+  String FALLBACK_TIMEOUT = "sonar-timeout";
+  String FALLBACK_PACKET_HANDLER = "sonar-packet-handler";
+  String FALLBACK_PACKET_ENCODER = "sonar-packet-encoder";
+  String FALLBACK_PACKET_DECODER = "sonar-packet-decoder";
+  String FALLBACK_TAIL_EXCEPTIONS = "sonar-exception-tail";
+  String FALLBACK_BANDWIDTH = "sonar-bandwidth-counter";
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 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
@@ -44,6 +44,9 @@ public interface FallbackUser {
  @NotNull
  SystemTimer getLoginTimer();

+  @NotNull
+  UUID getOfflineUuid();
+
  boolean isReceivedClientSettings();

  void setReceivedClientSettings(final boolean receivedClientSettings);
@@ -65,16 +68,10 @@ public interface FallbackUser {
  /**
   * Takes over the channel and begins the verification process
   *
-   * @param username Username of the player
-   * @param uuid     UUID of the player
-   * @param encoder  Name of the encoder pipeline
-   * @param decoder  Name of the decoder pipeline
-   * @param timeout  Name of the read timeout pipeline
-   * @param handler  Name of the main pipeline
+   * @param username    Username of the player
+   * @param offlineUuid UUID of the player
   */
-  void hijack(final @NotNull String username, final @NotNull UUID uuid,
-              final @NotNull String encoder, final @NotNull String decoder,
-              final @NotNull String timeout, final @NotNull String handler);
+  void hijack(final @NotNull String username, final @NotNull UUID offlineUuid);

  /**
   * Sends a packet/message to the player
@@ -0,0 +1,25 @@
+/*
+ * 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.captcha;
+
+import java.awt.image.BufferedImage;
+
+@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
@@ -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
@@ -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
@@ -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,19 +1,18 @@
 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 {
  name = rootProject.name
-  description = rootProject.description
-  version = rootProject.version.toString()
  main = "xyz.jonesdev.sonar.bukkit.SonarBukkitPlugin"
  authors = listOf("Jones Development", "Sonar Contributors")
  website = "https://jonesdev.xyz/discord/"
  load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
  softDepend = listOf("Geyser-Spigot", "floodgate", "Protocolize", "ProtocolSupport",
    "ViaVersion", "packetevents", "ProtocolLib", "FastLogin")
+  apiVersion = "1.13" // ignore legacy plugin warning
  foliaSupported = true

  commands {
@@ -33,11 +32,11 @@ dependencies {
  implementation(project(":common"))

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

-  implementation(rootProject.libs.adventure.platform.bukkit)
-  implementation(rootProject.libs.adventure.platform.api)
-  implementation(rootProject.libs.adventure.platform.facet)
-  implementation(rootProject.libs.adventure.nbt)
+  implementation(rootProject.libs.adventure.platform.bukkit) {
+    exclude(module = "adventure-nbt")
+  }
  implementation(rootProject.libs.bstats.bukkit)
  implementation(rootProject.libs.libby.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
@@ -23,24 +23,24 @@ import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
+import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
 import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
+import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
+import xyz.jonesdev.sonar.bukkit.listener.BukkitJoinListener;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

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

@Getter
 public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
-  public static SonarBukkit INSTANCE;
-
  public SonarBukkit(final @NotNull SonarBukkitPlugin plugin) {
-    super(plugin, SonarPlatform.BUKKIT, plugin.getDataFolder(),
-      new BukkitLibraryManager(plugin, plugin.getDataFolder().getName()));
-    INSTANCE = this;
+    super(plugin, SonarPlatform.BUKKIT, plugin.getDataFolder(), new BukkitLibraryManager(plugin));
  }

  /**
@@ -56,6 +56,11 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
    return bukkitAudiences.player(uniqueId);
  }

+  @Override
+  public @NotNull Audience sender(final @NotNull Object object) {
+    return bukkitAudiences.sender((CommandSender) object);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -82,6 +87,8 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {

  private Metrics metrics;

+  public static final CompletableFuture<Void> INITIALIZE_LISTENER = new CompletableFuture<>();
+
  @Override
  public void enable() {
    // Initialize bStats.org metrics
@@ -92,9 +99,23 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
      () -> getConfig().getVerification().getTiming().getDisplayName()));
    metrics.addCustomChart(new SimplePie("captcha",
      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("language",
+      () -> getConfig().getLanguage().getName()));
+    metrics.addCustomChart(new SimplePie("database_type",
+      () -> getConfig().getDatabase().getType().getDisplayName()));

    // Register Sonar command
    Objects.requireNonNull(getPlugin().getCommand("sonar")).setExecutor(new BukkitSonarCommand());
+
+    // Try to inject into the server
+    if (FallbackBukkitInjector.isLateBindEnabled()) {
+      getPlugin().getServer().getScheduler().runTask(getPlugin(), FallbackBukkitInjector::inject);
+    } else {
+      getPlugin().getServer().getPluginManager().registerEvents(new BukkitJoinListener(), getPlugin());
+    }
+
+    // Let the injector know that the plugin has been enabled
+    INITIALIZE_LISTENER.complete(null);
  }

  @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
@@ -18,10 +18,19 @@
 package xyz.jonesdev.sonar.bukkit;

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

 public final class SonarBukkitPlugin extends JavaPlugin {
  private SonarBukkit bootstrap;

+  @Override
+  public void onLoad() {
+    // Inject early if late-bind is disabled
+    if (!FallbackBukkitInjector.isLateBindEnabled()) {
+      FallbackBukkitInjector.inject();
+    }
+  }
+
  @Override
  public void onEnable() {
    bootstrap = new SonarBukkit(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
@@ -23,9 +23,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
-import xyz.jonesdev.sonar.bukkit.SonarBukkit;

 import java.util.List;

@@ -41,7 +41,7 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new InvocationSource(
      sender instanceof Player ? ((Player) sender).getUniqueId() : null,
-      SonarBukkit.INSTANCE.getBukkitAudiences().sender(sender),
+      Sonar.get().sender(sender),
      sender::hasPermission);
    // Pass the invocation source and command arguments to our command handler
    handle(invocationSource, args);
@@ -0,0 +1,95 @@
+/*
+ * 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 lombok.Getter;
+
+@Getter
+public enum BukkitServerVersion {
+  MINECRAFT_1_7_10,
+  MINECRAFT_1_8,
+  MINECRAFT_1_8_3,
+  MINECRAFT_1_8_8,
+  MINECRAFT_1_9,
+  MINECRAFT_1_9_2,
+  MINECRAFT_1_9_4,
+  MINECRAFT_1_10,
+  MINECRAFT_1_10_1,
+  MINECRAFT_1_10_2,
+  MINECRAFT_1_11,
+  MINECRAFT_1_11_2,
+  MINECRAFT_1_12,
+  MINECRAFT_1_12_1,
+  MINECRAFT_1_12_2,
+  MINECRAFT_1_13,
+  MINECRAFT_1_13_1,
+  MINECRAFT_1_13_2,
+  MINECRAFT_1_14,
+  MINECRAFT_1_14_1,
+  MINECRAFT_1_14_2,
+  MINECRAFT_1_14_3,
+  MINECRAFT_1_14_4,
+  MINECRAFT_1_15,
+  MINECRAFT_1_15_1,
+  MINECRAFT_1_15_2,
+  MINECRAFT_1_16,
+  MINECRAFT_1_16_1,
+  MINECRAFT_1_16_2,
+  MINECRAFT_1_16_3,
+  MINECRAFT_1_16_4,
+  MINECRAFT_1_16_5,
+  MINECRAFT_1_17,
+  MINECRAFT_1_17_1,
+  MINECRAFT_1_18,
+  MINECRAFT_1_18_1,
+  MINECRAFT_1_18_2,
+  MINECRAFT_1_19,
+  MINECRAFT_1_19_1,
+  MINECRAFT_1_19_2,
+  MINECRAFT_1_19_3,
+  MINECRAFT_1_19_4,
+  MINECRAFT_1_20,
+  MINECRAFT_1_20_1,
+  MINECRAFT_1_20_2,
+  MINECRAFT_1_20_3,
+  MINECRAFT_1_20_4,
+  MINECRAFT_1_20_5,
+  MINECRAFT_1_20_6,
+  MINECRAFT_1_21;
+
+  static final BukkitServerVersion[] REVERSED_VALUES;
+
+  static {
+    REVERSED_VALUES = values().clone();
+
+    final int size = REVERSED_VALUES.length;
+    final int half = size / 2;
+
+    for (int i = 0; i < half; i++) {
+      final BukkitServerVersion temp = REVERSED_VALUES[i];
+      REVERSED_VALUES[i] = REVERSED_VALUES[size - 1 - i];
+      REVERSED_VALUES[size - 1 - i] = temp;
+    }
+  }
+
+  private final String release;
+
+  BukkitServerVersion() {
+    this.release = name().substring(10).replace("_", ".");
+  }
+}
@@ -0,0 +1,250 @@
+package xyz.jonesdev.sonar.bukkit.fallback;
+
+import io.netty.buffer.ByteBufAllocator;
+import io.netty.channel.*;
+import io.netty.util.Attribute;
+import io.netty.util.AttributeKey;
+import io.netty.util.concurrent.EventExecutor;
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+
+import java.net.SocketAddress;
+import java.util.HashSet;
+import java.util.Set;
+
+public final class ChannelInactiveListener extends ChannelInboundHandlerAdapter {
+  private final Set<ChannelInboundHandler> handlers = new HashSet<>();
+
+  @Override
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+    final ProxiedChannelHandlerContext proxy = new ProxiedChannelHandlerContext(ctx);
+    for (final ChannelInboundHandler handler : handlers) {
+      try {
+        handler.channelInactive(proxy);
+      } catch (Exception exception) {
+        handler.exceptionCaught(proxy, exception);
+      }
+    }
+    super.channelInactive(ctx);
+  }
+
+  public void add(ChannelHandler handler) {
+    if (handler instanceof ChannelInboundHandler) {
+      handlers.add((ChannelInboundHandler) handler);
+    }
+  }
+
+  @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+  public static final class ProxiedChannelHandlerContext implements ChannelHandlerContext {
+    private final ChannelHandlerContext ctx;
+
+    // Overwrite to prevent call this method on next handler
+
+    @Override
+    public ChannelHandlerContext fireChannelInactive() {
+      return this;
+    }
+
+    @Override
+    public ChannelHandlerContext fireExceptionCaught(Throwable throwable) {
+      return this;
+    }
+
+    @Override
+    public Channel channel() {
+      return ctx.channel();
+    }
+
+    @Override
+    public EventExecutor executor() {
+      return ctx.executor();
+    }
+
+    @Override
+    public String name() {
+      return ctx.name();
+    }
+
+    @Override
+    public ChannelHandler handler() {
+      return ctx.handler();
+    }
+
+    @Override
+    public boolean isRemoved() {
+      return ctx.isRemoved();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelRegistered() {
+      return ctx.fireChannelRegistered();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelUnregistered() {
+      return ctx.fireChannelUnregistered();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelActive() {
+      return ctx.fireChannelActive();
+    }
+
+    @Override
+    public ChannelHandlerContext fireUserEventTriggered(Object o) {
+      return ctx.fireUserEventTriggered(o);
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelRead(Object o) {
+      return ctx.fireChannelRead(o);
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelReadComplete() {
+      return ctx.fireChannelReadComplete();
+    }
+
+    @Override
+    public ChannelHandlerContext fireChannelWritabilityChanged() {
+      return ctx.fireChannelWritabilityChanged();
+    }
+
+    @Override
+    public ChannelFuture bind(SocketAddress socketAddress) {
+      return ctx.bind(socketAddress);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress) {
+      return ctx.connect(socketAddress);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress, SocketAddress socketAddress1) {
+      return ctx.connect(socketAddress, socketAddress1);
+    }
+
+    @Override
+    public ChannelFuture disconnect() {
+      return ctx.disconnect();
+    }
+
+    @Override
+    public ChannelFuture close() {
+      return ctx.close();
+    }
+
+    @Override
+    public ChannelFuture deregister() {
+      return ctx.deregister();
+    }
+
+    @Override
+    public ChannelFuture bind(SocketAddress socketAddress, ChannelPromise channelPromise) {
+      return ctx.bind(socketAddress, channelPromise);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress, ChannelPromise channelPromise) {
+      return ctx.connect(socketAddress, channelPromise);
+    }
+
+    @Override
+    public ChannelFuture connect(SocketAddress socketAddress, SocketAddress socketAddress1, ChannelPromise channelPromise) {
+      return ctx.connect(socketAddress, socketAddress1, channelPromise);
+    }
+
+    @Override
+    public ChannelFuture disconnect(ChannelPromise channelPromise) {
+      return ctx.disconnect(channelPromise);
+    }
+
+    @Override
+    public ChannelFuture close(ChannelPromise channelPromise) {
+      return ctx.close(channelPromise);
+    }
+
+    @Override
+    public ChannelFuture deregister(ChannelPromise channelPromise) {
+      return ctx.deregister(channelPromise);
+    }
+
+    @Override
+    public ChannelHandlerContext read() {
+      return ctx.read();
+    }
+
+    @Override
+    public ChannelFuture write(Object o) {
+      return ctx.write(o);
+    }
+
+    @Override
+    public ChannelFuture write(Object o, ChannelPromise channelPromise) {
+      return ctx.write(o, channelPromise);
+    }
+
+    @Override
+    public ChannelHandlerContext flush() {
+      return ctx.flush();
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object o, ChannelPromise channelPromise) {
+      return ctx.writeAndFlush(o, channelPromise);
+    }
+
+    @Override
+    public ChannelFuture writeAndFlush(Object o) {
+      return ctx.writeAndFlush(o);
+    }
+
+    @Override
+    public ChannelPromise newPromise() {
+      return ctx.newPromise();
+    }
+
+    @Override
+    public ChannelProgressivePromise newProgressivePromise() {
+      return ctx.newProgressivePromise();
+    }
+
+    @Override
+    public ChannelFuture newSucceededFuture() {
+      return ctx.newSucceededFuture();
+    }
+
+    @Override
+    public ChannelFuture newFailedFuture(Throwable throwable) {
+      return ctx.newFailedFuture(throwable);
+    }
+
+    @Override
+    public ChannelPromise voidPromise() {
+      return ctx.voidPromise();
+    }
+
+    @Override
+    public ChannelPipeline pipeline() {
+      return ctx.pipeline();
+    }
+
+    @Override
+    public ByteBufAllocator alloc() {
+      return ctx.alloc();
+    }
+
+    @Override
+    @Deprecated
+    public <T> Attribute<T> attr(AttributeKey<T> attributeKey) {
+      return ctx.attr(attributeKey);
+    }
+
+    @Override
+    @Deprecated
+    public <T> boolean hasAttr(AttributeKey<T> attributeKey) {
+      return ctx.hasAttr(attributeKey);
+    }
+  }
+}
@@ -0,0 +1,149 @@
+/*
+ * 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.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.CorruptedFrameException;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandlerAdapter;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginStartPacket;
+
+import 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.readVarInt;
+
+final class FallbackBukkitInboundHandler extends FallbackInboundHandlerAdapter {
+
+  FallbackBukkitInboundHandler() {
+    updateRegistry(FallbackPacketRegistry.HANDSHAKE, DEFAULT_PROTOCOL_VERSION);
+
+    channelRemovalListener = (pipeline, name, handler) -> {
+      final var inactiveListener = (ChannelInactiveListener) pipeline.get(FALLBACK_INACTIVE_LISTENER);
+
+      if (inactiveListener != null) {
+        inactiveListener.add(handler);
+      }
+    };
+  }
+
+  private FallbackPacketRegistry.ProtocolRegistry registry;
+
+  private static final ProtocolVersion DEFAULT_PROTOCOL_VERSION = ProtocolVersion.MINECRAFT_1_7_2;
+
+  public void updateRegistry(final @NotNull FallbackPacketRegistry registry,
+                             final @NotNull ProtocolVersion protocolVersion) {
+    this.registry = registry.getProtocolRegistry(SERVERBOUND, protocolVersion);
+  }
+
+  @Override
+  public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
+    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
+      final int originalReaderIndex = byteBuf.readerIndex();
+      byteBuf.readerIndex(0);
+
+      // Don't continue if the ByteBuf isn't readable or the channel is closed
+      if (!ctx.channel().isActive() || !byteBuf.isReadable()) {
+        byteBuf.release();
+        return;
+      }
+
+      final int packetId = readVarInt(byteBuf);
+      final FallbackPacket packet = registry.createPacket(packetId);
+
+      // 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;
+      }
+
+      try {
+        // 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");
+      }
+
+      // 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");
+      }
+
+      // 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);
+            break;
+          case LOGIN:
+          case TRANSFER:
+            // Let the actual handler know about the handshake packet
+            handleHandshake(ctx.channel(), handshake.getHostname(), handshake.getProtocolVersionId());
+            // Be ready for the next packet (which is supposed to be a login packet)
+            updateRegistry(FallbackPacketRegistry.LOGIN, Objects.requireNonNull(protocolVersion));
+            break;
+          default:
+            throw new CorruptedFrameException("Unknown handshake intent " + handshake.getIntent());
+        }
+      } 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);
+        // 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);
+          if (inboundHandler != null) {
+            channelRemovalListener.accept(ctx.pipeline(), FALLBACK_INBOUND_HANDLER, inboundHandler);
+          }
+        }, loginStart.getUsername(), socketAddress);
+        // Release the ByteBuf to avoid memory leaks
+        byteBuf.release();
+        return;
+      }
+
+      byteBuf.readerIndex(originalReaderIndex);
+      ctx.fireChannelRead(byteBuf);
+    }
+  }
+}
@@ -0,0 +1,272 @@
+/*
+ * 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.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+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.common.fallback.netty.FallbackInjectedChannelInitializer;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_DECODER;
+
+// 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
+// https://github.com/dmulloy2/ProtocolLib/blob/master/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java
+// https://github.com/ViaVersion/ViaVersion/blob/master/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
+@UtilityClass
+public class FallbackBukkitInjector {
+  private final String LEGACY_NMS_PACKAGE;
+  private final String OBC_PACKAGE;
+
+  private final BukkitServerVersion SERVER_VERSION;
+  private final boolean USES_LEGACY_PACKAGING, OBFUSCATED;
+
+  private final Class<?> MINECRAFT_SERVER_CLASS;
+  private final Class<?> CRAFTBUKKIT_SERVER_CLASS;
+  private final Class<?> SERVER_CONNECTION_CLASS;
+  private final Object SERVER_INSTANCE;
+
+  @Getter
+  private boolean lateBindEnabled;
+
+  static {
+    SERVER_VERSION = resolveServerVersion();
+    USES_LEGACY_PACKAGING = SERVER_VERSION.compareTo(BukkitServerVersion.MINECRAFT_1_17) < 0;
+
+    try {
+      final String bukkitPackage = Bukkit.getServer().getClass().getPackage().getName();
+
+      String modifiedPackageName;
+      if (SERVER_VERSION.compareTo(BukkitServerVersion.MINECRAFT_1_20_5) >= 0) {
+        // Example: org.bukkit.craftbukkit
+        modifiedPackageName = bukkitPackage.split("\\.")[2];
+      } else {
+        // Example: org.bukkit.craftbukkit.v1_16_R3
+        modifiedPackageName = bukkitPackage.split("\\.")[3];
+      }
+
+      LEGACY_NMS_PACKAGE = "net.minecraft.server." + modifiedPackageName + ".";
+      OBC_PACKAGE = bukkitPackage + ".";
+
+      OBFUSCATED = isObfuscated();
+      // Minecraft classes
+      MINECRAFT_SERVER_CLASS = getNMSClass("server.MinecraftServer", "MinecraftServer");
+      SERVER_CONNECTION_CLASS = getNMSClass(OBFUSCATED ? "server.network.ServerConnection" : "server.network.ServerConnectionListener", "ServerConnection");
+      // CraftBukkit classes
+      CRAFTBUKKIT_SERVER_CLASS = getOBCClass("CraftServer");
+
+      Object minecraftServerInstance;
+      try {
+        // 1.20.5+
+        minecraftServerInstance = getFieldAt(MINECRAFT_SERVER_CLASS, MINECRAFT_SERVER_CLASS, 0).get(null);
+      } catch (Exception exception) {
+        minecraftServerInstance = getFieldAt(CRAFTBUKKIT_SERVER_CLASS, MINECRAFT_SERVER_CLASS, 0).get(Bukkit.getServer());
+      }
+      SERVER_INSTANCE = minecraftServerInstance;
+
+      checkLateBind();
+    } catch (Exception exception) {
+      throw new ReflectiveOperationException(exception);
+    }
+  }
+
+  private void checkLateBind() {
+    try {
+      try {
+        Class.forName("org.bukkit.event.server.ServerLoadEvent");
+        // late-bind does not exist on these versions, ignore this case
+        return;
+      } catch (ClassNotFoundException ignored) {
+      }
+
+      final Class<?> spigotConfiguration = Class.forName("org.spigotmc.SpigotConfig");
+      final Method initFieldMethod = spigotConfiguration.getDeclaredMethod("lateBind");
+      initFieldMethod.setAccessible(true);
+      initFieldMethod.invoke(null);
+
+      if ((boolean) spigotConfiguration.getField("lateBind").get(null)) {
+        lateBindEnabled = true;
+      }
+    } catch (java.lang.ReflectiveOperationException ignore) {
+    }
+  }
+
+  public @NotNull Field getFieldAt(final @NotNull Class<?> clazz,
+                                   final @NotNull Class<?> type,
+                                   final int index) {
+    int currentIndex = 0;
+    for (final Field field : clazz.getDeclaredFields()) {
+      field.setAccessible(true);
+
+      if (type.isAssignableFrom(field.getType())) {
+        if (currentIndex++ == index) {
+          return field;
+        }
+      }
+    }
+
+    if (clazz.getSuperclass() != null) {
+      return getFieldAt(clazz.getSuperclass(), type, index);
+    }
+    throw new IllegalStateException("Could not find field #" + index + " in " + clazz.getName());
+  }
+
+  public static @NotNull Field findField(final boolean checkSuperClass,
+                                         final @NotNull Class<?> clazz,
+                                         final String @NotNull ... types) throws NoSuchFieldException {
+    for (final Field field : clazz.getDeclaredFields()) {
+      final String fieldTypeName = field.getType().getSimpleName();
+      for (final String type : types) {
+        if (fieldTypeName.equals(type)) {
+          if (!Modifier.isPublic(field.getModifiers())) {
+            field.setAccessible(true);
+          }
+          return field;
+        }
+      }
+    }
+    if (checkSuperClass && clazz != Object.class && clazz.getSuperclass() != null) {
+      return findField(true, clazz.getSuperclass(), types);
+    }
+    throw new NoSuchFieldException(types[0]);
+  }
+
+  private @NotNull BukkitServerVersion resolveServerVersion() {
+    final String bukkitVersion = Bukkit.getBukkitVersion();
+
+    for (final BukkitServerVersion serverVersion : BukkitServerVersion.REVERSED_VALUES) {
+      if (bukkitVersion.contains(serverVersion.getRelease())) {
+        return serverVersion;
+      }
+    }
+
+    // Throw an error if we cannot find the server version
+    throw new IllegalStateException("Could not find server version " + bukkitVersion);
+  }
+
+  private boolean isObfuscated() {
+    try {
+      Class.forName("net.minecraft.server.network.PlayerConnection");
+      return true;
+    } catch (ClassNotFoundException exception) {
+      return false;
+    }
+  }
+
+  private @NotNull Class<?> getNMSClass(final String modern, final String legacy) throws ClassNotFoundException {
+    return Class.forName(USES_LEGACY_PACKAGING ? LEGACY_NMS_PACKAGE + legacy : "net.minecraft." + modern);
+  }
+
+  public @NotNull Class<?> getOBCClass(final String clazz) throws ClassNotFoundException {
+    return Class.forName(OBC_PACKAGE + clazz);
+  }
+
+  @SuppressWarnings("unchecked")
+  public void inject() {
+    try {
+      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>
+        if (!field.getGenericType().getTypeName().contains(ChannelFuture.class.getName())) {
+          continue;
+        }
+
+        final var list = (List<?>) field.get(getFieldAt(MINECRAFT_SERVER_CLASS, SERVER_CONNECTION_CLASS, 0).get(SERVER_INSTANCE));
+
+        for (final Object object : list) {
+          final ChannelFuture channelFuture = (ChannelFuture) object;
+          final List<String> names = channelFuture.channel().pipeline().names();
+
+          ChannelHandler bootstrap = null;
+
+          for (final String name : names) {
+            try {
+              final ChannelHandler handler = channelFuture.channel().pipeline().get(name);
+              final Field childHandlerField = handler.getClass().getDeclaredField("childHandler");
+              childHandlerField.setAccessible(true);
+              final var childHandler = (ChannelInitializer<?>) childHandlerField.get(handler);
+
+              if (childHandler != null) {
+                bootstrap = handler;
+              }
+              break;
+            } catch (Exception exception) {
+              // Some plugins modify this, so we better skip any exceptions
+            }
+          }
+
+          if (bootstrap == null) {
+            // Default to the first channel future if we couldn't find a childHandler
+            bootstrap = channelFuture.channel().pipeline().first();
+          }
+
+          final Field childHandlerField = bootstrap.getClass().getDeclaredField("childHandler");
+          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 (!SonarBukkit.INITIALIZE_LISTENER.isDone()) {
+            final ChannelInitializer<Channel> initializer = new ChannelInitializer<>() {
+              @Override
+              protected void initChannel(Channel channel) {
+                channel.close();
+              }
+            };
+            childHandlerField.set(finalBootstrap, initializer);
+          }
+
+          SonarBukkit.INITIALIZE_LISTENER.thenAccept(v -> {
+            try {
+              childHandlerField.set(finalBootstrap, new FallbackInjectedChannelInitializer(originalInitializer,
+                pipeline -> {
+                  pipeline.addAfter("splitter", FALLBACK_PACKET_DECODER, new FallbackBukkitInboundHandler());
+                  pipeline.addFirst(FallbackPipelines.FALLBACK_INACTIVE_LISTENER, new ChannelInactiveListener());
+                }
+              ));
+            } catch (IllegalAccessException exception) {
+              throw new ReflectiveOperationException(exception);
+            }
+          });
+        }
+        return;
+      }
+    } catch (Exception exception) {
+      Sonar.get().getLogger().error("An error occurred while injecting {}", exception);
+    }
+  }
+}
@@ -0,0 +1,99 @@
+/*
+ * 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.listener;
+
+import io.netty.channel.Channel;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
+import xyz.jonesdev.sonar.common.util.FakeChannelUtil;
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
+
+// 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;
+  // ServerGamePacketListenerImpl aka. PlayerConnection
+  private static MethodHandle _listenerField;
+  private static MethodHandle _networkManagerField;
+  private static MethodHandle _channelField;
+
+  private static boolean initialized;
+
+  static {
+    try {
+      final Method handleMethod = FallbackBukkitInjector.getOBCClass("entity.CraftPlayer")
+        .getDeclaredMethod("getHandle");
+      final Field listenerField = FallbackBukkitInjector.findField(false, handleMethod.getReturnType(),
+        "PlayerConnection", "ServerGamePacketListenerImpl");
+      final Field networkManagerField = FallbackBukkitInjector.findField(true, listenerField.getType(),
+        "NetworkManager", "Connection");
+      final Field channelField = FallbackBukkitInjector.getFieldAt(networkManagerField.getType(), Channel.class, 0);
+
+      _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;
+    }
+  }
+
+  @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 = _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.isFakePlayer(channel)) {
+        return;
+      }
+
+      // Close the channel if Sonar's handlers are not found when the PlayerJoinEvent is called
+      if (channel.pipeline().context(FALLBACK_BANDWIDTH) == null) {
+        channel.close();
+      }
+    } catch (Throwable throwable) {
+      Sonar.get().getLogger().warn("Couldn't find {}: {}", event.getPlayer().getName(), throwable);
+    }
+  }
+}
@@ -1,11 +1,9 @@
 plugins {
-  id("net.minecrell.plugin-yml.bungee") version "0.6.0" apply true
+  alias(libs.plugins.pluginyml.bungee) apply true
 }

 bungee {
  name = rootProject.name
-  description = rootProject.description
-  version = rootProject.version.toString()
  main = "xyz.jonesdev.sonar.bungee.SonarBungeePlugin"
  author = "Jones Development, Sonar Contributors"
  softDepends = setOf("Geyser-BungeeCord", "floodgate", "Protocolize", "ViaVersion", "packetevents", "FastLogin")
@@ -18,10 +16,9 @@ dependencies {
  compileOnly(rootProject.libs.bungeecord)
  testCompileOnly(rootProject.libs.bungeecord)

-  implementation(rootProject.libs.adventure.platform.bungee)
-  implementation(rootProject.libs.adventure.platform.api)
-  implementation(rootProject.libs.adventure.platform.facet)
-  implementation(rootProject.libs.adventure.nbt)
+  implementation(rootProject.libs.adventure.platform.bungee) {
+    exclude(module = "adventure-nbt")
+  }
  implementation(rootProject.libs.bstats.bungee)
  implementation(rootProject.libs.libby.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
@@ -21,6 +21,7 @@ import com.alessiodp.libby.BungeeLibraryManager;
 import lombok.Getter;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import net.md_5.bungee.api.CommandSender;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 import org.jetbrains.annotations.NotNull;
@@ -35,11 +36,8 @@ import java.util.UUID;

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

  /**
@@ -55,6 +53,11 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
    return bungeeAudiences.player(uniqueId);
  }

+  @Override
+  public @NotNull Audience sender(final @NotNull Object object) {
+    return bungeeAudiences.sender((CommandSender) object);
+  }
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -91,6 +94,10 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
      () -> getConfig().getVerification().getTiming().getDisplayName()));
    metrics.addCustomChart(new SimplePie("captcha",
      () -> getConfig().getVerification().getMap().getTiming().getDisplayName()));
+    metrics.addCustomChart(new SimplePie("language",
+      () -> getConfig().getLanguage().getName()));
+    metrics.addCustomChart(new SimplePie("database_type",
+      () -> getConfig().getDatabase().getType().getDisplayName()));

    // Register Sonar command
    getPlugin().getServer().getPluginManager().registerCommand(getPlugin(), new BungeeSonarCommand());
@@ -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
@@ -22,9 +22,9 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
-import xyz.jonesdev.sonar.bungee.SonarBungee;

 import static java.util.Collections.emptyList;

@@ -38,7 +38,7 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new InvocationSource(
      sender instanceof ProxiedPlayer ? ((ProxiedPlayer) sender).getUniqueId() : null,
-      SonarBungee.INSTANCE.getBungeeAudiences().sender(sender),
+      Sonar.get().sender(sender),
      sender::hasPermission);
    // Pass the invocation source and command arguments to our command handler
    handle(invocationSource, args);
@@ -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,19 +27,13 @@ import net.md_5.bungee.protocol.packet.Handshake;
 import net.md_5.bungee.protocol.packet.LoginRequest;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.common.fallback.FallbackChannelHandlerAdapter;
+import xyz.jonesdev.sonar.common.fallback.FallbackInboundHandlerAdapter;

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

-import static net.md_5.bungee.netty.PipelineUtils.*;
-
-public final class FallbackBungeeChannelHandler extends FallbackChannelHandlerAdapter {
-
-  public FallbackBungeeChannelHandler(final @NotNull Channel channel) {
-    super(channel);
-  }
+final class FallbackBungeeInboundHandler extends FallbackInboundHandlerAdapter {

  private static final MethodHandle CHANNEL_WRAPPER_GETTER;

@@ -53,18 +47,22 @@ public final class FallbackBungeeChannelHandler extends FallbackChannelHandlerAd
  }

  @Override
-  public void channelRead(final @NotNull ChannelHandlerContext ctx, final Object msg) throws Exception {
-    // TODO: put this into a separate handler
+  public void channelRead(final @NotNull ChannelHandlerContext ctx, final @NotNull Object msg) throws Exception {
    // Intercept any packets processed by BungeeCord
-    if (listenForPackets && msg instanceof PacketWrapper) {
+    if (msg instanceof PacketWrapper) {
      final PacketWrapper packetWrapper = (PacketWrapper) msg;
      final DefinedPacket wrappedPacket = packetWrapper.packet;
      // Don't handle any 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(handshake.getHost(), handshake.getProtocolVersion());
+          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);
+          }
        }
        // Intercept any server login packet by the client
        else if (wrappedPacket instanceof LoginRequest) {
@@ -78,9 +76,12 @@ public final class FallbackBungeeChannelHandler extends FallbackChannelHandlerAd
            throw new ReflectiveOperationException(throwable);
          }
          final InetSocketAddress socketAddress = (InetSocketAddress) channelWrapper.getRemoteAddress();
-          handleLogin(ctx, msg, loginRequest.getData(), socketAddress,
-            PACKET_ENCODER, PACKET_DECODER, TIMEOUT_HANDLER, BOSS_HANDLER);
+          // We've done our job - deject this pipeline
+          ctx.channel().pipeline().remove(this);
+          // Make sure to mark this packet as released
          packetWrapper.trySingleRelease();
+          // Let Sonar process the login packet
+          handleLogin(channel, ctx, () -> ctx.fireChannelRead(msg), loginRequest.getData(), socketAddress);
          return;
        }
      }
@@ -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,13 +22,13 @@ import io.netty.channel.ChannelInitializer;
 import lombok.experimental.UtilityClass;
 import net.md_5.bungee.netty.PipelineUtils;
 import sun.misc.Unsafe;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.common.fallback.injection.FallbackInjectedChannelInitializer;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.common.fallback.netty.FallbackInjectedChannelInitializer;

 import java.lang.reflect.Field;

 import static net.md_5.bungee.netty.PipelineUtils.PACKET_DECODER;
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_HANDLER;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_HANDLER;

@UtilityClass
 public class FallbackBungeeInjector {
@@ -39,9 +39,9 @@ public class FallbackBungeeInjector {

      // Make sure to store the original channel initializer
      final ChannelInitializer<Channel> originalInitializer = PipelineUtils.SERVER_CHILD;
-      final ChannelInitializer<Channel> fallbackInitializer = new FallbackInjectedChannelInitializer(
-        originalInitializer, pipeline -> pipeline.addAfter(PACKET_DECODER, FALLBACK_HANDLER,
-        new FallbackBungeeChannelHandler(pipeline.channel())));
+      final ChannelInitializer<Channel> injectedInitializer = new FallbackInjectedChannelInitializer(
+      originalInitializer, pipeline -> pipeline.addAfter(PACKET_DECODER, FALLBACK_PACKET_HANDLER,
+        new FallbackBungeeInboundHandler()));

      final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
      unsafeField.setAccessible(true);
@@ -53,9 +53,9 @@ public class FallbackBungeeInjector {
      final long offset = unsafe.staticFieldOffset(childField);

      // Replace the original channel initializer
-      unsafe.putObject(base, offset, fallbackInitializer);
+      unsafe.putObject(base, offset, injectedInitializer);
    } catch (Exception exception) {
-      throw new ReflectiveOperationException(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")
@@ -57,26 +57,12 @@ class LibraryLoader {
        .version("6.1")
        .relocate("com{}j256{}ormlite", "xyz{}jonesdev{}sonar{}libs{}ormlite")
        .build(),
-      // MySQL driver
+      // JHLabs image filters
      Library.builder()
-        .groupId("com{}mysql")
-        .artifactId("mysql-connector-j")
-        .version("8.4.0")
-        .relocate("com{}mysql", "xyz{}jonesdev{}sonar{}libs{}mysql")
-        .build(),
-      // MariaDB driver
-      Library.builder()
-        .groupId("org{}mariadb{}jdbc")
-        .artifactId("mariadb-java-client")
-        .version("3.4.0")
-        .relocate("org{}mariadb", "xyz{}jonesdev{}sonar{}libs{}mariadb")
-        .build(),
-      // H2 driver
-      Library.builder()
-        .groupId("com{}h2database")
-        .artifactId("h2")
-        .version("2.1.214")
-        .relocate("org{}h2", "xyz{}jonesdev{}sonar{}libs{}h2")
+        .groupId("com{}jhlabs")
+        .artifactId("filters")
+        .version("2.0.235-1")
+        .relocate("com{}jhlabs", "xyz{}jonesdev{}sonar{}libs{}jhlabs")
        .build()
    );

@@ -94,6 +80,12 @@ class LibraryLoader {
          .artifactId("adventure-text-serializer-gson")
          .version("4.17.0")
          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
+          .build(),
+        Library.builder()
+          .groupId("net{}kyori")
+          .artifactId("adventure-nbt")
+          .version("4.17.0")
+          .relocate("net{}kyori", "xyz{}jonesdev{}sonar{}libs{}kyori")
          .build()
      );
    }
@@ -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
@@ -36,11 +36,13 @@ 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.captcha.StandardCaptchaGenerator;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer;
 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.update.UpdateChecker;
+import xyz.jonesdev.sonar.common.util.ProtocolUtil;

 import java.io.File;
 import java.time.Duration;
@@ -55,6 +57,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
  private Notification notificationHandler;
  private SonarConfiguration config;
  private VerifiedPlayerController verifiedPlayerController;
+  private final LibraryManager libraryManager;
  private final SonarStatistics statistics;
  private final SonarPlatform platform;
  private final SubcommandRegistry subcommandRegistry;
@@ -66,6 +69,9 @@ public abstract class SonarBootstrap<T> implements Sonar {
                        final @NotNull LibraryManager libraryManager) {
    // Load all libraries before anything else
    LibraryLoader.loadLibraries(libraryManager, platform);
+    this.libraryManager = libraryManager;
+    // Check if Netty is up to date
+    ProtocolUtil.checkNettyVersion();
    // Set the Sonar API
    SonarSupplier.set(this);
    // Set the plugin instance
@@ -76,8 +82,8 @@ public abstract class SonarBootstrap<T> implements Sonar {
    this.verboseHandler = new Verbose();
    this.notificationHandler = new Notification();
    this.config = new SonarConfiguration(dataDirectory);
-    this.subcommandRegistry = new SubcommandRegistry();
    // Register all subcommands
+    this.subcommandRegistry = new SubcommandRegistry();
    this.subcommandRegistry.register(
      new BlacklistCommand(),
      new VerifiedCommand(),
@@ -142,6 +148,17 @@ public abstract class SonarBootstrap<T> implements Sonar {
      getLogger().warn("Reloading after changing the database type is not recommended as it may cause data loss.");
    }

+    // Update the CAPTCHA generator if necessary
+    if (getConfig().getVerification().getMap().getTiming() == SonarConfiguration.Verification.Timing.NEVER) {
+      getFallback().setCaptchaGenerator(null);
+    } else if (getFallback().getCaptchaGenerator() == null
+      || getFallback().getCaptchaGenerator() instanceof StandardCaptchaGenerator) {
+      getFallback().setCaptchaGenerator(new StandardCaptchaGenerator(128, 128,
+        Sonar.get().getConfig().getVerification().getMap().getBackgroundImage()));
+    } else {
+      getLogger().info("Custom CAPTCHA generator detected, skipping reinitialization.");
+    }
+
    // Prepare cached packets
    getLogger().info("Taking cached snapshots of all packets...");
    FallbackPreparer.prepare();
@@ -180,7 +197,7 @@ public abstract class SonarBootstrap<T> implements Sonar {
      // Close the old connection first
      verifiedPlayerController.close();
    }
-    verifiedPlayerController = new VerifiedPlayerController();
+    verifiedPlayerController = new VerifiedPlayerController(libraryManager);
  }

  public final void 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,247 +0,0 @@
-/*
- * Copyright (C) 2023-2024 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.common.fallback;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.CorruptedFrameException;
-import lombok.RequiredArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.fallback.Fallback;
-import xyz.jonesdev.sonar.api.fallback.FallbackUser;
-import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
-import xyz.jonesdev.sonar.common.util.GeyserDetection;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
-
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_BANDWIDTH;
-import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.customDisconnect;
-import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
-
-@RequiredArgsConstructor
-public class FallbackChannelHandlerAdapter extends ChannelInboundHandlerAdapter {
-  protected final Channel channel;
-  protected @Nullable String username;
-  protected InetAddress inetAddress;
-  protected ProtocolVersion protocolVersion;
-  protected boolean listenForPackets = true;
-
-  protected static final Fallback FALLBACK = Sonar.get().getFallback();
-
-  @Override
-  public final void channelActive(final @NotNull ChannelHandlerContext ctx) throws Exception {
-    // Increase connections per second for the action bar verbose
-    GlobalSonarStatistics.countConnection();
-    // Make sure to let the server handle the rest
-    ctx.fireChannelActive();
-  }
-
-  @Override
-  public final void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
-    // The player can disconnect without sending the login packet first
-    // Account for this by checking if the inetAddress has been set yet
-    if (inetAddress != null) {
-      // Remove the IP address from the connected players
-      FALLBACK.getConnected().compute(inetAddress, (key, value) -> null);
-      // Remove the IP address from the queue
-      FALLBACK.getQueue().getPlayers().compute(inetAddress, (key, value) -> null);
-      // Remove this account from the online players or decrement the number of accounts with the same IP
-      FALLBACK.getOnline().compute(inetAddress, (key, value) -> value == null || value <= 1 ? null : value - 1);
-    }
-    // Make sure to let the server handle the rest
-    ctx.fireChannelInactive();
-  }
-
-  // We can override the default exceptionCaught method since this handler
-  // will run before the connection knows that there has been an error.
-  // Additionally, this will also run after our custom decoder.
-  @Override
-  public final void exceptionCaught(final @NotNull ChannelHandlerContext ctx,
-                                    final @NotNull Throwable cause) throws Exception {
-    // Close the channel if we encounter any errors.
-    ctx.close();
-  }
-
-  /**
-   * Validates and handles incoming handshake packets
-   *
-   * @param hostname Hostname (server address) sent by the client
-   * @param protocol Protocol version number sent by the client
-   */
-  protected final void handleHandshake(final @NotNull String hostname, final int protocol) throws Exception {
-    // Check if the hostname is invalid
-    if (hostname.isEmpty()) {
-      throw new CorruptedFrameException("Hostname is empty");
-    }
-    // Check if the player has already sent a handshake packet
-    if (protocolVersion != null) {
-      throw new CorruptedFrameException("Already sent handshake");
-    }
-    // Store the protocol version
-    protocolVersion = ProtocolVersion.fromId(protocol);
-    // Hook the traffic listener
-    channel.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
-  }
-
-  /**
-   * Validates and handles incoming login packets
-   *
-   * @param ctx           Forwarded channel handler context
-   * @param loginPacket   Login packet sent by the client
-   * @param username      Username sent by the client
-   * @param socketAddress Socket address of the client
-   */
-  protected final void handleLogin(final @NotNull ChannelHandlerContext ctx,
-                                   final @NotNull Object loginPacket,
-                                   final @NotNull String username,
-                                   final @NotNull InetSocketAddress socketAddress,
-                                   final @NotNull String encoder,
-                                   final @NotNull String decoder,
-                                   final @NotNull String timeout,
-                                   final @NotNull String handler) throws Exception {
-    // Check if the player has already sent a login packet
-    if (this.username != null) {
-      throw new CorruptedFrameException("Already sent login");
-    }
-    // Connections from unknown protocol versions will be discarded
-    // as this is the safest way of handling unwanted connections
-    if (protocolVersion.isUnknown()) {
-      // Sonar does not support snapshots or Minecraft versions older than 1.7.2
-      throw new CorruptedFrameException("Unknown protocol version");
-    }
-    // Increase joins per second for the action bar verbose
-    GlobalSonarStatistics.countLogin();
-    // Store the username and IP address
-    this.username = username;
-    this.inetAddress = socketAddress.getAddress();
-
-    // Check the blacklist here since we cannot let the player "ghost join"
-    if (FALLBACK.getBlacklist().asMap().containsKey(inetAddress)) {
-      customDisconnect(channel, protocolVersion, blacklisted, encoder, handler);
-      return;
-    }
-
-    // Check if the player is already queued since we don't want bots to flood the queue
-    if (FALLBACK.getQueue().getPlayers().containsKey(inetAddress)) {
-      customDisconnect(channel, protocolVersion, alreadyQueued, encoder, handler);
-      return;
-    }
-
-    // Check if Fallback is already verifying a player with the same IP address
-    if (FALLBACK.getConnected().containsKey(inetAddress)) {
-      customDisconnect(channel, protocolVersion, alreadyVerifying, encoder, handler);
-      return;
-    }
-
-    // Don't continue the verification process if the verification is disabled
-    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
-      initialLogin(ctx, loginPacket, encoder, handler);
-      return;
-    }
-
-    // Completely skip Geyser connections if configured
-    final boolean geyser = GeyserDetection.isGeyserConnection(channel, socketAddress);
-    if (geyser && !Sonar.get().getConfig().getVerification().isCheckGeyser()) {
-      initialLogin(ctx, loginPacket, encoder, handler);
-      return;
-    }
-
-    // Check if the protocol ID of the player is not allowed to enter the server
-    if (Sonar.get().getConfig().getVerification().getBlacklistedProtocols()
-      .contains(protocolVersion.getProtocol())) {
-      customDisconnect(channel, protocolVersion, protocolBlacklisted, encoder, handler);
-      return;
-    }
-
-    // Make sure we actually have to verify the player
-    final String offlineUUIDString = "OfflinePlayer:" + username;
-    final UUID offlineUUID = UUID.nameUUIDFromBytes(offlineUUIDString.getBytes(StandardCharsets.UTF_8));
-    if (Sonar.get().getVerifiedPlayerController().has(inetAddress.toString(), offlineUUID)) {
-      initialLogin(ctx, loginPacket, encoder, handler);
-      return;
-    }
-
-    // Check if the IP address is currently being rate-limited
-    if (!FALLBACK.getRatelimiter().attempt(inetAddress)) {
-      customDisconnect(channel, protocolVersion, reconnectedTooFast, encoder, handler);
-      return;
-    }
-
-    // Check if the protocol ID of the player is allowed to bypass verification
-    if (Sonar.get().getConfig().getVerification().getWhitelistedProtocols()
-      .contains(protocolVersion.getProtocol())) {
-      initialLogin(ctx, loginPacket, encoder, handler);
-      return;
-    }
-
-    // Queue the connection for further processing
-    FALLBACK.getQueue().getPlayers().compute(inetAddress, (key, value) -> () -> {
-      // Check if the username matches the valid name regex to prevent
-      // UTF-16 names or other types of exploits
-      if (!Sonar.get().getConfig().getVerification().getValidNameRegex()
-        .matcher(username).matches()) {
-        customDisconnect(channel, protocolVersion, invalidUsername, encoder, handler);
-        return;
-      }
-
-      // Create an instance for the Fallback connection
-      final FallbackUser user = new FallbackUserWrapper(channel, inetAddress, protocolVersion, geyser);
-      // Let the verification handler take over the channel
-      user.hijack(username, offlineUUID, encoder, decoder, timeout, handler);
-    });
-  }
-
-  /**
-   * Executes the maximum accounts per IP limit check before letting the player join
-   *
-   * @param ctx         Forwarded channel handler context
-   * @param loginPacket Login packet sent by the client
-   */
-  protected final void initialLogin(final @NotNull ChannelHandlerContext ctx,
-                                    final @NotNull Object loginPacket,
-                                    final @NotNull String encoder,
-                                    final @NotNull String handler) throws Exception {
-    // Increment the number of accounts with the same IP
-    FALLBACK.getOnline().compute(inetAddress, (key, value) -> value == null ? 1 : value + 1);
-
-    final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();
-    // Skip the maximum online per IP check if it's disabled in the configuration
-    if (maxOnlinePerIp > 0) {
-      // Check if the number of online players using the same IP address as
-      // the connecting player is greater than the configured amount
-      final int onlinePerIp = FALLBACK.getOnline().getOrDefault(inetAddress, 0);
-      if (onlinePerIp >= maxOnlinePerIp) {
-        customDisconnect(channel, protocolVersion, tooManyOnlinePerIP, encoder, handler);
-        return;
-      }
-    }
-
-    // Don't listen for further packets
-    // TODO: deject the pipeline without breaking disconnect logic
-    listenForPackets = false;
-    // Let the server know about the login packet
-    ctx.fireChannelRead(loginPacket);
-  }
-}
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.fallback;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.common.statistics.GlobalSonarStatistics;
+
+import java.net.InetAddress;
+import java.util.function.Consumer;
+
+@RequiredArgsConstructor
+public final class FallbackInboundHandler extends ChannelInboundHandlerAdapter {
+  private final Consumer<ChannelPipeline> sonarPipelineInjector;
+  @Setter
+  @Getter
+  private InetAddress inetAddress;
+
+  @Override
+  public void channelActive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+    // Increase connections per second for the action bar verbose
+    GlobalSonarStatistics.countConnection();
+    // Make sure to let the server handle the rest
+    ctx.fireChannelActive();
+    // Add the packet handler pipeline
+    sonarPipelineInjector.accept(ctx.pipeline());
+  }
+
+  @Override
+  public void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+    // The player can disconnect without sending the login packet first
+    // Account for this by checking if the inetAddress has been set yet
+    if (inetAddress != null) {
+      // Remove the IP address from the connected players
+      Sonar.get().getFallback().getConnected().compute(inetAddress, (k, v) -> null);
+      // Remove the IP address from the queue
+      Sonar.get().getFallback().getQueue().getPlayers().compute(inetAddress, (k, v) -> null);
+      // Remove this account from the online players or decrement the number of accounts with the same IP
+      Sonar.get().getFallback().getOnline().compute(inetAddress, (k, v) -> v == null || v <= 1 ? null : v - 1);
+    }
+    // Make sure to let the server handle the rest
+    ctx.fireChannelInactive();
+  }
+
+  // We can override the default exceptionCaught method since this handler
+  // will run before the connection knows that there has been an error.
+  @Override
+  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx,
+                              final @NotNull Throwable cause) throws Exception {
+    // Close the channel if we encounter any errors.
+    ctx.close();
+  }
+}
@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.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.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 java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
+import static xyz.jonesdev.sonar.common.fallback.FallbackUserWrapper.closeWith;
+import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
+
+@AllArgsConstructor
+@RequiredArgsConstructor
+public abstract class FallbackInboundHandlerAdapter extends ChannelInboundHandlerAdapter {
+  protected @Nullable String username;
+  protected ProtocolVersion protocolVersion;
+  protected RemovalListener channelRemovalListener = RemovalListener.EMPTY;
+
+  protected static final Fallback FALLBACK = Sonar.get().getFallback();
+
+  /**
+   * Validates and handles incoming handshake packets
+   *
+   * @param hostname Hostname (server address) sent by the client
+   * @param protocol Protocol version number sent by the client
+   */
+  protected final void handleHandshake(final @NotNull Channel channel,
+                                       final @NotNull String hostname,
+                                       final int protocol) throws Exception {
+    // Check if the hostname is invalid
+    if (hostname.isEmpty()) {
+      throw new CorruptedFrameException("Hostname is empty");
+    }
+    // Check if the player has already sent a handshake packet
+    if (protocolVersion != null) {
+      throw new CorruptedFrameException("Already sent handshake");
+    }
+    // Store the protocol version
+    protocolVersion = ProtocolVersion.fromId(protocol);
+    // Hook the traffic listener
+    channel.pipeline().addFirst(FALLBACK_BANDWIDTH, FallbackBandwidthHandler.INSTANCE);
+  }
+
+  /**
+   * Validates and handles incoming login packets
+   *
+   * @param channel       Forwarded client channel
+   * @param loginPacket   Login packet sent by the client
+   * @param username      Username sent by the client
+   * @param socketAddress Socket address of the client
+   */
+  protected final void handleLogin(final @NotNull Channel channel,
+                                   final @NotNull ChannelHandlerContext ctx,
+                                   final @NotNull Runnable loginPacket,
+                                   final @NotNull String username,
+                                   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");
+    }
+    // Connections from unknown protocol versions will be discarded
+    // as this is the safest way of handling unwanted connections
+    if (protocolVersion.isUnknown()) {
+      // Sonar does not support snapshots or Minecraft versions older than 1.7.2
+      throw new CorruptedFrameException("Unknown protocol version");
+    }
+    // Increase joins per second for the action bar verbose
+    GlobalSonarStatistics.countLogin();
+    // Store the username and IP address
+    this.username = username;
+    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;
+    }
+
+    // Check if Fallback is already verifying a player with the same IP address
+    if (FALLBACK.getConnected().containsKey(inboundHandler.getInetAddress())) {
+      customDisconnect(channel, protocolVersion, alreadyVerifying);
+      return;
+    }
+
+    // Check if the protocol ID of the player is not allowed to enter the server
+    if (Sonar.get().getConfig().getVerification().getBlacklistedProtocols()
+      .contains(protocolVersion.getProtocol())) {
+      customDisconnect(channel, protocolVersion, protocolBlacklisted);
+      return;
+    }
+
+    // Don't continue the verification process if the verification is disabled
+    if (!Sonar.get().getFallback().shouldVerifyNewPlayers()) {
+      initialLogin(ctx, inboundHandler.getInetAddress(), loginPacket);
+      return;
+    }
+
+    // Completely skip Geyser connections if configured
+    final boolean geyser = GeyserUtil.isGeyserConnection(channel, socketAddress);
+    if (geyser && !Sonar.get().getConfig().getVerification().isCheckGeyser()) {
+      initialLogin(ctx, inboundHandler.getInetAddress(), loginPacket);
+      return;
+    }
+
+    // Make sure we actually have to verify the player
+    final String offlineUuidString = "OfflinePlayer:" + username;
+    final UUID offlineUuid = UUID.nameUUIDFromBytes(offlineUuidString.getBytes(StandardCharsets.UTF_8));
+    if (Sonar.get().getVerifiedPlayerController().has(inboundHandler.getInetAddress().toString(), offlineUuid)) {
+      initialLogin(ctx, inboundHandler.getInetAddress(), loginPacket);
+      return;
+    }
+
+    // Check if the IP address is currently being rate-limited
+    if (!FALLBACK.getRatelimiter().attempt(inboundHandler.getInetAddress())) {
+      customDisconnect(channel, protocolVersion, reconnectedTooFast);
+      return;
+    }
+
+    // Remove all other pipelines that could still mess up something
+    rewriteProtocol(ctx, channelRemovalListener);
+
+    // Queue the connection for further processing
+    FALLBACK.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);
+        // Remove other instances of this IP address from the queue
+        return null;
+      }
+
+      return () -> {
+        // Check if the username matches the valid name regex to prevent
+        // UTF-16 names or other types of exploits
+        if (!Sonar.get().getConfig().getVerification().getValidNameRegex()
+          .matcher(username).matches()) {
+          customDisconnect(channel, protocolVersion, invalidUsername);
+          return;
+        }
+
+        // Create an instance for the Fallback connection
+        final FallbackUser user = new FallbackUserWrapper(
+          channel, inboundHandler.getInetAddress(), protocolVersion, offlineUuid, geyser);
+        // Let the verification handler take over the channel
+        user.hijack(username, offlineUuid);
+      };
+    });
+  }
+
+  /**
+   * Removes all pipelines and rewrites them using our custom handlers
+   */
+  private static void rewriteProtocol(final @NotNull ChannelHandlerContext ctx,
+                                      final @NotNull RemovalListener removalListener) {
+    for (final Map.Entry<String, ChannelHandler> entry : ctx.pipeline()) {
+      // Don't accidentally remove Sonar's handlers
+      if (entry.getKey().startsWith("sonar")
+        // Don't remove floodgate's pipelines
+        || entry.getKey().startsWith("geyser")
+        || entry.getKey().startsWith("floodgate")
+        || entry.getKey().equals("DefaultChannelPipeline$TailContext#0")) {
+        continue;
+      }
+      ctx.pipeline().remove(entry.getValue());
+      removalListener.accept(ctx.pipeline(), entry.getKey(), entry.getValue());
+    }
+    // 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));
+  }
+
+  /**
+   * Executes the maximum accounts per IP limit check before letting the player join
+   *
+   * @param ctx         Forwarded client channel context
+   * @param inetAddress Resolved client IP address
+   * @param loginPacket Login packet sent by the client
+   */
+  protected final void initialLogin(final @NotNull ChannelHandlerContext ctx,
+                                    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);
+
+    final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();
+    // Skip the maximum online per IP check if it's disabled in the configuration
+    if (maxOnlinePerIp > 0) {
+      // Check if the number of online players using the same IP address as
+      // the connecting player is greater than the configured amount
+      final int onlinePerIp = FALLBACK.getOnline().getOrDefault(inetAddress, 0);
+      if (onlinePerIp >= maxOnlinePerIp) {
+        customDisconnect(ctx.channel(), protocolVersion, tooManyOnlinePerIP);
+        return;
+      }
+    }
+
+    // Let the server know about the login packet
+    loginPacket.run();
+  }
+
+
+  /**
+   * Disconnect the player before verification (during login)
+   * by replacing the encoder before running the method.
+   *
+   * @param packet          Disconnect packet
+   * @param channel         Channel of the player
+   * @param protocolVersion Protocol version of the player
+   */
+  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));
+    }
+  }
+
+  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());
+    if (channel.pipeline().context(handler) != null) {
+      channel.pipeline().remove(handler);
+    }
+    final String encoder = Sonar.get().getPlatform().getEncoderFunction().apply(channel.pipeline());
+    final ChannelHandler currentEncoder = channel.pipeline().get(encoder);
+    // Close the channel if no decoder exists
+    if (currentEncoder != null) {
+      // We don't need to update the encoder if it's already present
+      if (!(currentEncoder instanceof FallbackPacketEncoder)) {
+        final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
+        channel.pipeline().replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
+      }
+      closeWith(channel, protocolVersion, packet);
+    } else {
+      channel.close();
+    }
+  }
+
+  @FunctionalInterface
+  public interface RemovalListener {
+    void accept(final @NotNull ChannelPipeline pipeline,
+                final @NotNull String name,
+                final @NotNull ChannelHandler handler);
+
+    RemovalListener EMPTY = (pipeline, name, handler) -> {};
+  }
+}
@@ -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
@@ -19,7 +19,6 @@ package xyz.jonesdev.sonar.common.fallback;

 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPipeline;
 import io.netty.handler.codec.CorruptedFrameException;
 import lombok.Getter;
@@ -34,7 +33,9 @@ import xyz.jonesdev.sonar.api.event.impl.UserVerifyJoinEvent;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.api.timer.SystemTimer;
-import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+import xyz.jonesdev.sonar.common.fallback.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;
@@ -46,9 +47,8 @@ import java.net.InetAddress;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;

-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_DECODER;
-import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_PACKET_ENCODER;
-import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_20_2;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.CONFIG;
 import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry.GAME;

@@ -59,6 +59,7 @@ public final class FallbackUserWrapper implements FallbackUser {
  private final ChannelPipeline pipeline;
  private final InetAddress inetAddress;
  private final ProtocolVersion protocolVersion;
+  private final UUID offlineUuid;
  @Setter
  private boolean receivedClientSettings;
  @Setter
@@ -69,11 +70,13 @@ public final class FallbackUserWrapper implements FallbackUser {
  public FallbackUserWrapper(final @NotNull Channel channel,
                             final @NotNull InetAddress inetAddress,
                             final @NotNull ProtocolVersion protocolVersion,
+                             final @NotNull UUID offlineUuid,
                             final boolean geyser) {
    this.channel = channel;
    this.pipeline = channel.pipeline();
    this.inetAddress = inetAddress;
    this.protocolVersion = protocolVersion;
+    this.offlineUuid = offlineUuid;
    this.geyser = geyser;
  }

@@ -85,9 +88,7 @@ public final class FallbackUserWrapper implements FallbackUser {
  }

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

@@ -107,37 +108,36 @@ public final class FallbackUserWrapper implements FallbackUser {
    // Call the VerifyJoinEvent for external API usage
    Sonar.get().getEventManager().publish(new UserVerifyJoinEvent(username, this));

-    // Mark the player as connected by caching them in a map of verifying players
-    Sonar.get().getFallback().getConnected().compute(inetAddress, (key, value) -> (byte) 0);
-
+    // Run this in the channel's event loop to avoid issues
    channel.eventLoop().execute(() -> {
-      // Add better timeout handler to avoid known exploits or issues
-      // We also want to timeout bots quickly to avoid flooding
-      pipeline.replace(timeout, timeout, new FallbackTimeoutHandler(
-        Sonar.get().getConfig().getVerification().getReadTimeout(),
-        Sonar.get().getConfig().getVerification().getWriteTimeout(),
-        TimeUnit.MILLISECONDS));
+      // Make sure the channel is still active
+      if (!channel.isActive()) {
+        return;
+      }
+
+      // Mark the player as connected by caching them in a map of verifying players
+      Sonar.get().getFallback().getConnected().compute(inetAddress, (_k, _v) -> (byte) 0);

      // Replace normal encoder to allow custom packets
      final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
-      pipeline.replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
-
-      // Remove the main pipeline to completely take over the channel
-      if (pipeline.get(handler) != null) {
-        pipeline.remove(handler);
-      }
+      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
-      write(FallbackPreparer.LOGIN_SUCCESS);
+      write(FallbackPreparer.loginSuccess);

      // The LoginSuccess packet has been sent, now we can change the registry state
      newEncoder.updateRegistry(protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0 ? CONFIG : GAME);

      // Replace normal decoder to allow custom packets
      final FallbackPacketDecoder fallbackPacketDecoder = new FallbackPacketDecoder(protocolVersion);
-      pipeline.replace(decoder, FALLBACK_PACKET_DECODER, fallbackPacketDecoder);
+      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, uuid));
+      fallbackPacketDecoder.setListener(new FallbackLoginSessionHandler(this, username));
+
+      // Make sure to catch all exceptions during the verification
+      pipeline.addLast(FALLBACK_TAIL_EXCEPTIONS, FallbackTailExceptionsHandler.INSTANCE);
    });
  }

@@ -212,8 +212,8 @@ public final class FallbackUserWrapper implements FallbackUser {
                               final @NotNull ProtocolVersion protocolVersion,
                               final @NotNull Object msg) {
    if (channel.isActive()) {
-      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0
-        && protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_7_2) >= 0) {
+      if (protocolVersion.compareTo(MINECRAFT_1_8) < 0
+        && protocolVersion.compareTo(MINECRAFT_1_7_2) >= 0) {
        channel.eventLoop().execute(() -> {
          channel.config().setAutoRead(false);
          channel.eventLoop().schedule(() -> {
@@ -225,49 +225,4 @@ public final class FallbackUserWrapper implements FallbackUser {
      }
    }
  }
-
-  /**
-   * Disconnect the player before verification (during login)
-   * by replacing the encoder before running the method.
-   *
-   * @param packet          Disconnect packet
-   * @param encoder         Encoder to replace
-   * @param handler         Main pipeline to remove
-   * @param channel         Channel of the player
-   * @param protocolVersion Protocol version of the player
-   */
-  public static void customDisconnect(final @NotNull Channel channel,
-                                      final @NotNull ProtocolVersion protocolVersion,
-                                      final @NotNull FallbackPacket packet,
-                                      final @NotNull String encoder,
-                                      final @NotNull String handler) {
-    if (channel.eventLoop().inEventLoop()) {
-      _customDisconnect(channel, protocolVersion, packet, encoder, handler);
-    } else {
-      channel.eventLoop().execute(() -> _customDisconnect(channel, protocolVersion, packet, encoder, handler));
-    }
-  }
-
-  private static void _customDisconnect(final @NotNull Channel channel,
-                                        final @NotNull ProtocolVersion protocolVersion,
-                                        final @NotNull FallbackPacket packet,
-                                        final @NotNull String encoder,
-                                        final @NotNull String boss) {
-    // Remove the main pipeline to completely take over the channel
-    if (channel.pipeline().context(boss) != null) {
-      channel.pipeline().remove(boss);
-    }
-    final ChannelHandler currentEncoder = channel.pipeline().get(encoder);
-    // Close the channel if no decoder exists
-    if (currentEncoder != null) {
-      // We don't need to update the encoder if it's already present
-      if (!(currentEncoder instanceof FallbackPacketEncoder)) {
-        final FallbackPacketEncoder newEncoder = new FallbackPacketEncoder(protocolVersion);
-        channel.pipeline().replace(encoder, FALLBACK_PACKET_ENCODER, newEncoder);
-      }
-      closeWith(channel, protocolVersion, packet);
-    } else {
-      channel.close();
-    }
-  }
 }
@@ -1,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,19 +15,27 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.common.fallback.injection;
+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.common.fallback.FallbackInboundHandler;
+import xyz.jonesdev.sonar.common.util.FakeChannelUtil;

 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.util.function.Consumer;

+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.FALLBACK_INBOUND_HANDLER;
+
@RequiredArgsConstructor
 public final class FallbackInjectedChannelInitializer extends ChannelInitializer<Channel> {
  private static final MethodHandle INIT_CHANNEL_METHOD;
@@ -41,8 +49,8 @@ public final class FallbackInjectedChannelInitializer extends ChannelInitializer
    }
  }

-  private final ChannelInitializer<Channel> originalChannelInitializer;
-  private final Consumer<ChannelPipeline> sonarPipelineInjector;
+  private final @NotNull ChannelInitializer<Channel> originalChannelInitializer;
+  private final @NotNull Consumer<ChannelPipeline> sonarPipelineInjector;

  @Override
  protected void initChannel(final Channel channel) throws Exception {
@@ -53,9 +61,17 @@ public final class FallbackInjectedChannelInitializer extends ChannelInitializer
      throw new ReflectiveOperationException(throwable);
    }

-    // Inject Sonar's channel handler into the pipeline
-    if (channel.isActive()) {
-      sonarPipelineInjector.accept(channel.pipeline());
+    // 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.isFakePlayer(channel)) {
+      final ChannelHandler 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());
+        channel.pipeline().addBefore(encoder, FALLBACK_INBOUND_HANDLER, inboundHandler);
+      } else {
+        channel.pipeline().addFirst(FALLBACK_INBOUND_HANDLER, inboundHandler);
+      }
    }
  }
 }
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.fallback.netty;
+
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import org.jetbrains.annotations.NotNull;
+
+@ChannelHandler.Sharable
+public final class FallbackTailExceptionsHandler extends ChannelDuplexHandler {
+  public static final FallbackTailExceptionsHandler INSTANCE = new FallbackTailExceptionsHandler();
+
+  // We can override the default exceptionCaught method since the server
+  // does not have any other pipelines that could handle this error.
+  // Additionally, this will also run after our custom decoder.
+  @Override
+  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx,
+                              final @NotNull Throwable cause) throws Exception {
+    // Close the channel if we encounter any errors.
+    ctx.close();
+  }
+}
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.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 {
+  private int readVarInt, bytesRead;
+  private DecodeResult result = DecodeResult.TOO_SHORT;
+
+  @Override
+  public boolean process(byte k) {
+    if (k == 0 && bytesRead == 0) {
+      result = DecodeResult.RUN_OF_ZEROES;
+      return true;
+    }
+    if (result == DecodeResult.RUN_OF_ZEROES) {
+      return false;
+    }
+    readVarInt |= (k & 0x7F) << bytesRead++ * 7;
+    if (bytesRead > 3) {
+      result = DecodeResult.TOO_BIG;
+      return false;
+    }
+    if ((k & 0x80) != 128) {
+      result = DecodeResult.SUCCESS;
+      return false;
+    }
+    return true;
+  }
+
+  public enum DecodeResult {
+    SUCCESS,
+    TOO_SHORT,
+    TOO_BIG,
+    RUN_OF_ZEROES
+  }
+}
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.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 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 {
+
+  @Override
+  protected void decode(final @NotNull ChannelHandlerContext ctx, final ByteBuf in, final List<Object> out) {
+    if (!ctx.channel().isActive()) {
+      in.clear();
+      return;
+    }
+
+    final FallbackVarInt21ByteDecoder reader = new FallbackVarInt21ByteDecoder();
+    final int end = in.forEachByte(reader);
+
+    if (end == -1) {
+      // We tried to go beyond the end of the buffer.
+      // This is probably a good sign that the buffer was too short to hold a proper varint.
+      if (reader.getResult() == FallbackVarInt21ByteDecoder.DecodeResult.RUN_OF_ZEROES) {
+        // Special case where the entire packet is just a run of zeroes. We ignore them all.
+        in.clear();
+      }
+      return;
+    }
+
+    if (reader.getResult() == FallbackVarInt21ByteDecoder.DecodeResult.RUN_OF_ZEROES) {
+      // This will return to the point where the next varint starts
+      in.readerIndex(end);
+    } else if (reader.getResult() == FallbackVarInt21ByteDecoder.DecodeResult.SUCCESS) {
+      final int readVarInt = reader.getReadVarInt();
+      final int bytesRead = reader.getBytesRead();
+
+      if (readVarInt < 0) {
+        in.clear();
+        throw new CorruptedFrameException("Invalid VarInt length " + readVarInt);
+      } else if (readVarInt == 0) {
+        // Skip over the empty packet(s) and ignore it
+        in.readerIndex(end + 1);
+      } else {
+        int minimumRead = bytesRead + readVarInt;
+        if (in.isReadable(minimumRead)) {
+          out.add(in.retainedSlice(end + 1, readVarInt));
+          in.skipBytes(minimumRead);
+        }
+      }
+    } else if (reader.getResult() == FallbackVarInt21ByteDecoder.DecodeResult.TOO_BIG) {
+      in.clear();
+      throw new CorruptedFrameException("Too big VarInt " + reader.getReadVarInt());
+    }
+  }
+}
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2024 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.common.fallback.netty;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToByteEncoder;
+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> {
+  public static final FallbackVarInt21FrameEncoder INSTANCE = new FallbackVarInt21FrameEncoder();
+
+  @Override
+  protected void encode(final @NotNull ChannelHandlerContext ctx,
+                        final @NotNull ByteBuf msg,
+                        final @NotNull ByteBuf out) throws Exception {
+    writeVarInt(out, msg.readableBytes());
+    out.writeBytes(msg);
+  }
+
+  @Override
+  protected ByteBuf allocateBuffer(final @NotNull ChannelHandlerContext ctx,
+                                   final @NotNull ByteBuf msg,
+                                   final boolean preferDirect) throws Exception {
+    final int anticipatedRequiredCapacity = varIntBytes(msg.readableBytes()) + msg.readableBytes();
+    return ctx.alloc().buffer(anticipatedRequiredCapacity);
+  }
+}
@@ -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
@@ -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,9 @@ import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.FinishConfigurationPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.RegistryDataPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.handshake.HandshakePacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginAcknowledgedPacket;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginStartPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccessPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;

@@ -38,6 +40,12 @@ 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 {
+    {
+      serverbound.register(HandshakePacket.class, HandshakePacket::new,
+        map(0x00, MINECRAFT_1_7_2, false));
+    }
+  },
  LOGIN {
    {
      clientbound.register(DisconnectPacket.class, DisconnectPacket::new,
@@ -45,6 +53,8 @@ public enum FallbackPacketRegistry {
      clientbound.register(LoginSuccessPacket.class, LoginSuccessPacket::new,
        map(0x02, MINECRAFT_1_7_2, true));

+      serverbound.register(LoginStartPacket.class, LoginStartPacket::new,
+        map(0x00, MINECRAFT_1_7_2, false));
      serverbound.register(LoginAcknowledgedPacket.class, LoginAcknowledgedPacket::new,
        map(0x03, MINECRAFT_1_20_2, false));
    }
@@ -124,7 +134,7 @@ public enum FallbackPacketRegistry {
        map(0x1A, MINECRAFT_1_19_4, true),
        map(0x1B, MINECRAFT_1_20_2, true),
        map(0x1D, MINECRAFT_1_20_5, true));
-      clientbound.register(SetPlayerPositionRotation.class, SetPlayerPositionRotation::new,
+      clientbound.register(SetPlayerPositionRotationPacket.class, SetPlayerPositionRotationPacket::new,
        map(0x08, MINECRAFT_1_7_2, true),
        map(0x2E, MINECRAFT_1_9, true),
        map(0x2F, MINECRAFT_1_12_1, true),
@@ -444,7 +454,55 @@ 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(SetPlayerPositionRotation.class, SetPlayerPositionRotation::new,
+      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),
        map(0x0F, MINECRAFT_1_12, false),
@@ -462,38 +520,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
@@ -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,20 +26,21 @@ 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;
 import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionRegistry;
+import xyz.jonesdev.sonar.common.fallback.protocol.entity.EntityType;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.FinishConfigurationPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.configuration.RegistryDataPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccessPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.*;
 import xyz.jonesdev.sonar.common.util.ComponentHolder;

+import java.security.SecureRandom;
 import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;

@UtilityClass
 public class FallbackPreparer {
-
+  private final SecureRandom RANDOM = new SecureRandom();
  // LoginSuccess
-  public final FallbackPacket LOGIN_SUCCESS = new FallbackPacketSnapshot(new LoginSuccessPacket(new UUID(1L, 1L), "Sonar"));
+  public FallbackPacket loginSuccess;
  // Abilities
  public final FallbackPacket DEFAULT_ABILITIES = new FallbackPacketSnapshot(new PlayerAbilitiesPacket(0x00, 0f, 0f));
  public final FallbackPacket CAPTCHA_ABILITIES = new FallbackPacketSnapshot(new PlayerAbilitiesPacket(0x02, 0f, 0f));
@@ -60,7 +61,7 @@ public class FallbackPreparer {
  public FallbackPacket enterCodeMessage;
  public FallbackPacket incorrectCaptcha;
  // JoinGame
-  public final int PLAYER_ENTITY_ID = ThreadLocalRandom.current().nextInt(10);
+  public final int PLAYER_ENTITY_ID = RANDOM.nextInt(10);
  public FallbackPacket joinGame;
  // Update Section Blocks
  public FallbackPacket updateSectionBlocks;
@@ -70,7 +71,7 @@ public class FallbackPreparer {
  // Default Spawn Position
  public FallbackPacket defaultSpawnPosition;
  // Spawn Position
-  public final int TELEPORT_ID = ThreadLocalRandom.current().nextInt();
+  public final int TELEPORT_ID = RANDOM.nextInt();
  public FallbackPacket spawnPosition;
  // Transfer packet
  public static FallbackPacket transferToOrigin;
@@ -86,28 +87,27 @@ public class FallbackPreparer {

  // Vehicle
  public FallbackPacket removeEntities;
+  public FallbackPacket spawnEntity;
  public static FallbackPacket setPassengers;
-  public static final int VEHICLE_ENTITY_ID = PLAYER_ENTITY_ID + 1;
+  public static final int VEHICLE_ENTITY_ID = PLAYER_ENTITY_ID + 1 + RANDOM.nextInt(10);

  // Collisions
  public final int BLOCKS_PER_ROW = 8; // 8 * 8 = 64 (protocol maximum)
  public final int SPAWN_X_POSITION = 16 / 2; // middle of the chunk
  public final int SPAWN_Z_POSITION = 16 / 2; // middle of the chunk
  public final int DEFAULT_Y_COLLIDE_POSITION = 255; // 255 is the maximum Y position allowed
+  public final int IN_AIR_Y_POSITION = 1337;

-  // Captcha position
-  public final FallbackPacket CAPTCHA_POSITION = new FallbackPacketSnapshot(new SetPlayerPositionRotation(
-    SPAWN_X_POSITION, 1337, SPAWN_Z_POSITION, 0f, 90f, 0, false));
+  // CAPTCHA position
+  public final FallbackPacket CAPTCHA_POSITION = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
+    SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION, 0, 90, 0, false));

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

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

@@ -117,9 +117,13 @@ public class FallbackPreparer {
    Sonar.get().getLogger().info("Preloading all registered packets...");
    FallbackPacketRegistry.values();

+    // Prepare LoginSuccess packet
+    loginSuccess = new FallbackPacketSnapshot(new LoginSuccessPacket(new UUID(1L, 1L),
+      Sonar.get().getConfig().getGeneralConfig().getString("verification.cached-username")));
+
    // Prepare JoinGame packet
    joinGame = new FallbackPacketSnapshot(new JoinGamePacket(PLAYER_ENTITY_ID,
-      Sonar.get().getConfig().getVerification().getGravity().getGamemode().getId(),
+      Sonar.get().getConfig().getVerification().getGamemode().getId(),
      0, false, 0,
      true, false, false,
      new String[]{"minecraft:overworld"}, "minecraft:overworld"));
@@ -139,11 +143,13 @@ public class FallbackPreparer {
    dynamicSpawnYPosition = DEFAULT_Y_COLLIDE_POSITION + (int) Math.ceil(maxFallDistance);
    defaultSpawnPosition = new FallbackPacketSnapshot(new SetDefaultSpawnPositionPacket(
      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION));
-    spawnPosition = new FallbackPacketSnapshot(new SetPlayerPositionRotation(
+    spawnPosition = new FallbackPacketSnapshot(new SetPlayerPositionRotationPacket(
      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION,
      0, -90, TELEPORT_ID, false));

    // Prepare collision platform positions
+    blockType = BlockType.valueOf(Sonar.get().getConfig().getGeneralConfig().getString(
+      "verification.checks.collision.collision-block-type").toUpperCase());
    final BlockUpdate[] changedBlocks = new BlockUpdate[BLOCKS_PER_ROW * BLOCKS_PER_ROW];

    int index = 0;
@@ -180,6 +186,8 @@ public class FallbackPreparer {

    // Prepare packets for the vehicle check
    removeEntities = new FallbackPacketSnapshot(new RemoveEntitiesPacket(VEHICLE_ENTITY_ID));
+    spawnEntity = new FallbackPacketSnapshot(new SpawnEntityPacket(
+      VEHICLE_ENTITY_ID, EntityType.BOAT, SPAWN_X_POSITION, IN_AIR_Y_POSITION, SPAWN_Z_POSITION));
    setPassengers = new FallbackPacketSnapshot(new SetPassengersPacket(VEHICLE_ENTITY_ID, PLAYER_ENTITY_ID));

    if (Sonar.get().getConfig().getVerification().getMap().getTiming() != SonarConfiguration.Verification.Timing.NEVER
@@ -187,7 +195,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(
@@ -199,11 +207,11 @@ 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));
      }

      // Prepare CAPTCHA answers
-      MAP_INFO_PREPARER.prepare();
+      CaptchaPreparer.prepare();
    } else {
      // Throw away if not needed
      enterCodeMessage = 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
@@ -27,12 +27,111 @@ import java.util.function.Function;
@SuppressWarnings("unused")
@RequiredArgsConstructor
 public enum BlockType {
-  STONE(protocolVersion -> 1, 1D),
+  STONE(protocolVersion -> 1, 1),
+  // Useful resources:
+  // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
+  // - https://pokechu22.github.io/Burger/
+  // - https://github.com/ViaVersion/Mappings/tree/main/mappings
+  ENCHANTMENT_TABLE(protocolVersion -> {
+    switch (protocolVersion) {
+      case MINECRAFT_1_7_2:
+      case MINECRAFT_1_7_6:
+      default:
+        // 1.7.2-1.12.2
+        return 116;
+      case MINECRAFT_1_13:
+      case MINECRAFT_1_13_1:
+        return 4612;
+      case MINECRAFT_1_13_2:
+      case MINECRAFT_1_14:
+      case MINECRAFT_1_14_1:
+      case MINECRAFT_1_14_2:
+      case MINECRAFT_1_14_3:
+        return 4613;
+      case MINECRAFT_1_14_4:
+      case MINECRAFT_1_15:
+      case MINECRAFT_1_15_1:
+      case MINECRAFT_1_15_2:
+      case MINECRAFT_1_16:
+        return 5116;
+      case MINECRAFT_1_16_1:
+        return 5132;
+      case MINECRAFT_1_16_2:
+      case MINECRAFT_1_16_3:
+      case MINECRAFT_1_16_4:
+        return 5136;
+      case MINECRAFT_1_17:
+      case MINECRAFT_1_17_1:
+      case MINECRAFT_1_18:
+      case MINECRAFT_1_18_2:
+        return 5333;
+      case MINECRAFT_1_19:
+      case MINECRAFT_1_19_1:
+        return 5719;
+      case MINECRAFT_1_19_3:
+        return 7159;
+      case MINECRAFT_1_19_4:
+        return 7385;
+      case MINECRAFT_1_20:
+      case MINECRAFT_1_20_2:
+      case MINECRAFT_1_20_3:
+      case MINECRAFT_1_20_5:
+      case MINECRAFT_1_21:
+        return 7389;
+    }
+  }, 0.75f),
+  TRAPDOOR(protocolVersion -> {
+    switch (protocolVersion) {
+      case MINECRAFT_1_7_2:
+      case MINECRAFT_1_7_6:
+        // We have to use wooden trapdoors for 1.7 since 1.7 doesn't have iron trapdoors
+        return 96;
+      default:
+        // 1.8-1.12.2
+        return 167;
+      case MINECRAFT_1_13:
+      case MINECRAFT_1_13_1:
+        return 6509;
+      case MINECRAFT_1_13_2:
+      case MINECRAFT_1_14:
+      case MINECRAFT_1_14_1:
+      case MINECRAFT_1_14_2:
+      case MINECRAFT_1_14_3:
+        return 6510;
+      case MINECRAFT_1_14_4:
+      case MINECRAFT_1_15:
+      case MINECRAFT_1_15_1:
+      case MINECRAFT_1_15_2:
+      case MINECRAFT_1_16:
+        return 7016;
+      case MINECRAFT_1_16_1:
+        return 7552;
+      case MINECRAFT_1_16_2:
+      case MINECRAFT_1_16_3:
+      case MINECRAFT_1_16_4:
+        return 7556;
+      case MINECRAFT_1_17:
+      case MINECRAFT_1_17_1:
+      case MINECRAFT_1_18:
+      case MINECRAFT_1_18_2:
+        return 7802;
+      case MINECRAFT_1_19:
+      case MINECRAFT_1_19_1:
+        return 8293;
+      case MINECRAFT_1_19_3:
+        return 9937;
+      case MINECRAFT_1_19_4:
+        return 10269;
+      case MINECRAFT_1_20:
+        return 10273;
+      case MINECRAFT_1_20_2:
+      case MINECRAFT_1_20_3:
+      case MINECRAFT_1_20_5:
+      case MINECRAFT_1_21:
+        return 10414;
+    }
+  }, 0.1875),
  BARRIER(protocolVersion -> {
-    // Useful resources:
-    // - https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/
-    // - https://pokechu22.github.io/Burger/1.20.4.html
-    // - https://github.com/ViaVersion/Mappings/tree/main/mappings
    switch (protocolVersion) {
      case MINECRAFT_1_7_2:
      case MINECRAFT_1_7_6:
@@ -82,7 +181,7 @@ public enum BlockType {
      case MINECRAFT_1_21:
        return 10366;
    }
-  }, 1D);
+  }, 1);

  private final Function<ProtocolVersion, Integer> idFunction;
  // TODO: Implement per-version block heights?
@@ -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
Author	SHA1	Message	Date
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
Jones	0137fdf7e9	Release 2.1.0 (#361 )	2024-08-10 14:25:39 +02:00
Jones	df14e42a0b	Improve the collision check (#360 ) * feat: add iron trapdoor block * feat: add enchantment table block * fix: rename Captcha to CAPTCHA * feat: randomize vehicle entity ID * feat: make collision platform block type configurable * fix: only send experience bar if it's visible * feat: change vehicle "timing" to "enabled" * fix(fallback): captcha-on-fail not catching every scenario * style: oopsie doopsie	2024-08-10 14:08:28 +02:00
Michel Elkenwaat	c30dd0225b	Implement missing "fell through blocks" check	2024-08-09 04:22:31 +02:00
Michel Elkenwaat	626fa422bc	Fix some grammar mistakes in comments	2024-08-09 01:32:59 +02:00
Michel Elkenwaat	f08d9239fe	Fix `verification.currently-preparing` not being used	2024-08-08 23:29:14 +02:00
Michel Elkenwaat	1edd71df04	Fix Bedrock players not being able to be transferred (https://github.com/jonesdevelopment/sonar/issues/356 )	2024-08-08 22:28:39 +02:00
Jones Michel Elkenwaat Akkariin	aff3bd4a64	Implement Bukkit Support (#347 ) * feat: deject packet listener if not needed anymore * fix(db): dynamically load drivers libraries * refactor: outline VerifiedPlayerController#exactSize * fix(db): small synchronization issues in VerifiedPlayerController * feat: enforce Netty 4.1.x (or higher) * feat: [wip] Bukkit injection (NMS/OBC stuff) * fix: include MIT license header for fast varint reading * fix: allow Netty version to remain unknown * fix: optimize "command sender -> audience" logic * fix: extremely rare NoSuchElementException * fix: remove equals and hashcode annotations * build(deps): add annotations and simpleyaml to catalog * feat: [wip] implement Bukkit injection * feat: [wip] Bukkit packet reading and general improvements * refactor: small code style improvements * style: link wiki.vg in comments * fix: don't store unnecessary pipeline names * fix: transfer state not working on Bukkit * fix: possible bypass with the transfer mode exemption * fix(bukkit): library folder having the wrong name * feat: make cached player username configurable * fix: add missing configuration entry to pl.yml * fix: pipeline order breaking everything ¯\_(ツ)_/¯ * fix: exempt geyser pipelines from being removed... oops * fix: injection error on 1.20.5+ servers * build(bukkit): use 1.13.2 spigot api instead of 1.8.8 * fix: legacy plugin warning by setting the api version to 1.13 * fix: use entity type in SpawnEntityPacket * feat: improve the vehicle check by a lot * fix: pipeline exception tail error * fix: only compute player if actually connected (https://github.com/jonesdevelopment/sonar/issues/349) * style: static import consistency * fix: MessageToMessageDecoder literally breaking HAProxy * feat: add more bStats metrics (language and db type) * style: small code clean up * feat: remove unnecessary plugin-yml generation arguments * fix(bukkit): use the actual server name for debugging * feat: don't shadow adventure-nbt * chore: link transfer tutorial in configuration * fix: CI pipeline build error * build: mark all gradle tasks as non-deamon * fix: vehicle check 2.0 not being compatible with Geyser * refactor: PacketDecoder -> InboundHandler * fix: SetPlayerPositionRotationPacket onGround not being used * feat: recode vehicle check to work with laggy connections * fix: remove debug message(s) * feat: recode vehicle check again * fix: don't remove the entity twice * feat: [wip] implement Bukkit support (it's looking good) * fix: wrong exception being caught * fix: improve error handling in reflective operations * feat: optimize verification routines * feat: optimize and improve queue computing * fix: double/float comparison being broken haha * style: small comment improvements * style: fix invalid comments in vehicle check * Bug fixes in `bukkit-support` branch (#358) * Lazy load for ServerConnection to support late-bind * Remove `sonar-inbound-handler` when join server * Add missing license header in `Lazy.java` * Update FallbackBukkitInjector * Change `Bukkit#getScheduler` to `getPlugin().getServer().getScheduler()` * Inject the new initializer to close connection if the plugin is not enabled. * Don't remove `DefaultChannelPipeline$TailContext#0` in pipeline. * Add listener for close uninject player's connection if `late-bind` is disabled. * Fixed an issue where `max-online-per-ip` was not working properly. * Get `ServerConnection` in method. * Change overwrite methods position. * Move `ChannelInactiveListener` to `sonar-api` * style(bukkit): create unreflected fields in a static context * style(bukkit): use lombok Getter for late bind * build: fix compilation process * refactor: move `INITIALIZE_LISTENER` from SonarBukkitPlugin to SonarBukkit * style(bukkit): improve codestyle in the inbound handler * style: fix wrong comment --------- Co-authored-by: Michel Elkenwaat <admin@jonesdev.xyz> * style: add missing credits * build(deps): bump adventure-platform from 4.3.3 to 4.3.4 * fix: don't assign unused fields * fix: use encoder function instead of manual encoder check * fix: use encoder function, not handler function x) * fix: optimize bukkit encoder function by using `context`, not `get` * fix: memory leak in the login packet decoder --------- Co-authored-by: Akkariin <fallencrystal@outlook.com>	2024-08-08 21:13:16 +02:00
Michel Elkenwaat	ce1d623d60	Allow `general.max-online-per-ip` to be 0	2024-08-03 19:29:15 +02:00