Release 2.0.6 (#77 )

Implement BungeeCord support (#76 )
* feat: remove Velocity's (de-)compression dependency * feat: [wip] implement Fallback for BungeeCord * feat: disable legacy pipelines by default (can be enabled again) * fix(bungee): NPE on handshake * fix: use correct protocol version for channel initialization * feat: implement login packet spam fix * feat(bungee): implement duplicate login/status packet spam fix * feat: implement cleaner FallbackHandlerBoss * fix(bungee): traffic handler not being injected properly * fix(bungee): run verification check after running everything in the event loop * fix(bungee): only throw exceptions for up- and downstream bridge * fix(bungee): total traffic statistic not working * fix(bukkit, bungee): logger wrapper not supporting arguments * fix(bungee): perform the already-online check by the username, not the uuid * style: fix FallbackChannelHandler comments * style: don't annotate FallbackUserWrapper as EqualsAndHashCode * style: fix ToString annotation in EmptyChunkData * feat(fallback): remove 1.19/1.19.1 chat nbt mappings * feat: use expiring cache for joins per second counter * fix(bungee): don't log the join attempt if the login is canceled * fix(all): lockdown mode not being saved correctly * fix(bungee): closeWith method only working during verification * fix(bungee): use Velocity's server write mark * fix(bungee): don't set BB allocator if it's already set
2023-10-25 17:42:59 +02:00 · 2023-10-22 14:32:37 +02:00 · 2023-10-21 12:11:23 +02:00 · 2023-10-20 17:41:16 +02:00 · 2023-10-20 17:36:43 +02:00 · 2023-10-20 17:22:25 +02:00
64 changed files with 1067 additions and 1158 deletions
@@ -42,8 +42,8 @@
 - [Fallback](https://github.com/jonesdevelopment/sonar#fallback) is Sonar's main component designed to prevent
  all types of bots.
 - Spigot & BungeeCord
-  - The compression method is changed
-    to [Velocity's libdeflate](https://github.com/PaperMC/Velocity/tree/dev/3.0.0/native).
+  - Duplicate login/status packet spam fix
+  - Run server ping handling asynchronously
  - The Varint decoder is updated to Velocity's
    improved [MinecraftVarintFrameDecoder](https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/netty/MinecraftVarintFrameDecoder.java).

@@ -91,4 +91,4 @@ Sonar is licensed under the [GNU General Public License 3.0](https://www.gnu.org

 - Special thanks to the [contributors of Sonar](https://github.com/jonesdevelopment/sonar/graphs/contributors).
 - The nbt mappings were taken from [LimboAPI](https://github.com/Elytrium/LimboAPI).
- The compression and Varint decoding was taken from [Velocity](https://github.com/PaperMC/Velocity).
+- The Varint decoding was taken from [Velocity](https://github.com/PaperMC/Velocity).
@@ -22,7 +22,7 @@ allprojects {
  repositories {
    mavenCentral() // Lombok
    maven(url = "https://jitpack.io") // simple-yaml
-    maven(url = "https://repo.papermc.io/repository/maven-public") // Velocity natives
+    maven(url = "https://repo.papermc.io/repository/maven-public") // Velocity API
    maven(url = "https://repo.jonesdev.xyz/releases/") // Bungee & Velocity proxy module
  }
 }
@@ -72,7 +72,7 @@ tasks {

  shadowJar {
    // Set the file name of the shadowed jar
-    archiveFileName.set("${rootProject.name}.jar")
+    archiveFileName.set("Sonar.jar")

    // bStats has to be relocated to the Sonar package otherwise it throws an exception
    // https://github.com/Bastian/bstats-metrics/blob/master/base/src/main/java/org/bstats/MetricsBase.java#L251
@@ -83,7 +83,6 @@ tasks {
    relocate("net.kyori.adventure.nbt", "xyz.jonesdev.sonar.libs.nbt")
    relocate("com.google.gson", "xyz.jonesdev.sonar.libs.gson")
    relocate("com.j256.ormlite", "xyz.jonesdev.sonar.libs.ormlite")
-    relocate("com.velocitypowered.natives", "xyz.jonesdev.sonar.libs.natives")
  }

  compileJava {
@@ -1,2 +1,3 @@
 group=xyz.jonesdev.sonar
-version=2.0.4
+version=2.0.6
+description=Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)
@@ -1,4 +1,4 @@
-rootProject.name = "Sonar"
+rootProject.name = "sonar"

 sequenceOf("api", "bukkit", "bungee", "common", "velocity").forEach {
  val path = "sonar-$it"
@@ -24,7 +24,6 @@ import xyz.jonesdev.sonar.api.controller.VerifiedPlayerController;
 import xyz.jonesdev.sonar.api.event.SonarEventManager;
 import xyz.jonesdev.sonar.api.fallback.Fallback;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.api.server.ServerWrapper;
 import xyz.jonesdev.sonar.api.verbose.Verbose;

 import java.io.File;
@@ -35,9 +34,9 @@ public interface Sonar {
  String LINE_SEPARATOR = "\n"; // Using System.lineSeparator is broken, for some reason...

  /**
-   * @return A small wrapper for the server
+   * @return The platform the plugin is being run on
   */
-  @NotNull ServerWrapper getServer();
+  @NotNull SonarPlatform getPlatform();

  /**
   * @return A small wrapper for the plugin logger so we can use the logger everywhere
@@ -19,12 +19,14 @@ package xyz.jonesdev.sonar.api.command;

 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;

@Getter
@RequiredArgsConstructor
+@ToString(of = "rawArguments")
 public final class CommandInvocation {
  private final InvocationSource sender;
-  private final Subcommand command;
+  private final Subcommand subcommand;
  private final String[] rawArguments;
 }
@@ -28,6 +28,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 public abstract class InvocationSource {
  private final String name;
  private final Audience audience;
+  private final boolean player;

  /**
   * Sends an empty chat message to the command executor
@@ -18,14 +18,18 @@
 package xyz.jonesdev.sonar.api.command;

 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.event.HoverEvent;
-import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.cappuccino.Cappuccino;
 import xyz.jonesdev.cappuccino.ExpiringCache;
 import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
+import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

 import java.util.*;
+import java.util.stream.Collectors;
+
+import static java.util.Collections.emptyList;

 public interface SonarCommand {
  List<String> TAB_SUGGESTIONS = new ArrayList<>();
@@ -34,63 +38,55 @@ public interface SonarCommand {

  ExpiringCache<Object> DELAY = Cappuccino.buildExpiring(500L);

-  int COPYRIGHT_YEAR = Calendar.getInstance().get(Calendar.YEAR);
+  List<Component> CACHED_HELP_MESSAGE = new ArrayList<>();

-  List<Component> CACHED_HELP_MESSAGE = new Vector<>();
+  static void prepareCachedMessages() {
+    // Cache help message
+    CACHED_HELP_MESSAGE.clear();
+    for (final String message : Sonar.get().getConfig().getCommands().getHelpHeader()) {
+      CACHED_HELP_MESSAGE.add(MiniMessage.miniMessage().deserialize(message
+        .replace("%version%", Sonar.get().getVersion().getFormatted())
+        .replace("%platform%", Sonar.get().getPlatform().getDisplayName())
+        .replace("%copyright_year%", String.valueOf(Calendar.getInstance().get(Calendar.YEAR)))));
+    }

-  default void cacheHelpMessage() {
-    CACHED_HELP_MESSAGE.addAll(Arrays.asList(
-      Component.text("Running Sonar " + Sonar.get().getVersion()
-        + " on " + Sonar.get().getServer().getPlatform().getDisplayName()
-        + ".", NamedTextColor.YELLOW),
-      Component.text("(C) " + COPYRIGHT_YEAR + " Jones Development and Sonar Contributors", NamedTextColor.YELLOW),
-      Component.text("https://github.com/jonesdevelopment/sonar", NamedTextColor.GREEN)
-        .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/jonesdevelopment/sonar")),
-      Component.empty(),
-      Component.text("Need help or have any questions?", NamedTextColor.YELLOW),
-      Component.textOfChildren(
-        Component.text("Open a ticket on the Discord ", NamedTextColor.YELLOW)
-          .hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text("(Click to open Discord)")))
-          .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://jonesdev.xyz/discord/")),
-        Component.text("or open a new issue on GitHub.", NamedTextColor.YELLOW)
-          .hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text("(Click to open GitHub)")))
-          .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/jonesdevelopment/sonar" +
-            "/issues"))
-      ),
-      Component.empty()
-    ));
-
-    Sonar.get().getSubcommandRegistry().getSubcommands().forEach(sub -> {
-      Component component = Component.textOfChildren(
-        Component.text(" ▪ ", NamedTextColor.GRAY),
-        Component.text("/sonar " + sub.getInfo().name(), NamedTextColor.GREEN),
-        Component.text(" - ", NamedTextColor.GRAY),
-        Component.text(sub.getInfo().description(), NamedTextColor.WHITE)
-      );
-
-      Component hoverComponent = Component.textOfChildren(
-        Component.text("Only players: ", NamedTextColor.GRAY),
-        Component.text(sub.getInfo().onlyPlayers() ? "✔" : "✗",
-          sub.getInfo().onlyPlayers() ? NamedTextColor.GREEN : NamedTextColor.RED),
-        Component.newline(),
-        Component.text("Require console: ", NamedTextColor.GRAY),
-        Component.text(sub.getInfo().onlyConsole() ? "✔" : "✗",
-          sub.getInfo().onlyConsole() ? NamedTextColor.GREEN : NamedTextColor.RED),
-        Component.newline(),
-        Component.text("Permission: ", NamedTextColor.GRAY),
-        Component.text(sub.getPermission(), NamedTextColor.WHITE)
-      );
-      if (sub.getInfo().aliases().length > 0) {
-        hoverComponent = hoverComponent
-          .append(Component.newline())
-          .append(Component.text("Aliases: ", NamedTextColor.GRAY))
-          .append(Component.text(sub.getAliases(), NamedTextColor.WHITE));
-      }
-      component = component
-        .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.SUGGEST_COMMAND,
-          "/sonar " + sub.getInfo().name() + " "))
-        .hoverEvent(HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent));
-      CACHED_HELP_MESSAGE.add(component);
+    final String subcommandFormat = Sonar.get().getConfig().getCommands().getHelpSubcommands();
+    Sonar.get().getSubcommandRegistry().getSubcommands().forEach(subcommand -> {
+      final Component deserialized = MiniMessage.miniMessage().deserialize(subcommandFormat
+        .replace("%subcommand%", subcommand.getInfo().name())
+        .replace("%description%", subcommand.getInfo().description())
+        .replace("%only_players%", subcommand.getInfo().onlyPlayers() ? "<green>✔</green>" : "<red>✗</red>")
+        .replace("%require_console%", subcommand.getInfo().onlyConsole() ? "<green>✔</green>" : "<red>✗</red>")
+        .replace("%permission%", subcommand.getPermission())
+        .replace("%aliases%", subcommand.getAliases()));
+      CACHED_HELP_MESSAGE.add(deserialized);
    });
+
+    // Don't re-cache tab suggestions
+    if (!TAB_SUGGESTIONS.isEmpty()) return;
+    // Cache tab suggestions
+    for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
+      TAB_SUGGESTIONS.add(subcommand.getInfo().name());
+      if (subcommand.getInfo().aliases().length > 0) {
+        TAB_SUGGESTIONS.addAll(Arrays.asList(subcommand.getInfo().aliases()));
+      }
+      final List<String> parsedArguments = Arrays.stream(subcommand.getInfo().arguments())
+        .map(Argument::value)
+        .collect(Collectors.toList());
+      ARG_TAB_SUGGESTIONS.put(subcommand.getInfo().name(), parsedArguments);
+      for (final String alias : subcommand.getInfo().aliases()) {
+        ARG_TAB_SUGGESTIONS.put(alias, parsedArguments);
+      }
+    }
+  }
+
+  default List<String> getCachedTabSuggestions(final String @NotNull [] arguments) {
+    if (arguments.length <= 1) {
+      return TAB_SUGGESTIONS;
+    } else if (arguments.length == 2) {
+      final String subCommandName = arguments[0].toLowerCase();
+      return ARG_TAB_SUGGESTIONS.getOrDefault(subCommandName, emptyList());
+    }
+    return emptyList();
  }
 }
@@ -28,6 +28,7 @@ import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

@@ -35,10 +36,8 @@ import java.util.stream.Collectors;
 public abstract class Subcommand {
  private final @NotNull SubcommandInfo info;
  private final String permission, aliases, arguments;
+
  protected static final Sonar SONAR = Sonar.get();
-  protected static final Pattern IP_PATTERN = Pattern.compile(
-    "^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])([.])){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"
-  );

  public Subcommand() {
    info = getClass().getAnnotation(SubcommandInfo.class);
@@ -52,8 +51,14 @@ public abstract class Subcommand {
      .collect(Collectors.joining(", "));
  }

-  protected static @Nullable InetAddress checkIP(final InvocationSource source, final String rawIP) {
-    if (!IP_PATTERN.matcher(rawIP).matches()) {
+  // https://stackoverflow.com/questions/5284147/validating-ipv4-addresses-with-regexp
+  private static final Pattern IP_PATTERN = Pattern.compile("^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)\\.?\\b){4}$");
+
+  protected static @Nullable InetAddress getInetAddressIfValid(final InvocationSource source, final String rawIP) {
+    // We perform a regex check beforehand,
+    // so we don't have to create a new InetAddress,
+    // therefore, potentially saving some performance.
+    if (!IP_PATTERN.matcher(Objects.requireNonNull(rawIP)).matches()) {
      source.sendMessage(SONAR.getConfig().getCommands().getIncorrectIpAddress());
      return null;
    }
@@ -78,5 +83,31 @@ public abstract class Subcommand {
      .replace("%usage%", info.name() + " (" + arguments + ")"));
  }

-  public abstract void execute(final @NotNull CommandInvocation invocation);
+  public final void invoke(final @NotNull InvocationSource invocationSource, final String @NotNull [] arguments) {
+    // Check if the subcommand can only be executed by players
+    if (getInfo().onlyPlayers() && !invocationSource.isPlayer()) {
+      invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
+      return;
+    }
+
+    // Check if the subcommand can only be executed though console
+    if (getInfo().onlyConsole() && invocationSource.isPlayer()) {
+      invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
+      return;
+    }
+
+    final CommandInvocation commandInvocation = new CommandInvocation(invocationSource, this, arguments);
+
+    // The subcommands has arguments which are not present in the executed command
+    if (getInfo().argumentsRequired() && getInfo().arguments().length > 0 && arguments.length <= 1) {
+      invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
+        .replace("%usage%", getInfo().name() + " (" + getArguments() + ")"));
+      return;
+    }
+
+    // Execute the sub command
+    execute(commandInvocation);
+  }
+
+  protected abstract void execute(final @NotNull CommandInvocation invocation);
 }
@@ -18,6 +18,7 @@
 package xyz.jonesdev.sonar.api.config;

 import lombok.Getter;
+import org.jetbrains.annotations.NotNull;
 import org.simpleyaml.configuration.comments.format.YamlCommentFormat;
 import org.simpleyaml.configuration.file.YamlFile;
 import xyz.jonesdev.sonar.api.Sonar;
@@ -36,8 +37,8 @@ public final class SimpleYamlConfig {

  private static final List<String> HEADER = Arrays.asList(
    "",
-    "Running Sonar version " + Sonar.get().getVersion()
-      + " on " + Sonar.get().getServer().getPlatform().getDisplayName(),
+    String.format("Running Sonar version %s on %s",
+      Sonar.get().getVersion(), Sonar.get().getPlatform().getDisplayName()),
    "Need help or have questions? https://jonesdev.xyz/discord",
    "https://github.com/jonesdevelopment/sonar",
    ""
@@ -47,7 +48,7 @@ public final class SimpleYamlConfig {
    this(new File(dataFolder, fileName + ".yml"), dataFolder);
  }

-  private SimpleYamlConfig(final File file, final File folder) {
+  private SimpleYamlConfig(final File file, final @NotNull File folder) {
    if (!folder.exists() && !folder.mkdir()) {
      throw new IllegalStateException("Could not create folder?!");
    }
@@ -22,6 +22,7 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.dependencies.Dependency;

 import java.io.File;
@@ -157,10 +158,11 @@ public final class SonarConfiguration {
    private String networkStatistics;
    private String cpuStatistics;

+    private List<String> helpHeader;
+    private String helpSubcommands;
+
    private String verboseSubscribed;
    private String verboseUnsubscribed;
-    private String verboseSubscribedOther;
-    private String verboseUnsubscribedOther;

    private String reloading;
    private String reloaded;
@@ -507,6 +509,33 @@ public final class SonarConfiguration {
        "%footer%"
      ))));

+    messagesConfig.getYaml().setComment("commands.main",
+      "Translations for '/sonar'");
+    messagesConfig.getYaml().setComment("commands.main.header",
+      "Informational message that is shown above everything when running the main command");
+    commands.helpHeader = messagesConfig.getStringList("commands.main.header",
+      Arrays.asList(
+        "<yellow>Running Sonar %version% on %platform%.",
+        "<yellow>(C) %copyright_year% Jones Development and Sonar Contributors",
+        "<green><click:open_url:'https://github.com/jonesdevelopment/sonar'>https://github.com/jonesdevelopment/sonar",
+        "",
+        "<yellow>Need help or have any questions?",
+        "<yellow><click:open_url:'https://jonesdev.xyz/discord/'><hover:show_text:'(Click to open Discord)'>Open a " +
+          "ticket on the Discord </hover></click></yellow><yellow><click:open_url:'https://github" +
+          ".com/jonesdevelopment/sonar/issues'><hover:show_text:'(Click to open GitHub)'>or open a new issue on " +
+          "GitHub.",
+        ""
+      ));
+    messagesConfig.getYaml().setComment("commands.main.subcommands",
+      "Formatting of the list of subcommands shown when running the main command");
+    commands.helpSubcommands = formatString(messagesConfig.getString("commands.main.subcommands",
+      "<click:suggest_command:'/sonar %subcommand% '><hover:show_text:'<gray>Only players: " +
+        "</gray>%only_players%<br><gray>Require console: </gray>%require_console%<br><gray>Permission: " +
+        "</gray><white>%permission%<br><gray>Aliases: </gray>%aliases%'><gray> ▪ </gray><green>/sonar " +
+        "%subcommand%</green><gray> - </gray><white>%description%"));
+
+    SonarCommand.prepareCachedMessages();
+
    messagesConfig.getYaml().setComment("commands.reload",
      "Translations for '/sonar reload'");
    messagesConfig.getYaml().setComment("commands.reload.start",
@@ -543,16 +572,6 @@ public final class SonarConfiguration {
    commands.verboseUnsubscribed = formatString(messagesConfig.getString("commands.verbose.unsubscribed",
      "%prefix%You are no longer viewing Sonar verbose."));

-    messagesConfig.getYaml().setComment("commands.verbose.subscribed-other",
-      "Message that is shown when a player makes another player subscribe to Sonar verbose");
-    commands.verboseSubscribedOther = formatString(messagesConfig.getString("commands.verbose.subscribed-other",
-      "%prefix%%player% is now viewing Sonar verbose."));
-
-    messagesConfig.getYaml().setComment("commands.verbose.unsubscribed-other",
-      "Message that is shown when a player makes another player unsubscribe from Sonar verbose");
-    commands.verboseUnsubscribedOther = formatString(messagesConfig.getString("commands.verbose.unsubscribed-other",
-      "%prefix%%player% is no longer viewing Sonar verbose."));
-
    messagesConfig.getYaml().setComment("commands.blacklist",
      "Translations for '/sonar blacklist'");
    messagesConfig.getYaml().setComment("commands.blacklist.empty",
@@ -41,7 +41,7 @@ public final class Fallback {
  private final Map<String, InetAddress> connected = new ConcurrentHashMap<>();
  // Only block the player for a few minutes to avoid issues
  private final ExpiringCache<String> blacklisted = Cappuccino.buildExpiring(
-    10L, TimeUnit.MINUTES, 2500L
+    10L, TimeUnit.MINUTES, 5000L
  );
  private final @NotNull FallbackQueue queue = FallbackQueue.INSTANCE;
  private final @NotNull FallbackRatelimiter ratelimiter = FallbackRatelimiter.INSTANCE;
@@ -66,6 +66,6 @@ public final class Fallback {

  public boolean isPotentiallyUnderAttack() {
    final int min = SONAR.getConfig().getMinPlayersForAttack();
-    return connected.size() > min || queue.getQueuedPlayers().size() > min;
+    return Sonar.get().getVerboseHandler().getJoinsPerSecond().estimatedSize() > min;
  }
 }
@@ -20,10 +20,7 @@ package xyz.jonesdev.sonar.api.fallback.protocol;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;

@RequiredArgsConstructor
 public enum ProtocolVersion {
@@ -73,6 +70,7 @@ public enum ProtocolVersion {
  private final int protocol;

  public static final ProtocolVersion MINIMUM_VERSION = MINECRAFT_1_7_2;
+  public static final ProtocolVersion LATEST_VERSION;
  public static final Map<Integer, ProtocolVersion> ID_TO_PROTOCOL_CONSTANT;
  public static final Set<ProtocolVersion> SUPPORTED_VERSIONS;

@@ -96,7 +94,8 @@ public enum ProtocolVersion {
        }
      }

-      SUPPORTED_VERSIONS = versions;
+      SUPPORTED_VERSIONS = Collections.unmodifiableSet(versions);
+      LATEST_VERSION = new ArrayList<>(versions).get(versions.size() - 1);
    }
  }

@@ -17,6 +17,10 @@

 package xyz.jonesdev.sonar.api.logger;

+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Array;
+
 /**
 * The whole purpose of doing this is, so we can have one logger for every module.
 * We wouldn't need to get the plugin logger every time we try to use it.
@@ -28,4 +32,62 @@ public interface LoggerWrapper {
  void warn(final String message, final Object... args);

  void error(final String message, final Object... args);
+
+  // Taken from
+  // https://github.com/j256/ormlite-core/blob/master/src/main/java/com/j256/ormlite/logger/Logger.java
+  String ARG_STRING = "{}";
+  int ARG_STRING_LENGTH = ARG_STRING.length();
+  Object UNKNOWN_ARG = new Object();
+
+  default String buildFullMessage(final @NotNull String msg, final Object... args) {
+    StringBuilder sb = null;
+    int lastIndex = 0;
+    int argC = 0;
+    while (true) {
+      int argIndex = msg.indexOf(ARG_STRING, lastIndex);
+      // no more {} arguments?
+      if (argIndex == -1) {
+        break;
+      }
+      if (sb == null) {
+        // we build this lazily in case there is no {} in the msg
+        sb = new StringBuilder(128);
+      }
+      // add the string before the arg-string
+      sb.append(msg, lastIndex, argIndex);
+      // shift our last-index past the arg-string
+      lastIndex = argIndex + ARG_STRING_LENGTH;
+      // add the arguments
+      if (argC < args.length) {
+        appendArg(sb, args[argC]);
+      }
+      argC++;
+    }
+    if (sb == null) {
+      return msg;
+    } else {
+      sb.append(msg, lastIndex, msg.length());
+      return sb.toString();
+    }
+  }
+
+  default void appendArg(final StringBuilder stringBuilder, final Object arg) {
+    if (arg == UNKNOWN_ARG) {
+      // ignore it
+    } else if (arg == null) {
+      stringBuilder.append("null");
+    } else if (arg.getClass().isArray()) {
+      stringBuilder.append('[');
+      int length = Array.getLength(arg);
+      for (int i = 0; i < length; i++) {
+        if (i > 0) {
+          stringBuilder.append(", ");
+        }
+        appendArg(stringBuilder, Array.get(arg, i));
+      }
+      stringBuilder.append(']');
+    } else {
+      stringBuilder.append(arg);
+    }
+  }
 }
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2023 Sonar Contributors
- *
- * This 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.server;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
-
-import java.util.Optional;
-
-@Getter
-@RequiredArgsConstructor
-public abstract class ServerWrapper {
-
-  /**
-   * Platform of the server (Velocity, BungeeCord, Spigot)
-   */
-  private final SonarPlatform platform;
-
-  /**
-   * @param username Username of the player
-   * @return Optional player wrapped as InvocationSender
-   * @see InvocationSource
-   */
-  public abstract Optional<InvocationSource> getOnlinePlayer(final String username);
-}
@@ -19,55 +19,60 @@ package xyz.jonesdev.sonar.api.verbose;

 import lombok.Getter;
 import lombok.val;
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.cappuccino.Cappuccino;
+import xyz.jonesdev.cappuccino.ExpiringCache;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.profiler.JVMProfiler;
 import xyz.jonesdev.sonar.api.statistics.Statistics;
-import xyz.jonesdev.sonar.api.timer.SystemTimer;

 import java.util.Collection;
+import java.util.Map;
 import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;

 import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
 import static xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter.INCOMING;
 import static xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter.OUTGOING;

@Getter
-public abstract class Verbose implements JVMProfiler {
-  protected final @NotNull Collection<String> subscribers = new Vector<>(0);
-  private final SystemTimer secondTimer = new SystemTimer();
-  protected int joinsPerSecond, totalJoins;
-  private int lastTotalJoins, animationIndex;
+public final class Verbose implements JVMProfiler {
+  private final @NotNull Collection<String> subscribers = new Vector<>(0);
+  private final @NotNull Map<String, Audience> audiences = new ConcurrentHashMap<>();
+  private int animationIndex;
+  private final ExpiringCache<Long> joinsPerSecond = Cappuccino.buildExpiring(1L, TimeUnit.SECONDS);

  // Run action bar verbose
-  public final void update() {
+  public void update() {
    // Clean up all blacklisted IPs
    Sonar.get().getFallback().getBlacklisted().cleanUp(false);
+    joinsPerSecond.cleanUp(false);

-    totalJoins = Statistics.TOTAL_TRAFFIC.get();
-
-    // Statistically determine the joins per second without any caches
-    if (totalJoins > 0 && secondTimer.elapsed(1000L)) {
-      secondTimer.reset();
-      joinsPerSecond = totalJoins - lastTotalJoins;
-      lastTotalJoins = totalJoins;
-    }
-
+    // Don't prepare component if there are no subscribers
+    if (subscribers.isEmpty()) return;
+    // Prepare the action bar format component
+    final Component component = prepareActionBarFormat();
    // Send the action bar to all online players
-    broadcast(prepareActionBarFormat());
+    for (final String subscriber : subscribers) {
+      final Audience audience = audiences.get(subscriber);
+      if (audience == null) continue;
+      audience.sendActionBar(component);
+    }
  }

-  protected @NotNull Component prepareActionBarFormat() {
+  public @NotNull Component prepareActionBarFormat() {
    return MiniMessage.miniMessage().deserialize(Sonar.get().getConfig().getVerbose().getActionBarLayout()
      .replace("%queued%",
        DECIMAL_FORMAT.format(Sonar.get().getFallback().getQueue().getQueuedPlayers().size()))
      .replace("%verifying%", DECIMAL_FORMAT.format(Sonar.get().getFallback().getConnected().size()))
      .replace("%blacklisted%",
        DECIMAL_FORMAT.format(Sonar.get().getFallback().getBlacklisted().estimatedSize()))
-      .replace("%total-joins%", DECIMAL_FORMAT.format(totalJoins))
-      .replace("%per-second-joins%", DECIMAL_FORMAT.format(joinsPerSecond))
+      .replace("%total-joins%", DECIMAL_FORMAT.format(Statistics.TOTAL_TRAFFIC.get()))
+      .replace("%per-second-joins%", DECIMAL_FORMAT.format(joinsPerSecond.estimatedSize()))
      .replace("%verify-total%", DECIMAL_FORMAT.format(Statistics.REAL_TRAFFIC.get()))
      .replace("%verify-success%",
        DECIMAL_FORMAT.format(Sonar.get().getVerifiedPlayerController().estimatedSize()))
@@ -83,34 +88,31 @@ public abstract class Verbose implements JVMProfiler {
      .replace("%animation%", nextAnimation()));
  }

-  protected final String nextAnimation() {
+  public String nextAnimation() {
    val animations = Sonar.get().getConfig().getVerbose().getAnimation();
    final int nextIndex = ++animationIndex % animations.size();
    return animations.toArray(new String[0])[nextIndex];
  }

-  // Run action bar verbose
-  protected abstract void broadcast(final Component component);
-
  /**
-   * @param subscriber Name of the player who subscribed
-   * @return Whether the player is subscribed or not
+   * @param name Name of the audience
+   * @return Whether the audience is subscribed or not
   */
-  public final boolean isSubscribed(final @NotNull String subscriber) {
-    return subscribers.contains(subscriber);
+  public boolean isSubscribed(final @NotNull String name) {
+    return subscribers.contains(name);
  }

  /**
-   * @param subscriber Name of the player to subscribe
+   * @param name Name of the audience to subscribe
   */
-  public final void subscribe(final @NotNull String subscriber) {
-    subscribers.add(subscriber);
+  public void subscribe(final String name) {
+    subscribers.add(name);
  }

  /**
-   * @param subscriber Name of the player to unsubscribe
+   * @param name Name of the audience to unsubscribe
   */
-  public final void unsubscribe(final @NotNull String subscriber) {
-    subscribers.remove(subscriber);
+  public void unsubscribe(final String name) {
+    subscribers.remove(name);
  }
 }
@@ -7,12 +7,11 @@ plugins {
 apply(plugin = "net.minecrell.plugin-yml.bukkit")

 bukkit {
-  name = rootProject.name
+  name = "Sonar"
  version = rootProject.version.toString().split("-")[0]
  main = "xyz.jonesdev.sonar.bukkit.SonarBukkitPlugin"
  authors = listOf("Jones Development", "Sonar Contributors")
  website = "https://jonesdev.xyz/discord/"
-  description = "Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)"
  load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD

  commands {
@@ -18,31 +18,32 @@
 package xyz.jonesdev.sonar.bukkit;

 import lombok.Getter;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.api.server.ServerWrapper;
-import xyz.jonesdev.sonar.bukkit.command.BukkitInvocationSource;
+import xyz.jonesdev.sonar.bukkit.audience.AudienceListener;
 import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
-import xyz.jonesdev.sonar.bukkit.verbose.ActionBarVerbose;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

 import java.util.Objects;
-import java.util.Optional;
-import java.util.logging.Level;

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

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

+  /**
+   * Wrapper for Bukkit audiences
+   */
+  private final BukkitAudiences bukkitAudiences = BukkitAudiences.create(getPlugin());
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -53,34 +54,17 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {

    @Override
    public void info(final String message, final Object... args) {
-      getPlugin().getLogger().log(Level.INFO, message, args);
+      getPlugin().getLogger().info(buildFullMessage(message, args));
    }

    @Override
    public void warn(final String message, final Object... args) {
-      getPlugin().getLogger().log(Level.WARNING, message, args);
+      getPlugin().getLogger().warning(buildFullMessage(message, args));
    }

    @Override
    public void error(final String message, final Object... args) {
-      getPlugin().getLogger().log(Level.SEVERE, message, args);
-    }
-  };
-
-  /**
-   * Create a wrapper object for our server, so we can use it outside
-   * the velocity module.
-   * <br>
-   * We have to do this, so we can access all necessary API functions.
-   */
-  public final ServerWrapper server = new ServerWrapper(SonarPlatform.BUKKIT) {
-
-    @Override
-    public Optional<InvocationSource> getOnlinePlayer(final String username) {
-      return getPlugin().getServer().getOnlinePlayers().stream()
-        .filter(player -> player.getName().equalsIgnoreCase(username))
-        .findFirst()
-        .map(BukkitInvocationSource::new);
+      getPlugin().getLogger().severe(buildFullMessage(message, args));
    }
  };

@@ -88,11 +72,14 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
  public void enable() {

    // Initialize bStats.org metrics
-    new Metrics(getPlugin(), getServer().getPlatform().getMetricsId());
+    new Metrics(getPlugin(), getPlatform().getMetricsId());

    // Register Sonar command
    Objects.requireNonNull(getPlugin().getCommand("sonar")).setExecutor(new BukkitSonarCommand());

+    // Register audience register listener
+    getPlugin().getServer().getPluginManager().registerEvents(new AudienceListener(), getPlugin());
+
    // Register Fallback queue task
    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(), getFallback().getQueue()::poll,
      10L, 10L);
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.bukkit.audience;
+
+import net.kyori.adventure.audience.Audience;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.bukkit.SonarBukkit;
+
+public final class AudienceListener implements Listener {
+
+  @EventHandler(priority = EventPriority.LOWEST)
+  public void handle(final @NotNull PlayerJoinEvent event) {
+    final Audience audience = SonarBukkit.INSTANCE.getBukkitAudiences().player(event.getPlayer());
+    Sonar.get().getVerboseHandler().getAudiences().put(event.getPlayer().getName(), audience);
+  }
+
+  @EventHandler(priority = EventPriority.LOWEST)
+  public void handle(final @NotNull PlayerQuitEvent event) {
+    Sonar.get().getVerboseHandler().getAudiences().remove(event.getPlayer().getName());
+  }
+}
@@ -17,16 +17,14 @@

 package xyz.jonesdev.sonar.bukkit.command;

-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.bukkit.SonarBukkit;

 public final class BukkitInvocationSource extends InvocationSource {
-  private static final BukkitAudiences AUDIENCES = BukkitAudiences.create(SonarBukkit.INSTANCE.getPlugin());
-
  public BukkitInvocationSource(final @NotNull CommandSender sender) {
-    super(sender.getName(), AUDIENCES.sender(sender));
+    super(sender.getName(), SonarBukkit.INSTANCE.getBukkitAudiences().sender(sender), sender instanceof Player);
  }
 }
@@ -18,27 +18,23 @@
 package xyz.jonesdev.sonar.bukkit.command;

 import net.kyori.adventure.text.Component;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
-import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;

 import static java.util.Collections.emptyList;

 public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, SonarCommand {
-  {
-    cacheHelpMessage();
-  }

  @Override
  public boolean onCommand(final CommandSender sender,
@@ -48,7 +44,7 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new BukkitInvocationSource(sender);

-    if (!(sender instanceof ConsoleCommandSender)) {
+    if (invocationSource.isPlayer()) {
      // Check if the player actually has the permission to run the command
      if (!sender.hasPermission("sonar.command")) {
        invocationSource.sendMessage(Sonar.get().getConfig().getNoPermission());
@@ -99,31 +95,6 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
      }
    }

-    subcommand.ifPresent(sub -> {
-      if (sub.getInfo().onlyPlayers() && !(sender instanceof Player)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
-        return;
-      }
-
-      if (sub.getInfo().onlyConsole() && !(sender instanceof ConsoleCommandSender)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
-        return;
-      }
-
-      final CommandInvocation commandInvocation = new CommandInvocation(invocationSource, sub, args);
-
-      // The subcommands has arguments which are not present in the executed command
-      if (sub.getInfo().arguments().length > 0
-        && commandInvocation.getRawArguments().length <= 1) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
-          .replace("%usage%", sub.getInfo().name() + " (" + sub.getArguments() + ")"));
-        return;
-      }
-
-      // Execute the sub command with the custom invocation properties
-      sub.execute(commandInvocation);
-    });
-
    if (!subcommand.isPresent()) {

      // Re-use the old, cached help message since we don't want to scan
@@ -132,12 +103,14 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
      for (final Component component : CACHED_HELP_MESSAGE) {
        invocationSource.sendMessage(component);
      }
+    } else {
+      subcommand.get().invoke(invocationSource, args);
    }
    return false;
  }

  @Override
-  public List<String> onTabComplete(final CommandSender sender,
+  public List<String> onTabComplete(final @NotNull CommandSender sender,
                                    final Command command,
                                    final String commandAlias,
                                    final String @NotNull [] args) {
@@ -145,33 +118,6 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
    if (!sender.hasPermission("sonar.command")) {
      return emptyList();
    }
-    if (args.length <= 1) {
-      if (TAB_SUGGESTIONS.isEmpty()) {
-        for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-          TAB_SUGGESTIONS.add(subcommand.getInfo().name());
-
-          if (subcommand.getInfo().aliases().length > 0) {
-            TAB_SUGGESTIONS.addAll(Arrays.asList(subcommand.getInfo().aliases()));
-          }
-        }
-      }
-      return TAB_SUGGESTIONS;
-    } else if (args.length == 2) {
-      if (ARG_TAB_SUGGESTIONS.isEmpty()) {
-        for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-          final List<String> parsedArguments = Arrays.stream(subcommand.getInfo().arguments())
-            .map(Argument::value)
-            .collect(Collectors.toList());
-          ARG_TAB_SUGGESTIONS.put(subcommand.getInfo().name(), parsedArguments);
-          for (final String alias : subcommand.getInfo().aliases()) {
-            ARG_TAB_SUGGESTIONS.put(alias, parsedArguments);
-          }
-        }
-      }
-
-      final String subCommandName = args[0].toLowerCase();
-      return ARG_TAB_SUGGESTIONS.getOrDefault(subCommandName, emptyList());
-    }
-    return emptyList();
+    return getCachedTabSuggestions(args);
  }
 }
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2023 Sonar Contributors
- *
- * This 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.verbose;
-
-import lombok.RequiredArgsConstructor;
-import net.kyori.adventure.text.Component;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import xyz.jonesdev.sonar.api.verbose.Verbose;
-
-@RequiredArgsConstructor
-public final class ActionBarVerbose extends Verbose {
-  private final Server server;
-
-  @Override
-  public void broadcast(final Component component) {
-    synchronized (subscribers) {
-      for (final String subscriber : subscribers) {
-        final Player player = server.getPlayer(subscriber);
-        if (player != null) {
-          // TODO: use an adventure audience
-        }
-      }
-    }
-  }
-}
@@ -5,23 +5,16 @@ plugins {
 apply(plugin = "net.minecrell.plugin-yml.bungee")

 bungee {
-  name = rootProject.name
+  name = "Sonar"
  version = rootProject.version.toString().split("-")[0]
  main = "xyz.jonesdev.sonar.bungee.SonarBungeePlugin"
  author = "Jones Development, Sonar Contributors"
-  description = "Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)"
 }

 dependencies {
  compileOnly(project(":api"))
  compileOnly(project(":common"))

-  implementation("com.velocitypowered:velocity-native:1.1.9") {
-    exclude(group = "com.google.guava")
-    exclude(group = "io.netty")
-    exclude(group = "org.checkerframework")
-  }
-
  compileOnly("net.md_5:bungeecord:1.20.2-rc2-SNAPSHOT")

  // MiniMessage platform support
@@ -18,34 +18,35 @@
 package xyz.jonesdev.sonar.bungee;

 import lombok.Getter;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import org.bstats.bungeecord.Metrics;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.api.server.ServerWrapper;
-import xyz.jonesdev.sonar.bungee.command.BungeeInvocationSource;
+import xyz.jonesdev.sonar.bungee.audience.AudienceListener;
 import xyz.jonesdev.sonar.bungee.command.BungeeSonarCommand;
 import xyz.jonesdev.sonar.bungee.fallback.FallbackListener;
 import xyz.jonesdev.sonar.bungee.fallback.injection.BaseInjectionHelper;
 import xyz.jonesdev.sonar.bungee.fallback.injection.ChildChannelInitializer;
-import xyz.jonesdev.sonar.bungee.verbose.VerboseWrapper;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;

-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;

@Getter
 public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
  public static SonarBungee INSTANCE;

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

+  /**
+   * Wrapper for BungeeCord audiences
+   */
+  private final BungeeAudiences bungeeAudiences = BungeeAudiences.create(getPlugin());
+
  /**
   * Create a wrapper for the plugin logger, so we can use it outside
   * the velocity module.
@@ -56,34 +57,17 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {

    @Override
    public void info(final String message, final Object... args) {
-      getPlugin().getLogger().log(Level.INFO, message, args);
+      getPlugin().getLogger().info(buildFullMessage(message, args));
    }

    @Override
    public void warn(final String message, final Object... args) {
-      getPlugin().getLogger().log(Level.WARNING, message, args);
+      getPlugin().getLogger().warning(buildFullMessage(message, args));
    }

    @Override
    public void error(final String message, final Object... args) {
-      getPlugin().getLogger().log(Level.SEVERE, message, args);
-    }
-  };
-
-  /**
-   * Create a wrapper object for our server, so we can use it outside
-   * the velocity module.
-   * <br>
-   * We have to do this, so we can access all necessary API functions.
-   */
-  public final ServerWrapper server = new ServerWrapper(SonarPlatform.BUNGEE) {
-
-    @Override
-    public Optional<InvocationSource> getOnlinePlayer(final String username) {
-      return getPlugin().getServer().getPlayers().stream()
-        .filter(player -> player.getName().equalsIgnoreCase(username))
-        .findFirst()
-        .map(BungeeInvocationSource::new);
+      getPlugin().getLogger().severe(buildFullMessage(message, args));
    }
  };

@@ -91,13 +75,16 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
  public void enable() {

    // Initialize bStats.org metrics
-    new Metrics(getPlugin(), getServer().getPlatform().getMetricsId());
+    new Metrics(getPlugin(), getPlatform().getMetricsId());

    // Register Sonar command
    getPlugin().getServer().getPluginManager().registerCommand(getPlugin(), new BungeeSonarCommand());

    // Register Fallback listener
-    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new FallbackListener(getFallback()));
+    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new FallbackListener());
+
+    // Register audience register listener
+    getPlugin().getServer().getPluginManager().registerListener(getPlugin(), new AudienceListener());

    // Register Fallback queue task
    getPlugin().getServer().getScheduler().schedule(getPlugin(), getFallback().getQueue()::poll,
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.bungee.audience;
+
+import net.kyori.adventure.audience.Audience;
+import net.md_5.bungee.api.event.PlayerDisconnectEvent;
+import net.md_5.bungee.api.event.PostLoginEvent;
+import net.md_5.bungee.api.plugin.Listener;
+import net.md_5.bungee.event.EventHandler;
+import net.md_5.bungee.event.EventPriority;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.bungee.SonarBungee;
+
+public final class AudienceListener implements Listener {
+
+  @EventHandler(priority = EventPriority.LOWEST)
+  public void handle(final @NotNull PostLoginEvent event) {
+    final Audience audience = SonarBungee.INSTANCE.getBungeeAudiences().player(event.getPlayer());
+    Sonar.get().getVerboseHandler().getAudiences().put(event.getPlayer().getName(), audience);
+  }
+
+  @EventHandler(priority = EventPriority.LOWEST)
+  public void handle(final @NotNull PlayerDisconnectEvent event) {
+    Sonar.get().getVerboseHandler().getAudiences().remove(event.getPlayer().getName());
+  }
+}
@@ -17,16 +17,14 @@

 package xyz.jonesdev.sonar.bungee.command;

-import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.bungee.SonarBungee;

 public final class BungeeInvocationSource extends InvocationSource {
-  private static final BungeeAudiences AUDIENCES = BungeeAudiences.create(SonarBungee.INSTANCE.getPlugin());
-
  public BungeeInvocationSource(final @NotNull CommandSender sender) {
-    super(sender.getName(), AUDIENCES.sender(sender));
+    super(sender.getName(), SonarBungee.INSTANCE.getBungeeAudiences().sender(sender), sender instanceof ProxiedPlayer);
  }
 }
@@ -19,29 +19,22 @@ package xyz.jonesdev.sonar.bungee.command;

 import net.kyori.adventure.text.Component;
 import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;
-import net.md_5.bungee.command.ConsoleCommandSender;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
-import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;

 import static java.util.Collections.emptyList;

 public final class BungeeSonarCommand extends Command implements TabExecutor, SonarCommand {
  public BungeeSonarCommand() {
    super("sonar");
-    cacheHelpMessage();
  }

  @Override
@@ -50,7 +43,7 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new BungeeInvocationSource(sender);

-    if (!(sender instanceof ConsoleCommandSender)) {
+    if (invocationSource.isPlayer()) {
      // Check if the player actually has the permission to run the command
      if (!sender.hasPermission("sonar.command")) {
        invocationSource.sendMessage(Sonar.get().getConfig().getNoPermission());
@@ -101,31 +94,6 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
      }
    }

-    subcommand.ifPresent(sub -> {
-      if (sub.getInfo().onlyPlayers() && !(sender instanceof ProxiedPlayer)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
-        return;
-      }
-
-      if (sub.getInfo().onlyConsole() && !(sender instanceof ConsoleCommandSender)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
-        return;
-      }
-
-      final CommandInvocation commandInvocation = new CommandInvocation(invocationSource, sub, args);
-
-      // The subcommands has arguments which are not present in the executed command
-      if (sub.getInfo().arguments().length > 0
-        && commandInvocation.getRawArguments().length <= 1) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
-          .replace("%usage%", sub.getInfo().name() + " (" + sub.getArguments() + ")"));
-        return;
-      }
-
-      // Execute the sub command with the custom invocation properties
-      sub.execute(commandInvocation);
-    });
-
    if (!subcommand.isPresent()) {

      // Re-use the old, cached help message since we don't want to scan
@@ -134,42 +102,17 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
      for (final Component component : CACHED_HELP_MESSAGE) {
        invocationSource.sendMessage(component);
      }
+    } else {
+      subcommand.get().invoke(invocationSource, args);
    }
  }

  @Override
-  public Iterable<String> onTabComplete(final CommandSender sender, final String @NotNull [] args) {
+  public Iterable<String> onTabComplete(final @NotNull CommandSender sender, final String @NotNull [] args) {
    // Do not allow tab completion if the player does not have the required permission
    if (!sender.hasPermission("sonar.command")) {
      return emptyList();
    }
-    if (args.length <= 1) {
-      if (TAB_SUGGESTIONS.isEmpty()) {
-        for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-          TAB_SUGGESTIONS.add(subcommand.getInfo().name());
-
-          if (subcommand.getInfo().aliases().length > 0) {
-            TAB_SUGGESTIONS.addAll(Arrays.asList(subcommand.getInfo().aliases()));
-          }
-        }
-      }
-      return TAB_SUGGESTIONS;
-    } else if (args.length == 2) {
-      if (ARG_TAB_SUGGESTIONS.isEmpty()) {
-        for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-          final List<String> parsedArguments = Arrays.stream(subcommand.getInfo().arguments())
-            .map(Argument::value)
-            .collect(Collectors.toList());
-          ARG_TAB_SUGGESTIONS.put(subcommand.getInfo().name(), parsedArguments);
-          for (final String alias : subcommand.getInfo().aliases()) {
-            ARG_TAB_SUGGESTIONS.put(alias, parsedArguments);
-          }
-        }
-      }
-
-      final String subCommandName = args[0].toLowerCase();
-      return ARG_TAB_SUGGESTIONS.getOrDefault(subCommandName, emptyList());
-    }
-    return emptyList();
+    return getCachedTabSuggestions(args);
  }
 }
@@ -15,25 +15,12 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package xyz.jonesdev.sonar.velocity.verbose;
+package xyz.jonesdev.sonar.bungee.fallback;

-import com.velocitypowered.api.proxy.ProxyServer;
-import lombok.RequiredArgsConstructor;
-import net.kyori.adventure.text.Component;
-import xyz.jonesdev.sonar.api.verbose.Verbose;
+import io.netty.handler.codec.DecoderException;

-@RequiredArgsConstructor
-public final class VerboseWrapper extends Verbose {
-  private final ProxyServer server;
-
-  @Override
-  public void broadcast(final Component component) {
-    synchronized (subscribers) {
-      for (final String subscriber : subscribers) {
-        server.getPlayer(subscriber).ifPresent(player -> {
-          player.sendActionBar(component);
-        });
-      }
-    }
+final class ConditionFailedException extends DecoderException {
+  public ConditionFailedException(final String message) {
+    super(message);
  }
 }
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2023 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.bungee.fallback;
+
+import io.netty.channel.ChannelHandlerContext;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.connection.DownstreamBridge;
+import net.md_5.bungee.connection.UpstreamBridge;
+import net.md_5.bungee.netty.ChannelWrapper;
+import net.md_5.bungee.netty.HandlerBoss;
+import net.md_5.bungee.netty.PacketHandler;
+import org.jetbrains.annotations.NotNull;
+
+public final class FallbackHandlerBoss extends HandlerBoss {
+  private ChannelWrapper channel;
+  private PacketHandler handler;
+
+  @Override
+  public void setHandler(final @NotNull PacketHandler handler) {
+    this.handler = handler;
+    super.setHandler(handler);
+  }
+
+  @Override
+  public void channelActive(final ChannelHandlerContext ctx) throws Exception {
+    if (handler != null) {
+      channel = new ChannelWrapper(ctx);
+      handler.connected(channel);
+
+      if (handler instanceof DownstreamBridge) {
+        ProxyServer.getInstance().getLogger().info(handler + " has connected");
+      }
+    }
+  }
+
+  @Override
+  public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
+    if (handler != null) {
+      channel.markClosed();
+      handler.disconnected(channel);
+
+      if (handler instanceof DownstreamBridge) {
+        ProxyServer.getInstance().getLogger().info(handler + " has disconnected");
+      }
+    }
+  }
+
+  @Override
+  public void channelWritabilityChanged(final ChannelHandlerContext ctx) throws Exception {
+    if (handler != null) {
+      handler.writabilityChanged(channel);
+      super.channelWritabilityChanged(ctx);
+    }
+  }
+
+  @Override
+  public void exceptionCaught(final @NotNull ChannelHandlerContext ctx, final Throwable throwable) throws Exception {
+    if (ctx.channel().isActive()) {
+      if (handler instanceof DownstreamBridge || handler instanceof UpstreamBridge) {
+        try {
+          handler.exception(throwable);
+        } catch (Exception exception) {
+          ProxyServer.getInstance().getLogger().severe(handler + " - exception processing exception: " + exception);
+        }
+      }
+
+      channel.markClosed();
+      ctx.close();
+    }
+  }
+}
@@ -0,0 +1,331 @@
+/*
+ * Copyright (C) 2023 Sonar Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.jonesdev.sonar.bungee.fallback;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.DecoderException;
+import lombok.Getter;
+import lombok.val;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
+import net.md_5.bungee.BungeeCord;
+import net.md_5.bungee.EncryptionUtil;
+import net.md_5.bungee.api.config.ListenerInfo;
+import net.md_5.bungee.connection.InitialHandler;
+import net.md_5.bungee.netty.ChannelWrapper;
+import net.md_5.bungee.protocol.PlayerPublicKey;
+import net.md_5.bungee.protocol.packet.Kick;
+import net.md_5.bungee.protocol.packet.LoginRequest;
+import net.md_5.bungee.protocol.packet.StatusRequest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import xyz.jonesdev.sonar.api.ReflectiveOperationException;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.event.impl.UserVerifyJoinEvent;
+import xyz.jonesdev.sonar.api.fallback.Fallback;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.api.statistics.Statistics;
+import xyz.jonesdev.sonar.common.fallback.FallbackChannelHandler;
+import xyz.jonesdev.sonar.common.fallback.FallbackTimeoutHandler;
+import xyz.jonesdev.sonar.common.fallback.FallbackVerificationHandler;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketDecoder;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketEncoder;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacketRegistry;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.login.LoginSuccess;
+import xyz.jonesdev.sonar.common.fallback.traffic.TrafficChannelHooker;
+
+import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+import static net.md_5.bungee.netty.PipelineUtils.*;
+import static xyz.jonesdev.sonar.api.fallback.FallbackPipelines.*;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_19_1;
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_19_3;
+import static xyz.jonesdev.sonar.common.utility.geyser.GeyserUtil.isGeyserConnection;
+
+public final class FallbackInitialHandler extends InitialHandler {
+  public FallbackInitialHandler(final @NotNull BungeeCord bungee, final ListenerInfo listener) {
+    super(bungee, listener);
+    this.bungee = bungee;
+  }
+  private static final @NotNull Fallback FALLBACK = Objects.requireNonNull(Sonar.get().getFallback());
+  @Getter
+  private ChannelWrapper channelWrapper;
+  private @NotNull final BungeeCord bungee;
+  private @Nullable FallbackUserWrapper player;
+  @Getter
+  private ProtocolVersion protocolVersion;
+  private boolean receivedLoginPacket;
+  private boolean receivedStatusPacket;
+
+  @Override
+  public void connected(final ChannelWrapper channelWrapper) throws Exception {
+    this.channelWrapper = channelWrapper;
+    super.connected(channelWrapper);
+  }
+
+  private static @NotNull Kick generateKickPacket(final Component component) {
+    final String serialized = JSONComponentSerializer.json().serialize(component);
+    return new Kick(serialized);
+  }
+
+  @Override
+  public void handle(final StatusRequest statusRequest) throws Exception {
+    // Fix status packet spam exploit
+    if (receivedStatusPacket) {
+      throw new ConditionFailedException("Duplicate status packet");
+    }
+    receivedStatusPacket = true;
+    // Run the rest of the method asynchronously
+    CompletableFuture.runAsync(() -> {
+      // The channel always stays open because the client sends
+      // a StatusRequest and a Ping packet after one another
+      if (!isConnected()) {
+        throw new ConditionFailedException("Not connected anymore");
+      }
+      try {
+        super.handle(statusRequest);
+      } catch (Exception exception) {
+        throw new DecoderException(exception);
+      }
+    });
+  }
+
+  @Override
+  public void handle(final LoginRequest loginRequest) throws Exception {
+    // Increase joins per second for the action bar verbose
+    Sonar.get().getVerboseHandler().getJoinsPerSecond().put(System.nanoTime());
+
+    // Fix login packet spam exploit
+    if (receivedLoginPacket || player != null) {
+      throw new ConditionFailedException("Duplicate login packet");
+    }
+    receivedLoginPacket = true;
+    // Cache protocol version so other handlers don't throw NPEs
+    protocolVersion = ProtocolVersion.fromId(getHandshake().getProtocolVersion());
+    final Channel channel = channelWrapper.getHandle();
+
+    // Run in the channel's event loop
+    channel.eventLoop().execute(() -> {
+      try {
+        final ChannelPipeline pipeline = channel.pipeline();
+        TrafficChannelHooker.hook(pipeline, PACKET_DECODER, PACKET_ENCODER);
+
+        // Increase total traffic statistic
+        Statistics.TOTAL_TRAFFIC.increment();
+
+        // Check if the verification is enabled
+        if (!Sonar.get().getConfig().getVerification().isEnabled()) {
+          super.handle(loginRequest);
+          return;
+        }
+
+        final InetAddress inetAddress = getAddress().getAddress();
+        val uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + loginRequest.getData()).getBytes(StandardCharsets.UTF_8));
+        // Check if the player is already verified
+        if (Sonar.get().getVerifiedPlayerController().has(inetAddress, uuid)) {
+          super.handle(loginRequest);
+          return;
+        }
+
+        // Check the blacklist here since we cannot let the player "ghost join"
+        if (FALLBACK.getBlacklisted().has(inetAddress.toString())) {
+          closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getBlacklisted()));
+          return;
+        }
+
+        // Completely skip Geyser connections (for now)
+        if (isGeyserConnection(channel)) {
+          // TODO: Do we need to log this?
+          FALLBACK.getLogger().info("Allowing Geyser connection: {}", inetAddress);
+          super.handle(loginRequest);
+          return;
+        }
+
+        // Create wrapped Fallback user
+        player = new FallbackUserWrapper(
+          FALLBACK, channelWrapper, this,
+          channel, channel.pipeline(), inetAddress, protocolVersion
+        );
+
+        // Perform default BungeeCord checks
+        if (bungee.config.isEnforceSecureProfile()
+          && player.getProtocolVersion().compareTo(MINECRAFT_1_19_3) < 0) {
+          final PlayerPublicKey publicKey = loginRequest.getPublicKey();
+          if (publicKey == null) {
+            disconnect(bungee.getTranslation("secure_profile_required"));
+            return;
+          }
+          if (Instant.ofEpochMilli(publicKey.getExpiry()).isBefore(Instant.now())) {
+            disconnect(bungee.getTranslation("secure_profile_expired"));
+            return;
+          }
+          if (player.getProtocolVersion().compareTo(MINECRAFT_1_19_1) < 0
+            && !EncryptionUtil.check(publicKey, null)) {
+            disconnect(bungee.getTranslation("secure_profile_invalid"));
+            return;
+          }
+        }
+
+        // Check if the player is already queued since we don't want bots to flood the queue
+        if (FALLBACK.getQueue().getQueuedPlayers().containsKey(inetAddress)) {
+          closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getAlreadyQueued()));
+          return;
+        }
+
+        // Check if Fallback is already verifying a player
+        // → is another player with the same IP address connected to Fallback?
+        if (FALLBACK.getConnected().containsKey(loginRequest.getData())
+          || FALLBACK.getConnected().containsValue(inetAddress)) {
+          closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getAlreadyVerifying()));
+          return;
+        }
+
+        // We cannot allow too many players on our Fallback server
+        // There's technically no reason for limiting this, but we'll better stay safe.
+        if (FALLBACK.getConnected().size() > Sonar.get().getConfig().getVerification().getMaxVerifyingPlayers()) {
+          closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getTooManyPlayers()));
+          return;
+        }
+
+        // Check if the IP address is currently being rate-limited
+        if (!FALLBACK.getRatelimiter().attempt(inetAddress)) {
+          closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getTooFastReconnect()));
+          return;
+        }
+
+        // We have to add this pipeline to monitor whenever the client disconnects
+        // to remove them from the list of connected and queued players
+        pipeline.addFirst(FALLBACK_HANDLER, new FallbackChannelHandler(loginRequest.getData()));
+
+        // Queue the connection for further processing
+        FALLBACK.getQueue().queue(inetAddress, () -> channel.eventLoop().execute(() -> {
+
+          // Do not continue if the connection is closed or marked as disconnected
+          if (channelWrapper.isClosed() || channelWrapper.isClosing()) return;
+
+          // Check if the username matches the valid name regex to prevent
+          // UTF-16 names or other types of exploits
+          if (!Sonar.get().getConfig().getVerification().getValidNameRegex().matcher(loginRequest.getData()).matches()) {
+            closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getInvalidUsername()));
+            return;
+          }
+
+          // Add better timeout handler to avoid known exploits or issues
+          // We also want to timeout bots quickly to avoid flooding
+          pipeline.replace(
+            TIMEOUT_HANDLER,
+            TIMEOUT_HANDLER,
+            new FallbackTimeoutHandler(Sonar.get().getConfig().getVerification().getReadTimeout(),
+              TimeUnit.MILLISECONDS)
+          );
+
+          // Disconnect if the protocol version could not be resolved
+          if (player.getProtocolVersion().isUnknown()) {
+            closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getInvalidProtocol()));
+            return;
+          }
+
+          // Check if the player is already connected to the proxy but still tries to verify
+          final int limit = bungee.config.getPlayerLimit();
+          if (limit > 0 && bungee.getOnlineCount() >= limit) {
+            disconnect(bungee.getTranslation("proxy_full"));
+            return;
+          } else if (!isOnlineMode() && bungee.getPlayer(loginRequest.getData()) != null) {
+            closeWith(generateKickPacket(Sonar.get().getConfig().getVerification().getAlreadyConnected()));
+            return;
+          }
+
+          // The player joined the verification
+          Statistics.REAL_TRAFFIC.increment();
+
+          if (Sonar.get().getConfig().getVerification().isLogConnections()) {
+            // Only log the processing message if the server isn't under attack.
+            // We let the user override this through the configuration.
+            if (!FALLBACK.isPotentiallyUnderAttack() || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
+              FALLBACK.getLogger().info(Sonar.get().getConfig().getVerification().getConnectLog()
+                .replace("%name%", loginRequest.getData())
+                .replace("%ip%", Sonar.get().getConfig().formatAddress(inetAddress))
+                .replace("%protocol%", String.valueOf(player.getProtocolVersion().getProtocol())));
+            }
+          }
+
+          // Call the VerifyJoinEvent for external API usage
+          Sonar.get().getEventManager().publish(new UserVerifyJoinEvent(loginRequest.getData(), player));
+
+          // Mark the player as connected → verifying players
+          FALLBACK.getConnected().put(loginRequest.getData(), inetAddress);
+
+          // This sometimes happens when the channel hangs, but the player is still connecting
+          // This also fixes a unique issue with TCPShield and other reverse proxies
+          if (player.getPipeline().get(PACKET_ENCODER) == null
+            || player.getPipeline().get(PACKET_DECODER) == null) {
+            channelWrapper.close();
+            return;
+          }
+
+          // Replace normal encoder to allow custom packets
+          final FallbackPacketEncoder encoder = new FallbackPacketEncoder(player.getProtocolVersion());
+          player.getPipeline().replace(PACKET_ENCODER, FALLBACK_PACKET_ENCODER, encoder);
+
+          // Send LoginSuccess packet to make the client think they are joining the server
+          player.write(new LoginSuccess(loginRequest.getData(), uuid));
+
+          // The LoginSuccess packet has been sent, now we can change the registry state
+          encoder.updateRegistry(player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0
+            ? FallbackPacketRegistry.CONFIG : FallbackPacketRegistry.GAME);
+
+          // Replace normal decoder to allow custom packets
+          player.getPipeline().replace(
+            PACKET_DECODER, FALLBACK_PACKET_DECODER, new FallbackPacketDecoder(player,
+              new FallbackVerificationHandler(player, loginRequest.getData(), uuid)
+            ));
+        }));
+      } catch (Throwable throwable) {
+        throw new ReflectiveOperationException(throwable);
+      }
+    });
+  }
+
+  // Mostly taken from Velocity
+  public void closeWith(final Object msg) {
+    if (channelWrapper.getHandle().isActive()) {
+      boolean is17 = protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0
+        && protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_7_2) >= 0;
+      if (is17) {
+        channelWrapper.getHandle().eventLoop().execute(() -> {
+          channelWrapper.getHandle().config().setAutoRead(false);
+          channelWrapper.getHandle().eventLoop().schedule(() -> {
+            channelWrapper.markClosed();
+            channelWrapper.getHandle().writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
+          }, 250L, TimeUnit.MILLISECONDS);
+        });
+      } else {
+        channelWrapper.markClosed();
+        channelWrapper.getHandle().writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
+      }
+    }
+  }
+}
@@ -17,53 +17,24 @@

 package xyz.jonesdev.sonar.bungee.fallback;

-import com.velocitypowered.natives.compression.VelocityCompressor;
-import com.velocitypowered.natives.util.Natives;
-import io.netty.channel.ChannelPipeline;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
-import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.compress.PacketCompressor;
-import net.md_5.bungee.compress.PacketDecompressor;
-import net.md_5.bungee.connection.InitialHandler;
 import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.netty.ChannelWrapper;
 import net.md_5.bungee.protocol.packet.Kick;
 import org.jetbrains.annotations.NotNull;
-import xyz.jonesdev.sonar.api.ReflectiveOperationException;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.fallback.Fallback;
-import xyz.jonesdev.sonar.bungee.fallback.compress.FallbackPacketCompressor;
-import xyz.jonesdev.sonar.bungee.fallback.compress.FallbackPacketDecompressor;
-import xyz.jonesdev.sonar.bungee.fallback.handler.FallbackInitialHandler;
-
-import java.lang.reflect.Field;
-
-import static net.md_5.bungee.netty.PipelineUtils.FRAME_PREPENDER;

@RequiredArgsConstructor
 public final class FallbackListener implements Listener {
-  private final Fallback fallback;
-
-  private static final Field CHANNEL_WRAPPER;
-
-  static {
-    try {
-      CHANNEL_WRAPPER = InitialHandler.class.getDeclaredField("ch");
-      CHANNEL_WRAPPER.setAccessible(true);
-    } catch (Throwable throwable) {
-      throw new ReflectiveOperationException(throwable);
-    }
-  }

  @EventHandler
  @SuppressWarnings("deprecation")
-  public void handle(final @NotNull PostLoginEvent event) throws Throwable {
+  public void handle(final @NotNull PostLoginEvent event) {
    if (Sonar.get().getConfig().getLockdown().isEnabled()) {
      if (!event.getPlayer().hasPermission(Sonar.get().getConfig().getLockdown().getBypassPermission())) {
        final PendingConnection pendingConnection = event.getPlayer().getPendingConnection();
@@ -77,6 +48,7 @@ public final class FallbackListener implements Listener {
          // Fallback by disconnecting without a message
          pendingConnection.disconnect();
          Sonar.get().getLogger().warn("Fallback handler of {} is missing", event.getPlayer().getName());
+          return;
        }

        if (Sonar.get().getConfig().getLockdown().isLogAttempts()) {
@@ -87,43 +59,9 @@ public final class FallbackListener implements Listener {
            .replace("%protocol%",
              String.valueOf(event.getPlayer().getPendingConnection().getVersion())));
        }
-        return;
      } else if (Sonar.get().getConfig().getLockdown().isNotifyAdmins()) {
        event.getPlayer().sendMessage(new TextComponent(Sonar.get().getConfig().getLockdown().getNotification()));
      }
    }
-
-    final InitialHandler initialHandler = (InitialHandler) event.getPlayer().getPendingConnection();
-    final ChannelWrapper channelWrapper = (ChannelWrapper) CHANNEL_WRAPPER.get(initialHandler);
-
-    final ChannelPipeline pipeline = channelWrapper.getHandle().pipeline();
-
-    // You don't need the frame decoder anymore
-    if (pipeline.get(FRAME_PREPENDER) != null) {
-      pipeline.remove(FRAME_PREPENDER);
-    }
-
-    final int compressionThreshold = BungeeCord.getInstance().getConfig().getCompressionThreshold();
-
-    // Replace compression handlers
-    if (compressionThreshold > 0
-      && pipeline.get(PacketCompressor.class) != null
-      && pipeline.get(PacketDecompressor.class) != null) {
-      final VelocityCompressor compressor = Natives.compress.get().create(-1);
-
-      // Replace (de)compressor with Velocity's to ensure better performance
-      pipeline.replace(
-        PacketCompressor.class,
-        "compress",
-        // Create a new compressor instance with the Velocity compressor
-        new FallbackPacketCompressor(compressionThreshold, compressor)
-      );
-      pipeline.replace(
-        PacketDecompressor.class,
-        "decompress",
-        // Create a new decompressor instance with the Velocity decompressor
-        new FallbackPacketDecompressor(compressionThreshold, compressor)
-      );
-    }
  }
 }
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.Fallback;
 import xyz.jonesdev.sonar.api.fallback.FallbackUser;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.bungee.fallback.handler.FallbackInitialHandler;
 import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.Disconnect;

 import java.net.InetAddress;
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2023 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.bungee.fallback.compress;
-
-import com.velocitypowered.natives.compression.VelocityCompressor;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import net.md_5.bungee.compress.PacketCompressor;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.zip.DataFormatException;
-
-import static com.velocitypowered.natives.util.MoreByteBufUtils.ensureCompatible;
-import static com.velocitypowered.natives.util.MoreByteBufUtils.preferredBuffer;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.*;
-
-@Getter
-@AllArgsConstructor
-public final class FallbackPacketCompressor extends PacketCompressor {
-  private int compressionThreshold;
-  private final @NotNull VelocityCompressor compressor;
-
-  private static final int MAX_COMPRESSED_LENGTH = 1 << 21;
-
-  @Override
-  public void setThreshold(final int compressionThreshold) {
-    this.compressionThreshold = compressionThreshold;
-  }
-
-  @Override
-  public void handlerAdded(final ChannelHandlerContext ctx) throws Exception {
-    // Do nothing
-  }
-
-  @Override
-  public void handlerRemoved(final ChannelHandlerContext ctx) throws Exception {
-    compressor.close();
-  }
-
-  @Override
-  protected void encode(final ChannelHandlerContext ctx,
-                        final @NotNull ByteBuf msg,
-                        final ByteBuf out) throws Exception {
-    final int uncompressed = msg.readableBytes();
-    if (uncompressed < compressionThreshold) {
-      // Under the threshold, do nothing.
-      writeVarInt(out, uncompressed + 1);
-      writeVarInt(out, 0);
-      out.writeBytes(msg);
-    } else {
-      handleCompressed(ctx, msg, out);
-    }
-  }
-
-  private void handleCompressed(final @NotNull ChannelHandlerContext ctx,
-                                final @NotNull ByteBuf msg,
-                                final ByteBuf out) throws DataFormatException {
-    final int uncompressed = msg.readableBytes();
-
-    write21BitVarInt(out, 0); // Fake packet length
-    writeVarInt(out, uncompressed);
-
-    final ByteBuf compatibleIn = ensureCompatible(ctx.alloc(), compressor, msg);
-
-    final int startCompressed = out.writerIndex();
-    try {
-      compressor.deflate(compatibleIn, out);
-    } finally {
-      compatibleIn.release();
-    }
-
-    final int compressedLength = out.writerIndex() - startCompressed;
-    if (compressedLength >= MAX_COMPRESSED_LENGTH) {
-      throw new DataFormatException("The server sent a very large (over 2MiB compressed) packet.");
-    }
-
-    int writerIndex = out.writerIndex();
-    int packetLength = out.readableBytes() - 3;
-    out.writerIndex(0);
-    write21BitVarInt(out, packetLength); // Rewrite packet length
-    out.writerIndex(writerIndex);
-  }
-
-  @Override
-  protected ByteBuf allocateBuffer(final ChannelHandlerContext ctx,
-                                   final @NotNull ByteBuf msg,
-                                   final boolean preferDirect) throws Exception {
-    int uncompressed = msg.readableBytes();
-    if (uncompressed < compressionThreshold) {
-      int finalBufferSize = uncompressed + 1;
-      finalBufferSize += varIntBytes(finalBufferSize);
-      return ctx.alloc().directBuffer(finalBufferSize);
-    }
-
-    final int initialBufferSize = (uncompressed - 1) + 3 + varIntBytes(uncompressed);
-    return preferredBuffer(ctx.alloc(), compressor, initialBufferSize);
-  }
-}
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2023 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.bungee.fallback.compress;
-
-import com.velocitypowered.natives.compression.VelocityCompressor;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.CorruptedFrameException;
-import lombok.Getter;
-import net.md_5.bungee.compress.PacketDecompressor;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-import static com.velocitypowered.natives.util.MoreByteBufUtils.ensureCompatible;
-import static com.velocitypowered.natives.util.MoreByteBufUtils.preferredBuffer;
-import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.readVarInt;
-
-@Getter
-public final class FallbackPacketDecompressor extends PacketDecompressor {
-  private final int compressionThreshold;
-  private final @NotNull VelocityCompressor compressor;
-
-  private static final int VANILLA_MAXIMUM_UNCOMPRESSED_SIZE = 8 * 1024 * 1024; // 8MiB
-  private static final int HARD_MAXIMUM_UNCOMPRESSED_SIZE = 16 * 1024 * 1024; // 16MiB
-  private static final int UNCOMPRESSED_CAP = Boolean.getBoolean("sonar.increased-compression-cap")
-    ? HARD_MAXIMUM_UNCOMPRESSED_SIZE : VANILLA_MAXIMUM_UNCOMPRESSED_SIZE;
-
-  public FallbackPacketDecompressor(final int compressionThreshold,
-                                    final @NotNull VelocityCompressor compressor) {
-    super(); // super(compressionThreshold);
-    this.compressionThreshold = compressionThreshold;
-    this.compressor = compressor;
-  }
-
-  @Override
-  public void handlerAdded(final ChannelHandlerContext ctx) throws Exception {
-    // Do nothing
-  }
-
-  @Override
-  public void handlerRemoved(final ChannelHandlerContext ctx) throws Exception {
-    compressor.close();
-  }
-
-  @Override
-  protected void decode(final ChannelHandlerContext ctx,
-                        final @NotNull ByteBuf in,
-                        final List<Object> out) throws Exception {
-    final int claimedUncompressedSize = readVarInt(in);
-    if (claimedUncompressedSize == 0) {
-      // This message is not compressed.
-      out.add(in.retain());
-
-      // Check for invalid packet size after the packet is retained
-      final int size = in.readableBytes();
-      if (size > compressionThreshold + 2) {
-        throw new CorruptedFrameException("Invalid uncompressed packet size " + size);
-      }
-      return;
-    }
-
-    if (claimedUncompressedSize < compressionThreshold) {
-      throw new CorruptedFrameException(claimedUncompressedSize + " is less than " + compressionThreshold);
-    }
-    if (claimedUncompressedSize > UNCOMPRESSED_CAP) {
-      throw new CorruptedFrameException(claimedUncompressedSize + " exceeds maximum size");
-    }
-
-    final ByteBuf compatibleIn = ensureCompatible(ctx.alloc(), compressor, in);
-    final ByteBuf uncompressed = preferredBuffer(ctx.alloc(), compressor, claimedUncompressedSize);
-
-    try {
-      compressor.inflate(compatibleIn, uncompressed, claimedUncompressedSize);
-      out.add(uncompressed);
-    } catch (Exception exception) {
-      uncompressed.release();
-      throw exception;
-    } finally {
-      compatibleIn.release();
-    }
-  }
-}
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2023 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.bungee.fallback.handler;
-
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
-import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.api.config.ListenerInfo;
-import net.md_5.bungee.connection.InitialHandler;
-import net.md_5.bungee.netty.ChannelWrapper;
-import net.md_5.bungee.protocol.packet.LoginRequest;
-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.protocol.ProtocolVersion;
-import xyz.jonesdev.sonar.bungee.fallback.FallbackUserWrapper;
-
-import java.net.InetAddress;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-public final class FallbackInitialHandler extends InitialHandler {
-  public FallbackInitialHandler(final BungeeCord bungee, final ListenerInfo listener) {
-    super(bungee, listener);
-  }
-
-  private static final @NotNull Fallback FALLBACK = Objects.requireNonNull(Sonar.get().getFallback());
-  private ChannelWrapper channelWrapper;
-  @SuppressWarnings("unused") // TODO: remove later
-  private @Nullable FallbackUserWrapper player;
-
-  @Override
-  public void connected(final ChannelWrapper channelWrapper) throws Exception {
-    this.channelWrapper = channelWrapper;
-    super.connected(channelWrapper);
-  }
-
-  @Override
-  public void handle(final LoginRequest loginRequest) throws Exception {
-    final InetAddress inetAddress = getAddress().getAddress();
-
-    if (player == null && !Sonar.get().getVerifiedPlayerController().has(inetAddress)) {
-      final Channel channel = channelWrapper.getHandle();
-
-      player = new FallbackUserWrapper(
-        FALLBACK, channelWrapper, this,
-        channel, channel.pipeline(), inetAddress,
-        ProtocolVersion.fromId(getHandshake().getProtocolVersion())
-      );
-      // TODO: implement Fallback
-    }
-
-    super.handle(loginRequest);
-  }
-
-  // Mostly taken from Velocity
-  public void closeWith(final Object msg) {
-    if (player != null && player.getChannel().isActive()) {
-      boolean is17 = player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_8) < 0
-        && player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_7_2) >= 0;
-      if (is17) {
-        player.getChannel().eventLoop().execute(() -> {
-          channelWrapper.getHandle().config().setAutoRead(false);
-          player.getChannel().eventLoop().schedule(() -> {
-            channelWrapper.markClosed();
-            player.getChannel().writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
-          }, 250L, TimeUnit.MILLISECONDS);
-        });
-      } else {
-        channelWrapper.markClosed();
-        player.getChannel().writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
-      }
-    }
-  }
-}
@@ -17,16 +17,15 @@

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

-import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.*;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.netty.PipelineUtils;
 import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.ReflectiveOperationException;
+import xyz.jonesdev.sonar.bungee.fallback.FallbackHandlerBoss;
 import xyz.jonesdev.sonar.bungee.fallback.varint.Varint21FrameDecoder;
 import xyz.jonesdev.sonar.common.fallback.FallbackTimeoutHandler;

@@ -41,15 +40,13 @@ public final class BaseChannelInitializer extends ChannelInitializer<Channel> {

  private static final boolean REPLACE_VAR_INT_DECODER = !Boolean.getBoolean("sonar.do-not-replace-decoder");

-  private static final WriteBufferWaterMark MARK;
+  // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/network/ConnectionManager.java#L57
+  private static final WriteBufferWaterMark SERVER_WRITE_MARK = new WriteBufferWaterMark(1 << 20, 1 << 21);
+
  private static final Varint21LengthFieldPrepender FRAME_ENCODER;

  static {
    try {
-      final Field markField = PipelineUtils.class.getDeclaredField("MARK");
-      markField.setAccessible(true);
-      MARK = (WriteBufferWaterMark) markField.get(null);
-
      final Field frameEncoder = PipelineUtils.class.getDeclaredField("framePrepender");
      frameEncoder.setAccessible(true);
      FRAME_ENCODER = (Varint21LengthFieldPrepender) frameEncoder.get(null);
@@ -68,15 +65,13 @@ public final class BaseChannelInitializer extends ChannelInitializer<Channel> {
    }

    channel.config().setOption(ChannelOption.TCP_NODELAY, true);
-    channel.config().setAllocator(PooledByteBufAllocator.DEFAULT);
-    channel.config().setWriteBufferWaterMark(MARK);
+    channel.config().setWriteBufferWaterMark(SERVER_WRITE_MARK);

    channel.pipeline().addLast(FRAME_DECODER, REPLACE_VAR_INT_DECODER
      ? new Varint21FrameDecoder() : new net.md_5.bungee.protocol.Varint21FrameDecoder());
    channel.pipeline().addLast(TIMEOUT_HANDLER, new FallbackTimeoutHandler(
-      BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS
-    ));
+      BungeeCord.getInstance().config.getTimeout(), TimeUnit.MILLISECONDS));
    channel.pipeline().addLast(FRAME_PREPENDER, FRAME_ENCODER);
-    channel.pipeline().addLast(BOSS_HANDLER, new HandlerBoss());
+    channel.pipeline().addLast(BOSS_HANDLER, new FallbackHandlerBoss());
  }
 }
@@ -23,15 +23,15 @@ import io.netty.handler.codec.haproxy.HAProxyMessageDecoder;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import net.md_5.bungee.BungeeCord;
-import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ListenerInfo;
 import net.md_5.bungee.api.event.ClientConnectEvent;
-import net.md_5.bungee.netty.HandlerBoss;
 import net.md_5.bungee.netty.PipelineUtils;
 import net.md_5.bungee.protocol.*;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.ReflectiveOperationException;
-import xyz.jonesdev.sonar.bungee.fallback.handler.FallbackInitialHandler;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.bungee.fallback.FallbackHandlerBoss;
+import xyz.jonesdev.sonar.bungee.fallback.FallbackInitialHandler;

 import java.lang.reflect.Field;
 import java.net.SocketAddress;
@@ -43,7 +43,7 @@ public final class ChildChannelInitializer extends ChannelInitializer<Channel> {
  public static final ChildChannelInitializer INSTANCE = new ChildChannelInitializer();

  private static final BaseChannelInitializer BASE = BaseChannelInitializer.INSTANCE;
-
+  private static final BungeeCord BUNGEE = BungeeCord.getInstance();
  private static final KickStringWriter LEGACY_KICK;

  static {
@@ -63,7 +63,7 @@ public final class ChildChannelInitializer extends ChannelInitializer<Channel> {
    final SocketAddress remoteAddress = channel.remoteAddress() == null ? channel.parent().localAddress()
      : channel.remoteAddress();

-    if (BungeeCord.getInstance().getConnectionThrottle() != null && BungeeCord.getInstance().getConnectionThrottle().throttle(remoteAddress)) {
+    if (BUNGEE.getConnectionThrottle() != null && BUNGEE.getConnectionThrottle().throttle(remoteAddress)) {
      channel.close();
    } else {
      final ListenerInfo listener = channel.attr(PipelineUtils.LISTENER).get();
@@ -80,13 +80,12 @@ public final class ChildChannelInitializer extends ChannelInitializer<Channel> {
        }

        channel.pipeline().addBefore(FRAME_DECODER, LEGACY_DECODER, new LegacyDecoder());
-        channel.pipeline().addAfter(FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder(Protocol.HANDSHAKE, true,
-          ProxyServer.getInstance().getProtocolVersion()));
-        channel.pipeline().addAfter(FRAME_PREPENDER, PACKET_ENCODER, new MinecraftEncoder(Protocol.HANDSHAKE,
-          true, ProxyServer.getInstance().getProtocolVersion()));
+        channel.pipeline().addAfter(FRAME_DECODER, PACKET_DECODER, new MinecraftDecoder(
+          Protocol.HANDSHAKE, true, ProtocolVersion.LATEST_VERSION.getProtocol()));
+        channel.pipeline().addAfter(FRAME_PREPENDER, PACKET_ENCODER, new MinecraftEncoder(
+          Protocol.HANDSHAKE, true, ProtocolVersion.LATEST_VERSION.getProtocol()));
        channel.pipeline().addBefore(FRAME_PREPENDER, LEGACY_KICKER, LEGACY_KICK);
-        channel.pipeline().get(HandlerBoss.class).setHandler(new FallbackInitialHandler(BungeeCord.getInstance(),
-          listener));
+        channel.pipeline().get(FallbackHandlerBoss.class).setHandler(new FallbackInitialHandler(BUNGEE, listener));

        if (listener.isProxyProtocol()) {
          channel.pipeline().addFirst(new HAProxyMessageDecoder());
@@ -21,6 +21,7 @@ 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;

@@ -29,7 +30,7 @@ import java.util.List;
 public final class Varint21FrameDecoder extends ByteToMessageDecoder {

  @Override
-  protected void decode(final ChannelHandlerContext ctx,
+  protected void decode(final @NotNull ChannelHandlerContext ctx,
                        final ByteBuf byteBuf,
                        final List<Object> out) throws Exception {
    if (!ctx.channel().isActive() || !byteBuf.isReadable()) {
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2023 Sonar Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package xyz.jonesdev.sonar.bungee.verbose;
-
-import lombok.RequiredArgsConstructor;
-import net.kyori.adventure.text.Component;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import xyz.jonesdev.sonar.api.verbose.Verbose;
-
-@RequiredArgsConstructor
-public final class VerboseWrapper extends Verbose {
-  private final ProxyServer server;
-
-  @Override
-  public void broadcast(final Component component) {
-    synchronized (subscribers) {
-      for (final String subscriber : subscribers) {
-        final ProxiedPlayer player = server.getPlayer(subscriber);
-        if (player != null) {
-          // TODO: use an adventure audience
-        }
-      }
-    }
-  }
-}
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.cappuccino.Cappuccino;
 import xyz.jonesdev.cappuccino.ExpiringCache;
 import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.SonarSupplier;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandRegistry;
 import xyz.jonesdev.sonar.api.config.SonarConfiguration;
@@ -48,19 +49,21 @@ public abstract class SonarBootstrap<T> implements Sonar {
  private SonarConfiguration config;
  private VerifiedPlayerController verifiedPlayerController;
  private File dataDirectory;
+  private final SonarPlatform platform;
  private final SubcommandRegistry subcommandRegistry;
  private final SystemTimer launchTimer = new SystemTimer();

  public SonarBootstrap(final @NotNull T plugin,
                        final File dataDirectory,
-                        final Verbose verboseHandler) {
-    // Set the API to this instance so the config doesn't have issues
+                        final SonarPlatform platform) {
+    // Set the Sonar API
    SonarSupplier.set(this);

    // Set the plugin instance before anything else
    this.plugin = plugin;
    this.dataDirectory = dataDirectory;
-    this.verboseHandler = verboseHandler;
+    this.platform = platform;
+    this.verboseHandler = new Verbose();
    this.config = new SonarConfiguration(dataDirectory);
    this.subcommandRegistry = new SubcommandRegistryHolder();
  }
@@ -20,24 +20,23 @@ package xyz.jonesdev.sonar.common.fallback;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.fallback.Fallback;

-import java.net.InetAddress;
 import java.net.InetSocketAddress;

@RequiredArgsConstructor
 public final class FallbackChannelHandler extends ChannelInboundHandlerAdapter {
-  private static final Fallback FALLBACK = Sonar.get().getFallback();
-  private final String username;
+  private static final @NotNull Fallback FALLBACK = Sonar.get().getFallback();
+  private final @NotNull String username;

  @Override
-  public void channelUnregistered(final ChannelHandlerContext ctx) {
-    final InetAddress inetAddress = ((InetSocketAddress) ctx.channel().remoteAddress()).getAddress();
-
-    // Remove the IP address from the queue
+  public void channelUnregistered(final @NotNull ChannelHandlerContext ctx) {
+    // Remove the username from the connected players
    FALLBACK.getConnected().remove(username);
-    FALLBACK.getQueue().remove(inetAddress);
+    // Remove the IP address from the queue
+    FALLBACK.getQueue().remove(((InetSocketAddress) ctx.channel().remoteAddress()).getAddress());

    ctx.fireChannelUnregistered();
  }
@@ -47,16 +47,12 @@ import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 public class FallbackPreparer {

  // Mappings
-  private final CompoundBinaryTag CHAT_TYPE_119;
-  private final CompoundBinaryTag CHAT_TYPE_1191;
  private final CompoundBinaryTag DAMAGE_TYPE_1194;
  private final CompoundBinaryTag DAMAGE_TYPE_120;

  static {
-    CHAT_TYPE_119 = getMapping("chat_1_19.nbt");
-    CHAT_TYPE_1191 = getMapping("chat_1_19_1.nbt");
-    DAMAGE_TYPE_1194 = getMapping("damage_1_19_4.nbt");
-    DAMAGE_TYPE_120 = getMapping("damage_type_1_20.nbt");
+    DAMAGE_TYPE_1194 = getMapping("damage_type_1194.nbt");
+    DAMAGE_TYPE_120 = getMapping("damage_type_120.nbt");
  }

  // Abilities
@@ -234,12 +230,6 @@ public class FallbackPreparer {
        ))).build()
      );

-      if (protocolVersion.compareTo(MINECRAFT_1_19) == 0) {
-        registryContainer.put("minecraft:chat_type", CHAT_TYPE_119);
-      } else if (protocolVersion.compareTo(MINECRAFT_1_19_1) >= 0) {
-        registryContainer.put("minecraft:chat_type", CHAT_TYPE_1191);
-      }
-
      if (protocolVersion.compareTo(MINECRAFT_1_19_4) == 0) {
        registryContainer.put("minecraft:damage_type", DAMAGE_TYPE_1194);
      } else if (protocolVersion.compareTo(MINECRAFT_1_20) >= 0) {
@@ -56,10 +56,14 @@ public final class EmptyChunkData implements FallbackPacket {
  }

  private static @NotNull CompoundBinaryTag prepareNBT(final boolean legacy) {
+    final long[] arrayData = new long[legacy ? 36 : 37];
+    final LongArrayBinaryTag longArray = LongArrayBinaryTag.longArrayBinaryTag(arrayData);
+
+    final CompoundBinaryTag motion = CompoundBinaryTag.builder()
+      .put("MOTION_BLOCKING", longArray)
+      .build();
    return CompoundBinaryTag.builder()
-      .put("root", CompoundBinaryTag.builder()
-        .put("MOTION_BLOCKING", LongArrayBinaryTag.longArrayBinaryTag(new long[legacy ? 36 : 37]))
-        .build())
+      .put("root", motion)
      .build();
  }

@@ -68,9 +72,10 @@ public final class EmptyChunkData implements FallbackPacket {
    byteBuf.writeInt(x);
    byteBuf.writeInt(z);

-    if (protocolVersion.compareTo(MINECRAFT_1_17) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_17_1) <= 0) {
-      writeVarInt(byteBuf, 0); // mask
+    if (protocolVersion.compareTo(MINECRAFT_1_17) >= 0) {
+      if (protocolVersion.compareTo(MINECRAFT_1_17_1) <= 0) {
+        writeVarInt(byteBuf, 0); // mask
+      }
    } else {
      byteBuf.writeBoolean(true); // full chunk

@@ -22,12 +22,12 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import net.kyori.adventure.nbt.CompoundBinaryTag;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
 import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionInfo;

-import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.*;
 import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;

@@ -57,135 +57,133 @@ public final class JoinGame implements FallbackPacket {
  // https://github.com/Nan1t/NanoLimbo/blob/main/src/main/java/ua/nanit/limbo/protocol/packets/play/PacketJoinGame.java
  @Override
  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_20_2) >= 0) {
+      // haha funny, they made 1.20.2 more complicated
+      encode1202Up(byteBuf, protocolVersion);
+    } else if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16) >= 0) {
+      // Minecraft 1.16 and above have significantly more complicated logic for reading this packet,
+      // so separate it out.
+      encode116Up(byteBuf, protocolVersion);
+    } else {
+      encodeLegacy(byteBuf, protocolVersion);
+    }
+  }
+
+  private void encodeLegacy(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
    byteBuf.writeInt(entityId);
-
-    if (protocolVersion.compareTo(MINECRAFT_1_9) <= 0) {
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeByte(dimension);
-      byteBuf.writeByte(0); // difficulty
-      byteBuf.writeByte(1); // max players
-      writeString(byteBuf, "flat"); // level type
-
-      if (protocolVersion.compareTo(MINECRAFT_1_8) >= 0) {
-        byteBuf.writeBoolean(reducedDebugInfo);
-      }
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_9_1) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_13_2) <= 0) {
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeInt(dimension);
-      byteBuf.writeByte(0); // difficulty
-      byteBuf.writeByte(1); // max players
-      writeString(byteBuf, "flat"); // level type
-      byteBuf.writeBoolean(reducedDebugInfo);
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_14) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_14_4) <= 0) {
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeInt(dimension);
-      byteBuf.writeByte(1); // max players
-      writeString(byteBuf, "flat"); // level type
-      writeVarInt(byteBuf, viewDistance);
-      byteBuf.writeBoolean(reducedDebugInfo);
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_15) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_15_2) <= 0) {
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeInt(dimension);
-      byteBuf.writeLong(partialHashedSeed);
-      byteBuf.writeByte(1); // max players
-      writeString(byteBuf, "flat"); // level type
-      writeVarInt(byteBuf, viewDistance);
-      byteBuf.writeBoolean(reducedDebugInfo);
-      byteBuf.writeBoolean(showRespawnScreen);
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_16) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_16_1) <= 0) {
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeByte(previousGamemode);
-      writeStringArray(byteBuf, levelNames);
-      writeCompoundTag(byteBuf, registry);
-      writeString(byteBuf, dimensionInfo.getIdentifier());
-      writeString(byteBuf, dimensionInfo.getLevelName());
-      byteBuf.writeLong(partialHashedSeed);
-      byteBuf.writeByte(1); // max players
-      writeVarInt(byteBuf, viewDistance);
-      byteBuf.writeBoolean(reducedDebugInfo);
-      byteBuf.writeBoolean(showRespawnScreen);
-      byteBuf.writeBoolean(dimensionInfo.isDebug());
-      byteBuf.writeBoolean(dimensionInfo.isFlat());
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_16_2) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_18_2) <= 0) {
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
      byteBuf.writeBoolean(isHardcore);
      byteBuf.writeByte(gamemode);
-      byteBuf.writeByte(previousGamemode);
-      writeStringArray(byteBuf, levelNames);
-      writeCompoundTag(byteBuf, registry);
+    } else {
+      byteBuf.writeByte(isHardcore ? gamemode | 0x8 : gamemode);
+    }
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_9_1) >= 0) {
+      byteBuf.writeInt(dimension);
+    } else {
+      byteBuf.writeByte(dimension);
+    }
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_13_2) <= 0) {
+      byteBuf.writeByte(difficulty);
+    }
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_15) >= 0) {
+      byteBuf.writeLong(partialHashedSeed);
+    }
+    byteBuf.writeByte(1); // max players
+    if (levelType == null) {
+      throw new IllegalStateException("No level type specified.");
+    }
+    writeString(byteBuf, levelType);
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_14) >= 0) {
+      writeVarInt(byteBuf, viewDistance);
+    }
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_8) >= 0) {
+      byteBuf.writeBoolean(reducedDebugInfo);
+    }
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_15) >= 0) {
+      byteBuf.writeBoolean(showRespawnScreen);
+    }
+  }
+
+  private void encode116Up(final @NotNull ByteBuf byteBuf, final @NotNull ProtocolVersion protocolVersion) {
+    byteBuf.writeInt(entityId);
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
+      byteBuf.writeBoolean(isHardcore);
+      byteBuf.writeByte(gamemode);
+    } else {
+      byteBuf.writeByte(isHardcore ? gamemode | 0x8 : gamemode);
+    }
+    byteBuf.writeByte(previousGamemode);
+
+    writeStringArray(byteBuf, levelNames);
+    writeCompoundTag(byteBuf, registry);
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0
+      && protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19) < 0) {
      writeCompoundTag(byteBuf, currentDimensionData);
      writeString(byteBuf, dimensionInfo.getIdentifier());
-      byteBuf.writeLong(partialHashedSeed);
-      writeVarInt(byteBuf, 1); // max players
-      writeVarInt(byteBuf, viewDistance);
-      if (protocolVersion.compareTo(MINECRAFT_1_18) >= 0) {
-        writeVarInt(byteBuf, viewDistance); // simulation distance
-      }
-      byteBuf.writeBoolean(reducedDebugInfo);
-      byteBuf.writeBoolean(showRespawnScreen);
-      byteBuf.writeBoolean(dimensionInfo.isDebug());
-      byteBuf.writeBoolean(dimensionInfo.isFlat());
-    }
-
-    if (protocolVersion.compareTo(MINECRAFT_1_19) >= 0
-      && protocolVersion.compareTo(MINECRAFT_1_20) <= 0) {
-      byteBuf.writeBoolean(isHardcore);
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeByte(previousGamemode);
-      writeStringArray(byteBuf, levelNames);
-      writeCompoundTag(byteBuf, registry);
+    } else {
      writeString(byteBuf, dimensionInfo.getIdentifier());
      writeString(byteBuf, dimensionInfo.getLevelName());
-      byteBuf.writeLong(partialHashedSeed);
-      writeVarInt(byteBuf, 1); // max players
-      writeVarInt(byteBuf, viewDistance);
-      writeVarInt(byteBuf, viewDistance); // simulation distance
-      byteBuf.writeBoolean(reducedDebugInfo);
-      byteBuf.writeBoolean(showRespawnScreen);
-      byteBuf.writeBoolean(dimensionInfo.isDebug());
-      byteBuf.writeBoolean(dimensionInfo.isFlat());
-      byteBuf.writeBoolean(false); // last death location
-
-      if (protocolVersion.compareTo(MINECRAFT_1_20) == 0) {
-        writeVarInt(byteBuf, 0); // portal cooldown
-      }
    }

-    if (protocolVersion.compareTo(MINECRAFT_1_20_2) >= 0) {
-      byteBuf.writeBoolean(isHardcore);
-      writeStringArray(byteBuf, levelNames);
-      writeVarInt(byteBuf, 1); // max players
-      writeVarInt(byteBuf, viewDistance);
-      writeVarInt(byteBuf, viewDistance); // simulation distance
-      byteBuf.writeBoolean(reducedDebugInfo);
-      byteBuf.writeBoolean(showRespawnScreen);
-      byteBuf.writeBoolean(limitedCrafting);
-      writeString(byteBuf, dimensionInfo.getIdentifier());
-      writeString(byteBuf, dimensionInfo.getLevelName());
-      byteBuf.writeLong(partialHashedSeed);
-      byteBuf.writeByte(gamemode);
-      byteBuf.writeByte(previousGamemode);
-      byteBuf.writeBoolean(dimensionInfo.isDebug());
-      byteBuf.writeBoolean(dimensionInfo.isFlat());
-      byteBuf.writeBoolean(false); // last death location
+    byteBuf.writeLong(partialHashedSeed);
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
+      writeVarInt(byteBuf, 0); // max players
+    } else {
+      byteBuf.writeByte(0); // max players
+    }
+
+    writeVarInt(byteBuf, viewDistance);
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_18) >= 0) {
+      writeVarInt(byteBuf, simulationDistance);
+    }
+
+    byteBuf.writeBoolean(reducedDebugInfo);
+    byteBuf.writeBoolean(showRespawnScreen);
+
+    byteBuf.writeBoolean(dimensionInfo.isDebug());
+    byteBuf.writeBoolean(dimensionInfo.isFlat());
+
+    // optional death location
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19) >= 0) {
+      byteBuf.writeBoolean(false); // no last death position
+    }
+
+    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_20) >= 0) {
      writeVarInt(byteBuf, 0); // portal cooldown
    }
  }

+  private void encode1202Up(final @NotNull ByteBuf byteBuf,
+                            final @SuppressWarnings("unused") ProtocolVersion protocolVersion) {
+    byteBuf.writeInt(entityId);
+    byteBuf.writeBoolean(isHardcore);
+
+    writeStringArray(byteBuf, levelNames);
+
+    writeVarInt(byteBuf, 1); // max players
+
+    writeVarInt(byteBuf, viewDistance);
+    writeVarInt(byteBuf, simulationDistance);
+
+    byteBuf.writeBoolean(reducedDebugInfo);
+    byteBuf.writeBoolean(showRespawnScreen);
+    byteBuf.writeBoolean(limitedCrafting);
+
+    writeString(byteBuf, dimensionInfo.getIdentifier());
+    writeString(byteBuf, dimensionInfo.getLevelName());
+    byteBuf.writeLong(partialHashedSeed);
+
+    byteBuf.writeByte(gamemode);
+    byteBuf.writeByte(previousGamemode);
+
+    byteBuf.writeBoolean(dimensionInfo.isDebug());
+    byteBuf.writeBoolean(dimensionInfo.isFlat());
+
+    byteBuf.writeBoolean(false); // no last death position
+
+    writeVarInt(byteBuf, 0); // portal cooldown
+  }
+
  @Override
  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
    throw new UnsupportedOperationException();
@@ -39,7 +39,7 @@ import java.net.InetAddress;
 public final class BlacklistCommand extends Subcommand {

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
+  protected void execute(final @NotNull CommandInvocation invocation) {
    switch (invocation.getRawArguments()[1].toLowerCase()) {
      case "add": {
        if (invocation.getRawArguments().length <= 2) {
@@ -49,7 +49,7 @@ public final class BlacklistCommand extends Subcommand {
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        final InetAddress inetAddress = getInetAddressIfValid(invocation.getSender(), rawInetAddress);
        // Make sure the given IP address is valid
        if (inetAddress == null) return;

@@ -80,7 +80,7 @@ public final class BlacklistCommand extends Subcommand {
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        final InetAddress inetAddress = getInetAddressIfValid(invocation.getSender(), rawInetAddress);
        // Make sure the given IP address is valid
        if (inetAddress == null) return;

@@ -46,7 +46,7 @@ public final class DumpCommand extends Subcommand implements JVMProfiler {
    .create();

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
+  protected void execute(final @NotNull CommandInvocation invocation) {
    final String json = GSON.toJson(collectMappedInformation());
    SONAR.getLogger().info("Generated dump: {}", json);
  }
@@ -56,7 +56,7 @@ public final class DumpCommand extends Subcommand implements JVMProfiler {
    val mappings = new WeakHashMap<String, Object>();
    mappings.put("sonar", new Dump.Sonar(
      SONAR.getVersion().getFull(),
-      SONAR.getServer().getPlatform(),
+      SONAR.getPlatform(),
      SONAR.getVersion().isOnMainBranch()
    ));
    mappings.put("runtime", new Dump.Runtime(
@@ -29,10 +29,10 @@ import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;
 public final class LockdownCommand extends Subcommand {

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
+  protected void execute(final @NotNull CommandInvocation invocation) {
    final boolean newState = !SONAR.getConfig().getLockdown().isEnabled();
    SONAR.getConfig().getLockdown().setEnabled(newState);
-    SONAR.getConfig().getGeneralConfig().set("general.lockdown.enabled", newState);
+    SONAR.getConfig().getGeneralConfig().set("lockdown.enabled", newState);
    SONAR.getConfig().getGeneralConfig().save();

    invocation.getSender().sendMessage(newState
@@ -30,7 +30,7 @@ import xyz.jonesdev.sonar.api.timer.SystemTimer;
 public final class ReloadCommand extends Subcommand {

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
+  protected void execute(final @NotNull CommandInvocation invocation) {
    final SystemTimer timer = new SystemTimer();

    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getReloading());
@@ -48,7 +48,7 @@ public final class StatisticsCommand extends Subcommand implements JVMProfiler {
  }

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
+  protected void execute(final @NotNull CommandInvocation invocation) {
    StatisticType type = StatisticType.GENERAL;
    if (invocation.getRawArguments().length >= 2) {
      try {
@@ -17,46 +17,30 @@

 package xyz.jonesdev.sonar.common.subcommand.impl;

+import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.command.CommandInvocation;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;

-import java.util.Optional;
-
@SubcommandInfo(
  name = "verbose",
-  description = "Enable and disable Sonar verbose",
+  description = "Enable or disable Sonar verbose",
  onlyPlayers = true
 )
 public final class VerboseCommand extends Subcommand {

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
-    InvocationSource verboseSubscriber = invocation.getSender();
-
-    // Support for '/sonar verbose [username]'
-    if (invocation.getRawArguments().length >= 2) {
-      final Optional<InvocationSource> optional = SONAR.getServer().getOnlinePlayer(invocation.getRawArguments()[1]);
-      if (optional.isPresent()) verboseSubscriber = optional.get();
-    }
-
-    if (SONAR.getVerboseHandler().isSubscribed(verboseSubscriber.getName())) {
-      SONAR.getVerboseHandler().unsubscribe(verboseSubscriber.getName());
-      if (verboseSubscriber != invocation.getSender()) {
-        verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseUnsubscribedOther()
-          .replace("%player%", verboseSubscriber.getName()));
-      }
-      verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseUnsubscribed());
+  protected void execute(final @NotNull CommandInvocation invocation) {
+    if (SONAR.getVerboseHandler().isSubscribed(invocation.getSender().getName())) {
+      SONAR.getVerboseHandler().unsubscribe(invocation.getSender().getName());
+      invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerboseUnsubscribed());
+      // Reset ActionBar component when unsubscribing
+      invocation.getSender().getAudience().sendActionBar(Component.empty());
      return;
    }

-    if (verboseSubscriber != invocation.getSender()) {
-      verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseSubscribedOther()
-        .replace("%player%", verboseSubscriber.getName()));
-    }
-    verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseSubscribed());
-    SONAR.getVerboseHandler().subscribe(verboseSubscriber.getName());
+    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerboseSubscribed());
+    SONAR.getVerboseHandler().subscribe(invocation.getSender().getName());
  }
 }
@@ -43,7 +43,7 @@ public final class VerifiedCommand extends Subcommand {
  private static final Queue<String> LOCK = new LinkedBlockingQueue<>(1);

  @Override
-  public void execute(final @NotNull CommandInvocation invocation) {
+  protected void execute(final @NotNull CommandInvocation invocation) {
    switch (invocation.getRawArguments()[1].toLowerCase()) {
      case "history": {
        if (invocation.getRawArguments().length <= 2) {
@@ -53,7 +53,7 @@ public final class VerifiedCommand extends Subcommand {
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        final InetAddress inetAddress = getInetAddressIfValid(invocation.getSender(), rawInetAddress);
        // Make sure the given IP address is valid
        if (inetAddress == null) return;

@@ -85,7 +85,7 @@ public final class VerifiedCommand extends Subcommand {
          return;
        }

-        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        final InetAddress inetAddress = getInetAddressIfValid(invocation.getSender(), rawInetAddress);
        // Make sure the given IP address is valid
        if (inetAddress == null) return;

@@ -38,24 +38,39 @@ public class UpdateChecker {
    }
  };

+  private int convertVersion(final @NotNull String version) throws NumberFormatException, IllegalStateException {
+    final String[] convertedParts = version.split("\\.");
+    // Validate the length of the converted parts
+    if (convertedParts.length != 3) {
+      throw new IllegalStateException("Converted version length mismatch");
+    }
+    // Major updates are more important than minor updates,
+    // and minor updates are more important than patches.
+    final int convertedMajor = Integer.parseInt(convertedParts[0]) * 100000; // multiply by weight
+    final int convertedMinor = Integer.parseInt(convertedParts[1]) * 10000; // multiply by weight
+    final int patch = Integer.parseInt(convertedParts[2]);
+    return convertedMajor + convertedMinor + patch; // sum the converted version parts
+  }
+
  public void checkForUpdates() {
    ASYNC_EXECUTOR.execute(() -> {
      try {
        final URL url = new URL("https://api.github.com/repos/jonesdevelopment/sonar/releases/latest");
        final HttpsURLConnection urlConnection = prepareConnection(url);
        final JsonObject json = parseJson(urlConnection.getInputStream());
-        final String latestStableVersion = json.get("tag_name").getAsString();
+        final String latestStableRelease = json.get("tag_name").getAsString();
+        final int convertedLatestVersion = convertVersion(latestStableRelease);
+        final int convertedCurrentVersion = convertVersion(Sonar.get().getVersion().getSemanticVersion());

-        if (!latestStableVersion.equals(Sonar.get().getVersion().getSemanticVersion())) {
-          LOGGER.warn("A new version of Sonar is available: {}", latestStableVersion);
+        if (convertedCurrentVersion < convertedLatestVersion) {
+          LOGGER.warn("A new version of Sonar is available: {}", latestStableRelease);
          LOGGER.warn("Please make sure to update to the latest version to ensure stability and security:");
-          LOGGER.warn("https://github.com/jonesdevelopment/sonar/releases");
-        } else if (Sonar.get().getVersion().isOnMainBranch()) {
-          LOGGER.info("You are currently using the latest stable release of Sonar!");
+          LOGGER.warn("https://github.com/jonesdevelopment/sonar/releases/tag/{}", latestStableRelease);
+        } else if (convertedCurrentVersion > convertedLatestVersion || !Sonar.get().getVersion().isOnMainBranch()) {
+          LOGGER.warn("You are currently using an unreleased version of Sonar!");
+          LOGGER.warn("The contributors of Sonar are not responsible for any damage done by using an unstable version");
        } else {
-          LOGGER.warn("You are currently using the latest development version of Sonar!");
-          LOGGER.warn("The contributors of Sonar are not responsible for any damage done by using an unstable version" +
-            ".");
+          LOGGER.info("You are currently using the latest stable release of Sonar!");
        }
      } catch (Exception exception) {
        LOGGER.warn("Could not retrieve latest version information: {}", exception);
@@ -20,9 +20,8 @@ dependencies {
 tasks {
  processResources {
    val props = mapOf(
-      "name" to rootProject.name,
      "version" to rootProject.version.toString().split("-")[0],
-      "description" to "Effective Anti-bot plugin for Velocity, BungeeCord, and Bukkit (1.7-latest)",
+      "description" to rootProject.description,
      "url" to "https://jonesdev.xyz/discord/",
      "main" to "xyz.jonesdev.sonar.velocity.SonarVelocityPlugin"
    )
@@ -20,17 +20,13 @@ package xyz.jonesdev.sonar.velocity;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.SonarPlatform;
-import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.fallback.traffic.TrafficCounter;
 import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
-import xyz.jonesdev.sonar.api.server.ServerWrapper;
 import xyz.jonesdev.sonar.common.boot.SonarBootstrap;
-import xyz.jonesdev.sonar.velocity.command.VelocityInvocationSource;
+import xyz.jonesdev.sonar.velocity.audience.AudienceListener;
 import xyz.jonesdev.sonar.velocity.command.VelocitySonarCommand;
 import xyz.jonesdev.sonar.velocity.fallback.FallbackListener;
-import xyz.jonesdev.sonar.velocity.verbose.VerboseWrapper;

-import java.util.Optional;
 import java.util.concurrent.TimeUnit;

@Getter
@@ -38,7 +34,7 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
  public static SonarVelocity INSTANCE;

  public SonarVelocity(final @NotNull SonarVelocityPlugin plugin) {
-    super(plugin, plugin.getDataDirectory().toFile(), new VerboseWrapper(plugin.getServer()));
+    super(plugin, plugin.getDataDirectory().toFile(), SonarPlatform.VELOCITY);
    INSTANCE = this;
  }

@@ -66,28 +62,11 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
    }
  };

-  /**
-   * Create a wrapper object for our server, so we can use it outside
-   * the velocity module.
-   * <br>
-   * We have to do this, so we can access all necessary API functions.
-   */
-  public final ServerWrapper server = new ServerWrapper(SonarPlatform.VELOCITY) {
-
-    @Override
-    public Optional<InvocationSource> getOnlinePlayer(final String username) {
-      return getPlugin().getServer().getAllPlayers().stream()
-        .filter(player -> player.getUsername().equalsIgnoreCase(username))
-        .findFirst()
-        .map(VelocityInvocationSource::new);
-    }
-  };
-
  @Override
  public void enable() {

    // Initialize bStats.org metrics
-    getPlugin().getMetricsFactory().make(getPlugin(), getServer().getPlatform().getMetricsId());
+    getPlugin().getMetricsFactory().make(getPlugin(), getPlatform().getMetricsId());

    // Register Sonar command
    getPlugin().getServer().getCommandManager().register("sonar", new VelocitySonarCommand());
@@ -95,6 +74,9 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
    // Register Fallback listener
    getPlugin().getServer().getEventManager().register(getPlugin(), new FallbackListener(getFallback()));

+    // Register audience register listener
+    getPlugin().getServer().getEventManager().register(getPlugin(), new AudienceListener());
+
    // Register Fallback queue task
    getPlugin().getServer().getScheduler().buildTask(getPlugin(), getFallback().getQueue()::poll)
      .repeat(500L, TimeUnit.MILLISECONDS)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2023 Sonar Contributors
+ *
+ * This 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.velocity.audience;
+
+import com.velocitypowered.api.event.PostOrder;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.connection.DisconnectEvent;
+import com.velocitypowered.api.event.connection.PostLoginEvent;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+
+public final class AudienceListener {
+
+  @Subscribe(order = PostOrder.LAST)
+  public void handle(final @NotNull PostLoginEvent event) {
+    Sonar.get().getVerboseHandler().getAudiences().put(event.getPlayer().getUsername(), event.getPlayer());
+  }
+
+  @Subscribe(order = PostOrder.LAST)
+  public void handle(final @NotNull DisconnectEvent event) {
+    Sonar.get().getVerboseHandler().getAudiences().remove(event.getPlayer().getUsername());
+  }
+}
@@ -24,8 +24,6 @@ import xyz.jonesdev.sonar.api.command.InvocationSource;

 public final class VelocityInvocationSource extends InvocationSource {
  public VelocityInvocationSource(final @NotNull CommandSource sender) {
-    super(sender instanceof Player
-      ? ((Player) sender).getUsername()
-      : "Console", sender);
+    super(sender instanceof Player ? ((Player) sender).getUsername() : "Console", sender, sender instanceof Player);
  }
 }
@@ -18,35 +18,27 @@
 package xyz.jonesdev.sonar.velocity.command;

 import com.velocitypowered.api.command.SimpleCommand;
-import com.velocitypowered.api.proxy.ConsoleCommandSource;
-import com.velocitypowered.api.proxy.Player;
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
-import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.SonarCommand;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
-import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;

 import static java.util.Collections.emptyList;

 public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
-  {
-    cacheHelpMessage();
-  }

  @Override
  public void execute(final @NotNull Invocation invocation) {
    // Create our own invocation source wrapper to handle messages properly
    final InvocationSource invocationSource = new VelocityInvocationSource(invocation.source());

-    if (!(invocation.source() instanceof ConsoleCommandSource)) {
+    if (invocationSource.isPlayer()) {
      // Check if the player actually has the permission to run the command
      if (!invocation.source().hasPermission("sonar.command")) {
        invocationSource.sendMessage(Sonar.get().getConfig().getNoPermission());
@@ -97,32 +89,6 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
      }
    }

-    subcommand.ifPresent(sub -> {
-      if (sub.getInfo().onlyPlayers() && !(invocation.source() instanceof Player)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
-        return;
-      }
-
-      if (sub.getInfo().onlyConsole() && !(invocation.source() instanceof ConsoleCommandSource)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
-        return;
-      }
-
-      final CommandInvocation commandInvocation = new CommandInvocation(invocationSource, sub, invocation.arguments());
-
-      // The subcommands has arguments which are not present in the executed command
-      if (sub.getInfo().arguments().length > 0
-        && commandInvocation.getRawArguments().length <= 1
-        && sub.getInfo().argumentsRequired()) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
-          .replace("%usage%", sub.getInfo().name() + " (" + sub.getArguments() + ")"));
-        return;
-      }
-
-      // Execute the sub command with the custom invocation properties
-      sub.execute(commandInvocation);
-    });
-
    if (subcommand.isEmpty()) {

      // Re-use the old, cached help message since we don't want to scan
@@ -131,6 +97,8 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
      for (final Component component : CACHED_HELP_MESSAGE) {
        invocationSource.sendMessage(component);
      }
+    } else {
+      subcommand.get().invoke(invocationSource, invocation.arguments());
    }
  }

@@ -140,33 +108,6 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
    if (!invocation.source().hasPermission("sonar.command")) {
      return emptyList();
    }
-    if (invocation.arguments().length <= 1) {
-      if (TAB_SUGGESTIONS.isEmpty()) {
-        for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-          TAB_SUGGESTIONS.add(subcommand.getInfo().name());
-
-          if (subcommand.getInfo().aliases().length > 0) {
-            TAB_SUGGESTIONS.addAll(Arrays.asList(subcommand.getInfo().aliases()));
-          }
-        }
-      }
-      return TAB_SUGGESTIONS;
-    } else if (invocation.arguments().length == 2) {
-      if (ARG_TAB_SUGGESTIONS.isEmpty()) {
-        for (final Subcommand subcommand : Sonar.get().getSubcommandRegistry().getSubcommands()) {
-          final List<String> parsedArguments = Arrays.stream(subcommand.getInfo().arguments())
-            .map(Argument::value)
-            .collect(Collectors.toUnmodifiableList());
-          ARG_TAB_SUGGESTIONS.put(subcommand.getInfo().name(), parsedArguments);
-          for (final String alias : subcommand.getInfo().aliases()) {
-            ARG_TAB_SUGGESTIONS.put(alias, parsedArguments);
-          }
-        }
-      }
-
-      final String subCommandName = invocation.arguments()[0].toLowerCase();
-      return ARG_TAB_SUGGESTIONS.getOrDefault(subCommandName, emptyList());
-    }
-    return emptyList();
+    return getCachedTabSuggestions(invocation.arguments());
  }
 }
@@ -126,7 +126,8 @@ public final class FallbackListener {

  @Subscribe(order = PostOrder.LAST)
  public void handle(final @NotNull PreLoginEvent event) throws Throwable {
-    Statistics.TOTAL_TRAFFIC.increment();
+    // Increase joins per second for the action bar verbose
+    Sonar.get().getVerboseHandler().getJoinsPerSecond().put(System.nanoTime());

    val inboundConnection = (LoginInboundConnection) event.getConnection();
    val initialConnection = (InitialInboundConnection) INITIAL_CONNECTION.invokeExact(inboundConnection);
@@ -146,6 +147,9 @@ public final class FallbackListener {

      final InetAddress inetAddress = event.getConnection().getRemoteAddress().getAddress();

+      // Increase total traffic statistic
+      Statistics.TOTAL_TRAFFIC.increment();
+
      try {
        // Backwards compatibility for Velocity b265 and below
        val activeSessionHandler = (MinecraftSessionHandler) SESSION_HANDLER_FIELD.get(mcConnection);
@@ -311,7 +315,7 @@ public final class FallbackListener {
          fallback.getConnected().put(gameProfile.getName(), inetAddress);

          // This sometimes happens when the channel hangs, but the player is still connecting
-          // This also fixes a weird issue with TCPShield and other reverse proxies
+          // This also fixes a unique issue with TCPShield and other reverse proxies
          if (fallbackPlayer.getPipeline().get(MINECRAFT_ENCODER) == null
            || fallbackPlayer.getPipeline().get(MINECRAFT_DECODER) == null) {
            mcConnection.close(true);
@@ -21,7 +21,6 @@ import com.velocitypowered.proxy.connection.MinecraftConnection;
 import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
@@ -35,9 +34,8 @@ import xyz.jonesdev.sonar.common.fallback.protocol.packets.play.Disconnect;
 import java.net.InetAddress;

@Getter
-@ToString(of = {"protocolVersion"})
-@EqualsAndHashCode
@RequiredArgsConstructor
+@ToString(of = {"protocolVersion"})
 public final class FallbackUserWrapper implements FallbackUser<ConnectedPlayer, MinecraftConnection> {
  private final Fallback fallback;
  private final ConnectedPlayer player;
@@ -1,6 +1,6 @@
 {
  "id": "sonar",
-  "name": "$name",
+  "name": "Sonar",
  "version": "$version",
  "description": "$description",
  "url": "$url",
Author	SHA1	Message	Date
Jones	ef31dd4c87	Release 2.0.6 (#77 )	2023-10-25 17:42:59 +02:00
Jones	8361f1990d	Implement BungeeCord support (#76 ) * feat: remove Velocity's (de-)compression dependency * feat: [wip] implement Fallback for BungeeCord * feat: disable legacy pipelines by default (can be enabled again) * fix(bungee): NPE on handshake * fix: use correct protocol version for channel initialization * feat: implement login packet spam fix * feat(bungee): implement duplicate login/status packet spam fix * feat: implement cleaner FallbackHandlerBoss * fix(bungee): traffic handler not being injected properly * fix(bungee): run verification check after running everything in the event loop * fix(bungee): only throw exceptions for up- and downstream bridge * fix(bungee): total traffic statistic not working * fix(bukkit, bungee): logger wrapper not supporting arguments * fix(bungee): perform the already-online check by the username, not the uuid * style: fix FallbackChannelHandler comments * style: don't annotate FallbackUserWrapper as EqualsAndHashCode * style: fix ToString annotation in EmptyChunkData * feat(fallback): remove 1.19/1.19.1 chat nbt mappings * feat: use expiring cache for joins per second counter * fix(bungee): don't log the join attempt if the login is canceled * fix(all): lockdown mode not being saved correctly * fix(bungee): closeWith method only working during verification * fix(bungee): use Velocity's server write mark * fix(bungee): don't set BB allocator if it's already set	2023-10-22 14:32:37 +02:00
Jones	bf9e77a437	Implement better adventure audience system (#75 ) * feat: recode verbose handler by implementing per-platform audiences * feat: remove /sonar verbose [other player] * feat: remove ServerWrapper and replace it with the platform * feat: reset action bar when unsubscribing from verbose * feat: recode tab suggestions and help message caching * feat: make Sonar main command translatable/configurable * feat: don't cache copyright year * fix: tab suggestions breaking after the first iteration * feat: run only-players and require-console checks in the Subcommand class to remove duplicate code * fix(all): replace instance check with condition check * style: improve codestyle in YAML configuration loader * fix: argumentsRequired property not working at all * style: small codestyle improvements and comment fixes	2023-10-21 12:11:23 +02:00
Jones	7f604dd4ad	Release 2.0.5 (#74 )	2023-10-20 17:41:16 +02:00
Jones	ab96929070	Fix EmptyChunkData packet being broken on 1.17+ (#73 )	2023-10-20 17:36:43 +02:00
Michel Elkenwaat	fa20826b8e	Merge remote-tracking branch 'origin/main'	2023-10-20 17:22:25 +02:00
Michel Elkenwaat	c8c212a3ee	Fix issues with the plugin description (#69 )	2023-10-20 17:22:08 +02:00
Michel Elkenwaat	ad7d3e62eb	Fix issues with the plugin description https://github.com/jonesdevelopment/sonar/pull/69	2023-10-20 17:21:30 +02:00
Ismael	343d71d18c	Fix incompatibilities with Gradle 7.x (#69 ) Fix "java.lang.IllegalStateException: Module entity with name: sonar.bukkit should be available"	2023-10-20 16:38:52 +02:00
Jones	a2e252aece	Use a better conversion technique to improve update checker (#72 )	2023-10-20 15:09:31 +02:00
Jones	124bed86dc	Fix invalid root tag in chunk data packet (#70 ) * fix: use Velocity's JoinGame packet for consistency (https://github.com/jonesdevelopment/sonar/issues/68) * fix: incorrect motion blocking root tag in EmptyChunkData packet (https://github.com/jonesdevelopment/sonar/issues/68)	2023-10-20 14:19:53 +02:00
Jones	971d43df00	Recode IPv4 regex pattern check (#67 )	2023-10-19 17:03:52 +02:00