Release 2.0.3 (#60 )

Overhaul all configurations and add more translations (#59 )
* feat: create subclasses for different configuration value types * fix: only send UpdateSectionBlocks packet if the collision check is enabled * feat: restructure all configurations (config.yml, en.yml) * fix: invalid configuration path for certain settings * fix: use default comment stype because empty lines look ugly * feat: update configuration yaml file header * fix: smaller configuration fixes and relocations * feat: migrate messages to modern MiniMessage formatting * fix: verbose not deserializing the component properly * feat: refactor commands into their own category in the config * feat: remove unused postReload task/method * fix: make hover component in /sonar actually look decent * feat: make /sonar stats completely configurable * fix: use MiniMessage newline tag instead of hardcoded newline symbol * fix: use correct translation for /sonar stats cpu * style: remove resolved todo comment * refactor: lang/en.yml -> translations/en.yml
2023-10-08 11:55:52 +02:00 · 2023-10-07 16:33:29 +02:00 · 2023-10-07 10:44:51 +02:00 · 2023-10-06 22:06:53 +02:00 · 2023-10-06 21:46:54 +02:00 · 2023-10-06 20:27:48 +02:00
50 changed files with 1522 additions and 993 deletions
@@ -38,12 +38,14 @@ subprojects {
    testCompileOnly("org.projectlombok:lombok:1.18.30")
    testAnnotationProcessor("org.projectlombok:lombok:1.18.30")

-    // MiniMessage
-    implementation("net.kyori:adventure-text-minimessage:4.14.0")
-    implementation("net.kyori:adventure-text-serializer-gson:4.14.0")
-    implementation("net.kyori:adventure-text-serializer-legacy:4.14.0")
+    val adventureVersion = "4.14.0"
+
+    // adventure
+    implementation("net.kyori:adventure-text-minimessage:$adventureVersion")
+    implementation("net.kyori:adventure-text-serializer-gson:$adventureVersion")
+    // adventure nbt
+    implementation("net.kyori:adventure-nbt:$adventureVersion")

-    implementation("net.kyori:adventure-nbt:4.14.0") // nbt
    implementation("com.j256.ormlite:ormlite-jdbc:6.1") // ORM
    implementation("xyz.jonesdev:cappuccino:0.1.6-SNAPSHOT") // expiring cache

@@ -69,10 +71,19 @@ tasks {
  }

  shadowJar {
-    // bStats has to be relocated to the Sonar package otherwise it throws an exception.
-    relocate("org.bstats", "xyz.jonesdev.sonar.bstats")
    // Set the file name of the shadowed jar
    archiveFileName.set("${rootProject.name}.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
+    relocate("org.bstats", "xyz.jonesdev.sonar.libs.bstats")
+
+    // https://github.com/jonesdevelopment/sonar/issues/46
+    // Relocate some packages, so we don't run into issues where we accidentally use Velocity's classes
+    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,2 @@
 group=xyz.jonesdev.sonar
-version=2.0.2
+version=2.0.3
@@ -1,5 +1,7 @@
 dependencies {
-  implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") // yaml config
+  implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4") {
+    exclude(group = "org.yaml")
+  }

  compileOnly("org.jetbrains:annotations:24.0.1")
 }
@@ -57,6 +57,7 @@ public interface Sonar {
  /**
   * Set a custom verbose handler
   */
+  @SuppressWarnings("unused")
  void setVerboseHandler(final @NotNull Verbose verboseHandler);

  /**
@@ -64,20 +65,20 @@ public interface Sonar {
   */
  void reload();

-  @NotNull
-  default SonarEventManager getEventManager() {
-    return SonarEventManager.INSTANCE;
-  }
-
  @NotNull
  default SonarVersion getVersion() {
    return SonarVersion.GET;
  }

+  @NotNull
+  default SonarEventManager getEventManager() {
+    // We don't want anyone else to create a new instance.
+    return SonarEventManager.INSTANCE;
+  }
+
  @NotNull
  default Fallback getFallback() {
-    // We only have one single instance of Fallback,
-    // and we don't want anyone else to create a new instance.
+    // We don't want anyone else to create a new instance.
    return Fallback.INSTANCE;
  }

@@ -21,7 +21,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.text.minimessage.MiniMessage;

@Getter
@RequiredArgsConstructor
@@ -40,7 +40,7 @@ public abstract class InvocationSource {
   * Sends a message to the command executor
   */
  public final void sendMessage(final String legacy) {
-    sendMessage(LegacyComponentSerializer.legacyAmpersand().deserialize(legacy));
+    sendMessage(MiniMessage.miniMessage().deserialize(legacy));
  }

  /**
@@ -45,16 +45,16 @@ public interface SonarCommand {
        + ".", NamedTextColor.YELLOW),
      Component.text("(C) " + COPYRIGHT_YEAR + " Jones Development and Sonar Contributors", NamedTextColor.YELLOW),
      Component.text("https://github.com/jonesdevelopment/sonar", NamedTextColor.GREEN)
-        .clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.OPEN_URL, "https://github.com/jonesdevelopment/sonar")),
+        .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(net.kyori.adventure.text.event.HoverEvent.hoverEvent(net.kyori.adventure.text.event.HoverEvent.Action.SHOW_TEXT, Component.text("(Click to open Discord)")))
-          .clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.OPEN_URL, "https://jonesdev.xyz/discord/")),
+          .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(net.kyori.adventure.text.event.HoverEvent.hoverEvent(net.kyori.adventure.text.event.HoverEvent.Action.SHOW_TEXT, Component.text("(Click to open GitHub)")))
-          .clickEvent(net.kyori.adventure.text.event.ClickEvent.clickEvent(net.kyori.adventure.text.event.ClickEvent.Action.OPEN_URL, "https://github.com/jonesdevelopment/sonar" +
+          .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()
@@ -68,17 +68,28 @@ public interface SonarCommand {
        Component.text(sub.getInfo().description(), NamedTextColor.WHITE)
      );

-      component = component.clickEvent(
-        net.kyori.adventure.text.event.ClickEvent.clickEvent(ClickEvent.Action.SUGGEST_COMMAND,
-          "/sonar " + sub.getInfo().name() + " ")
-      ).hoverEvent(
-        net.kyori.adventure.text.event.HoverEvent.hoverEvent(HoverEvent.Action.SHOW_TEXT, Component.text(
-          "§7Only players: §f" + (sub.getInfo().onlyPlayers() ? "§a✔" : "§c✗")
-            + Sonar.LINE_SEPARATOR + "§7Require console: §f" + (sub.getInfo().onlyConsole() ? "§a✔" : "§c✗")
-            + Sonar.LINE_SEPARATOR + "§7Permission: §f" + sub.getPermission()
-            + Sonar.LINE_SEPARATOR + "§7Aliases: §f" + sub.getAliases()
-        ))
+      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);
    });
  }
@@ -19,11 +19,14 @@ package xyz.jonesdev.sonar.api.command.subcommand;

 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.jonesdev.sonar.api.Sonar;
 import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.InvocationSource;
 import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -49,8 +52,29 @@ public abstract class Subcommand {
      .collect(Collectors.joining(", "));
  }

+  protected static @Nullable InetAddress checkIP(final InvocationSource source, final String rawIP) {
+    if (!IP_PATTERN.matcher(rawIP).matches()) {
+      source.sendMessage(SONAR.getConfig().getCommands().getIncorrectIpAddress());
+      return null;
+    }
+
+    final InetAddress inetAddress;
+    try {
+      inetAddress = InetAddress.getByName(rawIP);
+
+      if (inetAddress.isAnyLocalAddress() || inetAddress.isLoopbackAddress()) {
+        source.sendMessage(SONAR.getConfig().getCommands().getIllegalIpAddress());
+        return null;
+      }
+    } catch (UnknownHostException exception) {
+      source.sendMessage(SONAR.getConfig().getCommands().getUnknownIpAddress());
+      return null;
+    }
+    return inetAddress;
+  }
+
  protected final void incorrectUsage(final @NotNull InvocationSource sender) {
-    sender.sendMessage(SONAR.getConfig().getIncorrectCommandUsage()
+    sender.sendMessage(SONAR.getConfig().getCommands().getIncorrectCommandUsage()
      .replace("%usage%", info.name() + " (" + arguments + ")"));
  }

@@ -36,9 +36,10 @@ public final class SimpleYamlConfig {

  private static final List<String> HEADER = Arrays.asList(
    "",
-    "Sonar anti-bot version " + Sonar.get().getVersion(),
-    " Currently running on: " + Sonar.get().getServer().getPlatform().getDisplayName(),
-    " Need help? https://jonesdev.xyz/discord",
+    "Running Sonar version " + Sonar.get().getVersion()
+      + " on " + Sonar.get().getServer().getPlatform().getDisplayName(),
+    "Need help or have questions? https://jonesdev.xyz/discord",
+    "https://github.com/jonesdevelopment/sonar",
    ""
  );

@@ -73,9 +74,7 @@ public final class SimpleYamlConfig {
    }

    // Always load the comment format and options
-    yaml.setCommentFormat(YamlCommentFormat.PRETTY);
-
-    yaml.options().headerFormatter().commentPrefix("# ");
+    yaml.setCommentFormat(YamlCommentFormat.DEFAULT);
    yaml.setHeader(String.join(LINE_SEPARATOR, HEADER));
  }

@@ -45,14 +45,14 @@ public final class VerifiedPlayerController {
  private Dao<VerifiedPlayer, Integer> dao;
  private QueryBuilder<VerifiedPlayer, Integer> queryBuilder;
  @Getter
-  private final @NotNull SonarConfiguration.DatabaseType cachedDatabaseType;
+  private final @NotNull SonarConfiguration.Database.Type cachedDatabaseType;

  public VerifiedPlayerController() {
    // Cache selected database type, so we don't need to call Sonar.get() every time
-    cachedDatabaseType = Sonar.get().getConfig().getDatabaseType();
+    cachedDatabaseType = Sonar.get().getConfig().getDatabase().getType();

    // Don't establish a database connection if the type is NONE
-    if (cachedDatabaseType == SonarConfiguration.DatabaseType.NONE) {
+    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
      Sonar.get().getLogger().warn("Make sure to configure a database to save verified players.");
      return;
    }
@@ -87,7 +87,7 @@ public final class VerifiedPlayerController {
    _remove(inetAddress);

    // Don't try to update the column if the database type is NONE
-    if (cachedDatabaseType == SonarConfiguration.DatabaseType.NONE) {
+    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
      return;
    }

@@ -129,7 +129,7 @@ public final class VerifiedPlayerController {
    _add(player);

    // Don't try to update the column if the database type is NONE
-    if (cachedDatabaseType == SonarConfiguration.DatabaseType.NONE) {
+    if (cachedDatabaseType == SonarConfiguration.Database.Type.NONE) {
      return;
    }

@@ -179,7 +179,7 @@ public final class VerifiedPlayerController {
      MAP.clear();

      // Only update the column if the database type is not NONE
-      if (cachedDatabaseType != SonarConfiguration.DatabaseType.NONE) {
+      if (cachedDatabaseType != SonarConfiguration.Database.Type.NONE) {
        dao.deleteBuilder().delete();
      }
    } catch (SQLException exception) {
@@ -38,8 +38,8 @@ public class DependencyLoader {
  public ConnectionSource setUpDriverAndConnect() throws Throwable {
    final SonarConfiguration config = Sonar.get().getConfig();

-    final URL[] urls = new URL[config.getDatabaseType().getDependencies().length];
-    for (final Dependency dependency : config.getDatabaseType().getDependencies()) {
+    final URL[] urls = new URL[config.getDatabase().getType().getDependencies().length];
+    for (final Dependency dependency : config.getDatabase().getType().getDependencies()) {
      final URL url = dependency.getClassLoaderURL();
      final ClassLoader currentClassLoader = DependencyLoader.class.getClassLoader();

@@ -50,12 +50,12 @@ public class DependencyLoader {
      urls[dependency.ordinal()] = url;
    }

-    final String type = config.getDatabaseType().name().toLowerCase();
-    final String databaseURL =
-      "jdbc:" + type + "://" + config.getSqlUrl() + ":" + config.getSqlPort() + "/" + config.getSqlDatabase();
+    final String type = config.getDatabase().getType().name().toLowerCase();
+    final String databaseURL = String.format("jdbc:%s://%s:%d/%s",
+      type, config.getDatabase().getUrl(), config.getDatabase().getPort(), config.getDatabase().getName());

    final ExternalClassLoader classLoader = new ExternalClassLoader(urls);
-    final Connection connection = connect(classLoader, databaseURL, config);
+    final Connection connection = connect(classLoader, databaseURL, config.getDatabase());
    return new JdbcSingleConnectionSource(databaseURL, connection);
  }

@@ -63,18 +63,16 @@ public class DependencyLoader {
  // https://github.com/Elytrium/LimboAuth/blob/master/src/main/java/net/elytrium/limboauth/dependencies/DatabaseLibrary.java#L134
  private Connection connect(final @NotNull ClassLoader classLoader,
                             final @NotNull String databaseURL,
-                             final @NotNull SonarConfiguration configuration) throws Throwable {
-    final Class<?> driverClass = classLoader.loadClass(configuration.getDatabaseType().getDriverClassName());
+                             final @NotNull SonarConfiguration.Database config) throws Throwable {
+    final Class<?> driverClass = classLoader.loadClass(config.getType().getDriverClassName());
    final Object driver = driverClass.getDeclaredConstructor().newInstance();

    DriverManager.registerDriver((Driver) driver);

    final Properties properties = new Properties();
-    if (!configuration.getSqlUser().isEmpty()) {
-      properties.put("user", configuration.getSqlUser());
-    }
-    if (!configuration.getSqlPassword().isEmpty()) {
-      properties.put("password", configuration.getSqlPassword());
+    properties.put("user", config.getUsername());
+    if (!config.getPassword().isEmpty()) {
+      properties.put("password", config.getPassword());
    }

    final Method connect = driverClass.getDeclaredMethod("connect", String.class, Properties.class);
@@ -50,22 +50,22 @@ public final class Fallback {

    @Override
    public void info(final String message, final Object... args) {
-      SONAR.getLogger().info("[Fallback] " + message, args);
+      SONAR.getLogger().info("[fallback] " + message, args);
    }

    @Override
    public void warn(final String message, final Object... args) {
-      SONAR.getLogger().warn("[Fallback] " + message, args);
+      SONAR.getLogger().warn("[fallback] " + message, args);
    }

    @Override
    public void error(final String message, final Object... args) {
-      SONAR.getLogger().error("[Fallback] " + message, args);
+      SONAR.getLogger().error("[fallback] " + message, args);
    }
  };

  public boolean isPotentiallyUnderAttack() {
-    return connected.size() > SONAR.getConfig().getMinimumPlayersForAttack()
-      || queue.getQueuedPlayers().size() > SONAR.getConfig().getMinimumPlayersForAttack();
+    final int min = SONAR.getConfig().getMinPlayersForAttack();
+    return connected.size() > min || queue.getQueuedPlayers().size() > min;
  }
 }
@@ -50,7 +50,7 @@ public final class FallbackQueue {
  }

  public void poll() {
-    final int max = Sonar.get().getConfig().getMaximumQueuePolls();
+    final int max = Sonar.get().getConfig().getQueue().getMaxQueuePolls();
    int index = 0;

    // We need to be very careful here since we don't want any concurrency issues.
@@ -74,6 +74,12 @@ public interface FallbackUser<X, Y> {
   */
  void write(final @NotNull Object msg);

+  /**
+   * Queues a buffered message that will be
+   * sent once all messages are flushed.
+   */
+  void delayedWrite(final @NotNull Object msg);
+
  ExpiringCache<String> PREVIOUS_FAILS = Cappuccino.buildExpiring(3L, TimeUnit.MINUTES);

  /**
@@ -89,10 +95,10 @@ public interface FallbackUser<X, Y> {
      // Call the VerifyFailedEvent for external API usage
      Sonar.get().getEventManager().publish(new UserVerifyFailedEvent(this, reason));

-      disconnect(Sonar.get().getConfig().getVerificationFailed());
+      disconnect(Sonar.get().getConfig().getVerification().getVerificationFailed());

      if (reason != null) {
-        getFallback().getLogger().info(Sonar.get().getConfig().getVerificationFailedLog()
+        getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getFailedLog()
          .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
          .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol()))
          .replace("%reason%", reason));
@@ -110,7 +116,7 @@ public interface FallbackUser<X, Y> {
      Sonar.get().getEventManager().publish(new UserBlacklistedEvent(this));

      getFallback().getBlacklisted().put(getInetAddress().toString());
-      getFallback().getLogger().info(Sonar.get().getConfig().getVerificationBlacklistLog()
+      getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getBlacklistLog()
        .replace("%ip%", Sonar.get().getConfig().formatAddress(getInetAddress()))
        .replace("%protocol%", String.valueOf(getProtocolVersion().getProtocol())));
    } else {
@@ -19,6 +19,8 @@ package xyz.jonesdev.sonar.api.verbose;

 import lombok.Getter;
 import lombok.val;
+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.profiler.JVMProfiler;
@@ -57,8 +59,8 @@ public abstract class Verbose implements JVMProfiler {
    broadcast(prepareActionBarFormat());
  }

-  protected @NotNull String prepareActionBarFormat() {
-    return Sonar.get().getConfig().getActionBarLayout()
+  protected @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()))
@@ -78,19 +80,17 @@ public abstract class Verbose implements JVMProfiler {
      .replace("%free-memory%", formatMemory(getFreeMemory()))
      .replace("%total-memory%", formatMemory(getTotalMemory()))
      .replace("%max-memory%", formatMemory(getMaxMemory()))
-      .replace("%animation%", nextAnimation());
+      .replace("%animation%", nextAnimation()));
  }

  protected final String nextAnimation() {
-    val animations = Sonar.get().getConfig().getAnimation();
+    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 void broadcast(final String message) {
-    // This should be replaced by the wrapper
-  }
+  protected abstract void broadcast(final Component component);

  /**
   * @param subscriber Name of the player who subscribed
@@ -105,9 +105,4 @@ public final class SonarBukkit extends SonarBootstrap<SonarBukkitPlugin> {
    getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(getPlugin(), getVerboseHandler()::update,
      2L, 2L);
  }
-
-  @Override
-  public void postReload() {
-    // Do nothing
-  }
 }
@@ -60,16 +60,14 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
      // Spamming should be prevented, especially if some heavy operations are done,
      // which is not the case here but let's still stay safe!
      if (mapTimestamp > 0L) {
-        sender.sendMessage(Sonar.get().getConfig().getCommandCoolDown());
+        sender.sendMessage(Sonar.get().getConfig().getCommands().getCommandCoolDown());

        // Format delay
        final long timestamp = System.currentTimeMillis();
        final double left = 0.5D - (timestamp - mapTimestamp) / 1000D;

-        sender.sendMessage(
-          Sonar.get().getConfig().getCommandCoolDownLeft()
-            .replace("%time-left%", Sonar.DECIMAL_FORMAT.format(left))
-        );
+        sender.sendMessage(Sonar.get().getConfig().getCommands().getCommandCoolDownLeft()
+          .replace("%time-left%", Sonar.DECIMAL_FORMAT.format(left)));
        return false;
      }

@@ -93,7 +91,7 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
        if (!subcommand.get().getInfo().onlyConsole()
          && !sender.hasPermission(subcommand.get().getPermission())
        ) {
-          invocationSource.sendMessage(Sonar.get().getConfig().getSubCommandNoPerm()
+          invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getSubCommandNoPerm()
            .replace("%permission%", subcommand.get().getPermission()));
          return false;
        }
@@ -102,12 +100,12 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S

    subcommand.ifPresent(sub -> {
      if (sub.getInfo().onlyPlayers() && !(sender instanceof Player)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getPlayersOnly());
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
        return;
      }

      if (sub.getInfo().onlyConsole() && !(sender instanceof ConsoleCommandSender)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getConsoleOnly());
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
        return;
      }

@@ -116,7 +114,7 @@ public final class BukkitSonarCommand implements CommandExecutor, TabExecutor, S
      // 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().getIncorrectCommandUsage()
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
          .replace("%usage%", sub.getInfo().name() + " (" + sub.getArguments() + ")"));
        return;
      }
@@ -18,7 +18,7 @@
 package xyz.jonesdev.sonar.bukkit.verbose;

 import lombok.RequiredArgsConstructor;
-import net.md_5.bungee.api.chat.TextComponent;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import xyz.jonesdev.sonar.api.verbose.Verbose;
@@ -27,14 +27,13 @@ import xyz.jonesdev.sonar.api.verbose.Verbose;
 public final class ActionBarVerbose extends Verbose {
  private final Server server;

-  public void broadcast(final String message) {
-    final TextComponent component = new TextComponent(message);
-
+  @Override
+  public void broadcast(final Component component) {
    synchronized (subscribers) {
      for (final String subscriber : subscribers) {
        final Player player = server.getPlayer(subscriber);
        if (player != null) {
-          //player.sendMessage(ChatMessageType.ACTION_BAR, component);
+          // TODO: use an adventure audience
        }
      }
    }
@@ -114,8 +114,4 @@ public final class SonarBungee extends SonarBootstrap<SonarBungeePlugin> {
    // Inject base into ProtocolUtils
    BaseInjectionHelper.inject(ChildChannelInitializer.INSTANCE);
  }
-
-  @Override
-  public void postReload() {
-  }
 }
@@ -63,13 +63,13 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
      // Spamming should be prevented, especially if some heavy operations are done,
      // which is not the case here but let's still stay safe!
      if (mapTimestamp > 0L) {
-        sender.sendMessage(new TextComponent(Sonar.get().getConfig().getCommandCoolDown()));
+        sender.sendMessage(new TextComponent(Sonar.get().getConfig().getCommands().getCommandCoolDown()));

        // Format delay
        final long timestamp = System.currentTimeMillis();
        final double left = 0.5D - (timestamp - mapTimestamp) / 1000D;

-        sender.sendMessage(new TextComponent(Sonar.get().getConfig().getCommandCoolDownLeft()
+        sender.sendMessage(new TextComponent(Sonar.get().getConfig().getCommands().getCommandCoolDownLeft()
          .replace("%time-left%", Sonar.DECIMAL_FORMAT.format(left))));
        return;
      }
@@ -94,10 +94,8 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
        if (!subcommand.get().getInfo().onlyConsole()
          && !sender.hasPermission(subcommand.get().getPermission())
        ) {
-          invocationSource.sendMessage(
-            Sonar.get().getConfig().getSubCommandNoPerm()
-              .replace("%permission%", subcommand.get().getPermission())
-          );
+          invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getSubCommandNoPerm()
+            .replace("%permission%", subcommand.get().getPermission()));
          return;
        }
      }
@@ -105,12 +103,12 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So

    subcommand.ifPresent(sub -> {
      if (sub.getInfo().onlyPlayers() && !(sender instanceof ProxiedPlayer)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getPlayersOnly());
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
        return;
      }

      if (sub.getInfo().onlyConsole() && !(sender instanceof ConsoleCommandSender)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getConsoleOnly());
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
        return;
      }

@@ -119,7 +117,7 @@ public final class BungeeSonarCommand extends Command implements TabExecutor, So
      // 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().getIncorrectCommandUsage()
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
          .replace("%usage%", sub.getInfo().name() + " (" + sub.getArguments() + ")"));
        return;
      }
@@ -64,13 +64,13 @@ public final class FallbackListener implements Listener {
  @EventHandler
  @SuppressWarnings("deprecation")
  public void handle(final @NotNull PostLoginEvent event) throws Throwable {
-    if (Sonar.get().getConfig().isLockdownEnabled()) {
-      if (!event.getPlayer().hasPermission("sonar.lockdown")) {
+    if (Sonar.get().getConfig().getLockdown().isEnabled()) {
+      if (!event.getPlayer().hasPermission("sonar.lockdown.bypass")) {
        final PendingConnection pendingConnection = event.getPlayer().getPendingConnection();
        // Try to close the channel with a custom serialized disconnect component
        if (pendingConnection instanceof FallbackInitialHandler) {
          final FallbackInitialHandler fallbackInitialHandler = (FallbackInitialHandler) pendingConnection;
-          final Component component = Sonar.get().getConfig().getLockdownDisconnect();
+          final Component component = Sonar.get().getConfig().getLockdown().getDisconnect();
          final String serialized = JSONComponentSerializer.json().serialize(component);
          fallbackInitialHandler.closeWith(new Kick(serialized));
        } else {
@@ -79,8 +79,8 @@ public final class FallbackListener implements Listener {
          Sonar.get().getLogger().warn("Fallback handler of {} is missing", event.getPlayer().getName());
        }

-        if (Sonar.get().getConfig().isLockdownLogAttempts()) {
-          Sonar.get().getLogger().info(Sonar.get().getConfig().getLockdownConsoleLog()
+        if (Sonar.get().getConfig().getLockdown().isLogAttempts()) {
+          Sonar.get().getLogger().info(Sonar.get().getConfig().getLockdown().getConsoleLog()
            .replace("%player%", event.getPlayer().getName())
            .replace("%ip%", Sonar.get().getConfig()
              .formatAddress(event.getPlayer().getAddress().getAddress()))
@@ -88,8 +88,8 @@ public final class FallbackListener implements Listener {
              String.valueOf(event.getPlayer().getPendingConnection().getVersion())));
        }
        return;
-      } else if (Sonar.get().getConfig().isLockdownEnableNotify()) {
-        event.getPlayer().sendMessage(new TextComponent(Sonar.get().getConfig().getLockdownNotification()));
+      } else if (Sonar.get().getConfig().getLockdown().isNotifyAdmins()) {
+        event.getPlayer().sendMessage(new TextComponent(Sonar.get().getConfig().getLockdown().getNotification()));
      }
    }

@@ -57,4 +57,13 @@ public final class FallbackUserWrapper implements FallbackUser<ChannelWrapper, F
      ReferenceCountUtil.release(packet);
    }
  }
+
+  @Override
+  public void delayedWrite(final @NotNull Object packet) {
+    if (channel.isActive()) {
+      channel.write(packet, channel.voidPromise());
+    } else {
+      ReferenceCountUtil.release(packet);
+    }
+  }
 }
@@ -18,9 +18,8 @@
 package xyz.jonesdev.sonar.bungee.verbose;

 import lombok.RequiredArgsConstructor;
-import net.md_5.bungee.api.ChatMessageType;
+import net.kyori.adventure.text.Component;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import xyz.jonesdev.sonar.api.verbose.Verbose;

@@ -28,14 +27,13 @@ import xyz.jonesdev.sonar.api.verbose.Verbose;
 public final class VerboseWrapper extends Verbose {
  private final ProxyServer server;

-  public void broadcast(final String message) {
-    final TextComponent component = new TextComponent(message);
-
+  @Override
+  public void broadcast(final Component component) {
    synchronized (subscribers) {
      for (final String subscriber : subscribers) {
        final ProxiedPlayer player = server.getPlayer(subscriber);
        if (player != null) {
-          player.sendMessage(ChatMessageType.ACTION_BAR, component);
+          // TODO: use an adventure audience
        }
      }
    }
@@ -33,6 +33,7 @@ import xyz.jonesdev.sonar.api.timer.SystemTimer;
 import xyz.jonesdev.sonar.api.verbose.Verbose;
 import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer;
 import xyz.jonesdev.sonar.common.subcommand.SubcommandRegistryHolder;
+import xyz.jonesdev.sonar.common.update.UpdateChecker;

 import java.io.File;
 import java.net.InetAddress;
@@ -90,8 +91,12 @@ public abstract class SonarBootstrap<T> implements Sonar {
    } catch (Throwable throwable) {
      // An error has occurred
      getLogger().error("An error has occurred while launching Sonar: {}", throwable);
-      throwable.printStackTrace();
+      throwable.printStackTrace(System.err);
+      return; // Do not check for updates if the launch failed
    }
+
+    // Check if a new version has been released
+    UpdateChecker.checkForUpdates();
  }

  public abstract void enable();
@@ -102,7 +107,7 @@ public abstract class SonarBootstrap<T> implements Sonar {

    // Warn player if they reloaded and changed the database type
    if (getVerifiedPlayerController() != null
-      && getVerifiedPlayerController().getCachedDatabaseType() != getConfig().getDatabaseType()) {
+      && getVerifiedPlayerController().getCachedDatabaseType() != getConfig().getDatabase().getType()) {
      Sonar.get().getLogger().warn("Reloading the server after changing the database type"
        + " is generally not recommended as it can sometimes cause data loss.");
    }
@@ -112,19 +117,13 @@ public abstract class SonarBootstrap<T> implements Sonar {

    // Update ratelimiter
    final ExpiringCache<InetAddress> expiringCache = Cappuccino.buildExpiring(
-      getConfig().getVerificationDelay(), TimeUnit.MILLISECONDS, 250L
-    );
+      getConfig().getVerification().getReconnectDelay(), TimeUnit.MILLISECONDS, 250L);
    FallbackRatelimiter.INSTANCE.setExpiringCache(expiringCache);

    // Reinitialize database controller
    verifiedPlayerController = new VerifiedPlayerController();
-
-    // Call post reload task
-    postReload();
  }

-  public abstract void postReload();
-
  public void shutdown() {
    getLogger().info("Starting shutdown process...");
    // ...
@@ -20,7 +20,6 @@ package xyz.jonesdev.sonar.common.fallback;
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.DecoderException;
-import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.Sonar;
@@ -44,54 +43,49 @@ import static xyz.jonesdev.sonar.common.fallback.protocol.FallbackPreparer.*;
 public final class FallbackVerificationHandler implements FallbackPacketListener {
  private final @NotNull FallbackUser<?, ?> user;
  private final String username;
-  private final UUID uuid;
-  private final short transactionId;
-  private final long verifyKeepAliveId;
-  private int movementTick, receivedPackets;
-  private double lastX, lastY, lastZ;
+  private final UUID playerUuid;
+  private short expectedTransactionId;
+  private long expectedKeepAliveId;
+  private int expectedTeleportId = -1;
+  private int tick, totalReceivedPackets;
+  private int ignoredMovementTicks;
+  private double posX, posY, posZ, lastY;
  @Setter
  private State state;
+  private boolean listenForMovements;

  private final SystemTimer login = new SystemTimer();
  private static final Random RANDOM = new Random();

-  @RequiredArgsConstructor
  public enum State {
-    // LOGIN
-    KEEP_ALIVE(false),
+    // PRE-JOIN
+    KEEP_ALIVE,
+    // JOIN
+    CLIENT_SETTINGS, PLUGIN_MESSAGE,
+    // POST-JOIN
+    TRANSACTION,
    // PLAY
-    CLIENT_SETTINGS(false),
-    PLUGIN_MESSAGE(false),
-    TRANSACTION(false),
-    // IN-GAME
-    TELEPORT(false),
-    POSITION(true),
-    COLLISIONS(true),
+    TELEPORT, POSITION, COLLISIONS,
    // OTHER
-    SUCCESS(false);
-
-    private final boolean canMove;
+    SUCCESS
  }

  public FallbackVerificationHandler(final @NotNull FallbackUser<?, ?> user,
                                     final @NotNull String username,
-                                     final @NotNull UUID uuid) {
+                                     final @NotNull UUID playerUuid) {
    this.user = user;
    this.username = username;
-    this.uuid = uuid;
-    this.transactionId = (short) RANDOM.nextInt();
-    this.verifyKeepAliveId = RANDOM.nextInt();
+    this.playerUuid = playerUuid;
    this.state = State.KEEP_ALIVE;

-    // Send LoginSuccess packet to make the client think they are joining the server
-    user.write(new ServerLoginSuccess(username, uuid));
-
    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) {
      // 1.7 players don't have KeepAlive packets in the login process
      sendJoinGamePacket();
    } else {
+      // Generate a random KeepAlive ID for the pre-join check
+      expectedKeepAliveId = RANDOM.nextInt();
      // Send first KeepAlive to check if the connection is somewhat responsive
-      user.write(new KeepAlive(verifyKeepAliveId));
+      user.write(new KeepAlive(expectedKeepAliveId));
    }
  }

@@ -99,10 +93,10 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    // Set the state to TRANSACTION to avoid false positives
    // and go on with the flow of the verification.
    state = State.TRANSACTION;
-    // Send a transaction with a
-    user.write(new Transaction(
-      0, transactionId, false
-    ));
+    // Generate a random transaction ID
+    expectedTransactionId = (short) RANDOM.nextInt();
+    // Send a transaction with the given ID
+    user.write(new Transaction(0, expectedTransactionId, false));
  }

  private void sendJoinGamePacket() {
@@ -113,21 +107,40 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    user.write(getJoinPacketForVersion(user.getProtocolVersion()));
  }

+  private void sendAbilitiesAndTeleport() {
+    // Set the state to TELEPORT to avoid false positives
+    // and go on with the flow of the verification.
+    state = State.TELEPORT;
+    // Make sure the player is unable to fly (the player is in spectator mode)
+    user.delayedWrite(DEFAULT_ABILITIES);
+    // Generate the current teleport ID
+    expectedTeleportId = RANDOM.nextInt(Short.MAX_VALUE);
+    // Teleport the player to the spawn position
+    user.delayedWrite(new PositionLook(
+      SPAWN_X_POSITION, dynamicSpawnYPosition, SPAWN_Z_POSITION,
+      0f, 0f, expectedTeleportId, false
+    ));
+  }
+
  private void sendChunkData() {
    // Set the state to POSITION to avoid false positives
    // and go on with the flow of the verification.
    state = State.POSITION;
    // Teleport player into the fake lobby by sending an empty chunk
-    user.write(EMPTY_CHUNK_DATA);
-    // Send an UpdateSectionBlocks packet with a platform of blocks
-    // to check if the player collides with the solid platform.
-    user.write(UPDATE_SECTION_BLOCKS);
+    user.delayedWrite(EMPTY_CHUNK_DATA);
+    if (Sonar.get().getConfig().getVerification().isCheckCollisions()) {
+      // Send an UpdateSectionBlocks packet with a platform of blocks
+      // to check if the player collides with the solid platform.
+      user.delayedWrite(UPDATE_SECTION_BLOCKS);
+    }
+    // Send all packets in one flush
+    user.getChannel().flush();
  }

  private static boolean validateClientLocale(final @SuppressWarnings("unused") @NotNull FallbackUser<?, ?> user,
                                              final String locale) {
    // Check the client locale by performing a simple regex check on it
-    final Pattern pattern = Sonar.get().getConfig().getValidLocaleRegex();
+    final Pattern pattern = Sonar.get().getConfig().getVerification().getValidLocaleRegex();
    return pattern.matcher(locale).matches(); // Disallow non-ascii characters (by default)
  }

@@ -135,14 +148,15 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    // We have to catch every DecoderException, so we can fail and punish
    // the player instead of only disconnecting them due to an exception.
    try {
-      // 1.7 has some very weird issues when trying to decode the client brand
-      // TODO: fix this?
-      if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) < 0) return true;
-      // No need to check for empty or too long client brands since
-      // ProtocolUtil#readString already does exactly that.
-      final String read = ProtocolUtil.readString(content, Sonar.get().getConfig().getMaximumBrandLength());
+      // No need to check for empty brands since ProtocolUtil#readBrandMessage
+      // already performs these checks by default.
+      final String read = ProtocolUtil.readBrandMessage(content);
+      // Check if the decoded client brand string is too long
+      if (read.length() > Sonar.get().getConfig().getVerification().getMaxBrandLength()) {
+        return false;
+      }
      // Regex pattern for validating client brands
-      final Pattern pattern = Sonar.get().getConfig().getValidBrandRegex();
+      final Pattern pattern = Sonar.get().getConfig().getVerification().getValidBrandRegex();
      return !read.equals("Vanilla") // The normal brand is always lowercase
        && pattern.matcher(read).matches(); // Disallow non-ascii characters (by default)
    } catch (DecoderException exception) {
@@ -155,13 +169,15 @@ public final class FallbackVerificationHandler implements FallbackPacketListener

  @Override
  public void handle(final @NotNull FallbackPacket packet) {
+    // The player has already been verified, drop all other packets
+    if (state == State.SUCCESS) return;
+
    // Check if the player is not sending a ton of packets to the server
-    final int maxPackets = Sonar.get().getConfig().getMaximumLoginPackets()
-      + Sonar.get().getConfig().getMaximumMovementTicks();
-    checkFrame(++receivedPackets < maxPackets, "too many packets");
+    final int maxPackets = Sonar.get().getConfig().getVerification().getMaxLoginPackets() + maxPredictionTick;
+    checkFrame(++totalReceivedPackets < maxPackets, "too many packets");

    // Check for timeout since the player could be sending packets but not important ones
-    final long timeout = Sonar.get().getConfig().getVerificationTimeout();
+    final long timeout = Sonar.get().getConfig().getVerification().getMaxPing();
    // Check if the time limit has exceeded
    if (login.elapsed(timeout)) {
      user.getChannel().close();
@@ -177,7 +193,7 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
      // Check if we are currently expecting a KeepAlive packet
      assertState(State.KEEP_ALIVE);

-      checkFrame(keepAlive.getId() == verifyKeepAliveId, "invalid KeepAlive ID");
+      checkFrame(keepAlive.getId() == expectedKeepAliveId, "invalid KeepAlive ID");

      // The correct KeepAlive packet has been received
      sendJoinGamePacket();
@@ -228,27 +244,27 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
      // The transaction should always be accepted
      checkFrame(transaction.isAccepted(), "transaction not accepted?!");
      // Check if the transaction ID is valid
-      checkFrame(transaction.getId() == transactionId, "invalid transaction id");
+      checkFrame(transaction.getId() == expectedTransactionId, "invalid transaction id");

      // Checking gravity is disabled, just finish verification
-      if (!Sonar.get().getConfig().isCheckGravity()) {
+      if (!Sonar.get().getConfig().getVerification().isCheckGravity()) {
        finish();
        return;
      }

-      // Make sure the player is unable to fly (the player is in spectator mode)
-      user.write(DEFAULT_ABILITIES);
-      // Teleport the player to the spawn position
-      user.write(SPAWN_TELEPORT);
+      // First, send an abilities packet to the client to make
+      // sure the player falls even in spectator mode.
+      // Then, teleport the player to the spawn position.
+      sendAbilitiesAndTeleport();

      // 1.7-1.8 clients do not have a TeleportConfirm packet
      if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) <= 0) {
        // Immediately send the chunk data as 1.7-1.8 can't confirm teleports
        sendChunkData();
      } else {
-        // Set the state to TELEPORT to avoid false positives
-        // and go on with the flow of the verification.
-        state = State.TELEPORT;
+        // Send all previously sent packets in one flush since we didn't flush
+        // the channel earlier when we teleported the player.
+        user.getChannel().flush();
      }
    }

@@ -256,47 +272,51 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
      // Check if we are currently expecting a TeleportConfirm packet
      assertState(State.TELEPORT);

+      // Check if the teleport ID is correct
      final TeleportConfirm teleportConfirm = (TeleportConfirm) packet;
+      checkFrame(teleportConfirm.getTeleportId() == expectedTeleportId, "invalid teleport ID");

-      // Check if the teleport id is correct
-      final boolean teleportIdCorrect = teleportConfirm.getTeleportId() == SPAWN_TELEPORT.getTeleportId();
-      checkFrame(teleportIdCorrect, "invalid teleport ID");
+      // Reset all values to ensure safety on teleport
+      tick = 1;
+      posY = lastY = -1;
+      expectedTeleportId = -1;

      // Now we can send the chunk data
      sendChunkData();
    }

-    // Only handle positions if the player can send position packets.
-    if (state.canMove) {
-      if (packet instanceof Position) {
-        final Position position = (Position) packet;
+    if (packet instanceof Position) {
+      final Position position = (Position) packet;
+      handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
+    }

-        // Immediately handle new position update
-        handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
-      }
+    if (packet instanceof PositionLook) {
+      final PositionLook position = (PositionLook) packet;
+      handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
+    }

-      if (packet instanceof PositionLook) {
-        final PositionLook position = (PositionLook) packet;
-
-        // Immediately handle new position update
-        handlePositionUpdate(position.getX(), position.getY(), position.getZ(), position.isOnGround());
-      }
-
-      if (packet instanceof Player) {
-        final Player player = (Player) packet;
-
-        // This packet does not send new position data, reuse the last Y
-        handlePositionUpdate(lastX, lastY, lastZ, player.isOnGround());
-      }
+    if (packet instanceof Player) {
+      final Player player = (Player) packet;
+      handlePositionUpdate(posX, posY, posZ, player.isOnGround());
    }
  }

  private void handlePositionUpdate(final double x, final double y, final double z, final boolean ground) {
-    final double deltaY = lastY - y;
+    // 1.8 does not have a TeleportConfirm packet, so we need to handle the spawning differently
+    if (user.getProtocolVersion().compareTo(MINECRAFT_1_8) <= 0
+      && expectedTeleportId != -1 // Check if the teleport ID is currently unset
+      // Then, check if the position is equal to the spawn position
+      && x == SPAWN_X_POSITION && y == dynamicSpawnYPosition && z == SPAWN_Z_POSITION) {
+      // Reset all values to ensure safety on teleport
+      tick = 1;
+      posY = -1;
+      expectedTeleportId = -1;
+    }

-    lastX = x;
-    lastY = y;
-    lastZ = z;
+    posX = x;
+    lastY = posY;
+    posY = y;
+    posZ = z;

    // The player is not allowed to move away from the collision platform.
    // This should not happen unless the max movement tick is configured to a high number.
@@ -306,45 +326,74 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    // The onGround property can never be true when we aren't checking for collisions
    checkFrame(!ground || state == State.COLLISIONS, "invalid ground state");

-    // Check if the chunk might be unloaded
-    if (deltaY > 0.07) {
-      // Verify the player if they sent correct movement packets
-      if (movementTick++ >= MAX_MOVEMENT_TICK) {
-        if (Sonar.get().getConfig().isCheckCollisions()) {
-          if (state != State.COLLISIONS) {
-            // Set the state to COLLISIONS to avoid false positives
-            // and go on with the flow of the verification.
-            // Now we don't care about gravity anymore,
-            // we just want the player to collide with the blocks.
-            state = State.COLLISIONS;
-          } else {
-            // Calculate the difference between the player's Y coordinate and the expected Y coordinate
-            final double offsetY = DEFAULT_Y_COLLIDE_POSITION - y;
+    // Check if the client hasn't moved before sending the first movement packet
+    if (!listenForMovements) {
+      if (posX == SPAWN_X_POSITION && posZ == SPAWN_Z_POSITION) {
+        // Now, once we verified the X and Z position, we can safely check for gravity
+        listenForMovements = true;
+      }

-            // The offset cannot greater than 0 since the blocks will not let the player fall through them.
-            checkFrame(offsetY <= 0, "no collisions: " + offsetY);
+      lastY = dynamicSpawnYPosition;
+      return;
+    }

-            // Check if the player is colliding by performing a basic Y offset check.
-            if (ground) {
-              // The player is colliding, finish verification
-              // TODO: Check for: velocity, entities/mounting, interactions
-              finish();
-            }
-          }
-        } else {
-          // Checking collisions is disabled, just finish verification
-          finish();
-        }
-      } else if (y <= DYNAMIC_SPAWN_Y_POSITION && y >= DEFAULT_Y_COLLIDE_POSITION) {
-        // This is a basic gravity check that predicts the next y position
-        final double predictedY = PREPARED_MOVEMENT_PACKETS[movementTick];
-        final double offsetY = Math.abs(deltaY - predictedY);
+    final double deltaY = lastY - y;
+    // The deltaY is 0 whenever the player sends their first position packet.
+    // We have to account for this or the player will fail the verification.
+    if (deltaY == 0) {
+      // Check for too many ignored Y ticks
+      final int maxIgnoredTicks = Sonar.get().getConfig().getVerification().getMaxIgnoredTicks();
+      checkFrame(++ignoredMovementTicks < maxIgnoredTicks, "too many ignored ticks");
+      return;
+    }

-        // Check if the y motion is roughly equal to the predicted value
-        final String verbose = String.format("%d: %.7f %.10f %.10f!%.10f", movementTick, y, offsetY, deltaY, predictedY);
-        checkFrame(offsetY < 0.01, verbose);
+    if (tick > maxMovementTick) {
+      if (!Sonar.get().getConfig().getVerification().isCheckCollisions()) {
+        // Checking collisions is disabled, just finish verification
+        finish();
+        return;
+      }
+
+      if (state != State.COLLISIONS) {
+        // Now we don't care about gravity anymore,
+        // we just want the player to collide with the blocks.
+        state = State.COLLISIONS;
+      }
+
+      // Calculate the difference between the player's Y coordinate and the expected Y coordinate
+      final double offsetY = DEFAULT_Y_COLLIDE_POSITION - y;
+
+      // Log/debug position if enabled in the configuration
+      if (Sonar.get().getConfig().getVerification().isDebugXYZPositions()) {
+        user.getFallback().getLogger().info("{}: {}/{}/{} - offset: {}", username, x, y, z, offsetY);
+      }
+
+      // Check if the player is colliding by performing a basic Y offset check.
+      // The offset cannot greater than 0 since the blocks will not let the player fall through them.
+      checkFrame(offsetY <= 0, "no collisions: " + offsetY);
+
+      if (ground) {
+        // The player is colliding to blocks, finish verification
+        finish();
+        return;
      }
    }
+
+    if (!ground && tick < maxPredictionTick) {
+      final double predictedY = preparedCachedYMotions[tick];
+      final double offsetY = Math.abs(deltaY - predictedY);
+
+      // Log/debug position if enabled in the configuration
+      if (Sonar.get().getConfig().getVerification().isDebugXYZPositions()) {
+        user.getFallback().getLogger().info("{}: {}/{}/{} - deltaY: {} - prediction: {} - offset: {}",
+          username, x, y, z, deltaY, predictedY, offsetY);
+      }
+
+      // Check if the y motion is roughly equal to the predicted value
+      checkFrame(offsetY < 0.005, String.format("invalid gravity: %d, %.7f, %.10f, %.10f != %.10f",
+        tick, y, offsetY, deltaY, predictedY));
+    }
+    tick++;
  }

  private void assertState(final @NotNull State expectedState) {
@@ -366,16 +415,17 @@ public final class FallbackVerificationHandler implements FallbackPacketListener
    user.getFallback().getConnected().remove(username);

    // Add verified player to the database
-    final VerifiedPlayer verifiedPlayer = new VerifiedPlayer(user.getInetAddress().toString(), uuid, login.getStart());
+    final VerifiedPlayer verifiedPlayer = new VerifiedPlayer(user.getInetAddress().toString(), playerUuid,
+      login.getStart());
    Sonar.get().getVerifiedPlayerController().add(verifiedPlayer);

    // Call the VerifySuccessEvent for external API usage
-    Sonar.get().getEventManager().publish(new UserVerifySuccessEvent(username, uuid, user, login.delay()));
+    Sonar.get().getEventManager().publish(new UserVerifySuccessEvent(username, playerUuid, user, login.delay()));

    // Disconnect player with the verification success message
-    user.disconnect(Sonar.get().getConfig().getVerificationSuccess());
+    user.disconnect(Sonar.get().getConfig().getVerification().getVerificationSuccess());

-    user.getFallback().getLogger().info(Sonar.get().getConfig().getVerificationSuccessfulLog()
+    user.getFallback().getLogger().info(Sonar.get().getConfig().getVerification().getSuccessLog()
      .replace("%name%", username)
      .replace("%time%", login.toString()));
  }
@@ -36,7 +36,7 @@ public final class FallbackPacketDecoder extends ChannelInboundHandlerAdapter {
  public FallbackPacketDecoder(final @NotNull FallbackUser<?, ?> user,
                               final @NotNull FallbackPacketListener listener) {
    this.user = user;
-    this.registry = FallbackPacketRegistry.SONAR.getProtocolRegistry(
+    this.registry = FallbackPacketRegistry.GAME.getProtocolRegistry(
      FallbackPacketRegistry.Direction.SERVERBOUND, user.getProtocolVersion()
    );
    this.listener = listener;
@@ -26,13 +26,17 @@ import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;

 public final class FallbackPacketEncoder extends MessageToByteEncoder<FallbackPacket> {
  private final ProtocolVersion protocolVersion;
-  private final FallbackPacketRegistry.ProtocolRegistry registry;
+  private FallbackPacketRegistry.ProtocolRegistry registry;

  public FallbackPacketEncoder(final ProtocolVersion protocolVersion) {
    this.protocolVersion = protocolVersion;
-    this.registry = FallbackPacketRegistry.SONAR.getProtocolRegistry(
-      FallbackPacketRegistry.Direction.CLIENTBOUND, protocolVersion
-    );
+    this.registry = FallbackPacketRegistry.LOGIN
+      .getProtocolRegistry(FallbackPacketRegistry.Direction.CLIENTBOUND, protocolVersion);
+  }
+
+  public void loginSuccess() {
+    this.registry = FallbackPacketRegistry.GAME
+      .getProtocolRegistry(FallbackPacketRegistry.Direction.CLIENTBOUND, protocolVersion);
  }

  @Override
@@ -32,16 +32,17 @@ import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
 // Most of this is taken from
 // https://github.com/PaperMC/Velocity/blob/dev/3.0.0/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
 public enum FallbackPacketRegistry {
-  SONAR {
+  LOGIN {
    {
      clientbound.fallback = false;
      serverbound.fallback = false;

-      // LOGIN
      clientbound.register(ServerLoginSuccess.class, ServerLoginSuccess::new,
        map(0x02, MINECRAFT_1_7_2, false));
-
-      // GAME
+    }
+  },
+  GAME {
+    {
      clientbound.register(JoinGame.class, JoinGame::new,
        map(0x01, MINECRAFT_1_7_2, true),
        map(0x23, MINECRAFT_1_9, true),
@@ -160,6 +161,17 @@ public enum FallbackPacketRegistry {
        map(0x2F, MINECRAFT_1_19_1, true),
        map(0x2E, MINECRAFT_1_19_3, true),
        map(0x32, MINECRAFT_1_19_4, true));
+      clientbound.register(Chat.class, Chat::new,
+        map(0x02, MINECRAFT_1_7_2, true),
+        map(0x0F, MINECRAFT_1_9, true),
+        map(0x0E, MINECRAFT_1_13, true),
+        map(0x0F, MINECRAFT_1_15, true),
+        map(0x0E, MINECRAFT_1_16, true),
+        map(0x0F, MINECRAFT_1_18_2, true),
+        map(0x5F, MINECRAFT_1_19, true),
+        map(0x62, MINECRAFT_1_19_1, true),
+        map(0x60, MINECRAFT_1_19_3, true),
+        map(0x64, MINECRAFT_1_19_4, true));

      serverbound.register(KeepAlive.class, KeepAlive::new,
        map(0x00, MINECRAFT_1_7_2, false),
@@ -24,25 +24,25 @@ import net.kyori.adventure.nbt.CompoundBinaryTag;
 import net.kyori.adventure.nbt.ListBinaryTag;
 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.fallback.protocol.ProtocolVersion;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockPosition;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.BlockType;
 import xyz.jonesdev.sonar.common.fallback.protocol.block.ChangedBlock;
 import xyz.jonesdev.sonar.common.fallback.protocol.dimension.DimensionInfo;
-import xyz.jonesdev.sonar.common.fallback.protocol.packets.*;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.Abilities;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.EmptyChunkData;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.JoinGame;
+import xyz.jonesdev.sonar.common.fallback.protocol.packets.UpdateSectionBlocks;

 import java.io.InputStream;
 import java.util.Collections;
 import java.util.Objects;
-import java.util.Random;

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

@UtilityClass
 public class FallbackPreparer {
-  private final Random RANDOM = new Random();
  private final DimensionInfo DIMENSION = new DimensionInfo(
    "minecraft:overworld",
    "sonar", false, false
@@ -62,20 +62,19 @@ public class FallbackPreparer {
  }

  // JoinGame
-  public JoinGame LEGACY_JOIN_GAME;
-  private JoinGame JOIN_GAME_1_16;
-  private JoinGame JOIN_GAME_1_16_2;
-  private JoinGame JOIN_GAME_1_18_2;
-  private JoinGame JOIN_GAME_1_19_1;
-  private JoinGame JOIN_GAME_1_19_4;
-  private JoinGame JOIN_GAME_1_20;
+  private JoinGame legacyJoinGame;
+  private JoinGame joinGame116;
+  private JoinGame joinGame1162;
+  private JoinGame joinGame1182;
+  private JoinGame joinGame1191;
+  private JoinGame joinGame1194;
+  private JoinGame joinGame120;

  // Abilities
  public final Abilities DEFAULT_ABILITIES = new Abilities((byte) 0, 0f, 0f);

  // Chunks
  public final EmptyChunkData EMPTY_CHUNK_DATA = new EmptyChunkData(0, 0);
-  public PositionLook SPAWN_TELEPORT;

  // Collisions
  public final int BLOCKS_PER_ROW = 8; // 8 * 8 = 64 (max)
@@ -85,45 +84,39 @@ public class FallbackPreparer {
  public UpdateSectionBlocks UPDATE_SECTION_BLOCKS;
  private final ChangedBlock[] CHANGED_BLOCKS = new ChangedBlock[BLOCKS_PER_ROW * BLOCKS_PER_ROW];

-  public int MAX_MOVEMENT_TICK;
-  public double[] PREPARED_MOVEMENT_PACKETS;
-  public int DYNAMIC_SPAWN_BUFFER = SPAWN_BUFFER;
-  public int DYNAMIC_SPAWN_Y_POSITION;
+  public int maxMovementTick, maxPredictionTick, dynamicSpawnYPosition;
+  public double[] preparedCachedYMotions;
+  public double maxFallDistance;
+  public final int SPAWN_X_POSITION = BLOCKS_PER_ROW; // middle of the chunk
+  public final int SPAWN_Z_POSITION = BLOCKS_PER_ROW;

  public void prepare() {
-    LEGACY_JOIN_GAME = createLegacyJoinGamePacket();
-    JOIN_GAME_1_16 = createJoinGamePacket(MINECRAFT_1_16);
-    JOIN_GAME_1_16_2 = createJoinGamePacket(MINECRAFT_1_16_2);
-    JOIN_GAME_1_18_2 = createJoinGamePacket(MINECRAFT_1_18_2);
-    JOIN_GAME_1_19_1 = createJoinGamePacket(MINECRAFT_1_19_1);
-    JOIN_GAME_1_19_4 = createJoinGamePacket(MINECRAFT_1_19_4);
-    JOIN_GAME_1_20 = createJoinGamePacket(MINECRAFT_1_20);
+    legacyJoinGame = createJoinGamePacket(MINECRAFT_1_8);
+    joinGame116 = createJoinGamePacket(MINECRAFT_1_16);
+    joinGame1162 = createJoinGamePacket(MINECRAFT_1_16_2);
+    joinGame1182 = createJoinGamePacket(MINECRAFT_1_18_2);
+    joinGame1191 = createJoinGamePacket(MINECRAFT_1_19_1);
+    joinGame1194 = createJoinGamePacket(MINECRAFT_1_19_4);
+    joinGame120 = createJoinGamePacket(MINECRAFT_1_20);

-    MAX_MOVEMENT_TICK = Sonar.get().getConfig().getMaximumMovementTicks();
-    PREPARED_MOVEMENT_PACKETS = new double[MAX_MOVEMENT_TICK + 1];
+    maxMovementTick = Sonar.get().getConfig().getVerification().getMaxMovementTicks();
+    maxPredictionTick = maxMovementTick + 10;
+    preparedCachedYMotions = new double[maxPredictionTick + 1];

-    for (int i = 0; i < MAX_MOVEMENT_TICK + 1; i++) {
-      PREPARED_MOVEMENT_PACKETS[i] = -((Math.pow(0.98, i) - 1) * 3.92);
+    for (int i = 0; i < maxPredictionTick + 1; i++) {
+      preparedCachedYMotions[i] = -((Math.pow(0.98, i) - 1) * 3.92);
    }

-    // Adjust block and collide Y position based on max movement ticks
-    double maxFallDistance = 0;
-    for (final double motion : PREPARED_MOVEMENT_PACKETS) {
-      maxFallDistance += motion;
+    // Adjust block and collide Y position based on max fall distance
+    maxFallDistance = 0;
+    for (int i = 0; i < maxMovementTick; i++) {
+      maxFallDistance += preparedCachedYMotions[i];
    }

    // Set the dynamic spawn buffer
-    DYNAMIC_SPAWN_BUFFER = (int) (SPAWN_BUFFER + maxFallDistance);
+    final int DYNAMIC_SPAWN_BUFFER = (int) (SPAWN_BUFFER + maxFallDistance);
    // Set the dynamic block and collide Y position based on the maximum fall distance
-    DYNAMIC_SPAWN_Y_POSITION = DEFAULT_Y_COLLIDE_POSITION + DYNAMIC_SPAWN_BUFFER;
-
-    // Prepare spawn PositionLook with the dynamic Y position
-    SPAWN_TELEPORT = new PositionLook(
-      8, DYNAMIC_SPAWN_Y_POSITION, 8,
-      0f, 0f,
-      RANDOM.nextInt(Short.MAX_VALUE),
-      false // 1.7 support
-    );
+    dynamicSpawnYPosition = DEFAULT_Y_COLLIDE_POSITION + DYNAMIC_SPAWN_BUFFER;

    // Prepare collision platform positions
    int index = 0;
@@ -135,7 +128,7 @@ public class FallbackPreparer {
          z + (BLOCKS_PER_ROW / 2),
          0, 0
        );
-        CHANGED_BLOCKS[index++] = new ChangedBlock(position, BlockType.STONE);
+        CHANGED_BLOCKS[index++] = new ChangedBlock(position, BlockType.BARRIER);
      }
    }

@@ -145,60 +138,53 @@ public class FallbackPreparer {

  private @Nullable CompoundBinaryTag getMapping(final @NotNull String fileName) {
    try (final InputStream inputStream = Sonar.class.getResourceAsStream("/mappings/" + fileName)) {
-      return BinaryTagIO.unlimitedReader().read(Objects.requireNonNull(inputStream),
-        BinaryTagIO.Compression.GZIP
-      );
+      return BinaryTagIO.reader().read(Objects.requireNonNull(inputStream), BinaryTagIO.Compression.GZIP);
    } catch (Throwable throwable) {
-      Sonar.get().getLogger().error("Could not load mapping {}", fileName);
-      throwable.printStackTrace(System.err);
+      Sonar.get().getLogger().error("Could not load mappings for {}: {}", fileName, throwable);
      return null;
    }
  }

-  public static JoinGame getJoinPacketForVersion(final ProtocolVersion protocolVersion) {
+  public static JoinGame getJoinPacketForVersion(final @NotNull ProtocolVersion protocolVersion) {
    if (protocolVersion.compareTo(MINECRAFT_1_15_2) <= 0) {
-      return LEGACY_JOIN_GAME; // 1.7-1.15.2
+      return legacyJoinGame; // 1.7-1.15.2
    }
    if (protocolVersion.compareTo(MINECRAFT_1_16_1) <= 0) {
-      return JOIN_GAME_1_16; // 1.16-1.16.1
+      return joinGame116; // 1.16-1.16.1
    }
    if (protocolVersion.compareTo(MINECRAFT_1_18) <= 0) {
-      return JOIN_GAME_1_16_2; // 1.16.2-1.18
+      return joinGame1162; // 1.16.2-1.18
    }
    if (protocolVersion.compareTo(MINECRAFT_1_19) <= 0) {
-      return JOIN_GAME_1_18_2; // 1.18.1-1.19
+      return joinGame1182; // 1.18.1-1.19
    }
    if (protocolVersion.compareTo(MINECRAFT_1_19_3) <= 0) {
-      return JOIN_GAME_1_19_1; // 1.19.1-1.19.3
+      return joinGame1191; // 1.19.1-1.19.3
    }
    if (protocolVersion.compareTo(MINECRAFT_1_19_4) <= 0) {
-      return JOIN_GAME_1_19_4; // 1.19.4
+      return joinGame1194; // 1.19.4
    }
    if (protocolVersion.compareTo(MINECRAFT_1_20) <= 0) {
-      return JOIN_GAME_1_20; // 1.20-1.20.1
+      return joinGame120; // 1.20-1.20.1
    }
    throw new IllegalStateException("Unsupported protocol version");
  }

-  private @NotNull JoinGame createLegacyJoinGamePacket() {
-    final JoinGame joinGame = new JoinGame();
-
-    joinGame.setLevelType("flat");
-    joinGame.setGamemode(Sonar.get().getConfig().getGamemodeId());
-    joinGame.setDimension(0);
-    joinGame.setReducedDebugInfo(true);
-    return joinGame;
-  }
-
  // Partially taken from
  // https://github.com/Elytrium/LimboAPI/blob/master/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java#L607
-  private @NotNull JoinGame createJoinGamePacket(final ProtocolVersion protocolVersion) {
+  private @NotNull JoinGame createJoinGamePacket(final @NotNull ProtocolVersion protocolVersion) {
    final JoinGame joinGame = new JoinGame();

    joinGame.setLevelType("flat");
-    joinGame.setGamemode(Sonar.get().getConfig().getGamemodeId());
+    joinGame.setGamemode(Sonar.get().getConfig().getVerification().getGamemodeId());
    joinGame.setDimension(0);
    joinGame.setReducedDebugInfo(true);
+
+    // 1.7/1.8 don't need dimension information
+    if (protocolVersion.compareTo(MINECRAFT_1_8) <= 0) {
+      return joinGame;
+    }
+
    joinGame.setDimensionInfo(DIMENSION);

    final CompoundBinaryTag.Builder registryContainer = CompoundBinaryTag.builder();
@@ -206,7 +192,7 @@ public class FallbackPreparer {
      .add(createDimensionData(protocolVersion))
      .build();

-    if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
+    if (protocolVersion.compareTo(MINECRAFT_1_16_2) >= 0) {
      final CompoundBinaryTag.Builder dimensionRegistryEntry = CompoundBinaryTag.builder();

      dimensionRegistryEntry.putString("type", "minecraft:dimension_type");
@@ -245,34 +231,30 @@ public class FallbackPreparer {
        ))).build()
      );

-      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19) == 0) {
+      if (protocolVersion.compareTo(MINECRAFT_1_19) == 0) {
        registryContainer.put("minecraft:chat_type", CHAT_TYPE_119);
-      } else if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0) {
+      } else if (protocolVersion.compareTo(MINECRAFT_1_19_1) >= 0) {
        registryContainer.put("minecraft:chat_type", CHAT_TYPE_1191);
      }

-      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_19_4) == 0) {
+      if (protocolVersion.compareTo(MINECRAFT_1_19_4) == 0) {
        registryContainer.put("minecraft:damage_type", DAMAGE_TYPE_1194);
-      } else if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_20) >= 0) {
+      } else if (protocolVersion.compareTo(MINECRAFT_1_20) >= 0) {
        registryContainer.put("minecraft:damage_type", DAMAGE_TYPE_120);
      }
    } else {
      registryContainer.put("dimension", encodedDimensionRegistry);
    }

-    try {
-      CompoundBinaryTag currentDimensionData = encodedDimensionRegistry.getCompound(0);
+    CompoundBinaryTag currentDimensionData = encodedDimensionRegistry.getCompound(0);

-      if (protocolVersion.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
-        currentDimensionData = currentDimensionData.getCompound("element");
-      }
-
-      joinGame.setCurrentDimensionData(currentDimensionData);
-      joinGame.setLevelNames(new String[]{"minecraft:overworld"});
-      joinGame.setRegistry(registryContainer.build());
-    } catch (Throwable throwable) {
-      throw new ReflectiveOperationException(throwable);
+    if (protocolVersion.compareTo(MINECRAFT_1_16_2) >= 0) {
+      currentDimensionData = currentDimensionData.getCompound("element");
    }
+
+    joinGame.setCurrentDimensionData(currentDimensionData);
+    joinGame.setLevelNames(new String[]{"minecraft:overworld"});
+    joinGame.setRegistry(registryContainer.build());
    return joinGame;
  }

@@ -289,7 +271,7 @@ public class FallbackPreparer {
      .putBoolean("respawn_anchor_works", false)
      .putBoolean("has_raids", false)
      .putInt("logical_height", 256)
-      .putString("infiniburn", version.compareTo(ProtocolVersion.MINECRAFT_1_18_2) >= 0 ? "#minecraft" +
+      .putString("infiniburn", version.compareTo(MINECRAFT_1_18_2) >= 0 ? "#minecraft" +
        ":infiniburn_nether" : "minecraft:infiniburn_nether")
      .putDouble("coordinate_scale", 1.0)
      .putString("effects", "minecraft:overworld")
@@ -299,7 +281,7 @@ public class FallbackPreparer {
      .putInt("monster_spawn_light_level", 0)
      .build();

-    if (version.compareTo(ProtocolVersion.MINECRAFT_1_16_2) >= 0) {
+    if (version.compareTo(MINECRAFT_1_16_2) >= 0) {
      return CompoundBinaryTag.builder()
        .putString("name", "minecraft:overworld")
        .putInt("id", 0)
@@ -17,21 +17,68 @@

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

-import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;

-import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.MINECRAFT_1_13;
+import java.util.function.Function;

-@Getter
@RequiredArgsConstructor
 public enum BlockType {
-  STONE {
-    @Override
-    public int getId(final ProtocolVersion protocolVersion) {
-      return protocolVersion.compareTo(MINECRAFT_1_13) >= 0 ? 1 : 16;
+  STONE(protocolVersion -> 1),
+  BARRIER(protocolVersion -> {
+    switch (protocolVersion) {
+      case MINECRAFT_1_7_2:
+      case MINECRAFT_1_7_6:
+        // We have to use glass for 1.7 since 1.7 doesn't have barrier blocks
+        return 20;
+      default:
+        // 1.8-1.12.2
+        return 166;
+      case MINECRAFT_1_13:
+      case MINECRAFT_1_13_1:
+        return 6493;
+      case MINECRAFT_1_13_2:
+        return 6494;
+      case MINECRAFT_1_14:
+      case MINECRAFT_1_14_1:
+      case MINECRAFT_1_14_2:
+      case MINECRAFT_1_14_3:
+      case MINECRAFT_1_14_4:
+      case MINECRAFT_1_15:
+      case MINECRAFT_1_15_1:
+      case MINECRAFT_1_15_2:
+        return 7000;
+      case MINECRAFT_1_16:
+      case MINECRAFT_1_16_1:
+        return 7536;
+      case MINECRAFT_1_16_2:
+      case MINECRAFT_1_16_3:
+      case MINECRAFT_1_16_4:
+        return 7540;
+      case MINECRAFT_1_17:
+      case MINECRAFT_1_17_1:
+      case MINECRAFT_1_18:
+      case MINECRAFT_1_18_2:
+        return 7754;
+      case MINECRAFT_1_19:
+      case MINECRAFT_1_19_1:
+        return 8245;
+      case MINECRAFT_1_19_3:
+        return 9889;
+      case MINECRAFT_1_19_4:
+        return 10221;
+      case MINECRAFT_1_20:
+        return 10225;
+      case MINECRAFT_1_20_2:
+        // https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/1.20/blocks.json
+        return 1; // TODO: 1.20.2 support
    }
-  };
+  });

-  public abstract int getId(final ProtocolVersion protocolVersion);
+  private final Function<ProtocolVersion, Integer> function;
+
+  public int getId(final @NotNull ProtocolVersion protocolVersion) {
+    return function.apply(protocolVersion);
+  }
 }
@@ -0,0 +1,71 @@
+/*
+ * 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.common.fallback.protocol.packets;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
+import xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion;
+import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;
+
+import java.util.UUID;
+
+import static xyz.jonesdev.sonar.api.fallback.protocol.ProtocolVersion.*;
+import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeString;
+import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeUUID;
+import static xyz.jonesdev.sonar.common.utility.protocol.VarIntUtil.writeVarInt;
+
+@Getter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public final class Chat implements FallbackPacket {
+  private static final UUID PLACEHOLDER_UUID = new UUID(0L, 0L);
+  private Component component;
+  private byte position;
+
+  @Override
+  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    final String serialized = JSONComponentSerializer.json().serialize(component);
+    writeString(byteBuf, serialized);
+
+    // Message type
+    if (protocolVersion.compareTo(MINECRAFT_1_19_1) >= 0) {
+      byteBuf.writeBoolean(position == 2);
+    } else if (protocolVersion.compareTo(MINECRAFT_1_19) >= 0) {
+      writeVarInt(byteBuf, position);
+    } else {
+      byteBuf.writeByte(this.position);
+    }
+
+    // UUID
+    if (protocolVersion.compareTo(MINECRAFT_1_16) >= 0
+      && protocolVersion.compareTo(MINECRAFT_1_19) < 0) {
+      writeUUID(byteBuf, PLACEHOLDER_UUID);
+    }
+  }
+
+  @Override
+  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
+  }
+}
@@ -30,7 +30,6 @@ import xyz.jonesdev.sonar.common.fallback.protocol.FallbackPacket;

 import java.util.Objects;

-import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.readString;
 import static xyz.jonesdev.sonar.common.utility.protocol.ProtocolUtil.writeString;

@Getter
@@ -41,13 +40,13 @@ public final class Disconnect implements FallbackPacket {
  private @Nullable String reason;

  @Override
-  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    reason = readString(byteBuf);
+  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    writeString(byteBuf, Objects.requireNonNull(reason));
  }

  @Override
-  public void encode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
-    writeString(byteBuf, Objects.requireNonNull(reason));
+  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    throw new UnsupportedOperationException();
  }

  public static Disconnect create(final Component component) {
@@ -45,6 +45,7 @@ public final class EmptyChunkData implements FallbackPacket {
  private static final byte[] SECTION_BYTES = new byte[]{0, 0, 0, 0, 0, 0, 1, 0};
  private static final byte[] LIGHT_BYTES = new byte[]{1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 3, -1, -1, 0, 0};

+  private static final byte[] LEGACY_FILLER_BYTES_17 = new byte[2];
  private static final byte[] LEGACY_FILLER_BYTES = new byte[256];
  private static final byte[] MODERN_FILLER_BYTES = new byte[1024];

@@ -128,8 +129,8 @@ public final class EmptyChunkData implements FallbackPacket {
      if (protocolVersion.compareTo(MINECRAFT_1_8) >= 0) {
        writeArray(byteBuf, LEGACY_FILLER_BYTES); // 1.8 - 1.12.2
      } else {
-        byteBuf.writeInt(0); // Compressed size.
-        byteBuf.writeBytes(new byte[2]); // 1.7
+        byteBuf.writeInt(0); // Compressed size
+        byteBuf.writeBytes(LEGACY_FILLER_BYTES_17); // 1.7
      }
    } else if (protocolVersion.compareTo(MINECRAFT_1_15) < 0) {
      writeArray(byteBuf, MODERN_FILLER_BYTES); // 1.13 - 1.14.4
@@ -44,6 +44,11 @@ public final class PluginMessage extends DeferredByteBufHolder implements Fallba
    return 8;
  }

+  @Override
+  public int expectedMaxLength(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
+    return 0xfff + 1; // limit packet size to 4096
+  }
+
  @Override
  public void decode(final ByteBuf byteBuf, final ProtocolVersion protocolVersion) {
    channel = readString(byteBuf);
@@ -45,19 +45,24 @@ public final class UpdateSectionBlocks implements FallbackPacket {
      byteBuf.writeInt(sectionZ);

      if (protocolVersion.compareTo(MINECRAFT_1_8) < 0) {
-        byteBuf.writeShort((short) changedBlocks.length);
+        byteBuf.writeShort(changedBlocks.length);
        byteBuf.writeInt(4 * changedBlocks.length);
-
-        for (final ChangedBlock block : changedBlocks) {
-          byteBuf.writeShort(block.getLegacyChunkPosCrammed());
-          byteBuf.writeShort(block.getType().getId(protocolVersion));
-        }
      } else {
        writeVarInt(byteBuf, changedBlocks.length);
+      }

-        for (final ChangedBlock block : changedBlocks) {
-          byteBuf.writeShort(block.getLegacyChunkPosCrammed());
-          writeVarInt(byteBuf, block.getType().getId(protocolVersion));
+      for (final ChangedBlock block : changedBlocks) {
+        byteBuf.writeShort(block.getLegacyChunkPosCrammed());
+        final int id = block.getType().getId(protocolVersion);
+        if (protocolVersion.compareTo(MINECRAFT_1_13) >= 0) {
+          writeVarInt(byteBuf, id);
+        } else {
+          final int shiftedBlockId = id << 4;
+          if (protocolVersion.compareTo(MINECRAFT_1_8) < 0) {
+            byteBuf.writeShort(shiftedBlockId);
+          } else {
+            writeVarInt(byteBuf, shiftedBlockId);
+          }
        }
      }
    } else {
@@ -80,7 +85,8 @@ public final class UpdateSectionBlocks implements FallbackPacket {

      for (final ChangedBlock block : changedBlocks) {
        final int shiftedBlockId = block.getType().getId(protocolVersion) << 12;
-        writeVarLong(byteBuf, shiftedBlockId | block.getModernChunkPosCrammed());
+        final long positionIdValue = shiftedBlockId | block.getModernChunkPosCrammed();
+        writeVarLong(byteBuf, positionIdValue);
      }
    }
  }
@@ -25,7 +25,6 @@ import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;
 import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

 import java.net.InetAddress;
-import java.net.UnknownHostException;

@SubcommandInfo(
  name = "blacklist",
@@ -44,79 +43,56 @@ public final class BlacklistCommand extends Subcommand {
    switch (invocation.getRawArguments()[1].toLowerCase()) {
      case "add": {
        if (invocation.getRawArguments().length <= 2) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectCommandUsage()
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getIncorrectCommandUsage()
            .replace("%usage%", "blacklist add <IP address>"));
          return;
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        if (!IP_PATTERN.matcher(rawInetAddress).matches()) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectIpAddress());
-          return;
-        }
-
-        final InetAddress inetAddress;
-        try {
-          inetAddress = InetAddress.getByName(rawInetAddress);
-
-          if (inetAddress.isAnyLocalAddress() || inetAddress.isLoopbackAddress()) {
-            invocation.getSender().sendMessage(SONAR.getConfig().getIllegalIpAddress());
-            return;
-          }
-        } catch (UnknownHostException exception) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIllegalIpAddress());
-          return;
-        }
+        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        // Make sure the given IP address is valid
+        if (inetAddress == null) return;

+        // Make sure the IP is not blacklisted already
        if (SONAR.getFallback().getBlacklisted().has(inetAddress.toString())) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistDuplicate());
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistDuplicate());
          return;
        }

+        // Display a warning if the IP is verified but being added to the blacklist
        if (SONAR.getVerifiedPlayerController().has(inetAddress)) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistAddWarning()
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistAddWarning()
            .replace("%ip%", rawInetAddress));
        }

+        // Blacklist the given IP address
        SONAR.getFallback().getBlacklisted().put(inetAddress.toString());
-        invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistAdd()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistAdd()
          .replace("%ip%", rawInetAddress));
        break;
      }

      case "remove": {
        if (invocation.getRawArguments().length <= 2) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectCommandUsage()
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getIncorrectCommandUsage()
            .replace("%usage%", "blacklist remove <IP address>"));
          return;
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        if (!IP_PATTERN.matcher(rawInetAddress).matches()) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectIpAddress());
-          return;
-        }
-
-        final InetAddress inetAddress;
-        try {
-          inetAddress = InetAddress.getByName(rawInetAddress);
-
-          if (inetAddress.isAnyLocalAddress() || inetAddress.isLoopbackAddress()) {
-            invocation.getSender().sendMessage(SONAR.getConfig().getIllegalIpAddress());
-            return;
-          }
-        } catch (UnknownHostException exception) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIllegalIpAddress());
-          return;
-        }
+        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        // Make sure the given IP address is valid
+        if (inetAddress == null) return;

+        // Make sure the IP is blacklisted
        if (!SONAR.getFallback().getBlacklisted().has(inetAddress.toString())) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistNotFound());
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistNotFound());
          return;
        }

+        // Invalidate the cache entry of the blacklisted IP address
        SONAR.getFallback().getBlacklisted().invalidate(inetAddress.toString());
-        invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistRemove()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistRemove()
          .replace("%ip%", rawInetAddress));
        break;
      }
@@ -125,18 +101,19 @@ public final class BlacklistCommand extends Subcommand {
        final int blacklisted = SONAR.getFallback().getBlacklisted().estimatedSize();

        if (blacklisted == 0) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistEmpty());
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistEmpty());
          return;
        }

+        // Invalidate all cache entries
        SONAR.getFallback().getBlacklisted().invalidateAll();
-        invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistCleared()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistCleared()
          .replace("%removed%", Sonar.DECIMAL_FORMAT.format(blacklisted)));
        break;
      }

      case "size": {
-        invocation.getSender().sendMessage(SONAR.getConfig().getBlacklistSize()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getBlacklistSize()
          .replace("%amount%", Sonar.DECIMAL_FORMAT.format(SONAR.getFallback().getBlacklisted().estimatedSize())));
        break;
      }
@@ -17,38 +17,101 @@

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

+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Unmodifiable;
+import xyz.jonesdev.sonar.api.SonarPlatform;
 import xyz.jonesdev.sonar.api.command.CommandInvocation;
 import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;
 import xyz.jonesdev.sonar.api.profiler.JVMProfiler;

+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
 // This command is only used to display helpful information in order to help
-// the Sonar developer(s) to fix issues more quickly
+// the Sonar contributors to fix issues more quickly
@SubcommandInfo(
  name = "dump",
  description = "Print developer information",
  onlyConsole = true
 )
 public final class DumpCommand extends Subcommand implements JVMProfiler {
+  private static final Gson GSON = new GsonBuilder()
+    .disableInnerClassSerialization()
+    .create();

  @Override
  public void execute(final @NotNull CommandInvocation invocation) {
-    final String osName = System.getProperty("os.name");
-    final String osArch = System.getProperty("os.arch");
-    final String jvmArgs = String.join(",", RUNTIME_MX_BEAN.getInputArguments());
+    final String json = GSON.toJson(collectMappedInformation());
+    SONAR.getLogger().info("Generated dump: {}", json);
+  }

-    invocation.getSender().sendMessage("Virtual cores: " + getVirtualCores());
-    invocation.getSender().sendMessage("JVM args: " + jvmArgs);
-    invocation.getSender().sendMessage("Java name: " + RUNTIME_MX_BEAN.getVmName());
-    invocation.getSender().sendMessage("Java version: " + RUNTIME_MX_BEAN.getVmVersion());
-    invocation.getSender().sendMessage("Java vendor: " + RUNTIME_MX_BEAN.getVmVendor());
-    invocation.getSender().sendMessage("Operating system: " + osName + ", " + osArch);
-    invocation.getSender().sendMessage("Total memory: " + formatMemory(getTotalMemory()));
-    invocation.getSender().sendMessage("Max memory: " + formatMemory(getMaxMemory()));
-    invocation.getSender().sendMessage("Free memory: " + formatMemory(getFreeMemory()));
-    invocation.getSender().sendMessage("Used Memory: " + formatMemory(getUsedMemory()));
-    invocation.getSender().sendMessage("Platform: " + SONAR.getServer().getPlatform().getDisplayName());
-    invocation.getSender().sendMessage("Version: " + SONAR.getVersion().getFull());
+  @Unmodifiable
+  private @NotNull Map<String, Object> collectMappedInformation() {
+    val mappings = new WeakHashMap<String, Object>();
+    mappings.put("sonar", new Dump.Sonar(
+      SONAR.getVersion().getFull(),
+      SONAR.getServer().getPlatform(),
+      SONAR.getVersion().isOnMainBranch()
+    ));
+    mappings.put("runtime", new Dump.Runtime(
+      getVirtualCores(),
+      RUNTIME_MX_BEAN.getInputArguments(),
+      RUNTIME_MX_BEAN.getVmName(),
+      RUNTIME_MX_BEAN.getVmVendor(),
+      RUNTIME_MX_BEAN.getVmVersion()
+    ));
+    mappings.put("os", new Dump.OS(
+      System.getProperty("os.name"),
+      System.getProperty("os.arch"),
+      System.getProperty("os.version")
+    ));
+    mappings.put("memory", new Dump.Memory(
+      formatMemory(getTotalMemory()),
+      formatMemory(getMaxMemory()),
+      formatMemory(getFreeMemory()),
+      formatMemory(getUsedMemory())
+    ));
+    return mappings;
+  }
+
+  @SuppressWarnings("unused")
+  private static final class Dump {
+
+    @RequiredArgsConstructor
+    private static final class Sonar {
+      private final String version;
+      private final SonarPlatform platform;
+      private final boolean isOnMainBranch;
+    }
+
+    @RequiredArgsConstructor
+    private static final class Runtime {
+      private final int virtualCores;
+      private final List<String> jvmArguments;
+      private final String vmName;
+      private final String vmVendor;
+      private final String vmVersion;
+    }
+
+    @RequiredArgsConstructor
+    private static final class Memory {
+      private final String total;
+      private final String max;
+      private final String free;
+      private final String used;
+    }
+
+    @RequiredArgsConstructor
+    private static final class OS {
+      private final String name;
+      private final String arch;
+      private final String version;
+    }
  }
 }
@@ -24,18 +24,18 @@ import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;

@SubcommandInfo(
  name = "lockdown",
-  description = "Lock the server down"
+  description = "Prevent all players from joining"
 )
 public final class LockdownCommand extends Subcommand {

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

    invocation.getSender().sendMessage(newState
-      ? SONAR.getConfig().getLockdownActivated() : SONAR.getConfig().getLockdownDeactivated());
+      ? SONAR.getConfig().getLockdown().getActivated() : SONAR.getConfig().getLockdown().getDeactivated());
  }
 }
@@ -25,7 +25,7 @@ import xyz.jonesdev.sonar.api.timer.SystemTimer;

@SubcommandInfo(
  name = "reload",
-  description = "Reload the configuration"
+  description = "Reload all configurations"
 )
 public final class ReloadCommand extends Subcommand {

@@ -33,10 +33,10 @@ public final class ReloadCommand extends Subcommand {
  public void execute(final @NotNull CommandInvocation invocation) {
    final SystemTimer timer = new SystemTimer();

-    invocation.getSender().sendMessage(SONAR.getConfig().getReloading());
+    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getReloading());
    SONAR.reload();

-    invocation.getSender().sendMessage(SONAR.getConfig().getReloaded()
+    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getReloaded()
      .replace("%taken%", String.valueOf(timer.delay())));
  }
 }
@@ -40,60 +40,71 @@ import static xyz.jonesdev.sonar.api.Sonar.DECIMAL_FORMAT;
  argumentsRequired = false
 )
 public final class StatisticsCommand extends Subcommand implements JVMProfiler {
+  private enum StatisticType {
+    GENERAL,
+    NETWORK,
+    MEMORY,
+    CPU
+  }

  @Override
  public void execute(final @NotNull CommandInvocation invocation) {
-    final String showing = invocation.getRawArguments().length >= 2
-      ? invocation.getRawArguments()[1].toLowerCase() : "bot";
-
-    invocation.getSender().sendMessage("§eShowing " + showing + " statistics for this session:");
-    invocation.getSender().sendMessage("§ePlease note that session statistics are not saved when the server restarts.");
-    invocation.getSender().sendMessage();
-
-    if (!showing.equals("bot")) {
-      switch (showing) {
-        case "network": {
-          invocation.getSender().sendMessage(" §7▪ §aCurrent incoming used bandwidth: §f" + TrafficCounter.INCOMING.getCachedSecond());
-          invocation.getSender().sendMessage(" §7▪ §aCurrent outgoing used bandwidth: §f" + TrafficCounter.OUTGOING.getCachedSecond());
-          invocation.getSender().sendMessage(" §7▪ §aTotal incoming used bandwidth: §f" + TrafficCounter.INCOMING.getCachedTtl());
-          invocation.getSender().sendMessage(" §7▪ §aTotal outgoing used bandwidth: §f" + TrafficCounter.OUTGOING.getCachedTtl());
-          return;
-        }
-
-        case "memory": {
-          invocation.getSender().sendMessage(" §7▪ §aTotal free memory (JVM): §f" + formatMemory(getFreeMemory()));
-          invocation.getSender().sendMessage(" §7▪ §aTotal used memory (JVM): §f" + formatMemory(getUsedMemory()));
-          invocation.getSender().sendMessage(" §7▪ §aTotal maximum memory (JVM): §f" + formatMemory(getMaxMemory()));
-          invocation.getSender().sendMessage(" §7▪ §aTotal allocated memory (JVM): §f" + formatMemory(getTotalMemory()));
-          return;
-        }
-
-        case "cpu": {
-          invocation.getSender().sendMessage(" §7▪ §aProcess CPU usage right now: §f" + DECIMAL_FORMAT.format(getProcessCPUUsage()) + "%");
-          invocation.getSender().sendMessage(" §7▪ §aSystem CPU usage right now: §f" + DECIMAL_FORMAT.format(getSystemCPUUsage()) + "%");
-          invocation.getSender().sendMessage(" §7▪ §aPer-core process CPU usage: §f" + DECIMAL_FORMAT.format(getAverageProcessCPUUsage()) + "%");
-          invocation.getSender().sendMessage(" §7▪ §aPer-core system CPU usage: §f" + DECIMAL_FORMAT.format(getAverageSystemCPUUsage()) + "%");
-          invocation.getSender().sendMessage(" §7▪ §aGeneral system load average: §f" + DECIMAL_FORMAT.format(getSystemLoadAverage()) + "%");
-          invocation.getSender().sendMessage(" §7▪ §aTotal virtual cpu cores (JVM): §f" + DECIMAL_FORMAT.format(getVirtualCores()));
-          return;
-        }
+    StatisticType type = StatisticType.GENERAL;
+    if (invocation.getRawArguments().length >= 2) {
+      try {
+        type = StatisticType.valueOf(invocation.getRawArguments()[1].toUpperCase());
+      } catch (Exception exception) {
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getUnknownStatisticType()
+          .replace("%statistics%", getArguments()));
+        return;
      }
    }

-    final int total = Statistics.TOTAL_TRAFFIC.get();
-    final int real = Statistics.REAL_TRAFFIC.get();
-    final int failed = Statistics.FAILED_VERIFICATIONS.get();
-    final int queued = SONAR.getFallback().getQueue().getQueuedPlayers().size();
-    final int verifying = SONAR.getFallback().getConnected().size();
-    final int verified = SONAR.getVerifiedPlayerController().estimatedSize();
-    final int blacklisted = SONAR.getFallback().getBlacklisted().estimatedSize();
+    invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getStatisticsHeader()
+      .replace("%type%", type.name().toLowerCase()));
+    invocation.getSender().sendMessage();

-    invocation.getSender().sendMessage(" §7▪ §aVerified IP addresses: §f" + DECIMAL_FORMAT.format(verified));
-    invocation.getSender().sendMessage(" §7▪ §aVerifying IP addresses: §f" + DECIMAL_FORMAT.format(verifying));
-    invocation.getSender().sendMessage(" §7▪ §aBlacklisted IP addresses: §f" + DECIMAL_FORMAT.format(blacklisted));
-    invocation.getSender().sendMessage(" §7▪ §aCurrently queued logins: §f" + DECIMAL_FORMAT.format(queued));
-    invocation.getSender().sendMessage(" §7▪ §aTotal non-unique joins: §f" + DECIMAL_FORMAT.format(total));
-    invocation.getSender().sendMessage(" §7▪ §aTotal verification attempts: §f" + DECIMAL_FORMAT.format(real));
-    invocation.getSender().sendMessage(" §7▪ §aTotal failed verifications: §f" + DECIMAL_FORMAT.format(failed));
+    switch (type) {
+      case GENERAL: {
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getGeneralStatistics()
+          .replace("%verified%", DECIMAL_FORMAT.format(SONAR.getVerifiedPlayerController().estimatedSize()))
+          .replace("%verifying%", DECIMAL_FORMAT.format(SONAR.getFallback().getConnected().size()))
+          .replace("%blacklisted%", DECIMAL_FORMAT.format(SONAR.getFallback().getBlacklisted().estimatedSize()))
+          .replace("%queued%", DECIMAL_FORMAT.format(SONAR.getFallback().getQueue().getQueuedPlayers().size()))
+          .replace("%total_joins%", DECIMAL_FORMAT.format(Statistics.TOTAL_TRAFFIC.get()))
+          .replace("%total_attempts%", DECIMAL_FORMAT.format(Statistics.REAL_TRAFFIC.get()))
+          .replace("%total_failed%", DECIMAL_FORMAT.format(Statistics.FAILED_VERIFICATIONS.get())));
+        break;
+      }
+
+      case CPU: {
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getCpuStatistics()
+          .replace("%process_cpu%", DECIMAL_FORMAT.format(getProcessCPUUsage()))
+          .replace("%system_cpu%", DECIMAL_FORMAT.format(getSystemCPUUsage()))
+          .replace("%average_process_cpu%", DECIMAL_FORMAT.format(getAverageProcessCPUUsage()))
+          .replace("%average_system_cpu%", DECIMAL_FORMAT.format(getAverageSystemCPUUsage()))
+          .replace("%load_average%", DECIMAL_FORMAT.format(getSystemLoadAverage()))
+          .replace("%virtual_cores%", DECIMAL_FORMAT.format(getVirtualCores())));
+        break;
+      }
+
+      case MEMORY: {
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getMemoryStatistics()
+          .replace("%free_memory%", formatMemory(getFreeMemory()))
+          .replace("%used_memory%", formatMemory(getUsedMemory()))
+          .replace("%max_memory%", formatMemory(getMaxMemory()))
+          .replace("%total_memory%", formatMemory(getTotalMemory())));
+        break;
+      }
+
+      case NETWORK: {
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getNetworkStatistics()
+          .replace("%incoming%", TrafficCounter.INCOMING.getCachedSecond())
+          .replace("%outgoing%", TrafficCounter.OUTGOING.getCachedSecond())
+          .replace("%ttl_incoming%", TrafficCounter.INCOMING.getCachedTtl())
+          .replace("%ttl_outgoing%", TrafficCounter.OUTGOING.getCachedTtl()));
+        break;
+      }
+    }
  }
 }
@@ -45,18 +45,18 @@ public final class VerboseCommand extends Subcommand {
    if (SONAR.getVerboseHandler().isSubscribed(verboseSubscriber.getName())) {
      SONAR.getVerboseHandler().unsubscribe(verboseSubscriber.getName());
      if (verboseSubscriber != invocation.getSender()) {
-        verboseSubscriber.sendMessage(SONAR.getConfig().getVerboseUnsubscribedOther()
+        verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseUnsubscribedOther()
          .replace("%player%", verboseSubscriber.getName()));
      }
-      verboseSubscriber.sendMessage(SONAR.getConfig().getVerboseUnsubscribed());
+      verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseUnsubscribed());
      return;
    }

    if (verboseSubscriber != invocation.getSender()) {
-      verboseSubscriber.sendMessage(SONAR.getConfig().getVerboseSubscribedOther()
+      verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseSubscribedOther()
        .replace("%player%", verboseSubscriber.getName()));
    }
-    verboseSubscriber.sendMessage(SONAR.getConfig().getVerboseSubscribed());
+    verboseSubscriber.sendMessage(SONAR.getConfig().getCommands().getVerboseSubscribed());
    SONAR.getVerboseHandler().subscribe(verboseSubscriber.getName());
  }
 }
@@ -24,6 +24,7 @@ import xyz.jonesdev.sonar.api.command.subcommand.Subcommand;
 import xyz.jonesdev.sonar.api.command.subcommand.SubcommandInfo;
 import xyz.jonesdev.sonar.api.command.subcommand.argument.Argument;

+import java.net.InetAddress;
 import java.util.Queue;
 import java.util.UUID;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -39,73 +40,70 @@ import java.util.concurrent.LinkedBlockingQueue;
  }
 )
 public final class VerifiedCommand extends Subcommand {
-  private static final Queue<String> LOCK = new LinkedBlockingQueue<>(10);
+  private static final Queue<String> LOCK = new LinkedBlockingQueue<>(1);

  @Override
  public void execute(final @NotNull CommandInvocation invocation) {
    switch (invocation.getRawArguments()[1].toLowerCase()) {
      case "history": {
        if (invocation.getRawArguments().length <= 2) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectCommandUsage()
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getIncorrectCommandUsage()
            .replace("%usage%", "verified history <IP address>"));
          return;
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        if (!IP_PATTERN.matcher(rawInetAddress).matches()) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectIpAddress());
+        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        // Make sure the given IP address is valid
+        if (inetAddress == null) return;
+
+        // Make sure the IP is verified already
+        if (!SONAR.getVerifiedPlayerController().has(inetAddress.toString())) {
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedNotFound());
          return;
        }

-        // We don't need to parse this, so we can just use the string.
-        final String realInetAddress = "/" + rawInetAddress;
-
-        if (!SONAR.getVerifiedPlayerController().has(realInetAddress)) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedNotFound());
-          return;
-        }
-
-        invocation.getSender().sendMessage("§ePrevious UUIDs for " + rawInetAddress + ":");
-
-        for (final UUID uuid : SONAR.getVerifiedPlayerController().getUUIDs(realInetAddress)) {
-          invocation.getSender().sendMessage(" §7▪ §f" + uuid.toString());
+        invocation.getSender().sendMessage("<yellow>Previous UUIDs for " + rawInetAddress + ":");
+        for (final UUID uuid : SONAR.getVerifiedPlayerController().getUUIDs(inetAddress.toString())) {
+          invocation.getSender().sendMessage(" <gray>▪ <white>" + uuid.toString());
        }
        break;
      }

      case "remove": {
        if (invocation.getRawArguments().length <= 2) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectCommandUsage()
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getIncorrectCommandUsage()
            .replace("%usage%", "verified remove <IP address>"));
          return;
        }

        final String rawInetAddress = invocation.getRawArguments()[2];
-        if (!IP_PATTERN.matcher(rawInetAddress).matches()) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getIncorrectIpAddress());
+
+        // Make sure we aren't currently locking the IP address to avoid a double I/O operation
+        if (LOCK.contains(rawInetAddress)) {
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedBlocked());
          return;
        }

-        // We don't need to parse this, so we can just use the string.
-        final String realInetAddress = "/" + rawInetAddress;
+        final InetAddress inetAddress = checkIP(invocation.getSender(), rawInetAddress);
+        // Make sure the given IP address is valid
+        if (inetAddress == null) return;

-        if (LOCK.contains(realInetAddress)) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedBlocked());
-          return;
-        }
-
-        if (!SONAR.getVerifiedPlayerController().has(realInetAddress)) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedNotFound());
+        // Make sure the player is verified already
+        if (!SONAR.getVerifiedPlayerController().has(inetAddress.toString())) {
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedNotFound());
          return;
        }

+        // Lock the IP address
        // Make sure we don't accidentally run 2 operations at the same time
-        LOCK.add(realInetAddress);
-        SONAR.getVerifiedPlayerController().remove(realInetAddress);
-        LOCK.remove(realInetAddress);
+        LOCK.add(rawInetAddress);
+        SONAR.getVerifiedPlayerController().remove(inetAddress.toString());

-        invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedRemove()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedRemove()
          .replace("%ip%", rawInetAddress));
+        // Unlock the IP address
+        LOCK.remove(rawInetAddress);
        break;
      }

@@ -113,18 +111,19 @@ public final class VerifiedCommand extends Subcommand {
        final int verified = SONAR.getVerifiedPlayerController().estimatedSize();

        if (verified == 0) {
-          invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedEmpty());
+          invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedEmpty());
          return;
        }

+        // Invalidate all cache entries
        SONAR.getVerifiedPlayerController().clearAll();
-        invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedCleared()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedCleared()
          .replace("%removed%", Sonar.DECIMAL_FORMAT.format(verified)));
        break;
      }

      case "size": {
-        invocation.getSender().sendMessage(SONAR.getConfig().getVerifiedSize()
+        invocation.getSender().sendMessage(SONAR.getConfig().getCommands().getVerifiedSize()
          .replace("%amount%", Sonar.DECIMAL_FORMAT.format(SONAR.getVerifiedPlayerController().estimatedSize())));
        break;
      }
@@ -0,0 +1,98 @@
+package xyz.jonesdev.sonar.common.update;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import lombok.experimental.UtilityClass;
+import org.jetbrains.annotations.NotNull;
+import xyz.jonesdev.sonar.api.Sonar;
+import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+@UtilityClass
+public class UpdateChecker {
+  private final ExecutorService ASYNC_EXECUTOR = Executors.newSingleThreadExecutor();
+
+  private final LoggerWrapper LOGGER = new LoggerWrapper() {
+
+    @Override
+    public void info(final String message, final Object... args) {
+      Sonar.get().getLogger().info("[update-checker] " + message, args);
+    }
+
+    @Override
+    public void warn(final String message, final Object... args) {
+      Sonar.get().getLogger().warn("[update-checker] " + message, args);
+    }
+
+    @Override
+    public void error(final String message, final Object... args) {
+      Sonar.get().getLogger().error("[update-checker] " + message, args);
+    }
+  };
+
+  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();
+
+        if (!latestStableVersion.equals(Sonar.get().getVersion().getSemanticVersion())) {
+          LOGGER.warn("A new version of Sonar is available: {}", latestStableVersion);
+          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!");
+        } 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" +
+            ".");
+        }
+      } catch (Exception exception) {
+        LOGGER.warn("Could not retrieve latest version information: {}", exception);
+      }
+    });
+  }
+
+  private @NotNull JsonObject parseJson(final @NotNull InputStream inputStream) throws IOException {
+    final InputStreamReader inputStreamReader = new InputStreamReader(inputStream);
+    final StringBuilder content = new StringBuilder();
+
+    // Read the entire page content
+    try (final BufferedReader bufferedReader = new BufferedReader(inputStreamReader)) {
+      String line;
+
+      while ((line = bufferedReader.readLine()) != null) {
+        content.append(line);
+      }
+    }
+
+    // Parse site content as JSON using Gson
+    final JsonParser jsonParser = new JsonParser();
+    return jsonParser.parse(content.toString()).getAsJsonObject();
+  }
+
+  private @NotNull HttpsURLConnection prepareConnection(final @NotNull URL url) throws Exception {
+    final HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection();
+    // Set connection timeout
+    urlConnection.setConnectTimeout(15000);
+    urlConnection.setReadTimeout(15000);
+    // Set necessary properties
+    urlConnection.setRequestMethod("GET");
+    urlConnection.setRequestProperty("Accept", "application/vnd.github.v3+json");
+    // Only continue if the connection is a success
+    if (urlConnection.getResponseCode() != 200) {
+      throw new IllegalStateException("Unexpected response code " + urlConnection.getResponseCode());
+    }
+    return urlConnection;
+  }
+}
@@ -21,6 +21,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.handler.codec.CorruptedFrameException;
+import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.EncoderException;
 import lombok.experimental.UtilityClass;
 import net.kyori.adventure.nbt.BinaryTagIO;
@@ -47,19 +48,33 @@ public class ProtocolUtil {
  private static final String UNREGISTER_CHANNEL = "minecraft:unregister";
  private static final Pattern INVALID_IDENTIFIER_REGEX = Pattern.compile("[^a-z0-9\\-_]*");

-  public static @NotNull String readString(final ByteBuf buf) throws CorruptedFrameException {
-    return readString(buf, Short.MAX_VALUE);
+  public static @NotNull String readBrandMessage(final @NotNull ByteBuf content) throws DecoderException {
+    final ByteBuf slice = content.slice();
+    try {
+      return readString(slice);
+    } catch (DecoderException exception) {
+      return readString(slice, 65536, slice.readableBytes());
+    }
  }

-  public static @NotNull String readString(final ByteBuf buf,
-                                           final int cap) throws CorruptedFrameException {
-    final int length = VarIntUtil.readVarInt(buf);
+  public static @NotNull String readString(final ByteBuf byteBuf) throws CorruptedFrameException {
+    return readString(byteBuf, Short.MAX_VALUE);
+  }

+  public static @NotNull String readString(final ByteBuf byteBuf,
+                                           final int cap) throws CorruptedFrameException {
+    final int length = VarIntUtil.readVarInt(byteBuf);
+    return readString(byteBuf, cap, length);
+  }
+
+  public static @NotNull String readString(final @NotNull ByteBuf byteBuf,
+                                           final int cap,
+                                           final int length) throws CorruptedFrameException {
    checkFrame(length >= 0, "Got a negative-length string");
    checkFrame(length <= cap * 3, "Bad string size");
-    checkFrame(buf.isReadable(length), "Got an invalid string length");
-    final String str = buf.toString(buf.readerIndex(), length, StandardCharsets.UTF_8);
-    buf.skipBytes(length);
+    checkFrame(byteBuf.isReadable(length), "Tried to read a too-long string");
+    final String str = byteBuf.toString(byteBuf.readerIndex(), length, StandardCharsets.UTF_8);
+    byteBuf.skipBytes(length);
    checkFrame(str.length() <= cap, "Got a too-long string");
    return str;
  }
@@ -110,8 +110,4 @@ public final class SonarVelocity extends SonarBootstrap<SonarVelocityPlugin> {
      .repeat(100L, TimeUnit.MILLISECONDS)
      .schedule();
  }
-
-  @Override
-  public void postReload() {
-  }
 }
@@ -58,13 +58,13 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
      // Spamming should be prevented, especially if some heavy operations are done,
      // which is not the case here but let's still stay safe!
      if (mapTimestamp > 0L) {
-        invocation.source().sendMessage(Component.text(Sonar.get().getConfig().getCommandCoolDown()));
+        invocation.source().sendMessage(Component.text(Sonar.get().getConfig().getCommands().getCommandCoolDown()));

        // Format delay
        final long timestamp = System.currentTimeMillis();
        final double left = 0.5D - (timestamp - mapTimestamp) / 1000D;

-        invocation.source().sendMessage(Component.text(Sonar.get().getConfig().getCommandCoolDownLeft()
+        invocation.source().sendMessage(Component.text(Sonar.get().getConfig().getCommands().getCommandCoolDownLeft()
          .replace("%time-left%", Sonar.DECIMAL_FORMAT.format(left))));
        return;
      }
@@ -89,10 +89,8 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
        if (!subcommand.get().getInfo().onlyConsole()
          && !invocation.source().hasPermission(subcommand.get().getPermission())
        ) {
-          invocationSource.sendMessage(
-            Sonar.get().getConfig().getSubCommandNoPerm()
-              .replace("%permission%", subcommand.get().getPermission())
-          );
+          invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getSubCommandNoPerm()
+            .replace("%permission%", subcommand.get().getPermission()));
          return;
        }
      }
@@ -100,12 +98,12 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {

    subcommand.ifPresent(sub -> {
      if (sub.getInfo().onlyPlayers() && !(invocation.source() instanceof Player)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getPlayersOnly());
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getPlayersOnly());
        return;
      }

      if (sub.getInfo().onlyConsole() && !(invocation.source() instanceof ConsoleCommandSource)) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getConsoleOnly());
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getConsoleOnly());
        return;
      }

@@ -115,7 +113,7 @@ public final class VelocitySonarCommand implements SimpleCommand, SonarCommand {
      if (sub.getInfo().arguments().length > 0
        && commandInvocation.getRawArguments().length <= 1
        && sub.getInfo().argumentsRequired()) {
-        invocationSource.sendMessage(Sonar.get().getConfig().getIncorrectCommandUsage()
+        invocationSource.sendMessage(Sonar.get().getConfig().getCommands().getIncorrectCommandUsage()
          .replace("%usage%", sub.getInfo().name() + " (" + sub.getArguments() + ")"));
        return;
      }
@@ -110,14 +110,14 @@ public final class FallbackListener {
    if (fallback.getBlacklisted().has(inetAddress.toString())) {
      markConnectionAsDead(mcConnection.getSessionHandler());
      initialConnection.getConnection().closeWith(Disconnect.create(
-        Sonar.get().getConfig().getBlacklisted(),
+        Sonar.get().getConfig().getVerification().getBlacklisted(),
        inboundConnection.getProtocolVersion()
      ));
      return;
    }

    // Don't continue the verification process if the verification is disabled
-    if (!Sonar.get().getConfig().isEnableVerification()) return;
+    if (!Sonar.get().getConfig().getVerification().isEnabled()) return;

    // Check if the player is already verified.
    // No one wants to be verified over and over again.
@@ -134,12 +134,21 @@ public final class FallbackListener {
    // We now mark the connection as dead by using our dummy connection
    markConnectionAsDead(mcConnection.getSessionHandler());

+    // Check if the player is already queued since we don't want bots to flood the queue
+    if (fallback.getQueue().getQueuedPlayers().containsKey(inetAddress)) {
+      initialConnection.getConnection().closeWith(Disconnect.create(
+        Sonar.get().getConfig().getVerification().getAlreadyQueued(),
+        inboundConnection.getProtocolVersion()
+      ));
+      return;
+    }
+
    // Check if Fallback is already verifying a player
    // → is another player with the same IP address connected to Fallback?
    if (fallback.getConnected().containsKey(event.getUsername())
      || fallback.getConnected().containsValue(inetAddress)) {
      initialConnection.getConnection().closeWith(Disconnect.create(
-        Sonar.get().getConfig().getAlreadyVerifying(),
+        Sonar.get().getConfig().getVerification().getAlreadyVerifying(),
        inboundConnection.getProtocolVersion()
      ));
      return;
@@ -147,9 +156,9 @@ public final class FallbackListener {

    // 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().getMaximumVerifyingPlayers()) {
+    if (fallback.getConnected().size() > Sonar.get().getConfig().getVerification().getMaxVerifyingPlayers()) {
      initialConnection.getConnection().closeWith(Disconnect.create(
-        Sonar.get().getConfig().getTooManyPlayers(),
+        Sonar.get().getConfig().getVerification().getTooManyPlayers(),
        inboundConnection.getProtocolVersion()
      ));
      return;
@@ -158,16 +167,7 @@ public final class FallbackListener {
    // Check if the IP address is currently being rate-limited
    if (!fallback.getRatelimiter().attempt(inetAddress)) {
      initialConnection.getConnection().closeWith(Disconnect.create(
-        Sonar.get().getConfig().getTooFastReconnect(),
-        inboundConnection.getProtocolVersion()
-      ));
-      return;
-    }
-
-    // Check if the player is already queued since we don't want bots to flood the queue
-    if (fallback.getQueue().getQueuedPlayers().containsKey(inetAddress)) {
-      initialConnection.getConnection().closeWith(Disconnect.create(
-        Sonar.get().getConfig().getAlreadyQueued(),
+        Sonar.get().getConfig().getVerification().getTooFastReconnect(),
        inboundConnection.getProtocolVersion()
      ));
      return;
@@ -191,8 +191,9 @@ public final class FallbackListener {

        // Check if the username matches the valid name regex in order to prevent
        // UTF-16 names or other types of flood attacks
-        if (!Sonar.get().getConfig().getValidNameRegex().matcher(event.getUsername()).matches()) {
-          mcConnection.closeWith(Disconnect.create(Sonar.get().getConfig().getInvalidUsername(), mcConnection.getProtocolVersion()));
+        if (!Sonar.get().getConfig().getVerification().getValidNameRegex().matcher(event.getUsername()).matches()) {
+          mcConnection.closeWith(Disconnect.create(Sonar.get().getConfig().getVerification().getInvalidUsername(),
+            mcConnection.getProtocolVersion()));
          return;
        }

@@ -201,7 +202,7 @@ public final class FallbackListener {
        pipeline.replace(
          READ_TIMEOUT,
          READ_TIMEOUT,
-          new FallbackTimeoutHandler(Sonar.get().getConfig().getVerificationReadTimeout(), TimeUnit.MILLISECONDS)
+          new FallbackTimeoutHandler(Sonar.get().getConfig().getVerification().getReadTimeout(), TimeUnit.MILLISECONDS)
        );

        // We need to determine if the player is premium before we handle the connection,
@@ -223,13 +224,13 @@ public final class FallbackListener {
  public void handle(final @NotNull LoginEvent event) {
    val connectedPlayer = (ConnectedPlayer) event.getPlayer();

-    if (Sonar.get().getConfig().isLockdownEnabled()) {
-      if (!event.getPlayer().hasPermission("sonar.lockdown")) {
+    if (Sonar.get().getConfig().getLockdown().isEnabled()) {
+      if (!event.getPlayer().hasPermission("sonar.lockdown.bypass")) {
        connectedPlayer.getConnection().closeWith(Disconnect.create(
-          Sonar.get().getConfig().getLockdownDisconnect(), connectedPlayer.getProtocolVersion()));
+          Sonar.get().getConfig().getLockdown().getDisconnect(), connectedPlayer.getProtocolVersion()));

-        if (Sonar.get().getConfig().isLockdownLogAttempts()) {
-          Sonar.get().getLogger().info(Sonar.get().getConfig().getLockdownConsoleLog()
+        if (Sonar.get().getConfig().getLockdown().isLogAttempts()) {
+          Sonar.get().getLogger().info(Sonar.get().getConfig().getLockdown().getConsoleLog()
            .replace("%player%", event.getPlayer().getUsername())
            .replace("%ip%", Sonar.get().getConfig()
              .formatAddress(event.getPlayer().getRemoteAddress().getAddress()))
@@ -237,8 +238,8 @@ public final class FallbackListener {
              String.valueOf(event.getPlayer().getProtocolVersion().getProtocol())));
        }
        return;
-      } else if (Sonar.get().getConfig().isLockdownEnableNotify()) {
-        event.getPlayer().sendMessage(Component.text(Sonar.get().getConfig().getLockdownNotification()));
+      } else if (Sonar.get().getConfig().getLockdown().isNotifyAdmins()) {
+        event.getPlayer().sendMessage(Component.text(Sonar.get().getConfig().getLockdown().getNotification()));
      }
    }

@@ -246,7 +247,7 @@ public final class FallbackListener {

    // Check if the number of online players using the same IP address as
    // the connecting player is greater than the configured amount
-    final int maxOnlinePerIp = Sonar.get().getConfig().getMaximumOnlinePerIp();
+    final int maxOnlinePerIp = Sonar.get().getConfig().getMaxOnlinePerIp();

    if (maxOnlinePerIp > 0) {
      final long onlinePerIp = SonarVelocity.INSTANCE.getPlugin().getServer().getAllPlayers().stream()
@@ -36,6 +36,7 @@ import xyz.jonesdev.sonar.api.statistics.Statistics;
 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.packets.ServerLoginSuccess;

 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -122,11 +123,11 @@ public final class FallbackSessionHandler implements MinecraftSessionHandler {
    // The player joined the verification
    Statistics.REAL_TRAFFIC.increment();

-    if (Sonar.get().getConfig().isLogConnections()) {
+    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().isLogDuringAttack()) {
-        fallback.getLogger().info(Sonar.get().getConfig().getVerificationConnectLog()
+      if (!fallback.isPotentiallyUnderAttack() || Sonar.get().getConfig().getVerification().isLogDuringAttack()) {
+        fallback.getLogger().info(Sonar.get().getConfig().getVerification().getConnectLog()
          .replace("%name%", connectedPlayer.getUsername())
          .replace("%ip%", Sonar.get().getConfig().formatAddress(fallbackPlayer.getInetAddress()))
          .replace("%protocol%", String.valueOf(fallbackPlayer.getProtocolVersion().getProtocol())));
@@ -148,25 +149,20 @@ public final class FallbackSessionHandler implements MinecraftSessionHandler {
    }

    // Replace normal encoder to allow custom packets
-    fallbackPlayer.getPipeline().replace(
-      MINECRAFT_ENCODER,
-      FALLBACK_PACKET_ENCODER,
-      new FallbackPacketEncoder(fallbackPlayer.getProtocolVersion())
-    );
+    final FallbackPacketEncoder encoder = new FallbackPacketEncoder(fallbackPlayer.getProtocolVersion());
+    fallbackPlayer.getPipeline().replace(MINECRAFT_ENCODER, FALLBACK_PACKET_ENCODER, encoder);
+
+    // Send LoginSuccess packet to make the client think they are joining the server
+    fallbackPlayer.write(new ServerLoginSuccess(gameProfile.getName(), gameProfile.getId()));
+
+    // The LoginSuccess packet has been sent, now we can change the registry state
+    encoder.loginSuccess();

    // Replace normal decoder to allow custom packets
    fallbackPlayer.getPipeline().replace(
-      MINECRAFT_DECODER,
-      FALLBACK_PACKET_DECODER,
-      new FallbackPacketDecoder(
-        fallbackPlayer,
-        new FallbackVerificationHandler(
-          fallbackPlayer,
-          gameProfile.getName(),
-          connectedPlayer.getUniqueId()
-        )
-      )
-    );
+      MINECRAFT_DECODER, FALLBACK_PACKET_DECODER, new FallbackPacketDecoder(fallbackPlayer,
+        new FallbackVerificationHandler(fallbackPlayer, gameProfile.getName(), connectedPlayer.getUniqueId())
+      ));
  }

  @Override
@@ -56,4 +56,9 @@ public final class FallbackUserWrapper implements FallbackUser<ConnectedPlayer,
  public void write(final @NotNull Object packet) {
    connection.write(packet);
  }
+
+  @Override
+  public void delayedWrite(final @NotNull Object packet) {
+    connection.delayedWrite(packet);
+  }
 }
@@ -27,9 +27,7 @@ public final class VerboseWrapper extends Verbose {
  private final ProxyServer server;

  @Override
-  public void broadcast(final String message) {
-    final Component component = Component.text(message);
-
+  public void broadcast(final Component component) {
    synchronized (subscribers) {
      for (final String subscriber : subscribers) {
        server.getPlayer(subscriber).ifPresent(player -> {
Author	SHA1	Message	Date
Jones	bb33aa3fa4	Release 2.0.3 (#60 )	2023-10-08 11:55:52 +02:00
Jones	a0e308321d	Overhaul all configurations and add more translations (#59 ) * feat: create subclasses for different configuration value types * fix: only send UpdateSectionBlocks packet if the collision check is enabled * feat: restructure all configurations (config.yml, en.yml) * fix: invalid configuration path for certain settings * fix: use default comment stype because empty lines look ugly * feat: update configuration yaml file header * fix: smaller configuration fixes and relocations * feat: migrate messages to modern MiniMessage formatting * fix: verbose not deserializing the component properly * feat: refactor commands into their own category in the config * feat: remove unused postReload task/method * fix: make hover component in /sonar actually look decent * feat: make /sonar stats completely configurable * fix: use MiniMessage newline tag instead of hardcoded newline symbol * fix: use correct translation for /sonar stats cpu * style: remove resolved todo comment * refactor: lang/en.yml -> translations/en.yml	2023-10-07 16:33:29 +02:00
Jones	71b6d39eab	Recode some commands and implement new dump system (#58 ) * feat: reimplement the dumping system using Gson * feat(subcommands): recoded blacklist/verified IP checking logic * feat: add unknown IP address (Unknown Host) translation to config * fix: start with a default queue size of 1 in the I/O lock for /sonar verified remove * fix: lock IP addresses in /sonar verified history to avoid double I/O operations * Revert "fix: lock IP addresses in /sonar verified history to avoid double I/O operations" This reverts commit 6b092100befa423272f1eb310f5d1f8a0e9afb82. * feat: recode /sonar stats to be more reliable and stable * feat: update several subcommand descriptions to be more accurate * fix: set lockdown bypass permission to sonar.lockdown.bypass	2023-10-07 10:44:51 +02:00
Jones	3faf8c8b7f	General code cleanup and improvements (#57 ) * style(api): small codestyle improvements and QoL updates * style: reformat code using IntelliJ's code refactoring tool	2023-10-06 22:06:53 +02:00
Jones	b45626eafb	Implement update checker (#56 ) * feat: implement update checker on server start * feat: add non-main-branch message to update checker to avoid confusion	2023-10-06 21:46:54 +02:00
Jones	702ea1b370	Use barriers instead of stone blocks for verification (#54 ) * feat: replace abstract method with a java.util.function.Function * fix: make spawn x and z position adapt to platform size * feat: optimize/improve Fallback packet preparing * fix: block id shifting being broken on 1.7-1.13 * fix: optimize 1.7 support in UpdateSectionBlocks packet * style: improve codestyle of the UpdateSectionBlocks packet * fix: use normal binary io reader for mappings instead of unlimited reader * feat: implement universal Chat packet and add LOGIN / GAME states for better packet registry control * feat: [wip] barrier block integration (block ids for 1.13+ are still missing) * feat: use buffered writing more often to potentially reduce performance impact * feat: optimize chunk sending by only flushing the packets if necessary * refactor: setAbilitiesAndTeleport -> sendAbilitiesAndTeleport * style: fix fields being named incorrectly * feat: cache 1.7 empty chunk filler bytes * feat: use barrier blocks instead of stone blocks for verification	2023-10-06 20:27:48 +02:00
Jones	a75c409e13	Recode gravity and collision checks (#53 ) * feat: recode gravity verification system to avoid issues on 1.7/1.8 * feat: check for too many invalid x/z ticks (changes) * feat: check for too many ignored Y ticks (changes) * feat: allow all position changes to be logged to console * fix: false positive with invalid movement ticks * feat: improve verbose message in the gravity check	2023-10-05 20:52:04 +02:00
Jones	afe9f3f9ea	Implement support for delayed writing of packets (#50 ) * feat: implement support for sending packets buffered/delayed * feat: send EmptyChunkData and UpdateSectionBlocks delayed to potentially improve performance	2023-10-04 22:09:59 +02:00
Jones	ba63e80fd0	Fix client brand decoding not working on 1.7 clients (#49 )	2023-10-04 21:54:42 +02:00
Jones	5ff7e23fcb	Apply hardcoded packet size limits to some packets (#48 )	2023-10-04 21:43:26 +02:00
Jones	cc194b0d62	Fix missing relocations potentially causing classes to clash (#47 ) * fix: exclude snakeyaml from being implemented twice * fix: relocate some packages to avoid classes being loaded twice	2023-10-04 20:48:55 +02:00