From 2f48b07783eebc1b360171853f0f2bd5eedae15d Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 25 Jun 2026 18:04:51 +0200
Subject: [PATCH 01/82] Bumped version to 0.3.2-SNAPSHOT/0.4.3-SNAPSHOT

---
 build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c9f7d67..175c866 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 // Project related options.
-extra["coreVersion"] = "0.4.2-rc"
+extra["coreVersion"] = "0.4.3-SNAPSHOT"
 
 // Dependency related options.
 extra["lampVersion"] = "4.0.0-rc.17"
@@ -9,7 +9,7 @@ extra["bstatsVersion"] = "3.2.1"
 subprojects {
 
     group = "cloud.gteam"
-    version = "0.3.1-rc"
+    version = "0.3.2-SNAPSHOT"
 
     repositories {
         mavenCentral()

From d38486b068acfd29af99d573dfcb0f8e050f4c6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2026 23:14:03 +0000
Subject: [PATCH 02/82] Bump the dev-deps group with 2 updates

Bumps the dev-deps group with 2 updates: [com.gradleup.shadow](https://github.com/GradleUp/shadow) and [gradle-wrapper](https://github.com/gradle/gradle).


Updates `com.gradleup.shadow` from 9.4.2 to 9.4.3
- [Release notes](https://github.com/GradleUp/shadow/releases)
- [Commits](https://github.com/GradleUp/shadow/compare/9.4.2...9.4.3)

Updates `gradle-wrapper` from 9.6.0 to 9.6.1
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](https://github.com/gradle/gradle/compare/v9.6.0...v9.6.1)

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 9.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dev-deps
- dependency-name: gradle-wrapper
  dependency-version: 9.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dev-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 bungeecord/build.gradle.kts              | 2 +-
 core/build.gradle.kts                    | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 paper/build.gradle.kts                   | 2 +-
 spigot/build.gradle.kts                  | 2 +-
 velocity/build.gradle.kts                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index ff1078c..a7bb258 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.2"
+    id("com.gradleup.shadow") version "9.4.3"
 
 }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index b8cf10b..399f497 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.kotlin.dsl.shadowJar
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.2"
+    id("com.gradleup.shadow") version "9.4.3"
 
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b248d97..1e8d71c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
index 9699f1e..3741c65 100644
--- a/paper/build.gradle.kts
+++ b/paper/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.2"
+    id("com.gradleup.shadow") version "9.4.3"
 
 }
 
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index fa1cf90..76ef978 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.2"
+    id("com.gradleup.shadow") version "9.4.3"
 
 }
 
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 685a2de..56c8277 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.2"
+    id("com.gradleup.shadow") version "9.4.3"
 
 }
 

From 494b69088317825c053096d7ec70e355c5273d89 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Mon, 29 Jun 2026 08:04:11 +0200
Subject: [PATCH 03/82] Working on Bungeecord support

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 317620d..53569fc 100644
--- a/README.md
+++ b/README.md
@@ -208,6 +208,14 @@ If you wish to get support, test or have any questions about CoralGate, make sur
     <tr>
       <td><b>BungeeCord</b></td>
       <td align="center">❌</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">❌</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
       <td align="center" colspan="53">❓</td>
     </tr>
     <tr>

From 2ec7c8b7ed3b7c9000fd99343416659af17c392b Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sat, 4 Jul 2026 19:11:35 +0200
Subject: [PATCH 04/82] WIP: client settings/brand check

---
 .../gteam/coralgate/config/ConfigManager.java |   6 +-
 .../gteam/coralgate/config/ConfigModel.java   |  13 +
 .../coralgate/processor/NetworkProcessor.java | 273 +++++++++++++++---
 core/src/main/resources/config.yml            |  19 +-
 4 files changed, 270 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
index 1103921..36cd46f 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
@@ -28,10 +28,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 
 public class ConfigManager {
 
-    private final String latestConfigVersion = "0.2.1";
+    private final String latestConfigVersion = "0.2.2";
 
     private final String configFileName;
     private final File configFile;
@@ -81,7 +82,7 @@ private void mapFields() {
 
         if (this.document == null) return;
 
-        this.config.setConfigVersion(this.document.getString("version", "0.2.1"));
+        this.config.setConfigVersion(this.document.getString("version", this.latestConfigVersion));
 
         this.config.setNormalPrefix(this.document.getString("prefixes.normal", "§b§lCoralGate §7» §r"));
         this.config.setWarningPrefix(this.document.getString("prefixes.warning", "§6§lCoralGate §7» §r"));
@@ -96,6 +97,7 @@ private void mapFields() {
         this.config.setApiTriggerFieldValue(this.document.getString("api-settings.trigger-field-value", "true"));
 
         this.config.setIgnoreLocalAddresses(this.document.getBoolean("filter-settings.ignore-local-addresses", true));
+        this.config.setAllowedClientBrands(this.document.getStringList("filter-settings.allowed-client-brands", Arrays.asList("vanilla", "fabric", "forge", "neoforge", "quilt", "lunarclient", "badlion", "feather", "labymod4", "cheatbreaker", "geyser")));
 
     }
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
index ad36eda..007499e 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
@@ -18,6 +18,9 @@
 
 package cloud.gteam.coralgate.config;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class ConfigModel {
 
     private String version;
@@ -52,6 +55,8 @@ private static class FilterSettings {
 
         private boolean ignoreLocalAddresses = true;
 
+        private List<String> allowedClientBrands = Arrays.asList("vanilla", "fabric", "forge", "neoforge", "quilt", "lunarclient", "badlion", "feather", "labymod4", "cheatbreaker", "Geyser");
+
     }
 
     public void setConfigVersion(final String version) {
@@ -150,4 +155,12 @@ public boolean isIgnoreLocalAddresses() {
         return this.filterSettings.ignoreLocalAddresses;
     }
 
+    public List<String> getAllowedClientBrands() {
+        return this.filterSettings.allowedClientBrands;
+    }
+
+    public void setAllowedClientBrands(final List<String> allowedClientBrands) {
+        this.filterSettings.allowedClientBrands = allowedClientBrands;
+    }
+
 }
diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index 3680aca..c593205 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -23,13 +23,20 @@
 import com.github.retrooper.packetevents.event.PacketListener;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
+import com.github.retrooper.packetevents.event.UserDisconnectEvent;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.wrapper.configuration.client.WrapperConfigClientPluginMessage;
+import com.github.retrooper.packetevents.wrapper.configuration.client.WrapperConfigClientSettings;
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
 import com.github.retrooper.packetevents.wrapper.login.client.WrapperLoginClientLoginStart;
+import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerDisconnect;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPluginMessage;
+import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientSettings;
 import com.github.retrooper.packetevents.wrapper.status.client.WrapperStatusClientPing;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerResponse;
 
@@ -38,6 +45,7 @@
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
 
 public class NetworkProcessor implements PacketListener {
 
@@ -58,21 +66,21 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         // Exempt local IP addresses according to configuration file.
         if (this.corePlugin.getConfigManager().getConfig().isIgnoreLocalAddresses() && !this.corePlugin.isTestMode()) {
 
-            try {
+            final InetAddress inetAddress = inetSocketAddress.getAddress();
 
-                final InetAddress inetAddress = InetAddress.getByName(ipAddress);
-
-                if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) return;
-
-            } catch (final IOException ignored) {}
+            if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress())
+                return;
 
         }
 
         final PacketTypeCommon packetTypeCommon = packetReceiveEvent.getPacketType();
+        final ClientVersion clientVersion = packetReceiveEvent.getUser().getClientVersion();
+
+        System.out.println("C->S | " + packetTypeCommon);
 
         /*
-        * SOURCE PORT FILTERING.
-        */
+         * SOURCE PORT FILTERING.
+         */
 
         /* Check different condition to trigger a MOTD packet check and blockage. */
 
@@ -104,12 +112,17 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
             if (suspiciousPort) {
 
                 // Log this suspicious connection.
-                if (!invalidPort) CorePlugin.getLogger().warning("Suspicious port used by client. Keep an eye out for " + inetSocketAddress + ". [C->S | " + packetTypeCommon.getName() + "]");
-                else CorePlugin.getLogger().severe("Invalid port used by client. Closing connection from " + inetSocketAddress + ". [C->S | " + packetTypeCommon.getName() + "]");
+                if (!invalidPort)
+                    CorePlugin.getLogger().warning("Suspicious port used by client. Keep an eye out for " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "."  + packetTypeCommon.getName() + "]");
+                else
+                    CorePlugin.getLogger().severe("Invalid port used by client. Closing connection from " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "."  + packetTypeCommon.getName() + "]");
 
                 // Report the IP to CoralGate API.
                 this.corePlugin.getApiManager().reportIp(ipAddress);
 
+                // Clean up.
+                this.connectionState.remove(inetSocketAddress);
+
             }
 
             if (processMOTD) {
@@ -174,8 +187,8 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         /* Source port is ok, check IP now. */
 
         /*
-        * API IP CHECK.
-        */
+         * API IP CHECK.
+         */
 
         // Match every login sequence related packet.
         final boolean isLoginSequencePacket = packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE
@@ -200,7 +213,7 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         }
 
         /*
-        * PROTOCOL FILTERING.
+         * PROTOCOL FILTERING.
          */
 
         if (isStatusPacket || isLoginSequencePacket) {
@@ -210,7 +223,7 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
             if (!scannerTest) {
 
                 // If the client's protocol version is invalid.
-                if (packetReceiveEvent.getUser().getClientVersion() == null || packetReceiveEvent.getUser().getClientVersion().getProtocolVersion() == -1) {
+                if (clientVersion == null || clientVersion.getProtocolVersion() == -1) {
 
                     // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
                     logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid protocol version.");
@@ -224,9 +237,12 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
         }
 
+        // We don't need those packets anymore.
+        if (isStatusPacket) return;
+
         /*
-        * PACKET ORDER FILTERING.
-        */
+         * PACKET ORDER FILTERING.
+         */
 
         // Specific 'LOGIN' handshake login, the first packet in a legitimate connection sequence.
         if (packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE) {
@@ -300,11 +316,162 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
         }
 
-        final PacketTypeCommon expectedFinalState = PacketEvents.getAPI().getServerManager().getVersion().isOlderThanOrEquals(ServerVersion.V_1_20_2)
-                ? PacketType.Login.Server.LOGIN_SUCCESS
-                : PacketType.Login.Client.LOGIN_SUCCESS_ACK;
+        // Prior to 1.20.2 CLIENT_SETTINGS are sent via the PLAY state right after LOGIN_SUCCESS.
+        // On 1.20.2+, CLIENT_SETTINGS is sent exclusively via the CONFIGURATION state.
+        // This is exclusively used on < 1.20.2.
+        // Ignore the packet if the connection is already done. This can be triggered in game.
+        if (packetTypeCommon == PacketType.Play.Client.CLIENT_SETTINGS && this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Play.Client.PLUGIN_MESSAGE) {
+
+            final PacketTypeCommon expectedState = clientVersion.isOlderThan(ClientVersion.V_1_20_2)
+                    ? PacketType.Configuration.Client.CONFIGURATION_END_ACK
+                    : PacketType.Login.Server.LOGIN_SUCCESS;
+
+            // Validate state against certain conditions: previous LOGIN_SUCCESS (< 1.20.2), Configuration.PLUGIN_MESSAGE (>= 1.20.2).
+            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, expectedState, packetTypeCommon, "Missing login success procedure before client settings.");
+
+            final WrapperPlayClientSettings wrapperPlayClientSettings = new WrapperPlayClientSettings(packetReceiveEvent);
+
+            // If view distance exceeds minimum or maximum (vanilla).
+            if (wrapperPlayClientSettings.getViewDistance() < 2 || wrapperPlayClientSettings.getViewDistance() > 32)
+                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid view distance.");
+
+            // TODO: maybe go deeper in registries or more checks regarding settings?
+
+            // Block further logic.
+            return;
+
+        }
+
+        // Minecraft versions prior to 1.20.2 exclusively use PLUGIN_MESSAGE in the PLAY state.
+        // Versions from 1.20.2 and above first use PLUGIN_MESSAGE in the CONFIGURATION state to send the brand,
+        // then uses the PLAY state to send "minecraft:register".
+        if (packetTypeCommon == PacketType.Play.Client.PLUGIN_MESSAGE) {
+
+            final WrapperPlayClientPluginMessage wrapperPlayClientPluginMessage = new WrapperPlayClientPluginMessage(packetReceiveEvent);
+            final String channelName = wrapperPlayClientPluginMessage.getChannelName();
+
+            // Calculate expected state since 1.20.2+ also uses the CONFIGURATION state.
+            // On < 1.20.2, PLUGIN_MESSAGE is sent twice in a row, once for "minecraft:brand" and another "minecraft:register".
+            final PacketTypeCommon expectedState = clientVersion.isOlderThan(ClientVersion.V_1_20_2)
+                    ? channelName.equals("minecraft:register")
+                      ? PacketType.Play.Client.PLUGIN_MESSAGE
+                      : PacketType.Play.Client.CLIENT_SETTINGS
+                    : PacketType.Configuration.Client.CONFIGURATION_END_ACK;
+
+            // Validate state against certain conditions: previous Play.CLIENT_SETTINGS/Play.PLUGIN_MESSAGE (< 1.20.2), CONFIGURATION_END_ACK (>= 1.20.2).
+            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, expectedState, packetTypeCommon, "Missing configuration before client brand.");
+
+            // Took from TotemGuard: https://github.com/Bram1903/TotemGuard/blob/main/src/main/java/com/deathmotion/totemguard/checks/impl/misc/ClientBrand.java
+            // All credits to Bram!
+            // Check client brand.
+            if (!channelName.equals("minecraft:brand") && !channelName.equals("MC|BRAND")) return;
+
+            final byte[] data = wrapperPlayClientPluginMessage.getData();
+
+            // Weird ahhhh brand, im not waisting my time on no namer brands.
+            if (data.length > 64 || data.length == 0)
+                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid client brand. (" + data.length + " bytes).");
+
+            final byte[] minusLength = new byte[data.length - 1];
+            System.arraycopy(data, 1, minusLength, 0, minusLength.length);
+            String clientBrand = new String(minusLength).replace(" (Velocity)", ""); // removes velocity's brand suffix
+            clientBrand = !clientBrand.isEmpty() ? Pattern.compile("(?i)" + '§' + "[0-9A-FK-ORX]").matcher(clientBrand).replaceAll("") : clientBrand;
+
+            // Special handling for lunar...
+            if (clientBrand.startsWith("lunarclient:")) clientBrand = "lunarclient";
+
+            if (!this.corePlugin.getConfigManager().getConfig().getAllowedClientBrands().contains(clientBrand))
+                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Unauthorized client brand name (" +  clientBrand + ").");
+
+            // Block further logic.
+            return;
+
+        }
+
+        // Used exclusively on 1.20.2+, the client brand is sent here.
+        if (packetTypeCommon == PacketType.Configuration.Client.PLUGIN_MESSAGE) {
+
+            // Validate state against certain conditions: previous LOGIN_SUCCESS_ACK.
+            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Configuration.Server.CONFIGURATION_END, packetTypeCommon, "Missing configuration end from server.");
+
+            // Took from TotemGuard: https://github.com/Bram1903/TotemGuard/blob/main/src/main/java/com/deathmotion/totemguard/checks/impl/misc/ClientBrand.java
+            // All credits to Bram!
+            // Check client brand.
+            final WrapperConfigClientPluginMessage wrapperConfigClientPluginMessage = new WrapperConfigClientPluginMessage(packetReceiveEvent);
+            final String channelName = wrapperConfigClientPluginMessage.getChannelName();
+
+            if (!channelName.equals("minecraft:brand") && !channelName.equals("MC|BRAND")) return;
+
+            final byte[] data = wrapperConfigClientPluginMessage.getData();
+
+            // Weird ahhhh brand, im not waisting my time on no namer brands.
+            if (data.length > 64 || data.length == 0)
+                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid client brand. (" + data.length + " bytes).");
+
+            final byte[] minusLength = new byte[data.length - 1];
+            System.arraycopy(data, 1, minusLength, 0, minusLength.length);
+            String clientBrand = new String(minusLength).replace(" (Velocity)", ""); // removes velocity's brand suffix
+            clientBrand = !clientBrand.isEmpty() ? Pattern.compile("(?i)" + '§' + "[0-9A-FK-ORX]").matcher(clientBrand).replaceAll("") : clientBrand;
+
+            // Special handling for lunar...
+            if (clientBrand.startsWith("lunarclient:")) clientBrand = "lunarclient";
+
+            if (!this.corePlugin.getConfigManager().getConfig().getAllowedClientBrands().contains(clientBrand))
+                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Unauthorized client brand name (" +  clientBrand + ").");
 
-        if (this.connectionState.getOrDefault(inetSocketAddress, null) != expectedFinalState)
+            // Block further logic.
+            return;
+
+        }
+
+        // Used exclusively on 1.20.2+.
+        if (packetTypeCommon == PacketType.Configuration.Client.CLIENT_SETTINGS) {
+
+            // Validate state against certain conditions: previous Configuration.PLUGIN_MESSAGE.
+            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Configuration.Client.PLUGIN_MESSAGE, packetTypeCommon, "Missing client brand before client settings.");
+
+            final WrapperConfigClientSettings wrapperConfigClientSettings = new WrapperConfigClientSettings(packetReceiveEvent);
+
+            // If view distance exceeds minimum or maximum (vanilla).
+            if (wrapperConfigClientSettings.getViewDistance() < 2 || wrapperConfigClientSettings.getViewDistance() > 32)
+                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid view distance.");
+
+            // TODO: maybe go deeper in registries or more checks regarding settings?
+
+            // Block further logic.
+            return;
+
+        }
+
+        // Once CLIENT_SETTINGS and PLUGIN_MESSAGE are validated by the server.
+        if (packetTypeCommon == PacketType.Configuration.Client.CONFIGURATION_END_ACK) {
+
+            final PacketTypeCommon expectedState = clientVersion.isOlderThan(ClientVersion.V_1_20_2)
+                    ? PacketType.Configuration.Server.CONFIGURATION_END
+                    : PacketType.Configuration.Client.CLIENT_SETTINGS;
+
+            // Validate state against certain conditions: previous Configuration.CLIENT_SETTINGS.
+            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, expectedState, packetTypeCommon, "Missing full client settings and client brand before finishing configuration.");
+
+            // Block further logic.
+            return;
+
+        }
+
+        // Get the proper login packet based off the client version.
+        final PacketTypeCommon currentState = this.connectionState.getOrDefault(inetSocketAddress, null);
+
+        // Directly evaluate if the current state is valid for this version context.
+        final boolean isValidState = clientVersion.isOlderThan(ClientVersion.V_1_20_2) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)
+                ? (currentState == PacketType.Configuration.Client.CONFIGURATION_END_ACK) || (currentState == PacketType.Play.Client.PLUGIN_MESSAGE) || (currentState == PacketType.Play.Client.CLIENT_SETTINGS)
+                : currentState == PacketType.Play.Client.PLUGIN_MESSAGE;
+
+        if (!isValidState)
             logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing full connection procedure.");
 
         /* All checks passed! */
@@ -320,18 +487,16 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         // Exempt local IP addresses according to configuration file.
         if (this.corePlugin.getConfigManager().getConfig().isIgnoreLocalAddresses() && !this.corePlugin.isTestMode()) {
 
-            try {
+            final InetAddress inetAddress = inetSocketAddress.getAddress();
 
-                final InetAddress inetAddress = InetAddress.getByName(ipAddress);
-
-                if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) return;
-
-            } catch (final IOException ignored) {}
+            if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) return;
 
         }
 
         final PacketTypeCommon packetTypeCommon = packetSendEvent.getPacketType();
 
+        System.out.println("S->C | " + packetTypeCommon);
+
         /*
         * PACKET ORDER FILTERING.
         */
@@ -343,7 +508,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         // Client should have passed login start procedure.
         if (packetTypeCommon == PacketType.Login.Server.ENCRYPTION_REQUEST && this.corePlugin.isOnlineMode()) {
 
-            // Validate state against certain conditions: previous LOGIN_START
+            // Validate state against certain conditions: previous LOGIN_START.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
             verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Client.LOGIN_START, packetTypeCommon, "Missing login start procedure.");
 
@@ -359,7 +524,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
                     ? PacketType.Login.Client.ENCRYPTION_RESPONSE
                     : PacketType.Login.Client.LOGIN_START;
 
-            // Validate state against certain conditions: previous ENCRYPTION_RESPONSE (if online mode) else LOGIN_START
+            // Validate state against certain conditions: previous ENCRYPTION_RESPONSE (if online mode) else LOGIN_START.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
             verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, requiredPacketTypeCommon, packetTypeCommon, "Missing encryption response or login start procedure.");
 
@@ -374,7 +539,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
                     ? (this.corePlugin.getCompressionThreshold() >= 0 ? PacketType.Login.Server.SET_COMPRESSION : PacketType.Login.Client.ENCRYPTION_RESPONSE)
                     : (this.corePlugin.getCompressionThreshold() >= 0 ? PacketType.Login.Server.SET_COMPRESSION : PacketType.Login.Client.LOGIN_START);
 
-            // Validate state against certain conditions: previous SET_COMPRESSION (if above 0) else ENCRYPTION_RESPONSE (if online mode) else LOGIN_START
+            // Validate state against certain conditions: previous SET_COMPRESSION (if above 0) else ENCRYPTION_RESPONSE (if online mode) else LOGIN_START.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
             verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, requiredPacketTypeCommon, packetTypeCommon, "Missing set compression procedure.");
 
@@ -383,38 +548,70 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         }
 
+        // Sent after the server is done sending basic server data.
+        // Right before the client starts sending its own client data.
+        if (packetTypeCommon == PacketType.Configuration.Server.CONFIGURATION_END) {
+
+            // Validate state against certain conditions: previous LOGIN_SUCCESS_ACK.
+            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Client.LOGIN_SUCCESS_ACK, packetTypeCommon, "Missing set compression procedure.");
+
+            // Block further logic.
+            return;
+
+        }
+
         // Get the proper login packet based off the client version.
-        final PacketTypeCommon requiredPacketTypeCommon = packetSendEvent.getUser().getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_2)
-                ? PacketType.Login.Client.LOGIN_SUCCESS_ACK
-                : PacketType.Login.Server.LOGIN_SUCCESS;
+        final PacketTypeCommon currentState = this.connectionState.getOrDefault(inetSocketAddress, null);
+
+        // Directly evaluate if the current state is valid for this version context.
+        final boolean isValidState = packetSendEvent.getUser().getClientVersion().isOlderThan(ClientVersion.V_1_20_2) && PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_20_2)
+                ? (currentState == PacketType.Login.Server.LOGIN_SUCCESS || currentState == PacketType.Play.Client.PLUGIN_MESSAGE)
+                : (currentState == PacketType.Login.Client.LOGIN_SUCCESS_ACK || currentState == PacketType.Configuration.Client.CONFIGURATION_END_ACK || currentState == PacketType.Play.Client.PLUGIN_MESSAGE);
 
-        // Connection procedure is not done yet, block outgoing packets.
-        if (this.connectionState.getOrDefault(inetSocketAddress, null) != requiredPacketTypeCommon)
-            packetSendEvent.setCancelled(true);
+       if (!isValidState)
+           logAndClose(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing full connection procedure.");
 
         /* All checks passed! */
 
     }
 
+    @Override
+    public void onUserDisconnect(final UserDisconnectEvent userDisconnectEvent) {
+
+        final User user = userDisconnectEvent.getUser();
+
+        if (user == null || user.getUUID() == null) return;
+
+        // Clean up.
+        this.connectionState.remove(user.getAddress());
+
+    }
+
     private void logAndClose(final PacketReceiveEvent packetReceiveEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final String reason) {
 
-        CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [C->S | " + packetTypeCommon.getName() + "]");
+        CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
         this.corePlugin.getApiManager().reportIp(ipAddress);
 
         packetReceiveEvent.setCancelled(true);
         packetReceiveEvent.getUser().closeConnection();
 
+        // Clean up.
+        this.connectionState.remove(inetSocketAddress);
+
     }
 
     private void logAndClose(final PacketSendEvent packetSendEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final String reason) {
 
-        CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [S->C | " + packetTypeCommon.getName() + "]");
-
+        CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [S->C | " + packetSendEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
         this.corePlugin.getApiManager().reportIp(ipAddress);
 
         packetSendEvent.setCancelled(true);
         packetSendEvent.getUser().closeConnection();
 
+        // Clean up.
+        this.connectionState.remove(inetSocketAddress);
+
     }
 
     private void verifyAndTransitionState(final PacketReceiveEvent packetReceiveEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final PacketTypeCommon requiredState, final PacketTypeCommon targetState, final String reason) {
diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index 3b383ca..25fd448 100644
--- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml
@@ -6,7 +6,7 @@
 # You need to restart your server in order to fully apply changes!
 
 # Config file version. DO NOT CHANGE THIS!
-version: "0.2.1"
+version: "0.2.2"
 
 # Per category message prefixes.
 prefixes:
@@ -87,3 +87,20 @@ filter-settings:
   # Expected value type: Boolean
   # Expected value: true
   ignore-local-addresses: true
+
+  # Client brands which are allowed to connect.
+  # This contains the big majority of widely used clients.
+  # If any is missing, feel free to add it.
+  # If the client brand you want to allow doesn't send a proper name, feel free to disable the client brand check.
+  allowed-client-brands:
+    - vanilla
+    - fabric
+    - forge
+    - neoforge
+    - quilt
+    - lunarclient
+    - badlion
+    - feather
+    - labymod4
+    - cheatbreaker
+    - geyser
\ No newline at end of file

From 60416ed7118c7ca369146184812b40a192f4f288 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jul 2026 23:15:04 +0000
Subject: [PATCH 05/82] Bump com.gradleup.shadow from 9.4.3 to 9.5.1 in the
 dev-deps group

Bumps the dev-deps group with 1 update: [com.gradleup.shadow](https://github.com/GradleUp/shadow).


Updates `com.gradleup.shadow` from 9.4.3 to 9.5.1
- [Release notes](https://github.com/GradleUp/shadow/releases)
- [Commits](https://github.com/GradleUp/shadow/compare/9.4.3...9.5.1)

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 9.5.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 bungeecord/build.gradle.kts | 2 +-
 core/build.gradle.kts       | 2 +-
 paper/build.gradle.kts      | 2 +-
 spigot/build.gradle.kts     | 2 +-
 velocity/build.gradle.kts   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index a7bb258..12b1d36 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.3"
+    id("com.gradleup.shadow") version "9.5.1"
 
 }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 399f497..692d3fb 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.kotlin.dsl.shadowJar
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.3"
+    id("com.gradleup.shadow") version "9.5.1"
 
 }
 
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
index 3741c65..64d0a5d 100644
--- a/paper/build.gradle.kts
+++ b/paper/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.3"
+    id("com.gradleup.shadow") version "9.5.1"
 
 }
 
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 76ef978..24eff79 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.3"
+    id("com.gradleup.shadow") version "9.5.1"
 
 }
 
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 56c8277..4f3eb18 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.3"
+    id("com.gradleup.shadow") version "9.5.1"
 
 }
 

From f9f29b19cb424bd885c3f47b13f108dad0fd3079 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 08:47:38 +0200
Subject: [PATCH 06/82] Made code a bit more readable

---
 core/build.gradle.kts                         |  2 +-
 .../cloud/gteam/coralgate/CorePlugin.java     | 25 ++++++++++++++-----
 .../coralgate/commands/CoralGateCommand.java  |  4 ++-
 .../permissions/PermissionFactory.java        |  4 ++-
 .../gteam/coralgate/config/ConfigManager.java |  6 ++++-
 .../gteam/coralgate/update/UpdateChecker.java | 14 ++++++++---
 .../gteam/coralgate/utils/ConfigUtils.java    |  6 ++++-
 7 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 399f497..3a1ac75 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -39,12 +39,12 @@ dependencies {
     // Dependencies.
     implementation("io.github.revxrsal:lamp.common:$lampVersion")
     implementation("blue.endless:jankson:1.2.3")
-    compileOnly("com.google.code.gson:gson:2.14.0")
     implementation("org.asynchttpclient:async-http-client:2.16.0")
     implementation("org.jetbrains:annotations:26.1.0")
     implementation("dev.dejvokep:boosted-yaml:1.3.7")
 
     compileOnly("com.github.retrooper:packetevents-api:$packetEventsVersion")
+    compileOnly("com.google.code.gson:gson:2.14.0")
 
 }
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java b/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
index 58c0716..850819b 100644
--- a/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
+++ b/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
@@ -60,7 +60,9 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
         // packetevents versions do not match.
         if (!peCoreVersion.equals(peServerVersion)) {
             logger.warning("packetevents version mismatch! You are using version '" + peServerVersion + "' but core module uses '" + peCoreVersion + "'! You may experience issues or bugs. Update CoralGate and packetevents to fix this issue.");
-        } else logger.info("Using packetevents version '" + peCoreVersion + "'...");
+        } else {
+            logger.info("Using packetevents version '" + peCoreVersion + "'...");
+        }
 
         this.testMode = new File(dataFolder, "test.mode").exists();
 
@@ -71,7 +73,9 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
         final String latestConfigVersion = this.configManager.getLatestConfigVersion();
 
         // Compare to internal configuration version to see if it's outdated.
-        if (!Objects.equals(latestConfigVersion, this.configManager.getConfig().getConfigVersion())) logger.warning("Please consider upgrading your configuration file to the latest version: '" + latestConfigVersion + "'.");
+        if (!Objects.equals(latestConfigVersion, this.configManager.getConfig().getConfigVersion())) {
+            logger.warning("Please consider upgrading your configuration file to the latest version: '" + latestConfigVersion + "'.");
+        }
 
         logger.info("Using configuration file version '" + this.configManager.getConfig().getConfigVersion() + "'.");
 
@@ -93,9 +97,13 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
 
                 });
 
-            } else logger.info("API health check skipped.");
+            } else {
+                logger.info("API health check skipped.");
+            }
 
-        } else logger.info("API loading skipped (disabled by config).");
+        } else {
+            logger.info("API loading skipped (disabled by config).");
+        }
 
         this.onlineMode = onlineMode;
 
@@ -125,8 +133,13 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
 
     public void onDisable() {
 
-        if (this.apiManager != null) this.apiManager.shutdown();
-        if (this.updateChecker != null) this.updateChecker.shutdown();
+        if (this.apiManager != null) {
+            this.apiManager.shutdown();
+        }
+
+        if (this.updateChecker != null) {
+            this.updateChecker.shutdown();
+        }
 
     }
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
index c5ec0d5..65d60b0 100644
--- a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
+++ b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
@@ -120,7 +120,9 @@ public void configReload(final CommandActor actor) {
         config = configManager.getConfig();
 
         // Compare current config version and latest version and alert the user if necessary.
-        if (!Objects.equals(latestConfigVersion, config.getConfigVersion())) actor.sendRawMessage(config.getWarningPrefix() + "Please consider upgrading your configuration file to the latest version: '" + latestConfigVersion + "'. Your configuration file is at version '" + config.getConfigVersion() + "'.");
+        if (!Objects.equals(latestConfigVersion, config.getConfigVersion())) {
+            actor.sendRawMessage(config.getWarningPrefix() + "Please consider upgrading your configuration file to the latest version: '" + latestConfigVersion + "'. Your configuration file is at version '" + config.getConfigVersion() + "'.");
+        }
 
         actor.sendRawMessage(config.getNormalPrefix() + "Configuration file reloaded!");
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/commands/permissions/PermissionFactory.java b/core/src/main/java/cloud/gteam/coralgate/commands/permissions/PermissionFactory.java
index 8115b3c..07e9bae 100644
--- a/core/src/main/java/cloud/gteam/coralgate/commands/permissions/PermissionFactory.java
+++ b/core/src/main/java/cloud/gteam/coralgate/commands/permissions/PermissionFactory.java
@@ -38,7 +38,9 @@ public PermissionFactory(final PermissionChecker permissionChecker) {
 
         final cloud.gteam.coralgate.commands.permissions.CommandPermission ann = annotations.get(cloud.gteam.coralgate.commands.permissions.CommandPermission.class);
 
-        if (ann == null) return null;
+        if (ann == null) {
+            return null;
+        }
 
         return (actor) -> permissionChecker.hasPermission(actor, ann.value());
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
index 36cd46f..868923c 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
@@ -52,8 +52,10 @@ public void load() {
             final InputStream defaultStream = getClass().getClassLoader().getResourceAsStream(this.configFileName);
 
             if (defaultStream == null) {
+
                 CorePlugin.getLogger().severe("Could not find default resource file: " + this.configFileName);
                 return;
+
             }
 
             this.config = new ConfigModel();
@@ -109,7 +111,9 @@ public void save() {
                 if (!this.configFile.getParentFile().mkdirs()) CorePlugin.getLogger().severe("Couldn't create data folders. Is the directory read-only? No error to display.");
             }
 
-            if (this.document != null) this.document.save();
+            if (this.document != null) {
+                this.document.save();
+            }
 
         } catch (final IOException e) {
             CorePlugin.getLogger().severe("Couldn't write data to " + this.configFileName + ". Is the directory read-only? See error:" + e.getMessage());
diff --git a/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java b/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
index 5fb3fad..50c61f0 100644
--- a/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
+++ b/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
@@ -54,10 +54,14 @@ public CompletableFuture<Boolean> isUpToDate() {
         final String currentVersion = this.corePlugin.getPlatformProperties().getProperty("platform-version");
 
         // This is a dev/preview build, assume it's "up to date" to not show an out of date console message.
-        if (currentVersion.endsWith("-SNAPSHOT")) return CompletableFuture.completedFuture(true);
+        if (currentVersion.endsWith("-SNAPSHOT")) {
+            return CompletableFuture.completedFuture(true);
+        }
 
         // Use cache.
-        if (this.updateCheckFuture != null) return this.updateCheckFuture;
+        if (this.updateCheckFuture != null) {
+            return this.updateCheckFuture;
+        }
 
         this.updateCheckFuture = this.httpClient.prepareGet("https://api.github.com/repos/GTeamX/CoralGate/releases/latest")
                 .setHeader("User-Agent", "CoralGate-UpdateChecker/" + currentVersion)
@@ -106,7 +110,11 @@ public void shutdown() {
         }
 
         try {
-            if (!this.httpClient.isClosed()) this.httpClient.close();
+
+            if (!this.httpClient.isClosed()) {
+                this.httpClient.close();
+            }
+
         } catch (final IOException e) {
             CorePlugin.getLogger().severe("Error closing UpdateChecker client: " + e.getMessage());
         }
diff --git a/core/src/main/java/cloud/gteam/coralgate/utils/ConfigUtils.java b/core/src/main/java/cloud/gteam/coralgate/utils/ConfigUtils.java
index c2c710e..219dafa 100644
--- a/core/src/main/java/cloud/gteam/coralgate/utils/ConfigUtils.java
+++ b/core/src/main/java/cloud/gteam/coralgate/utils/ConfigUtils.java
@@ -34,7 +34,11 @@ public static boolean isOnlineMode(final String fileName) {
 
             final List<String> lines = Files.readAllLines(Paths.get(fileName));
             for (final String line : lines) {
-                if (line.trim().startsWith("online-mode")) return line.contains("true");
+
+                if (line.trim().startsWith("online-mode")) {
+                    return line.contains("true");
+                }
+
             }
 
         } catch (final IOException e) {

From 670d09f784aab01149d4fe50d821a38ba12db080 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 08:48:08 +0200
Subject: [PATCH 07/82] Switched API to synchronous fetching instead of async

---
 .../cloud/gteam/coralgate/api/APIManager.java | 62 ++++++++++++-------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
index 901bbb0..c135d91 100644
--- a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
@@ -61,21 +61,24 @@ public APIManager(final CorePlugin corePlugin) {
         this.jankson = Jankson.builder().build();
     }
 
-    public CompletableFuture<Boolean> isIpBlocked(final String ipAddress) {
+    public boolean isIpBlocked(final String ipAddress) {
 
         // Get IP from cache before fetching from API.
         final CacheEntry entry = this.ipCache.get(ipAddress);
 
         // Serve cache if available.
         if (entry != null && !entry.isExpired(this.cacheTime)) {
-            return CompletableFuture.completedFuture(entry.isBlocked());
+            return entry.isBlocked();
         }
 
-        // Cache not available, fetch from API.
-        return fetchFromApi(ipAddress).thenApply(result -> {
-            if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) this.ipCache.put(ipAddress, new CacheEntry(result));
-            return result;
-        });
+        // Cache not available, fetch from API synchronously.
+        boolean result = fetchFromApi(ipAddress);
+
+        if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) {
+            this.ipCache.put(ipAddress, new CacheEntry(result));
+        }
+
+        return result;
 
     }
 
@@ -88,22 +91,26 @@ public void reportIp(final String ipAddress) {
         fetchFromApi(ipAddress);
     }
 
-    private CompletableFuture<Boolean> fetchFromApi(final String ipAddress) {
+    private boolean fetchFromApi(final String ipAddress) {
 
-        if (!this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) return CompletableFuture.completedFuture(false);
+        if (!this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) {
+            return false; // Not blocked.
+        }
 
         try {
 
             final InetAddress inetAddress = InetAddress.getByName(ipAddress);
-
-            if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) return CompletableFuture.completedFuture(false);
+            if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) {
+                return false; // Not blocked.
+            }
 
         } catch (final UnknownHostException e) {
 
             CorePlugin.getLogger().severe("Couldn't parse IP address. Is the API properly configured? See error: " + e.getMessage());
             this.healthStatus = false;
 
-            return CompletableFuture.completedFuture(false);
+            // Not blocked.
+            return false;
 
         }
 
@@ -115,14 +122,14 @@ private CompletableFuture<Boolean> fetchFromApi(final String ipAddress) {
                 .exceptionally(e -> {
                     CorePlugin.getLogger().severe("Couldn't reach API. Is it down? See error: " + e.getMessage());
                     this.healthStatus = false;
-                    return false;
+                    return false; // Not blocked.
                 });
 
         // Keep track of requests to cleanly clear them on shutdown.
         this.pendingFutures.add(future);
-        future.whenComplete((res, ex) -> this.pendingFutures.remove(future));
+        future.whenComplete((res, exception) -> this.pendingFutures.remove(future));
 
-        return future;
+        return future.join();
 
     }
 
@@ -139,9 +146,12 @@ private boolean parseBlockedResponse(final Response response) {
             final JsonElement field = json.get(expectedField);
 
             if (field == null) {
+
                 CorePlugin.getLogger().severe("Couldn't find field '" + expectedField + "' in API's JSON response. Did the API change? No error to display.");
                 this.healthStatus = false;
-                return false;
+
+                return false; // Not blocked.
+
             }
 
             // Compare values.
@@ -153,14 +163,14 @@ private boolean parseBlockedResponse(final Response response) {
 
             this.healthStatus = true;
 
-            return Objects.equals(actualValue, expectedValue);
+            return Objects.equals(actualValue, expectedValue); // Blocked.
 
         } catch (final Exception e) {
 
             CorePlugin.getLogger().severe("Couldn't parse '" + expectedField + "' status from API. Did the API change? See error: " + e.getMessage());
             this.healthStatus = false;
 
-            return false;
+            return false; // Not blocked.
 
         }
 
@@ -184,7 +194,9 @@ public CompletableFuture<Boolean> checkHealth() {
                         // Extract the "health" field.
                         final JsonElement healthField = json.get("health");
 
-                        if (healthField == null) return false;
+                        if (healthField == null) {
+                            return false;
+                        }
 
                         // Clean the value and compare to "OK".
                         this.healthStatus = "OK".equalsIgnoreCase(healthField.toJson(false, false).replace("\"", ""));
@@ -211,13 +223,21 @@ public void shutdown() {
 
         // Forcefully cancel any HTTP callbacks still hanging around.
         for (final CompletableFuture<?> forFuture : this.pendingFutures) {
-            if (!forFuture.isDone()) forFuture.cancel(true);
+
+            if (!forFuture.isDone()) {
+                forFuture.cancel(true);
+            }
+
         }
 
         this.pendingFutures.clear();
 
         try {
-            if (!this.httpClient.isClosed()) this.httpClient.close();
+
+            if (!this.httpClient.isClosed()) {
+                this.httpClient.close();
+            }
+
         } catch (final IOException e) {
             CorePlugin.getLogger().severe("Couldn't close AsyncHttpClient. See error: " + e.getMessage());
         }

From 1d40461222a84c5d329bffd98e38c0a8399c7756 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 08:48:15 +0200
Subject: [PATCH 08/82] Remade scanner

---
 scanner/src/Main.java | 678 ++++++++++++++++++++++++++++--------------
 1 file changed, 458 insertions(+), 220 deletions(-)

diff --git a/scanner/src/Main.java b/scanner/src/Main.java
index e246ef4..64d36b1 100644
--- a/scanner/src/Main.java
+++ b/scanner/src/Main.java
@@ -1,287 +1,525 @@
+// Written by Claude Sonnet 5.
+// GTeam does not claim ownership or this code.
+// Yes I was too lazy to write it all...
+
 /*
-*
-* This code was written by Gemini 3.1 Pro and cleaned up by a human.
-* GTeam does not claim ownership of this code.
-*
-* Yeah I was too lazy to write it all...
-*
+ * CoralGateScanner
+ * ------------------------------------------------------------
+ * A raw Minecraft-protocol test client built to exercise every
+ * branch of NetworkProcessor (CoralGate). It does NOT use
+ * packetevents - it speaks the wire protocol directly so it can
+ * freely forge handshakes, bad protocol versions, and control its
+ * own *source* port (which is what NetworkProcessor actually
+ * inspects via InetSocketAddress#getPort()).
+ *
+ * Usage:
+ *   java Main <host> <port> [protocolVersion] [timeoutMs]
+ *
+ * Example:
+ *   java Main 127.0.0.1 25565 776 3000
+ *
+ * Exit code: 0 if every test's actual outcome matched the expected
+ * outcome, 1 if at least one test deviated (i.e. a real security
+ * failure such as leaking real server data when it should not have).
+ *
+ * IMPORTANT: run this only against servers you own/operate. Binding
+ * arbitrary local source ports and forging handshakes is exactly the
+ * kind of traffic pattern that gets IPs auto-reported by your own
+ * CoralGate API manager - expect your own IP to get flagged during
+ * this run, that's the point.
  */
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.BindException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
-public class Main {
-
-    private static final String TARGET_IP = "127.0.0.1";
-    private static final int TARGET_PORT = 25565;
-    private static final int PROTOCOL_VERSION = 776; // 26.2
-
-    private static final String FORGED_MOTD = "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"CraftBukkit 26.2\",\"protocol\":776},\"enforcesSecureChat\":true}";
-
-    private static boolean isExposed = false; // Added to track if the backend leaked.
-
-    private static final String RESET = "\u001B[0m";
-    private static final String RED = "\u001B[31m";
-    private static final String GREEN = "\u001B[32m";
-
-    public static void main(String[] args) {
-
-        final long startTime = System.currentTimeMillis();
-
-        System.out.println("Starting CoralGate filter tester v1.1.1");
-
-        // Broken handshake.
-        System.out.print(" (1) Broken handshake: ");
-        runTest(50000, "STATUS", out -> {
-            sendHandshake(out, 1, PROTOCOL_VERSION);
-            sendStatusRequest(out);
-        });
-
-        // Bot username.
-        System.out.print(" (2) Bot username: ");
-        runTest(50001, "LOGIN", out -> {
-            sendHandshake(out, 2, PROTOCOL_VERSION);
-            sendLoginStart(out, "Player12345");
-        });
-
-        // Suspicious port.
-        System.out.print(" (3) Suspicious port: ");
-        runTest(40000, "STATUS", out -> {
-            sendHandshake(out, 1, PROTOCOL_VERSION);
-            sendStatusRequest(out);
-        });
-
-        // Invalid port.
-        System.out.print(" (4) Invalid port: ");
-        runTest(30000, "STATUS", out -> {
-            sendHandshake(out, 1, PROTOCOL_VERSION);
-            sendStatusRequest(out);
-        });
-
-        // Skip handshake.
-        System.out.print(" (5) Jump packet: ");
-        runTest(65535, "LOGIN", out -> sendLoginStart(out, "CoralGate"));
-
-        // Invalid protocol.
-        System.out.print(" (6) Invalid protocol: ");
-        runTest(50003, "STATUS", out -> {
-            sendHandshake(out, 1, 100);
-            sendStatusRequest(out);
-        });
-
-        System.out.println("Scan finished in " + (System.currentTimeMillis() - startTime) + "ms.");
 
+import java.io.*;
+import java.net.*;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class Main {
+
+    // ----------------------------------------------------------------
+    // ANSI colors
+    // ----------------------------------------------------------------
+    private static final String RESET  = "\u001B[0m";
+    private static final String BOLD   = "\u001B[1m";
+    private static final String DIM    = "\u001B[2m";
+    private static final String RED    = "\u001B[31m";
+    private static final String GREEN  = "\u001B[32m";
+    private static final String YELLOW = "\u001B[33m";
+    private static final String CYAN   = "\u001B[36m";
+
+    // ----------------------------------------------------------------
+    // Config
+    // ----------------------------------------------------------------
+    private static String HOST;
+    private static int PORT;
+    private static int PROTOCOL;          // "legit" protocol version to advertise
+    private static int TIMEOUT_MS = 3000;
+
+    // Local source ports used to simulate each client class.
+    // >=49152           -> normal dynamic port (Windows/Mac range)   -> "legit"
+    // 32768..49151      -> below Windows/Mac range, above Linux one  -> "suspicious"
+    // <32768            -> below Linux dynamic range                -> "invalid"
+    private static final int LEGIT_LOCAL_PORT       = 51000;
+    private static final int SUSPICIOUS_LOCAL_PORT  = 40000;
+    private static final int INVALID_LOCAL_PORT     = 10000;
+
+    // Fingerprint of NetworkProcessor#getForgedMOTD()
+    private static final String FORGED_MARKER_1 = "Paper 26.2";
+    private static final String FORGED_MARKER_2 = "\"protocol\":776";
+    private static final String FORGED_MARKER_3 = "\"enforcesSecureChat\":true";
+
+    private static int passCount = 0;
+    private static int failCount = 0;
+
+    public static void main(String[] args) throws Exception {
+        if (args.length < 2) {
+            System.out.println("Usage: java CoralGateScanner <host> <port> [protocolVersion] [timeoutMs]");
+            System.exit(2);
+        }
+        HOST = args[0];
+        PORT = Integer.parseInt(args[1]);
+        PROTOCOL = args.length >= 3 ? Integer.parseInt(args[2]) : 776;
+        if (args.length >= 4) TIMEOUT_MS = Integer.parseInt(args[3]);
+
+        banner();
+
+        runTest("T1  Legit connection (full status handshake)", Main::testLegitStatus);
+        runTest("T2  Suspicious source port (status request)", Main::testSuspiciousPortStatus);
+        runTest("T3  Invalid source port (status request)", Main::testInvalidPortStatus);
+        runTest("T4  Invalid protocol version (status request)", Main::testInvalidProtocolStatus);
+        runTest("T5  Missing handshake before status request", Main::testMissingHandshakeStatus);
+        runTest("T6  Invalid source port (login intent)", Main::testInvalidPortLogin);
+        runTest("T7  Suspicious port + bot-like username (login)", Main::testSuspiciousPortBotUsername);
+        runTest("T8  Suspicious port + normal username (login)", Main::testSuspiciousPortNormalUsername);
+        runTest("T9  Legacy server list ping (0xFE)", Main::testLegacyPing);
+        runTest("T10 Legit login handshake, bot-like username", Main::testLegitPortBotUsername);
+
+        summary();
+        System.exit(failCount == 0 ? 0 : 1);
     }
 
-    private static void runTest(final int sourcePort, final String expectedState, final PacketSender packetSender) {
+    // ----------------------------------------------------------------
+    // Test cases
+    // ----------------------------------------------------------------
 
-        try (final Socket socket = new Socket()) {
+    /** Fully legitimate client: dynamic port, correct protocol, proper handshake -> should receive REAL info. */
+    private static Outcome testLegitStatus() throws IOException {
+        try (Socket s = connect(LEGIT_LOCAL_PORT)) {
+            sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 1));
+            sendPacket(s, 0x00, new byte[0]); // Status Request
 
-            socket.setReuseAddress(true);
-            socket.bind(new InetSocketAddress(sourcePort));
-            socket.connect(new InetSocketAddress(TARGET_IP, TARGET_PORT), 3000);
+            RawPacket resp = receivePacket(s, TIMEOUT_MS);
+            String json = readString(new ByteArrayInputStream(resp.data));
 
-            final DataOutputStream dataOutputStream = new DataOutputStream(socket.getOutputStream());
-            final DataInputStream dataInputStream = new DataInputStream(socket.getInputStream());
+            long pingPayload = 0x1234ABCDL;
+            sendPacket(s, 0x01, longBytes(pingPayload)); // Ping
+            RawPacket pong = receivePacket(s, TIMEOUT_MS);
+            long pongPayload = readLong(pong.data);
 
-            packetSender.send(dataOutputStream);
-            parseServerResponse(dataInputStream, expectedState);
+            boolean forged = isForgedMotd(json);
+            boolean pingOk = pongPayload == pingPayload;
 
-        } catch (final BindException e) {
-            System.out.println(RED + "(!) Cannot bind to port " + sourcePort + ". Socket still locked by OS allocation." + RESET);
-        } catch (final Exception e) {
-            System.out.println(RED + "(!) Connection error: " + e.getMessage() + RESET);
+            String info = describeMotd(json);
+            if (!forged && pingOk) {
+                return Outcome.pass("Real server data received as expected. " + info);
+            }
+            return Outcome.fail("Legit traffic was treated as suspicious! forgedMotd=" + forged
+                    + " pingEchoOk=" + pingOk + " raw=" + truncate(json));
+        } catch (IOException e) {
+            return Outcome.fail("Legit connection was unexpectedly blocked/closed: " + e);
         }
-
     }
 
-    private static void parseServerResponse(final DataInputStream dataInputStream, final String state) {
-
-        try {
-
-            readVarInt(dataInputStream);
-            final int packetId = readVarInt(dataInputStream);
-
-            if ("STATUS".equals(state)) {
-
-                if (packetId == 0x00) {
-
-                    final String jsonMOTD = readString(dataInputStream);
-
-                    if (jsonMOTD.equals(FORGED_MOTD)) {
-
-                        System.out.println(GREEN + "PASSED! (filter active)" + RESET);
-
-                    } else {
-
-                        System.out.println(RED + "FAILED! (MOTD retrieved: " + jsonMOTD + ")" + RESET);
-                        isExposed = true;
-
-                    }
-
-                } else {
-
-                    System.out.println(RED + "(!) Received unexpected Status packet ID: 0x" + Integer.toHexString(packetId) + RESET);
-                    isExposed = true;
-
-                }
-
-            } else if ("LOGIN".equals(state)) {
-
-                if (packetId == 0x00) {
-
-                    System.out.println(RED + "FAILED! (server reached)" + RESET);
-                    isExposed = true;
-
-                } else if (packetId == 0x01) {
-
-                    System.out.println(RED + "FAILED! (server replied with encryption request)" + RESET);
-                    isExposed = true;
-
-                } else if (packetId == 0x02) {
-
-                    System.out.println(RED + "FAILED! (server replied with login success)" + RESET);
-                    isExposed = true;
-
-                } else {
-
-                    System.out.println(RED + "FAILED! (0x" + Integer.toHexString(packetId) + ")" + RESET);
-                    isExposed = true;
+    /** Suspicious source port during a status request -> filter should return the forged MOTD. */
+    private static Outcome testSuspiciousPortStatus() throws IOException {
+        return expectForgedStatus(SUSPICIOUS_LOCAL_PORT, "Suspicious-port status request");
+    }
 
-                }
+    /** Invalid source port during a status request -> filter should also return the forged MOTD. */
+    private static Outcome testInvalidPortStatus() throws IOException {
+        return expectForgedStatus(INVALID_LOCAL_PORT, "Invalid-port status request");
+    }
 
+    /** Legit port, but garbage/negative protocol version -> filter should return the forged MOTD. */
+    private static Outcome testInvalidProtocolStatus() throws IOException {
+        try (Socket s = connect(LEGIT_LOCAL_PORT)) {
+            sendPacket(s, 0x00, buildHandshake(-1, HOST, PORT, 1));
+            sendPacket(s, 0x00, new byte[0]);
+            RawPacket resp = receivePacket(s, TIMEOUT_MS);
+            String json = readString(new ByteArrayInputStream(resp.data));
+            if (isForgedMotd(json)) {
+                return Outcome.pass("Forged MOTD correctly returned for invalid protocol version.");
             }
+            return Outcome.fail("Real server info leaked despite invalid protocol version! raw=" + truncate(json));
+        } catch (IOException e) {
+            // Some servers may just close on a garbage handshake before status - that's also an
+            // acceptable "no info leaked" outcome.
+            return Outcome.pass("Connection closed/blocked on invalid protocol version before info leaked (" + e + ").");
+        }
+    }
 
-        } catch (final IOException e) {
-
-            // If the server was already exposed by a previous test, an IOException just means the vanilla server crashed the socket.
-            if (isExposed) {
-
-                System.out.println(RED + "FAILED! (protocol crash)" + RESET);
-
-            } else {
-
-                // If it hasn't leaked yet, an abrupt drop indicates active proxy mitigation.
-                System.out.println(GREEN + "PASSED! (zero bytes returned)" + RESET);
+    /** Skip the handshake entirely and jump straight to a status request. */
+    private static Outcome testMissingHandshakeStatus() throws IOException {
+        try (Socket s = connect(LEGIT_LOCAL_PORT)) {
+            sendPacket(s, 0x00, new byte[0]); // Status Request with no prior HANDSHAKE
+            RawPacket resp = receivePacket(s, TIMEOUT_MS);
+            String json = readString(new ByteArrayInputStream(resp.data));
+            if (isForgedMotd(json)) {
+                return Outcome.pass("Forged MOTD correctly returned for missing handshake.");
             }
-
+            return Outcome.fail("Real server info leaked with no prior handshake! raw=" + truncate(json));
+        } catch (IOException e) {
+            return Outcome.pass("Connection closed/blocked with no prior handshake before info leaked (" + e + ").");
         }
-
     }
 
-    interface PacketSender {
-        void send(final DataOutputStream dataOutputStream) throws IOException;
+    /** Invalid port + LOGIN intent -> handshake itself should trigger an immediate disconnect. */
+    private static Outcome testInvalidPortLogin() throws IOException {
+        try (Socket s = connect(INVALID_LOCAL_PORT)) {
+            sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 2)); // LOGIN intent
+            RawPacket resp = tryReceive(s, TIMEOUT_MS);
+            if (resp == null) {
+                return Outcome.pass("Connection closed immediately after handshake, as expected.");
+            }
+            return Outcome.fail("Connection stayed open after invalid-port LOGIN handshake! got packet id="
+                    + resp.id + " data=" + truncate(bytesToHex(resp.data)));
+        } catch (IOException e) {
+            return Outcome.pass("Connection closed/reset immediately, as expected (" + e + ").");
+        }
     }
 
-    private static void sendHandshake(final DataOutputStream dataOutputStream, final int nextState, final int protocolVersion) throws IOException {
-
-        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        final DataOutputStream handshakeOutputStream = new DataOutputStream(byteArrayOutputStream);
-
-        handshakeOutputStream.writeByte(0x00);
-
-        writeVarInt(handshakeOutputStream, protocolVersion);
-        writeString(handshakeOutputStream, Main.TARGET_IP);
-
-        handshakeOutputStream.writeShort(Main.TARGET_PORT);
-
-        writeVarInt(handshakeOutputStream, nextState);
-        writePacket(dataOutputStream, byteArrayOutputStream.toByteArray());
-
+    /** Suspicious port (warn-only) + a bot-like username ("Player...") -> should be kicked at LOGIN_START. */
+    private static Outcome testSuspiciousPortBotUsername() throws IOException {
+        try (Socket s = connect(SUSPICIOUS_LOCAL_PORT)) {
+            sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 2));
+            sendPacket(s, 0x00, buildLoginStart("Player" + System.currentTimeMillis() % 1000));
+            RawPacket resp = tryReceive(s, TIMEOUT_MS);
+            if (resp == null) {
+                return Outcome.pass("Connection closed after bot-like username, as expected.");
+            }
+            // A disconnect packet before login success also counts as correctly caught.
+            return Outcome.fail("Bot-like username was not rejected! got packet id=" + resp.id
+                    + " data=" + truncate(bytesToHex(resp.data)));
+        } catch (IOException e) {
+            return Outcome.pass("Connection closed/reset after bot-like username, as expected (" + e + ").");
+        }
     }
 
-    private static void sendStatusRequest(final DataOutputStream dataOutputStream) throws IOException {
-
-        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        final DataOutputStream requestOutputStream = new DataOutputStream(byteArrayOutputStream);
-
-        requestOutputStream.writeByte(0x00);
-        writePacket(dataOutputStream, byteArrayOutputStream.toByteArray());
-
+    /** Suspicious port + a normal-looking username -> port alone should only warn, not close. */
+    private static Outcome testSuspiciousPortNormalUsername() throws IOException {
+        try (Socket s = connect(SUSPICIOUS_LOCAL_PORT)) {
+            sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 2));
+            sendPacket(s, 0x00, buildLoginStart("ScannerUser"));
+            RawPacket resp = tryReceive(s, TIMEOUT_MS);
+            if (resp != null) {
+                return Outcome.pass("Login sequence continued past the suspicious-port check (got packet id="
+                        + resp.id + "). Note: any later disconnect is your own server logic (online-mode/"
+                        + "whitelist/etc.), not necessarily CoralGate.");
+            }
+            return Outcome.fail("Connection was closed immediately on a normal username - suspicious port "
+                    + "alone should only log a warning, not close the connection during LOGIN.");
+        } catch (IOException e) {
+            return Outcome.fail("Connection closed/reset on a normal username at a suspicious (not invalid) "
+                    + "port - suspicious port should only warn during LOGIN, not disconnect (" + e + ").");
+        }
     }
 
-    private static void sendLoginStart(final DataOutputStream dataOutputStream, final String username) throws IOException {
-
-        final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        final DataOutputStream loginStartOutputStream = new DataOutputStream(byteArrayOutputStream);
-
-        loginStartOutputStream.writeByte(0x00);
+    /** Legit port + LOGIN intent + bot-like username -> should still be kicked (username check is independent of port). */
+    private static Outcome testLegitPortBotUsername() throws IOException {
+        try (Socket s = connect(LEGIT_LOCAL_PORT + 1)) {
+            sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 2));
+            sendPacket(s, 0x00, buildLoginStart("Player_Bot"));
+            RawPacket resp = tryReceive(s, TIMEOUT_MS);
+            if (resp == null) {
+                return Outcome.pass("Connection closed after bot-like username on a legit port, as expected.");
+            }
+            return Outcome.fail("Bot-like username was NOT rejected even on a legit port! got packet id="
+                    + resp.id + " data=" + truncate(bytesToHex(resp.data)));
+        } catch (IOException e) {
+            return Outcome.pass("Connection closed/reset after bot-like username, as expected (" + e + ").");
+        }
+    }
 
-        writeString(loginStartOutputStream, username);
+    /** Old-style (pre-Netty) 0xFE server list ping, sent with no modern handshake. */
+    private static Outcome testLegacyPing() throws IOException {
+        try (Socket s = connect(LEGIT_LOCAL_PORT + 2)) {
+            OutputStream out = s.getOutputStream();
+            out.write(0xFE);
+            out.write(0x01);
+            out.flush();
+
+            s.setSoTimeout(TIMEOUT_MS);
+            int first;
+            try {
+                first = s.getInputStream().read();
+            } catch (SocketTimeoutException e) {
+                return Outcome.info("No response to legacy ping within " + TIMEOUT_MS
+                        + "ms (server may silently drop legacy pings - verify manually).");
+            }
+            if (first == -1) {
+                return Outcome.pass("Connection closed on legacy ping with no prior handshake, as expected.");
+            }
+            if (first == 0xFF) {
+                // Legacy disconnect/kick packet: short length (UTF-16BE chars) + UTF-16BE string
+                DataInputStream dis = new DataInputStream(s.getInputStream());
+                int len = dis.readUnsignedShort();
+                byte[] strBytes = new byte[len * 2];
+                dis.readFully(strBytes);
+                String message = new String(strBytes, StandardCharsets.UTF_16BE);
+                boolean forged = isForgedMotd(message);
+                return forged
+                        ? Outcome.pass("Legacy ping answered with forged data, as expected.")
+                        : Outcome.info("Legacy ping answered with a 0xFF packet - manually verify it doesn't "
+                                       + "leak real info: " + truncate(message));
+            }
+            return Outcome.info("Legacy ping got an unexpected first byte (0x"
+                    + Integer.toHexString(first) + ") - likely a modern packet sent in reply to a legacy "
+                    + "ping (protocol mismatch on the plugin side); verify manually.");
+        } catch (IOException e) {
+            return Outcome.pass("Connection closed/reset on legacy ping, as expected (" + e + ").");
+        }
+    }
 
-        loginStartOutputStream.writeLong(0L);
-        loginStartOutputStream.writeLong(1L);
+    // ----------------------------------------------------------------
+    // Shared helpers
+    // ----------------------------------------------------------------
+
+    private static Outcome expectForgedStatus(int localPort, String label) throws IOException {
+        try (Socket s = connect(localPort)) {
+            sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 1));
+            sendPacket(s, 0x00, new byte[0]);
+            RawPacket resp = receivePacket(s, TIMEOUT_MS);
+            String json = readString(new ByteArrayInputStream(resp.data));
+            if (isForgedMotd(json)) {
+                return Outcome.pass("Forged MOTD correctly returned. (" + label + ")");
+            }
+            return Outcome.fail("Real server info leaked! raw=" + truncate(json));
+        } catch (IOException e) {
+            // Filter closing the connection outright instead of forging is still "no leak" - acceptable.
+            return Outcome.pass("Connection closed/blocked before any info leaked (" + e + ").");
+        }
+    }
 
-        writePacket(dataOutputStream, byteArrayOutputStream.toByteArray());
+    private static Socket connect(int localPort) throws IOException {
+        Socket socket = new Socket();
+        socket.setReuseAddress(true);
+        socket.bind(new InetSocketAddress(localPort));
+        socket.connect(new InetSocketAddress(HOST, PORT), TIMEOUT_MS);
+        return socket;
+    }
 
+    private static boolean isForgedMotd(String text) {
+        return text != null
+                && text.contains(FORGED_MARKER_1)
+                && text.contains(FORGED_MARKER_2)
+                && text.contains(FORGED_MARKER_3);
     }
 
-    private static void writePacket(final DataOutputStream dataOutputStream, final byte[] data) throws IOException {
+    private static String describeMotd(String json) {
+        String version = extract(json, "\"version\"\\s*:\\s*\\{[^}]*\"name\"\\s*:\\s*\"([^\"]*)\"");
+        String protocol = extract(json, "\"version\"\\s*:\\s*\\{[^}]*\"protocol\"\\s*:\\s*(-?\\d+)");
+        String online = extract(json, "\"players\"\\s*:\\s*\\{[^}]*\"online\"\\s*:\\s*(\\d+)");
+        String max = extract(json, "\"players\"\\s*:\\s*\\{[^}]*\"max\"\\s*:\\s*(\\d+)");
+        return "version=" + version + " protocol=" + protocol + " players=" + online + "/" + max;
+    }
 
-        writeVarInt(dataOutputStream, data.length);
+    private static String extract(String text, String regex) {
+        Matcher m = Pattern.compile(regex).matcher(text);
+        return m.find() ? m.group(1) : "?";
+    }
 
-        dataOutputStream.write(data);
-        dataOutputStream.flush();
+    private static String truncate(String s) {
+        if (s == null) return "null";
+        return s.length() > 160 ? s.substring(0, 160) + "..." : s;
+    }
 
+    private static String bytesToHex(byte[] data) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : data) sb.append(String.format("%02x ", b));
+        return sb.toString().trim();
     }
 
-    private static void writeVarInt(final DataOutputStream dataOutputStream, int value) throws IOException {
+    // -- Minecraft protocol wire helpers --------------------------------
 
+    private static void writeVarInt(OutputStream out, int value) throws IOException {
         while (true) {
-
             if ((value & ~0x7F) == 0) {
-
-                dataOutputStream.writeByte(value);
+                out.write(value);
                 return;
-
             }
-
-            dataOutputStream.writeByte((value & 0x7F) | 0x80);
+            out.write((value & 0x7F) | 0x80);
             value >>>= 7;
-
         }
-
     }
 
-    private static int readVarInt(final DataInputStream dataInputStream) throws IOException {
+    private static int readVarInt(InputStream in) throws IOException {
+        int value = 0, position = 0, b;
+        while (true) {
+            b = in.read();
+            if (b == -1) throw new EOFException("Stream closed while reading VarInt");
+            value |= (b & 0x7F) << position;
+            if ((b & 0x80) == 0) break;
+            position += 7;
+            if (position >= 32) throw new IOException("VarInt too big");
+        }
+        return value;
+    }
 
-        int numRead = 0, result = 0;
-        byte read;
-        do {
+    private static void writeString(OutputStream out, String s) throws IOException {
+        byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
+        writeVarInt(out, bytes.length);
+        out.write(bytes);
+    }
 
-            read = dataInputStream.readByte();
-            result |= ((read & 0b01111111) << (7 * numRead));
+    private static String readString(InputStream in) throws IOException {
+        int len = readVarInt(in);
+        byte[] bytes = new byte[len];
+        int read = 0;
+        while (read < len) {
+            int r = in.read(bytes, read, len - read);
+            if (r == -1) throw new EOFException("Stream closed while reading String");
+            read += r;
+        }
+        return new String(bytes, StandardCharsets.UTF_8);
+    }
 
-            if (numRead++ > 5) throw new RuntimeException("VarInt too big");
+    private static byte[] longBytes(long value) {
+        byte[] b = new byte[8];
+        for (int i = 7; i >= 0; i--) {
+            b[i] = (byte) (value & 0xFF);
+            value >>>= 8;
+        }
+        return b;
+    }
 
-        } while ((read & 0b10000000) != 0);
+    private static long readLong(byte[] data) {
+        long v = 0;
+        for (int i = 0; i < 8; i++) v = (v << 8) | (data[i] & 0xFF);
+        return v;
+    }
 
-        return result;
+    private static byte[] buildHandshake(int protocol, String host, int port, int nextState) throws IOException {
+        ByteArrayOutputStream b = new ByteArrayOutputStream();
+        writeVarInt(b, protocol);
+        writeString(b, host);
+        b.write((port >> 8) & 0xFF);
+        b.write(port & 0xFF);
+        writeVarInt(b, nextState);
+        return b.toByteArray();
+    }
 
+    private static byte[] buildLoginStart(String username) throws IOException {
+        ByteArrayOutputStream b = new ByteArrayOutputStream();
+        writeString(b, username);
+        // Zero UUID - covers modern protocol versions that expect a mandatory player UUID field.
+        // Harmless for older versions since NetworkProcessor only reads the username itself.
+        b.write(new byte[16]);
+        return b.toByteArray();
     }
 
-    private static void writeString(final DataOutputStream dataOutputStream, final String value) throws IOException {
+    private static void sendPacket(Socket socket, int packetId, byte[] data) throws IOException {
+        ByteArrayOutputStream payload = new ByteArrayOutputStream();
+        writeVarInt(payload, packetId);
+        payload.write(data);
+        ByteArrayOutputStream full = new ByteArrayOutputStream();
+        writeVarInt(full, payload.size());
+        full.write(payload.toByteArray());
+        OutputStream out = socket.getOutputStream();
+        out.write(full.toByteArray());
+        out.flush();
+    }
 
-        final byte[] bytes = value.getBytes(java.nio.charset.StandardCharsets.UTF_8);
+    private record RawPacket(int id, byte[] data) {}
+
+    private static RawPacket receivePacket(Socket socket, int timeoutMs) throws IOException {
+        socket.setSoTimeout(timeoutMs);
+        InputStream in = socket.getInputStream();
+        int length = readVarInt(in);
+        byte[] full = new byte[length];
+        int read = 0;
+        while (read < length) {
+            int r = in.read(full, read, length - read);
+            if (r == -1) throw new EOFException("Connection closed mid-packet");
+            read += r;
+        }
+        ByteArrayInputStream bais = new ByteArrayInputStream(full);
+        int id = readVarInt(bais);
+        byte[] data = bais.readAllBytes();
+        return new RawPacket(id, data);
+    }
 
-        writeVarInt(dataOutputStream, bytes.length);
+    /** Like receivePacket but returns null instead of throwing on timeout/EOF (i.e. "connection did not respond"). */
+    private static RawPacket tryReceive(Socket socket, int timeoutMs) throws IOException {
+        try {
+            return receivePacket(socket, timeoutMs);
+        } catch (SocketTimeoutException | EOFException e) {
+            return null;
+        }
+    }
 
-        dataOutputStream.write(bytes);
+    // ----------------------------------------------------------------
+    // Test harness plumbing
+    // ----------------------------------------------------------------
 
+    private interface TestCase {
+        Outcome run() throws IOException;
     }
 
-    private static String readString(final DataInputStream dataInputStream) throws IOException {
+    private record Outcome(Status status, String detail) {
+        static Outcome pass(String detail) { return new Outcome(Status.PASS, detail); }
+        static Outcome fail(String detail) { return new Outcome(Status.FAIL, detail); }
+        static Outcome info(String detail) { return new Outcome(Status.INFO, detail); }
+    }
 
-        final byte[] bytes = new byte[readVarInt(dataInputStream)];
+    private enum Status { PASS, FAIL, INFO }
 
-        dataInputStream.readFully(bytes);
+    private static void runTest(String name, TestCase test) {
+        System.out.print(BOLD + name + RESET + " ".repeat(Math.max(1, 52 - name.length())));
+        Outcome outcome;
+        try {
+            outcome = test.run();
+        } catch (Exception e) {
+            outcome = Outcome.fail("Unhandled scanner exception: " + e);
+        }
+        switch (outcome.status()) {
+            case PASS -> {
+                System.out.println(GREEN + "[ PASS ]" + RESET);
+                passCount++;
+            }
+            case FAIL -> {
+                System.out.println(RED + "[ FAIL ]" + RESET);
+                failCount++;
+            }
+            case INFO -> System.out.println(YELLOW + "[ INFO ]" + RESET);
+        }
+        System.out.println(DIM + "        " + outcome.detail() + RESET);
+        sleep(250); // let connectionState cleanup settle between tests
+    }
 
-        return new String(bytes, java.nio.charset.StandardCharsets.UTF_8);
+    private static void sleep(long ms) {
+        try { Thread.sleep(ms); } catch (InterruptedException ignored) { Thread.currentThread().interrupt(); }
+    }
 
+    private static void banner() {
+        System.out.println(CYAN + BOLD + "CoralGate NetworkProcessor Scanner" + RESET);
+        System.out.println(CYAN + "Target: " + HOST + ":" + PORT + "  protocol=" + PROTOCOL
+                + "  timeout=" + TIMEOUT_MS + "ms" + RESET);
+        System.out.println(DIM + "Local test ports -> legit>=49152: " + LEGIT_LOCAL_PORT
+                + "  suspicious(32768-49151): " + SUSPICIOUS_LOCAL_PORT
+                + "  invalid(<32768): " + INVALID_LOCAL_PORT + RESET);
+        System.out.println();
     }
 
-}
+    private static void summary() {
+        System.out.println();
+        System.out.println(BOLD + "Summary: " + RESET
+                + GREEN + passCount + " passed" + RESET + ", "
+                + (failCount > 0 ? RED : DIM) + failCount + " failed" + RESET);
+        if (failCount > 0) {
+            System.out.println(RED + "One or more checks behaved unexpectedly - review the [ FAIL ] lines above." + RESET);
+        } else {
+            System.out.println(GREEN + "All checks behaved as expected." + RESET);
+        }
+    }
+}
\ No newline at end of file

From 0882e811044e865d5eb6b8e7d76d9fe35216aae1 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 08:49:18 +0200
Subject: [PATCH 09/82] Added platform type property

---
 bungeecord/src/main/resources/platform.properties | 1 +
 paper/src/main/resources/platform.properties      | 1 +
 spigot/src/main/resources/platform.properties     | 1 +
 velocity/src/main/resources/platform.properties   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/bungeecord/src/main/resources/platform.properties b/bungeecord/src/main/resources/platform.properties
index 91d4b12..69b49b7 100644
--- a/bungeecord/src/main/resources/platform.properties
+++ b/bungeecord/src/main/resources/platform.properties
@@ -1,4 +1,5 @@
 platform-name=${name}
+platform-type=proxy
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file
diff --git a/paper/src/main/resources/platform.properties b/paper/src/main/resources/platform.properties
index 91d4b12..d255182 100644
--- a/paper/src/main/resources/platform.properties
+++ b/paper/src/main/resources/platform.properties
@@ -1,4 +1,5 @@
 platform-name=${name}
+platform-type=backend
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file
diff --git a/spigot/src/main/resources/platform.properties b/spigot/src/main/resources/platform.properties
index 91d4b12..d255182 100644
--- a/spigot/src/main/resources/platform.properties
+++ b/spigot/src/main/resources/platform.properties
@@ -1,4 +1,5 @@
 platform-name=${name}
+platform-type=backend
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file
diff --git a/velocity/src/main/resources/platform.properties b/velocity/src/main/resources/platform.properties
index 91d4b12..69b49b7 100644
--- a/velocity/src/main/resources/platform.properties
+++ b/velocity/src/main/resources/platform.properties
@@ -1,4 +1,5 @@
 platform-name=${name}
+platform-type=proxy
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file

From 7ecdd4a9eda722e88173f1262040915d4af21604 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 08:49:48 +0200
Subject: [PATCH 10/82] Added run parameters for scanner

---
 .run/Scanner.run.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.run/Scanner.run.xml b/.run/Scanner.run.xml
index ba9eecb..b6ae699 100644
--- a/.run/Scanner.run.xml
+++ b/.run/Scanner.run.xml
@@ -4,6 +4,7 @@
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="Main" />
     <module name="scanner" />
+    <option name="PROGRAM_PARAMETERS" value="127.0.0.1 25565" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/scanner" />
     <method v="2">
       <option name="Make" enabled="true" />

From 00bc0a32326782e2d029eaa2a305af13b85bd212 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 08:50:50 +0200
Subject: [PATCH 11/82] WIP: validation for bungeecord support

---
 README.md | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 53569fc..c1e4030 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ If you wish to get support, test or have any questions about CoralGate, make sur
       <td align="center">❌</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
-      <td align="center">❌</td>
+      <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
@@ -190,7 +190,7 @@ If you wish to get support, test or have any questions about CoralGate, make sur
       <td align="center">❌</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
-      <td align="center">❌</td>
+      <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
@@ -216,7 +216,51 @@ If you wish to get support, test or have any questions about CoralGate, make sur
       <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
-      <td align="center" colspan="53">❓</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">❌</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">❌</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">✅</td>
+      <td align="center">❓</td>
     </tr>
     <tr>
       <td><b>Velocity</b></td>
@@ -251,7 +295,6 @@ If you wish to get support, test or have any questions about CoralGate, make sur
 - 1.9.1 jar cannot be downloaded or built.
 - 1.16 jar cannot be downloaded or built.
 - 1.19.3 throws java.lang.RuntimeException: The received byte array length is longer than maximum allowed (8742 > 512) for LOGIN_START wrapper.
-- 1.20.2 client sends PLUGIN_MESSAGE and CLIENT_SETTINGS after HANDSHAKE
 
 **Paper**:
 - Only 1.8.8 build exists.
@@ -261,7 +304,10 @@ If you wish to get support, test or have any questions about CoralGate, make sur
 - Only 1.16.x build exists.
 - Only 1.18.x build exists.
 - 1.19.3 throws java.lang.RuntimeException: The received byte array length is longer than maximum allowed (8742 > 512) for LOGIN_START wrapper.
-- 1.20.2 client sends PLUGIN_MESSAGE and CLIENT_SETTINGS after HANDSHAKE
+
+**BungeeCord**:
+- 1.9.1 jar cannot be downloaded or built.
+- 1.16 jar cannot be downloaded or built.
 </details>
 
 *Legend:*

From 714b7958a67b06c34d68ac04e0267dcd71e00364 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:05:16 +0200
Subject: [PATCH 12/82] Fixed modern paper support to proper api version

---
 paper/src/main/resources/paper-plugin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml
index 3da7d68..4bce9e4 100644
--- a/paper/src/main/resources/paper-plugin.yml
+++ b/paper/src/main/resources/paper-plugin.yml
@@ -1,7 +1,7 @@
 name: CoralGate
 version: "${version}"
 main: cloud.gteam.coralgate.PaperPlugin
-api-version: 1.21
+api-version: '1.19'
 prefix: CoralGate
 load: STARTUP
 authors: [ XIII___, Vagdedes2 ]

From a2c6b2bac4648f0bc04c2df12816d14ed287769b Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:05:34 +0200
Subject: [PATCH 13/82] Including project version to modern paper

---
 paper/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
index 64d0a5d..f67b71e 100644
--- a/paper/build.gradle.kts
+++ b/paper/build.gradle.kts
@@ -58,8 +58,8 @@ tasks.processResources {
     val packetEventsVersion: String by rootProject.extra
     val coreVersion: String by rootProject.extra
 
-    // Replace plugin.yml
-    filesMatching("plugin.yml") {
+    // Replaces placeholders in BOTH yml files.
+    filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
         expand("version" to project.version)
     }
 

From 4f254b2b871c9f6a0c923198ad4ffee977ebffe8 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:38:06 +0200
Subject: [PATCH 14/82] Added version checking for spoofed disconnect message

---
 scanner/src/Main.java | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/scanner/src/Main.java b/scanner/src/Main.java
index 64d36b1..8cdb604 100644
--- a/scanner/src/Main.java
+++ b/scanner/src/Main.java
@@ -195,14 +195,23 @@ private static Outcome testSuspiciousPortBotUsername() throws IOException {
             sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 2));
             sendPacket(s, 0x00, buildLoginStart("Player" + System.currentTimeMillis() % 1000));
             RawPacket resp = tryReceive(s, TIMEOUT_MS);
+
             if (resp == null) {
-                return Outcome.pass("Connection closed after bot-like username, as expected.");
+                return Outcome.fail("Connection closed abruptly with no data, expected a forged disconnect reason packet.");
+            }
+
+            if (resp.id == 0x00) { // Disconnect Packet ID
+                String message = readString(new ByteArrayInputStream(resp.data));
+                if (message.contains("26.2")) {
+                    return Outcome.pass("Bot rejected with expected forged string. Decoded text: \"" + message + "\"");
+                }
+                return Outcome.fail("Bot disconnected, but reason did not match forged version '26.2'! Got: \"" + message + "\"");
             }
-            // A disconnect packet before login success also counts as correctly caught.
+
             return Outcome.fail("Bot-like username was not rejected! got packet id=" + resp.id
                     + " data=" + truncate(bytesToHex(resp.data)));
         } catch (IOException e) {
-            return Outcome.pass("Connection closed/reset after bot-like username, as expected (" + e + ").");
+            return Outcome.fail("Connection threw unexpected exception instead of offering packet validation: " + e);
         }
     }
 
@@ -231,13 +240,23 @@ private static Outcome testLegitPortBotUsername() throws IOException {
             sendPacket(s, 0x00, buildHandshake(PROTOCOL, HOST, PORT, 2));
             sendPacket(s, 0x00, buildLoginStart("Player_Bot"));
             RawPacket resp = tryReceive(s, TIMEOUT_MS);
+
             if (resp == null) {
-                return Outcome.pass("Connection closed after bot-like username on a legit port, as expected.");
+                return Outcome.fail("Connection closed abruptly with no data, expected a forged disconnect reason packet.");
+            }
+
+            if (resp.id == 0x00) { // Disconnect Packet ID
+                String message = readString(new ByteArrayInputStream(resp.data));
+                if (message.contains("26.2")) {
+                    return Outcome.pass("Bot rejected with expected forged string on legit port. Decoded text: \"" + message + "\"");
+                }
+                return Outcome.fail("Bot disconnected, but reason did not match forged version '26.2'! Got: \"" + message + "\"");
             }
+
             return Outcome.fail("Bot-like username was NOT rejected even on a legit port! got packet id="
                     + resp.id + " data=" + truncate(bytesToHex(resp.data)));
         } catch (IOException e) {
-            return Outcome.pass("Connection closed/reset after bot-like username, as expected (" + e + ").");
+            return Outcome.fail("Connection threw unexpected exception instead of offering packet validation: " + e);
         }
     }
 

From 1b56862169000c96ef234821d98917c7d6455416 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:38:46 +0200
Subject: [PATCH 15/82] Updated modern paper support for 1.19.3 - 1.20.5

---
 README.md | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c1e4030..e79a80a 100644
--- a/README.md
+++ b/README.md
@@ -188,11 +188,11 @@ If you wish to get support, test or have any questions about CoralGate, make sur
       <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
+      <td align="center">⚠️</td>
+      <td align="center">⚠️</td>
+      <td align="center">⚠️</td>
+      <td align="center">⚠️</td>
+      <td align="center">⚠️</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
       <td align="center">✅</td>
@@ -304,6 +304,12 @@ If you wish to get support, test or have any questions about CoralGate, make sur
 - Only 1.16.x build exists.
 - Only 1.18.x build exists.
 - 1.19.3 throws java.lang.RuntimeException: The received byte array length is longer than maximum allowed (8742 > 512) for LOGIN_START wrapper.
+- 1.19.4 use Spigot version.
+- 1.20 use Spigot version.
+- 1.20.1 use Spigot version.
+- 1.20.2 use Spigot version.
+- 1.20.4 use Spigot version.
+- 1.20.5 use Spigot version.
 
 **BungeeCord**:
 - 1.9.1 jar cannot be downloaded or built.

From b2bba1ff9fa1c37148d2063af700d97350913494 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:39:00 +0200
Subject: [PATCH 16/82] Added kyori adventure api for DISCONNECT packet

---
 core/build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 850dc14..611659f 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -45,6 +45,7 @@ dependencies {
 
     compileOnly("com.github.retrooper:packetevents-api:$packetEventsVersion")
     compileOnly("com.google.code.gson:gson:2.14.0")
+    compileOnly("net.kyori:adventure-api:4.26.1")
 
 }
 

From 9773db9ace7faa09dde8776188b5fed350bbf003 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 8 Jul 2026 10:45:34 +0200
Subject: [PATCH 17/82] Remade the filter with better easier to understand
 logic Fixed some flaws Fixed "Outdated server!" version leak Fixing
 LEGACY_SERVER_LIST_PING later

---
 .../coralgate/processor/NetworkProcessor.java | 642 ++++++++----------
 1 file changed, 296 insertions(+), 346 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index c593205..9e81358 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -30,22 +30,19 @@
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
-import com.github.retrooper.packetevents.wrapper.configuration.client.WrapperConfigClientPluginMessage;
-import com.github.retrooper.packetevents.wrapper.configuration.client.WrapperConfigClientSettings;
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
 import com.github.retrooper.packetevents.wrapper.login.client.WrapperLoginClientLoginStart;
 import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerDisconnect;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientPluginMessage;
-import com.github.retrooper.packetevents.wrapper.play.client.WrapperPlayClientSettings;
 import com.github.retrooper.packetevents.wrapper.status.client.WrapperStatusClientPing;
+import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerPong;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerResponse;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Pattern;
 
 public class NetworkProcessor implements PacketListener {
 
@@ -57,201 +54,157 @@ public NetworkProcessor(final CorePlugin corePlugin) {
         this.corePlugin = corePlugin;
     }
 
-    // Incoming packets (Client -> Server) [C->S]
+    // Incoming packets (Client -> Server) [C->S].
     public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
         final InetSocketAddress inetSocketAddress = packetReceiveEvent.getSocketAddress();
-        final String ipAddress = inetSocketAddress.getHostString();
 
         // Exempt local IP addresses according to configuration file.
-        if (this.corePlugin.getConfigManager().getConfig().isIgnoreLocalAddresses() && !this.corePlugin.isTestMode()) {
-
-            final InetAddress inetAddress = inetSocketAddress.getAddress();
-
-            if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress())
-                return;
-
+        if (exemptLocalIpAddress(inetSocketAddress)) {
+            return;
         }
 
+        final String ipAddress = inetSocketAddress.getHostString();
+        final User packetUser = packetReceiveEvent.getUser();
         final PacketTypeCommon packetTypeCommon = packetReceiveEvent.getPacketType();
-        final ClientVersion clientVersion = packetReceiveEvent.getUser().getClientVersion();
-
-        System.out.println("C->S | " + packetTypeCommon);
-
-        /*
-         * SOURCE PORT FILTERING.
-         */
-
-        /* Check different condition to trigger a MOTD packet check and blockage. */
-
-        // This is the lowest dynamic port used by Linux.
-        // Anything bellow means the port was forced to use that port and is therefore, not a real Minecraft client.
-        final boolean invalidPort = inetSocketAddress.getPort() < 32768;
 
         // Match MOTD related packets.
-        final boolean isStatusPacket = packetTypeCommon == PacketType.Status.Client.PING
+        final boolean isMOTDPacket = packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE
                 || packetTypeCommon == PacketType.Status.Client.REQUEST
+                || packetTypeCommon == PacketType.Status.Client.PING
                 || packetTypeCommon == PacketType.Handshaking.Client.LEGACY_SERVER_LIST_PING;
 
-        /* Filter only packets that are used to get information about the server. */
-
-        // Handshake is also a MOTD related packet in a certain state.
-        if (isStatusPacket || packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE) {
+        // Match login sequence related packets.
+        final boolean isLoginSequencePacket = packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE
+                || packetTypeCommon == PacketType.Login.Client.LOGIN_START
+                || packetTypeCommon == PacketType.Login.Client.ENCRYPTION_RESPONSE
+                || packetTypeCommon == PacketType.Login.Client.LOGIN_SUCCESS_ACK;
 
-            // This is the lowest dynamic port used by Windows & Mac.
-            // Since Linux players are "rare", we'll issue a warning statement about them.
-            // Alongside that, we will block any server list ping to prevent bots from getting information about the server.
-            // (server version, online players, player count...).
-            final boolean suspiciousPort = inetSocketAddress.getPort() < 49152;
+        boolean isInvalidProtocol = false;
 
-            // Block the first incoming MOTD related packet of an IP.
-            final boolean processMOTD = suspiciousPort
-                    || !this.corePlugin.getApiManager().isIpBlockedCache(ipAddress)
-                    || !this.corePlugin.getApiManager().isHealthy();
+        // Check client's protocol & client version.
+        // Only match MOTD/login sequence related packets to save resources.
+        if (isMOTDPacket || isLoginSequencePacket) {
 
-            if (suspiciousPort) {
+            // If the client's version/protocol version is invalid.
+            //noinspection ConstantValue
+            if (packetReceiveEvent.getUser().getClientVersion() == null || packetReceiveEvent.getUser().getClientVersion().getProtocolVersion() <= 4) {
 
-                // Log this suspicious connection.
-                if (!invalidPort)
-                    CorePlugin.getLogger().warning("Suspicious port used by client. Keep an eye out for " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "."  + packetTypeCommon.getName() + "]");
-                else
-                    CorePlugin.getLogger().severe("Invalid port used by client. Closing connection from " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "."  + packetTypeCommon.getName() + "]");
+                // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid protocol version.", !isMOTDPacket);
 
-                // Report the IP to CoralGate API.
-                this.corePlugin.getApiManager().reportIp(ipAddress);
+                // To send fake MOTD later down the line.
+                isInvalidProtocol = true;
 
-                // Clean up.
-                this.connectionState.remove(inetSocketAddress);
+                // Block further logic.
+                if (!isMOTDPacket) return;
 
             }
 
-            if (processMOTD) {
-
-                // Packet responsible for the latency showup.
-                if (packetTypeCommon == PacketType.Status.Client.PING || packetTypeCommon == PacketType.Handshaking.Client.LEGACY_SERVER_LIST_PING) {
-
-                    // Cancel packet and send a "forged" response.
-                    packetReceiveEvent.setCancelled(true);
-                    packetReceiveEvent.getUser().sendPacketSilently(new WrapperStatusClientPing(packetReceiveEvent));
+        }
 
-                    // Block further logic.
-                    return;
+        // This is the lowest dynamic port used by Windows & Mac.
+        // Since Linux players are "rare", we'll issue a warning statement about them.
+        // Alongside that, we will block any server list ping to prevent bots from getting information about the server.
+        // (server version, online players, player count...).
+        final boolean isSuspiciousPort = inetSocketAddress.getPort() < 49152;
 
-                }
-
-                // Packet responsible for the MOTD message and server related information (player count, version).
-                if (packetTypeCommon == PacketType.Status.Client.REQUEST) {
+        // This is the lowest dynamic port used by Linux.
+        // Anything bellow means the port was forcefully used and is therefore not a real Minecraft client.
+        final boolean isInvalidPort = inetSocketAddress.getPort() < 32768;
 
-                    // Cancel the packet and send a forged generic looking MOTD.
-                    packetReceiveEvent.setCancelled(true);
-                    packetReceiveEvent.getUser().sendPacketSilently(new WrapperStatusServerResponse(getForgedMOTD()));
+        // Englobe suspicious port (which also includes invalid port) and bad protocol version.
+        final boolean isBadPacket = isSuspiciousPort || isInvalidProtocol;
 
-                    // Block further logic.
-                    return;
+        // Connection initialization for both MOTD and login procedures. (cross versions, cross-platform).
+        if (packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE) {
 
-                }
+            this.connectionState.put(inetSocketAddress, packetTypeCommon);
 
-                // Specific 'STATUS' handshake state.
-                // Yes the condition is "always true", but I prefer to keep this in case the protocol changes in future releases.
-                if (packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE) {
+            final WrapperHandshakingClientHandshake wrapperHandshakingClientHandshake = new WrapperHandshakingClientHandshake(packetReceiveEvent);
 
-                    final WrapperHandshakingClientHandshake wrapperHandshakingClientHandshake = new WrapperHandshakingClientHandshake(packetReceiveEvent);
+            // Drop the packet if it's suspicious and if it's a STATUS packet.
+            if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.STATUS
+                    && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.STATUS) {
 
-                    // 'STATUS' only.
-                    if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.STATUS && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.STATUS) {
+                if (isBadPacket) {
 
-                        packetReceiveEvent.setCancelled(true);
+                    // Decide reason based on port.
+                    String reason = isInvalidPort
+                            ? "Invalid port used by client."
+                            : "Suspicious port used by client.";
 
-                        // Block further logic.
-                        return;
+                    // Decide reason based on invalid protocol (or port).
+                    reason = isInvalidProtocol
+                            ? "Invalid protocol version."
+                            : reason;
 
-                    }
+                    // Don't close the connection yet.
+                    log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
 
                 }
 
-            }
-
-        }
-
-        // Ran last so forged MOTD can be sent. This effectively only blocks actual connection packets.
-        if (invalidPort) {
-
-            // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid port used by client.");
+            // Drop the packet if it's suspicious, close connection if it's invalid.
+            // Only if it's a LOGIN packet.
+            } else if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.LOGIN
+                    && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.LOGIN) {
 
-            // Block further logic.
-            return;
-
-        }
-
-        /* Source port is ok, check IP now. */
-
-        /*
-         * API IP CHECK.
-         */
-
-        // Match every login sequence related packet.
-        final boolean isLoginSequencePacket = packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE
-                || packetTypeCommon == PacketType.Login.Client.LOGIN_START
-                || packetTypeCommon == PacketType.Login.Client.ENCRYPTION_RESPONSE
-                || packetTypeCommon == PacketType.Login.Client.LOGIN_SUCCESS_ACK;
+                // Close the connection.
+                if (isInvalidPort || isInvalidProtocol) {
 
-        if (isStatusPacket || isLoginSequencePacket) {
+                    // Decide reason based off if the port is invalid or if the protocol version is.
+                    final String reason = isInvalidPort
+                            ? "Invalid port used by client."
+                            : "Invalid protocol version.";
 
-            if (this.corePlugin.getApiManager().isHealthy()) {
+                    // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                    log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, true);
 
-                this.corePlugin.getApiManager().isIpBlocked(ipAddress).thenAccept(blocked -> {
+                // Log an alert but don't close the connection.
+                } else if (isSuspiciousPort) {
 
-                    if (blocked)
-                        // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                        logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "IP is blocked by the API.");
+                    // Don't cancel the packet else the LOGIN_START procedure fails.
+                    CorePlugin.getLogger().warning("Suspicious port used by client. Keep an eye on " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
 
-                });
+                }
 
             }
 
-        }
-
-        /*
-         * PROTOCOL FILTERING.
-         */
-
-        if (isStatusPacket || isLoginSequencePacket) {
-
-            // Exempt for local scanner test.
-            final boolean scannerTest = inetSocketAddress.getHostString().equals("127.0.0.1") && inetSocketAddress.getPort() == 65535 && this.corePlugin.isTestMode();
-            if (!scannerTest) {
-
-                // If the client's protocol version is invalid.
-                if (clientVersion == null || clientVersion.getProtocolVersion() == -1) {
-
-                    // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                    logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid protocol version.");
-
-                    // Block further logic.
-                    return;
+            // Block further logic.
+            return;
 
-                }
+        }
 
-            }
+        // Request to get server's information (MOTD, version, player count).
+        if (packetTypeCommon == PacketType.Status.Client.REQUEST) {
 
-        }
+            final boolean badHandshake = this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Handshaking.Client.HANDSHAKE;
+            final boolean sendForgedMOTD = isBadPacket || badHandshake;
 
-        // We don't need those packets anymore.
-        if (isStatusPacket) return;
+            // Either suspicious port or bad handshake.
+            if (sendForgedMOTD) {
 
-        /*
-         * PACKET ORDER FILTERING.
-         */
+                // Send forged MOTD.
+                packetUser.sendPacketSilently(new WrapperStatusServerResponse(getForgedMOTD()));
 
-        // Specific 'LOGIN' handshake login, the first packet in a legitimate connection sequence.
-        if (packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE) {
+                // Custom logging based off port number.
+                //noinspection ExtractMethodRecommender
+                String reason = isInvalidPort
+                        ? "Invalid port used by client."
+                        : "Suspicious port used by client.";
 
-            final WrapperHandshakingClientHandshake wrapperHandshakingClientHandshake = new WrapperHandshakingClientHandshake(packetReceiveEvent);
+                // Custom logging based off the factor (suspicious port/bad handshake).
+                reason = badHandshake
+                        ? "Missing proper handshake."
+                        : reason;
 
-            if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.LOGIN && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.LOGIN) {
+                // Custom logging based off if the protocol version is bad.
+                reason = isInvalidProtocol
+                        ? "Invalid protocol version."
+                        : reason;
 
-                this.connectionState.put(inetSocketAddress, packetTypeCommon);
+                // Log the violation, report the IP to CoralGate API, cancel the packet and send forged MOTD.
+                log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
 
             }
 
@@ -260,220 +213,133 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
         }
 
-        // Handshake has passed (or skipped).
-        if (packetTypeCommon == PacketType.Login.Client.LOGIN_START) {
+        // Ping to get the latency between the client and the server.
+        // Doesn't really expose any server information, but we'll keep it under control.
+        if (packetTypeCommon == PacketType.Status.Client.PING) {
 
-            if (this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Handshaking.Client.HANDSHAKE) {
+            final boolean badHandshake = this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Handshaking.Client.HANDSHAKE;
+            final boolean sendForgedPong = isBadPacket || badHandshake;
 
-                // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing handshake procedure.");
+            // Either suspicious port or bad handshake.
+            if (sendForgedPong) {
 
-                // Block further logic.
-                return;
+                // Send forged pong.
+                packetUser.sendPacketSilently(new WrapperStatusServerPong(new WrapperStatusClientPing(packetReceiveEvent).getTime()));
 
-            }
+                // Custom logging based off port number.
+                //noinspection ExtractMethodRecommender
+                String reason = isInvalidPort
+                        ? "Invalid port used by client."
+                        : "Suspicious port used by client.";
 
-            final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
+                // Custom logging based off the factor (suspicious port/bad handshake).
+                reason = badHandshake
+                        ? "Missing proper handshake."
+                        : reason;
 
-            // Filter debug usernames.
-            if (wrapperLoginClientLoginStart.getUsername().startsWith("Player")) {
-
-                // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Bot-like username pattern detected.");
+                // Custom logging based off if the protocol version is bad.
+                reason = isInvalidProtocol
+                        ? "Invalid protocol version."
+                        : reason;
 
-                // Block further logic.
-                return;
+                // Log the violation, report the IP to CoralGate API, cancel the packet and send forged pong.
+                log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
 
             }
 
-            this.connectionState.put(inetSocketAddress, packetTypeCommon);
-
             // Block further logic.
             return;
 
         }
 
-        // After login start has passed and the server sent an encryption request. This is only for servers that are in online mode.
-        if (packetTypeCommon == PacketType.Login.Client.ENCRYPTION_RESPONSE && this.corePlugin.isOnlineMode()) {
+        // TODO: find some way to block this cuz PE ain't seeing the goddamn packet
+        // TODO: Netty pipeline injection?
+        // Legacy ping exposes information like MOTD, version & player count.
+        // No wrapper exists for it so we'll have to drop the packet.
+        if (packetTypeCommon == PacketType.Handshaking.Client.LEGACY_SERVER_LIST_PING) {
 
-            // Validate state against certain conditions: previous ENCRYPTION_REQUEST
-            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Server.ENCRYPTION_REQUEST, packetTypeCommon, "Missing login start procedure.");
+            // Cancel the packet.
+            packetReceiveEvent.setCancelled(true);
 
             // Block further logic.
             return;
 
         }
 
-        if (packetTypeCommon == PacketType.Login.Client.LOGIN_SUCCESS_ACK) {
-
-            // Validate state against certain conditions: previous LOGIN_SUCCESS
-            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Server.LOGIN_SUCCESS, packetTypeCommon, "Missing login success procedure.");
-
-            // Block further logic.
-            return;
-
-        }
-
-        // Prior to 1.20.2 CLIENT_SETTINGS are sent via the PLAY state right after LOGIN_SUCCESS.
-        // On 1.20.2+, CLIENT_SETTINGS is sent exclusively via the CONFIGURATION state.
-        // This is exclusively used on < 1.20.2.
-        // Ignore the packet if the connection is already done. This can be triggered in game.
-        if (packetTypeCommon == PacketType.Play.Client.CLIENT_SETTINGS && this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Play.Client.PLUGIN_MESSAGE) {
-
-            final PacketTypeCommon expectedState = clientVersion.isOlderThan(ClientVersion.V_1_20_2)
-                    ? PacketType.Configuration.Client.CONFIGURATION_END_ACK
-                    : PacketType.Login.Server.LOGIN_SUCCESS;
-
-            // Validate state against certain conditions: previous LOGIN_SUCCESS (< 1.20.2), Configuration.PLUGIN_MESSAGE (>= 1.20.2).
-            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, expectedState, packetTypeCommon, "Missing login success procedure before client settings.");
+        // Handle invalid port incoming connections.
+        if (isInvalidPort) {
 
-            final WrapperPlayClientSettings wrapperPlayClientSettings = new WrapperPlayClientSettings(packetReceiveEvent);
-
-            // If view distance exceeds minimum or maximum (vanilla).
-            if (wrapperPlayClientSettings.getViewDistance() < 2 || wrapperPlayClientSettings.getViewDistance() > 32)
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid view distance.");
-
-            // TODO: maybe go deeper in registries or more checks regarding settings?
+            // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+            log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid port used by client.", true);
 
             // Block further logic.
             return;
 
         }
 
-        // Minecraft versions prior to 1.20.2 exclusively use PLUGIN_MESSAGE in the PLAY state.
-        // Versions from 1.20.2 and above first use PLUGIN_MESSAGE in the CONFIGURATION state to send the brand,
-        // then uses the PLAY state to send "minecraft:register".
-        if (packetTypeCommon == PacketType.Play.Client.PLUGIN_MESSAGE) {
-
-            final WrapperPlayClientPluginMessage wrapperPlayClientPluginMessage = new WrapperPlayClientPluginMessage(packetReceiveEvent);
-            final String channelName = wrapperPlayClientPluginMessage.getChannelName();
-
-            // Calculate expected state since 1.20.2+ also uses the CONFIGURATION state.
-            // On < 1.20.2, PLUGIN_MESSAGE is sent twice in a row, once for "minecraft:brand" and another "minecraft:register".
-            final PacketTypeCommon expectedState = clientVersion.isOlderThan(ClientVersion.V_1_20_2)
-                    ? channelName.equals("minecraft:register")
-                      ? PacketType.Play.Client.PLUGIN_MESSAGE
-                      : PacketType.Play.Client.CLIENT_SETTINGS
-                    : PacketType.Configuration.Client.CONFIGURATION_END_ACK;
+        // Login start procedure after handshake has been established.
+        if (packetTypeCommon == PacketType.Login.Client.LOGIN_START) {
 
-            // Validate state against certain conditions: previous Play.CLIENT_SETTINGS/Play.PLUGIN_MESSAGE (< 1.20.2), CONFIGURATION_END_ACK (>= 1.20.2).
+            // Validate state against certain conditions: previous HANDSHAKE.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, expectedState, packetTypeCommon, "Missing configuration before client brand.");
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Handshaking.Client.HANDSHAKE, packetTypeCommon, "Missing proper handshake.");
 
-            // Took from TotemGuard: https://github.com/Bram1903/TotemGuard/blob/main/src/main/java/com/deathmotion/totemguard/checks/impl/misc/ClientBrand.java
-            // All credits to Bram!
-            // Check client brand.
-            if (!channelName.equals("minecraft:brand") && !channelName.equals("MC|BRAND")) return;
-
-            final byte[] data = wrapperPlayClientPluginMessage.getData();
-
-            // Weird ahhhh brand, im not waisting my time on no namer brands.
-            if (data.length > 64 || data.length == 0)
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid client brand. (" + data.length + " bytes).");
+            final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
 
-            final byte[] minusLength = new byte[data.length - 1];
-            System.arraycopy(data, 1, minusLength, 0, minusLength.length);
-            String clientBrand = new String(minusLength).replace(" (Velocity)", ""); // removes velocity's brand suffix
-            clientBrand = !clientBrand.isEmpty() ? Pattern.compile("(?i)" + '§' + "[0-9A-FK-ORX]").matcher(clientBrand).replaceAll("") : clientBrand;
+            // Filter debug usernames.
+            if (wrapperLoginClientLoginStart.getUsername().startsWith("Player")) {
 
-            // Special handling for lunar...
-            if (clientBrand.startsWith("lunarclient:")) clientBrand = "lunarclient";
+                // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Bot-like username pattern detected.", true);
 
-            if (!this.corePlugin.getConfigManager().getConfig().getAllowedClientBrands().contains(clientBrand))
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Unauthorized client brand name (" +  clientBrand + ").");
+            }
 
             // Block further logic.
             return;
 
         }
 
-        // Used exclusively on 1.20.2+, the client brand is sent here.
-        if (packetTypeCommon == PacketType.Configuration.Client.PLUGIN_MESSAGE) {
+        // After login start has passed and the server sent an encryption request. This is only for servers that are in online mode.
+        if (packetTypeCommon == PacketType.Login.Client.ENCRYPTION_RESPONSE && this.corePlugin.isOnlineMode()) {
 
-            // Validate state against certain conditions: previous LOGIN_SUCCESS_ACK.
+            // Validate state against certain conditions: previous ENCRYPTION_REQUEST.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Configuration.Server.CONFIGURATION_END, packetTypeCommon, "Missing configuration end from server.");
-
-            // Took from TotemGuard: https://github.com/Bram1903/TotemGuard/blob/main/src/main/java/com/deathmotion/totemguard/checks/impl/misc/ClientBrand.java
-            // All credits to Bram!
-            // Check client brand.
-            final WrapperConfigClientPluginMessage wrapperConfigClientPluginMessage = new WrapperConfigClientPluginMessage(packetReceiveEvent);
-            final String channelName = wrapperConfigClientPluginMessage.getChannelName();
-
-            if (!channelName.equals("minecraft:brand") && !channelName.equals("MC|BRAND")) return;
-
-            final byte[] data = wrapperConfigClientPluginMessage.getData();
-
-            // Weird ahhhh brand, im not waisting my time on no namer brands.
-            if (data.length > 64 || data.length == 0)
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid client brand. (" + data.length + " bytes).");
-
-            final byte[] minusLength = new byte[data.length - 1];
-            System.arraycopy(data, 1, minusLength, 0, minusLength.length);
-            String clientBrand = new String(minusLength).replace(" (Velocity)", ""); // removes velocity's brand suffix
-            clientBrand = !clientBrand.isEmpty() ? Pattern.compile("(?i)" + '§' + "[0-9A-FK-ORX]").matcher(clientBrand).replaceAll("") : clientBrand;
-
-            // Special handling for lunar...
-            if (clientBrand.startsWith("lunarclient:")) clientBrand = "lunarclient";
-
-            if (!this.corePlugin.getConfigManager().getConfig().getAllowedClientBrands().contains(clientBrand))
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Unauthorized client brand name (" +  clientBrand + ").");
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Server.ENCRYPTION_REQUEST, packetTypeCommon, "Missing login start procedure.");
 
             // Block further logic.
             return;
 
         }
 
-        // Used exclusively on 1.20.2+.
-        if (packetTypeCommon == PacketType.Configuration.Client.CLIENT_SETTINGS) {
+        // The client acknowledging the server sent LOGIN_SUCCESS. This only applies for 1.20.2+ clients and 1.20.2+ servers (if using Via).
+        if (packetTypeCommon == PacketType.Login.Client.LOGIN_SUCCESS_ACK) {
 
-            // Validate state against certain conditions: previous Configuration.PLUGIN_MESSAGE.
+            // Validate state against certain conditions: previous LOGIN_SUCCESS.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Configuration.Client.PLUGIN_MESSAGE, packetTypeCommon, "Missing client brand before client settings.");
-
-            final WrapperConfigClientSettings wrapperConfigClientSettings = new WrapperConfigClientSettings(packetReceiveEvent);
-
-            // If view distance exceeds minimum or maximum (vanilla).
-            if (wrapperConfigClientSettings.getViewDistance() < 2 || wrapperConfigClientSettings.getViewDistance() > 32)
-                logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid view distance.");
-
-            // TODO: maybe go deeper in registries or more checks regarding settings?
+            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Server.LOGIN_SUCCESS, packetTypeCommon, "Missing login success procedure.");
 
             // Block further logic.
             return;
 
         }
 
-        // Once CLIENT_SETTINGS and PLUGIN_MESSAGE are validated by the server.
-        if (packetTypeCommon == PacketType.Configuration.Client.CONFIGURATION_END_ACK) {
-
-            final PacketTypeCommon expectedState = clientVersion.isOlderThan(ClientVersion.V_1_20_2)
-                    ? PacketType.Configuration.Server.CONFIGURATION_END
-                    : PacketType.Configuration.Client.CLIENT_SETTINGS;
-
-            // Validate state against certain conditions: previous Configuration.CLIENT_SETTINGS.
-            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, expectedState, packetTypeCommon, "Missing full client settings and client brand before finishing configuration.");
-
-            // Block further logic.
-            return;
-
+        // Decide if we should use the new LOGIN_SUCCESS_ACK (1.20.2+) or the older LOGIN_SUCCESS (< 1.20.2).
+        // If we are on a backend, the server version is straight forward to get.
+        // However, if we're on a proxy, the server version is marked as 1.8 since it's the lowest Bungee supports (when it could be anything else).
+        // Therefore, we should base ourselves off the client's version ONLY if we are running on a proxy.
+        final boolean useLoginSuccessAck = PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)
+                || (this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")
+                && packetUser.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_2));
+
+        final PacketTypeCommon expectedFinalState = useLoginSuccessAck
+                ? PacketType.Login.Client.LOGIN_SUCCESS_ACK
+                : PacketType.Login.Server.LOGIN_SUCCESS;
+
+        // Connection procedure is not done yet, block incoming packets.
+        if (this.connectionState.getOrDefault(inetSocketAddress, null) != expectedFinalState) {
+            log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing full connection procedure.", true);
         }
 
-        // Get the proper login packet based off the client version.
-        final PacketTypeCommon currentState = this.connectionState.getOrDefault(inetSocketAddress, null);
-
-        // Directly evaluate if the current state is valid for this version context.
-        final boolean isValidState = clientVersion.isOlderThan(ClientVersion.V_1_20_2) && PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)
-                ? (currentState == PacketType.Configuration.Client.CONFIGURATION_END_ACK) || (currentState == PacketType.Play.Client.PLUGIN_MESSAGE) || (currentState == PacketType.Play.Client.CLIENT_SETTINGS)
-                : currentState == PacketType.Play.Client.PLUGIN_MESSAGE;
-
-        if (!isValidState)
-            logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing full connection procedure.");
-
         /* All checks passed! */
 
     }
@@ -482,28 +348,19 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
     public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         final InetSocketAddress inetSocketAddress = packetSendEvent.getSocketAddress();
-        final String ipAddress = inetSocketAddress.getHostString();
 
         // Exempt local IP addresses according to configuration file.
-        if (this.corePlugin.getConfigManager().getConfig().isIgnoreLocalAddresses() && !this.corePlugin.isTestMode()) {
-
-            final InetAddress inetAddress = inetSocketAddress.getAddress();
-
-            if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) return;
-
+        if (exemptLocalIpAddress(inetSocketAddress)) {
+            return;
         }
 
+        final String ipAddress = inetSocketAddress.getHostString();
         final PacketTypeCommon packetTypeCommon = packetSendEvent.getPacketType();
 
-        System.out.println("S->C | " + packetTypeCommon);
-
-        /*
-        * PACKET ORDER FILTERING.
-        */
-
-        // Whitelisted MOTD related packets.
-        if (packetTypeCommon == PacketType.Status.Server.RESPONSE || packetTypeCommon == PacketType.Status.Server.PONG)
+        // Whitelisted packets.
+        if (packetTypeCommon == PacketType.Status.Server.RESPONSE || packetTypeCommon == PacketType.Status.Server.PONG) {
             return;
+        }
 
         // Client should have passed login start procedure.
         if (packetTypeCommon == PacketType.Login.Server.ENCRYPTION_REQUEST && this.corePlugin.isOnlineMode()) {
@@ -517,16 +374,23 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         }
 
-        // Client should have sent the encryption response (if online mode). The compression level can be set to -1 (disabled) on proxies for less network/cpu overhead.
+        // Client should have sent the encryption response (if online mode).
+        // The compression level can be set to -1 (disabled) on proxies for less network/cpu overhead.
         if (packetTypeCommon == PacketType.Login.Server.SET_COMPRESSION && this.corePlugin.getCompressionThreshold() >= 0) {
 
+            // Offline servers do not have encryption, the previous packet is therefore simply LOGIN_START.
             final PacketTypeCommon requiredPacketTypeCommon = this.corePlugin.isOnlineMode()
                     ? PacketType.Login.Client.ENCRYPTION_RESPONSE
                     : PacketType.Login.Client.LOGIN_START;
 
+            // Determine proper message based off previous statement.
+            final String reason = requiredPacketTypeCommon == PacketType.Login.Client.ENCRYPTION_RESPONSE
+                    ? "encryption response."
+                    : "login start procedure.";
+
             // Validate state against certain conditions: previous ENCRYPTION_RESPONSE (if online mode) else LOGIN_START.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, requiredPacketTypeCommon, packetTypeCommon, "Missing encryption response or login start procedure.");
+            verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, requiredPacketTypeCommon, packetTypeCommon, "Missing " + reason);
 
             // Block further logic.
             return;
@@ -535,9 +399,23 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         if (packetTypeCommon == PacketType.Login.Server.LOGIN_SUCCESS) {
 
+            // If it's an online server with compression: SET_COMPRESSION.
+            // If it's an online server WITHOUT compression: ENCRYPTION_RESPONSE.
+            //noinspection ExtractMethodRecommender
+            final PacketTypeCommon onlineModePreviousStatus = this.corePlugin.getCompressionThreshold() >= 0
+                    ? PacketType.Login.Server.SET_COMPRESSION
+                    : PacketType.Login.Client.ENCRYPTION_RESPONSE;
+
+            // If it's an offline server with compression: SET_COMPRESSION.
+            // If it's an offline server WITHOUT compression: LOGIN_START.
+            final PacketTypeCommon offlineModePreviousStatus = this.corePlugin.getCompressionThreshold() >= 0
+                    ? PacketType.Login.Server.SET_COMPRESSION
+                    : PacketType.Login.Client.LOGIN_START;
+
+            // Choose required packet type based off previous statements.
             final PacketTypeCommon requiredPacketTypeCommon = this.corePlugin.isOnlineMode()
-                    ? (this.corePlugin.getCompressionThreshold() >= 0 ? PacketType.Login.Server.SET_COMPRESSION : PacketType.Login.Client.ENCRYPTION_RESPONSE)
-                    : (this.corePlugin.getCompressionThreshold() >= 0 ? PacketType.Login.Server.SET_COMPRESSION : PacketType.Login.Client.LOGIN_START);
+                    ? onlineModePreviousStatus
+                    : offlineModePreviousStatus;
 
             // Validate state against certain conditions: previous SET_COMPRESSION (if above 0) else ENCRYPTION_RESPONSE (if online mode) else LOGIN_START.
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
@@ -548,29 +426,61 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         }
 
-        // Sent after the server is done sending basic server data.
-        // Right before the client starts sending its own client data.
-        if (packetTypeCommon == PacketType.Configuration.Server.CONFIGURATION_END) {
+        // Fired when a connection is closed.
+        if (packetTypeCommon == PacketType.Login.Server.DISCONNECT) {
 
-            // Validate state against certain conditions: previous LOGIN_SUCCESS_ACK.
-            // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-            verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Login.Client.LOGIN_SUCCESS_ACK, packetTypeCommon, "Missing set compression procedure.");
+            final WrapperLoginServerDisconnect wrapperLoginServerDisconnect = new WrapperLoginServerDisconnect(packetSendEvent);
+
+            final Component disconnectReason = wrapperLoginServerDisconnect.getReason();
+            final String serverVersion = PacketEvents.getAPI().getServerManager().getVersion().getReleaseName();
+
+            if (disconnectReason instanceof TextComponent) {
+
+                final TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
+                final String disconnectReasonString = disconnectReasonTextComponent.content();
+
+                // Intercept "Outdated server! I'm still on X.XX.X" messages to not show the server's version.
+                if (disconnectReasonString.contains(serverVersion)) {
+
+                    // Replace the real server's version by the spoofed one.
+                    final String newDisconnectReason = disconnectReasonString.replace(serverVersion, "26.2");
+
+                    // Reconstruct reason with spoofed server version.
+                    final Component safeDisconnectReason = Component.text()
+                            .content(newDisconnectReason)
+                            .style(disconnectReasonTextComponent.style())
+                            .build();
+
+                    // Set the new reason and tell packetevents to re-encode the packet and send it.
+                    wrapperLoginServerDisconnect.setReason(safeDisconnectReason);
+
+                    packetSendEvent.markForReEncode(true);
+
+                }
+
+            }
 
             // Block further logic.
             return;
 
         }
 
-        // Get the proper login packet based off the client version.
-        final PacketTypeCommon currentState = this.connectionState.getOrDefault(inetSocketAddress, null);
-
-        // Directly evaluate if the current state is valid for this version context.
-        final boolean isValidState = packetSendEvent.getUser().getClientVersion().isOlderThan(ClientVersion.V_1_20_2) && PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_20_2)
-                ? (currentState == PacketType.Login.Server.LOGIN_SUCCESS || currentState == PacketType.Play.Client.PLUGIN_MESSAGE)
-                : (currentState == PacketType.Login.Client.LOGIN_SUCCESS_ACK || currentState == PacketType.Configuration.Client.CONFIGURATION_END_ACK || currentState == PacketType.Play.Client.PLUGIN_MESSAGE);
-
-       if (!isValidState)
-           logAndClose(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing full connection procedure.");
+        // Decide if we should use the new LOGIN_SUCCESS_ACK (1.20.2+) or the older LOGIN_SUCCESS (< 1.20.2).
+        // If we are on a backend, the server version is straight forward to get.
+        // However, if we're on a proxy, the server version is marked as 1.8 since it's the lowest Bungee supports (when it could be anything else).
+        // Therefore, we should base ourselves off the client's version ONLY if we are running on a proxy.
+        final boolean useLoginSuccessAck = PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)
+                || (this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")
+                && packetSendEvent.getUser().getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_2));
+
+        final PacketTypeCommon expectedFinalState = useLoginSuccessAck
+                ? PacketType.Login.Client.LOGIN_SUCCESS_ACK
+                : PacketType.Login.Server.LOGIN_SUCCESS;
+
+        // Connection procedure is not done yet, block incoming packets.
+        if (this.connectionState.getOrDefault(inetSocketAddress, null) != expectedFinalState) {
+            log(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Missing full connection procedure.");
+        }
 
         /* All checks passed! */
 
@@ -580,30 +490,48 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
     public void onUserDisconnect(final UserDisconnectEvent userDisconnectEvent) {
 
         final User user = userDisconnectEvent.getUser();
-
-        if (user == null || user.getUUID() == null) return;
+        //noinspection ConstantValue
+        if (user == null || user.getAddress() == null) {
+            return;
+        }
 
         // Clean up.
         this.connectionState.remove(user.getAddress());
 
     }
 
-    private void logAndClose(final PacketReceiveEvent packetReceiveEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final String reason) {
+    private void log(final PacketReceiveEvent packetReceiveEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final String reason, final boolean closeConnection) {
+
+        final String messageComplement = closeConnection
+                ? " Closing connection from "
+                : " Dropping packet from ";
+
+        // Log based if the connection should be closed or not.
+        if (closeConnection) {
+            CorePlugin.getLogger().severe(reason + messageComplement + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
+        } else {
+            CorePlugin.getLogger().warning(reason + messageComplement + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
+        }
 
-        CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
+        // Report IP to CoralGate's API.
         this.corePlugin.getApiManager().reportIp(ipAddress);
 
         packetReceiveEvent.setCancelled(true);
-        packetReceiveEvent.getUser().closeConnection();
+        if (closeConnection) {
+            packetReceiveEvent.getUser().closeConnection();
+        }
 
         // Clean up.
         this.connectionState.remove(inetSocketAddress);
 
     }
 
-    private void logAndClose(final PacketSendEvent packetSendEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final String reason) {
+    private void log(final PacketSendEvent packetSendEvent, final InetSocketAddress inetSocketAddress, final String ipAddress, final PacketTypeCommon packetTypeCommon, final String reason) {
 
+        // Log based if the connection should be closed or not.
         CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [S->C | " + packetSendEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
+
+        // Report IP to CoralGate's API.
         this.corePlugin.getApiManager().reportIp(ipAddress);
 
         packetSendEvent.setCancelled(true);
@@ -620,7 +548,11 @@ private void verifyAndTransitionState(final PacketReceiveEvent packetReceiveEven
 
             this.connectionState.put(inetSocketAddress, targetState);
 
-        } else logAndClose(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason);
+        } else {
+
+            log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, true);
+
+        }
 
     }
 
@@ -630,12 +562,30 @@ private void verifyAndTransitionState(final PacketSendEvent packetSendEvent, fin
 
             this.connectionState.put(inetSocketAddress, targetState);
 
-        } else logAndClose(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason);
+        } else {
+
+            log(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason);
+
+        }
 
     }
 
     private String getForgedMOTD() {
-        return "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"CraftBukkit 26.2\",\"protocol\":776},\"enforcesSecureChat\":true}";
+        return "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"Paper 26.2\",\"protocol\":776},\"enforcesSecureChat\":true}";
+    }
+
+    private boolean exemptLocalIpAddress(final InetSocketAddress inetSocketAddress) {
+
+        // Exempt local IP addresses according to configuration file.
+        if (this.corePlugin.getConfigManager().getConfig().isIgnoreLocalAddresses() && !this.corePlugin.isTestMode()) {
+
+            final InetAddress inetAddress = inetSocketAddress.getAddress();
+            return inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress();
+
+        }
+
+        return false;
+
     }
 
 }

From 701971f8b923ac3891fcec10a7875697622737f5 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 8 Jul 2026 23:39:43 +0200
Subject: [PATCH 18/82] Merge spigot and paper module

---
 settings.gradle.kts                        |  1 -
 spigot/build.gradle.kts                    |  4 ++--
 spigot/src/main/resources/paper-plugin.yml | 14 ++++++++++++++
 spigot/src/main/resources/plugin.yml       |  3 +--
 4 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 spigot/src/main/resources/paper-plugin.yml

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8091328..1b667bf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,7 +3,6 @@ rootProject.name = "CoralGate"
 include(
     "core",
     "spigot",
-    "paper",
     "bungeecord",
     "velocity"
 )
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 24eff79..d52a647 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -58,8 +58,8 @@ tasks.processResources {
     val packetEventsVersion: String by rootProject.extra
     val coreVersion: String by rootProject.extra
 
-    // Replace plugin.yml
-    filesMatching("plugin.yml") {
+    // Replaces placeholders in BOTH yml files.
+    filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
         expand("version" to project.version)
     }
 
diff --git a/spigot/src/main/resources/paper-plugin.yml b/spigot/src/main/resources/paper-plugin.yml
new file mode 100644
index 0000000..5094c47
--- /dev/null
+++ b/spigot/src/main/resources/paper-plugin.yml
@@ -0,0 +1,14 @@
+name: CoralGate
+version: "${version}"
+main: cloud.gteam.coralgate.SpigotPlugin
+api-version: '1.19'
+prefix: CoralGate
+load: STARTUP
+authors: [ XIII___, Vagdedes2 ]
+description: On-the-fly packet inspection and real-time IP verification for Minecraft servers and networks.
+dependencies:
+  server:
+    packetevents:
+      load: BEFORE
+      required: true
+      join-classpath: true
\ No newline at end of file
diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml
index cd6191a..18a5437 100644
--- a/spigot/src/main/resources/plugin.yml
+++ b/spigot/src/main/resources/plugin.yml
@@ -6,5 +6,4 @@ prefix: CoralGate
 load: STARTUP
 authors: [ XIII___, Vagdedes2 ]
 description: On-the-fly packet inspection and real-time IP verification for Minecraft servers and networks.
-depend:
-  - packetevents
+depend: [ packetevents ]

From 7e79207677994667bd0760faf9a86c7a2f37c939 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 8 Jul 2026 23:41:16 +0200
Subject: [PATCH 19/82] Remove unnecessary paper project

---
 paper/build.gradle.kts                        | 107 ------------------
 .../cloud/gteam/coralgate/PaperPlugin.java    |  73 ------------
 .../commands/PaperPermissionChecker.java      |  32 ------
 paper/src/main/resources/paper-plugin.yml     |  14 ---
 paper/src/main/resources/platform.properties  |   5 -
 paper/src/main/resources/plugin.yml           |   9 --
 6 files changed, 240 deletions(-)
 delete mode 100644 paper/build.gradle.kts
 delete mode 100644 paper/src/main/java/cloud/gteam/coralgate/PaperPlugin.java
 delete mode 100644 paper/src/main/java/cloud/gteam/coralgate/commands/PaperPermissionChecker.java
 delete mode 100644 paper/src/main/resources/paper-plugin.yml
 delete mode 100644 paper/src/main/resources/platform.properties
 delete mode 100644 paper/src/main/resources/plugin.yml

diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
deleted file mode 100644
index f67b71e..0000000
--- a/paper/build.gradle.kts
+++ /dev/null
@@ -1,107 +0,0 @@
-plugins {
-
-    `java-library`
-    id("com.gradleup.shadow") version "9.5.1"
-
-}
-
-java {
-
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
-
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
-}
-
-repositories {
-
-    mavenCentral()
-    mavenLocal()
-
-    // PacketEvents repository.
-    maven("https://repo.codemc.io/repository/maven-releases/")
-
-    // Legacy Paper repository.
-    maven("https://repo.papermc.io/repository/maven-snapshots/")
-
-    // bungeecord-chat repository.
-    maven("https://hub.spigotmc.org/nexus/content/groups/public/")
-
-}
-
-dependencies {
-
-    // Get versions.
-    val lampVersion: String by rootProject.extra
-    val packetEventsVersion: String by rootProject.extra
-    val bstatsVersion: String by rootProject.extra
-
-    // Dependencies.
-    implementation("org.bstats:bstats-bukkit:$bstatsVersion")
-    implementation("io.github.revxrsal:lamp.common:$lampVersion")
-    implementation("io.github.revxrsal:lamp.bukkit:$lampVersion")
-
-    compileOnly("com.github.retrooper:packetevents-spigot:$packetEventsVersion")
-    compileOnly("org.github.paperspigot:paperspigot-api:1.8.8-R0.1-SNAPSHOT")
-
-    // Core implementation.
-    implementation(project(":core"))
-
-}
-
-tasks.processResources {
-
-    // Get versions.
-    val packetEventsVersion: String by rootProject.extra
-    val coreVersion: String by rootProject.extra
-
-    // Replaces placeholders in BOTH yml files.
-    filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
-        expand("version" to project.version)
-    }
-
-    // Replace properties.
-    filesMatching("platform.properties") {
-
-        expand(
-            "name" to project.name,
-            "version" to project.version,
-            "coreVersion" to coreVersion,
-            "packeteventsVersion" to packetEventsVersion
-        )
-
-    }
-
-}
-
-tasks.shadowJar {
-
-    // Wait for the core shadowJar to finish.
-    dependsOn(project(":core").tasks.named("shadowJar"))
-
-    archiveBaseName.set("CoralGate-Paper")
-    archiveVersion.set(project.version.toString())
-    archiveClassifier.set("")
-
-    // Relocate Netty for AsyncHTTPClient.
-    relocate("io.netty", "cloud.gteam.coralgate.libs.netty")
-
-    // Relocate bStats.
-    relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
-
-    exclude("META-INF/*.SF")
-    exclude("META-INF/*.DSA")
-    exclude("META-INF/*.RSA")
-
-}
-
-tasks.compileJava {
-    dependsOn(project(":core").tasks.named("jar"))
-}
-
-tasks.build {
-    dependsOn(tasks.shadowJar)
-}
diff --git a/paper/src/main/java/cloud/gteam/coralgate/PaperPlugin.java b/paper/src/main/java/cloud/gteam/coralgate/PaperPlugin.java
deleted file mode 100644
index be75297..0000000
--- a/paper/src/main/java/cloud/gteam/coralgate/PaperPlugin.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of CoralGate - https://github.com/GTeamX/CoralGate
- * Copyright (C) 2026 GTeamX (GTeam) and it's contributors
- *
- * This 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 <http://www.gnu.org/licenses/>.
- */
-
-package cloud.gteam.coralgate;
-
-import cloud.gteam.coralgate.commands.CoralGateCommand;
-import cloud.gteam.coralgate.commands.PaperPermissionChecker;
-import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
-import cloud.gteam.coralgate.processor.NetworkProcessor;
-import cloud.gteam.coralgate.utils.PlatformUtils;
-import com.github.retrooper.packetevents.PacketEvents;
-import com.github.retrooper.packetevents.event.PacketListenerPriority;
-import org.bstats.bukkit.Metrics;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.java.JavaPlugin;
-import revxrsal.commands.Lamp;
-import revxrsal.commands.bukkit.BukkitLamp;
-import revxrsal.commands.bukkit.actor.BukkitCommandActor;
-
-public final class PaperPlugin extends JavaPlugin {
-
-    private final CorePlugin corePlugin = new CorePlugin();
-
-    @Override
-    public void onLoad() {
-        PacketEvents.getAPI().getEventManager().registerListener(
-                new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
-    }
-
-    @Override
-    public void onEnable() {
-
-        // Start bStats.
-        new Metrics(this, 29439);
-
-        // Load core.
-        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), Bukkit.getOnlineMode(), "server.properties", PlatformUtils.loadProperties(this.getClass()));
-
-        // Load commands.
-        final Lamp<BukkitCommandActor> bukkitCommandActor = BukkitLamp.builder(this)
-                .permissionFactory(new PermissionFactory(new PaperPermissionChecker()))
-                .build();
-        bukkitCommandActor.register(new CoralGateCommand(this.corePlugin));
-
-    }
-
-    @Override
-    public void onDisable() {
-
-        this.corePlugin.onDisable();
-
-    }
-
-    public CorePlugin getCorePlugin() {
-        return this.corePlugin;
-    }
-
-}
diff --git a/paper/src/main/java/cloud/gteam/coralgate/commands/PaperPermissionChecker.java b/paper/src/main/java/cloud/gteam/coralgate/commands/PaperPermissionChecker.java
deleted file mode 100644
index 2044f67..0000000
--- a/paper/src/main/java/cloud/gteam/coralgate/commands/PaperPermissionChecker.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of CoralGate - https://github.com/GTeamX/CoralGate
- * Copyright (C) 2026 GTeamX (GTeam) and it's contributors
- *
- * This 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 <http://www.gnu.org/licenses/>.
- */
-
-package cloud.gteam.coralgate.commands;
-
-import cloud.gteam.coralgate.commands.permissions.PermissionChecker;
-import revxrsal.commands.bukkit.actor.BukkitCommandActor;
-import revxrsal.commands.command.CommandActor;
-
-public class PaperPermissionChecker implements PermissionChecker {
-
-    @Override
-    public boolean hasPermission(final CommandActor actor, final String permission) {
-        return ((BukkitCommandActor) actor).sender().hasPermission(permission);
-    }
-
-}
diff --git a/paper/src/main/resources/paper-plugin.yml b/paper/src/main/resources/paper-plugin.yml
deleted file mode 100644
index 4bce9e4..0000000
--- a/paper/src/main/resources/paper-plugin.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: CoralGate
-version: "${version}"
-main: cloud.gteam.coralgate.PaperPlugin
-api-version: '1.19'
-prefix: CoralGate
-load: STARTUP
-authors: [ XIII___, Vagdedes2 ]
-description: On-the-fly packet inspection and real-time IP verification for Minecraft servers and networks.
-dependencies:
-  server:
-    packetevents:
-      load: BEFORE
-      required: true
-      join-classpath: true
\ No newline at end of file
diff --git a/paper/src/main/resources/platform.properties b/paper/src/main/resources/platform.properties
deleted file mode 100644
index d255182..0000000
--- a/paper/src/main/resources/platform.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-platform-name=${name}
-platform-type=backend
-platform-version=${version}
-core-version=${coreVersion}
-packetevents-version=${packeteventsVersion}
\ No newline at end of file
diff --git a/paper/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml
deleted file mode 100644
index 9476d7e..0000000
--- a/paper/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: CoralGate
-version: "${version}"
-main: cloud.gteam.coralgate.PaperPlugin
-api-version: 1.13
-prefix: CoralGate
-load: STARTUP
-authors: [ XIII___, Vagdedes2 ]
-description: On-the-fly packet inspection and real-time IP verification for Minecraft servers and networks.
-depend: [packetevents]
\ No newline at end of file

From 20d9b39208930361f3cc30f95443239e89c8670f Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 8 Jul 2026 23:43:03 +0200
Subject: [PATCH 20/82] Add version catalog for easier dependency management
 and maintenance

---
 build.gradle.kts            |  8 ------
 bungeecord/build.gradle.kts | 41 +++++++++--------------------
 core/build.gradle.kts       | 29 +++++++++------------
 gradle/libs.versions.toml   | 52 +++++++++++++++++++++++++++++++++++++
 spigot/build.gradle.kts     | 38 ++++++++-------------------
 velocity/build.gradle.kts   | 41 ++++++++++-------------------
 6 files changed, 100 insertions(+), 109 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/build.gradle.kts b/build.gradle.kts
index 175c866..023301f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,3 @@
-// Project related options.
-extra["coreVersion"] = "0.4.3-SNAPSHOT"
-
-// Dependency related options.
-extra["lampVersion"] = "4.0.0-rc.17"
-extra["packetEventsVersion"] = "2.13.0"
-extra["bstatsVersion"] = "3.2.1"
-
 subprojects {
 
     group = "cloud.gteam"
diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index 12b1d36..39e3bca 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.5.1"
+    alias(libs.plugins.shadow)
 
 }
 
@@ -31,18 +31,13 @@ repositories {
 
 dependencies {
 
-    // Get versions.
-    val lampVersion: String by rootProject.extra
-    val packetEventsVersion: String by rootProject.extra
-    val bstatsVersion: String by rootProject.extra
-
     // Dependencies.
-    implementation("org.bstats:bstats-bungeecord:$bstatsVersion")
-    implementation("io.github.revxrsal:lamp.common:$lampVersion")
-    implementation("io.github.revxrsal:lamp.bungee:$lampVersion")
+    implementation(libs.bstats.bungeecord)
+    implementation(libs.lamp.common)
+    implementation(libs.lamp.bungee)
 
-    compileOnly("com.github.retrooper:packetevents-bungeecord:$packetEventsVersion")
-    compileOnly("net.md-5:bungeecord-api:1.16-R0.4")
+    compileOnly(libs.packetevents.bungeecord)
+    compileOnly(libs.bungeecord.api)
 
     // Core implementation.
     implementation(project(path = ":core", configuration = "shadow"))
@@ -51,27 +46,15 @@ dependencies {
 
 tasks.processResources {
 
-    // Get versions.
-    val packetEventsVersion: String by rootProject.extra
-    val coreVersion: String by rootProject.extra
-
-    // Replace bungee.yml
-    filesMatching("bungee.yml") {
-        expand("version" to project.version)
-    }
+    inputs.property("name", project.name)
+    inputs.property("version", project.version)
+    inputs.property("coreVersion", libs.versions.coreVersion.get())
+    inputs.property("packeteventsVersion", libs.versions.packetevents.get())
 
     // Replace properties.
-    filesMatching("platform.properties") {
-
-        expand(
-            "name" to project.name,
-            "version" to project.version,
-            "coreVersion" to coreVersion,
-            "packeteventsVersion" to packetEventsVersion
-        )
-
+    filesMatching(listOf("bungee.yml", "platform.properties")) {
+        expand(inputs.properties)
     }
-
 }
 
 tasks.shadowJar {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 611659f..6035f37 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -3,12 +3,12 @@ import org.gradle.kotlin.dsl.shadowJar
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.5.1"
+    alias(libs.plugins.shadow)
 
 }
 
 group = "cloud.gteam.coralgate"
-version = rootProject.extra["coreVersion"]!!
+version = libs.versions.coreVersion.get()
 
 java {
 
@@ -32,31 +32,26 @@ repositories {
 
 dependencies {
 
-    // Get versions.
-    val lampVersion: String by rootProject.extra
-    val packetEventsVersion: String by rootProject.extra
-
     // Dependencies.
-    implementation("io.github.revxrsal:lamp.common:$lampVersion")
-    implementation("blue.endless:jankson:1.2.3")
-    implementation("org.asynchttpclient:async-http-client:2.16.0")
-    implementation("org.jetbrains:annotations:26.1.0")
-    implementation("dev.dejvokep:boosted-yaml:1.3.7")
+    implementation(libs.lamp.common)
+    implementation(libs.jankson)
+    implementation(libs.async.http.client)
+    implementation(libs.jetbrains.annotations)
+    implementation(libs.boosted.yaml)
 
-    compileOnly("com.github.retrooper:packetevents-api:$packetEventsVersion")
-    compileOnly("com.google.code.gson:gson:2.14.0")
-    compileOnly("net.kyori:adventure-api:4.26.1")
+    compileOnly(libs.packetevents.api)
+    compileOnly(libs.gson)
+    compileOnly(libs.adventure.api)
 
 }
 
 tasks.processResources {
 
-    val props = mapOf("version" to version)
-    inputs.properties(props)
+    inputs.property("version", version)
     filteringCharset = "UTF-8"
 
     filesNotMatching("**/*.png") {
-        expand(props)
+        expand(inputs.properties)
     }
 
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..c8ef833
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,52 @@
+[versions]
+coreVersion = "0.4.3-SNAPSHOT"
+
+lamp = "4.0.0-rc.17"
+packetevents = "2.13.0"
+bstats = "3.2.1"
+
+jankson = "1.2.3"
+async-http-client = "2.16.0"
+jetbrains-annotations = "26.1.0"
+boosted-yaml = "1.3.7"
+gson = "2.14.0"
+adventure-api = "4.26.1"
+
+spigot = "1.8.8-R0.1-SNAPSHOT"
+bungeecord = "1.16-R0.4"
+velocity = "3.4.0"
+
+shadow = "9.5.1"
+
+[libraries]
+
+jankson = { module = "blue.endless:jankson", version.ref = "jankson" }
+async-http-client = { module = "org.asynchttpclient:async-http-client", version.ref = "async-http-client" }
+jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
+boosted-yaml = { module = "dev.dejvokep:boosted-yaml", version.ref = "boosted-yaml" }
+
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure-api" }
+
+bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "bstats" }
+bstats-bungeecord = { module = "org.bstats:bstats-bungeecord", version.ref = "bstats" }
+bstats-velocity = { module = "org.bstats:bstats-velocity", version.ref = "bstats" }
+
+lamp-common = { module = "io.github.revxrsal:lamp.common", version.ref = "lamp" }
+lamp-bukkit = { module = "io.github.revxrsal:lamp.bukkit", version.ref = "lamp" }
+lamp-bungee = { module = "io.github.revxrsal:lamp.bungee", version.ref = "lamp" }
+lamp-velocity = { module = "io.github.revxrsal:lamp.velocity", version.ref = "lamp" }
+lamp-brigadier = { module = "io.github.revxrsal:lamp.brigadier", version.ref = "lamp" }
+
+packetevents-api = { module = "com.github.retrooper:packetevents-api", version.ref = "packetevents" }
+packetevents-spigot = { module = "com.github.retrooper:packetevents-spigot", version.ref = "packetevents" }
+packetevents-bungeecord = { module = "com.github.retrooper:packetevents-bungeecord", version.ref = "packetevents" }
+packetevents-velocity = { module = "com.github.retrooper:packetevents-velocity", version.ref = "packetevents" }
+
+spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "spigot" }
+bungeecord-api = { module = "net.md-5:bungeecord-api", version.ref = "bungeecord" }
+velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
+
+
+[plugins]
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
\ No newline at end of file
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index d52a647..fd41be6 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.5.1"
+    alias(libs.plugins.shadow)
 
 }
 
@@ -34,18 +34,13 @@ repositories {
 
 dependencies {
 
-    // Get versions.
-    val lampVersion: String by rootProject.extra
-    val packetEventsVersion: String by rootProject.extra
-    val bstatsVersion: String by rootProject.extra
-
     // Dependencies.
-    implementation("org.bstats:bstats-bukkit:$bstatsVersion")
-    implementation("io.github.revxrsal:lamp.common:$lampVersion")
-    implementation("io.github.revxrsal:lamp.bukkit:$lampVersion")
+    implementation(libs.bstats.bukkit)
+    implementation(libs.lamp.common)
+    implementation(libs.lamp.bukkit)
 
-    compileOnly("com.github.retrooper:packetevents-spigot:$packetEventsVersion")
-    compileOnly("org.spigotmc:spigot-api:1.8-R0.1-SNAPSHOT")
+    compileOnly(libs.packetevents.spigot)
+    compileOnly(libs.spigot.api)
 
     // Core implementation.
     implementation(project(":core"))
@@ -54,25 +49,14 @@ dependencies {
 
 tasks.processResources {
 
-    // Get versions.
-    val packetEventsVersion: String by rootProject.extra
-    val coreVersion: String by rootProject.extra
+    inputs.property("name", project.name)
+    inputs.property("version", project.version)
+    inputs.property("coreVersion", libs.versions.coreVersion.get())
+    inputs.property("packeteventsVersion", libs.versions.packetevents.get())
 
     // Replaces placeholders in BOTH yml files.
     filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
-        expand("version" to project.version)
-    }
-
-    // Replace properties.
-    filesMatching("platform.properties") {
-
-        expand(
-            "name" to project.name,
-            "version" to project.version,
-            "coreVersion" to coreVersion,
-            "packeteventsVersion" to packetEventsVersion
-        )
-
+        expand(inputs.properties)
     }
 
 }
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 4f3eb18..eb9a97b 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.5.1"
+    alias(libs.plugins.shadow)
 
 }
 
@@ -31,19 +31,14 @@ repositories {
 
 dependencies {
 
-    // Get versions.
-    val lampVersion: String by rootProject.extra
-    val packetEventsVersion: String by rootProject.extra
-    val bstatsVersion: String by rootProject.extra
-
     // Dependencies.
-    implementation("org.bstats:bstats-velocity:$bstatsVersion")
-    implementation("io.github.revxrsal:lamp.common:$lampVersion")
-    implementation("io.github.revxrsal:lamp.velocity:$lampVersion")
-    implementation("io.github.revxrsal:lamp.brigadier:$lampVersion")
+    implementation(libs.bstats.velocity)
+    implementation(libs.lamp.common)
+    implementation(libs.lamp.velocity)
+    implementation(libs.lamp.brigadier)
 
-    compileOnly("com.github.retrooper:packetevents-velocity:$packetEventsVersion")
-    compileOnly("com.velocitypowered:velocity-api:3.4.0")
+    compileOnly(libs.packetevents.velocity)
+    compileOnly(libs.velocity.api)
 
     // Core implementation.
     implementation(project(":core"))
@@ -53,24 +48,14 @@ dependencies {
 tasks.processResources {
 
     // Get versions.
-    val packetEventsVersion: String by rootProject.extra
-    val coreVersion: String by rootProject.extra
-
-    // Replace plugin.yml
-    filesMatching("velocity-plugin.json") {
-        expand("version" to project.version)
-    }
+    inputs.property("name", project.name)
+    inputs.property("version", project.version)
+    inputs.property("coreVersion", libs.versions.coreVersion.get())
+    inputs.property("packeteventsVersion", libs.versions.packetevents.get())
 
     // Replace properties.
-    filesMatching("platform.properties") {
-
-        expand(
-            "name" to project.name,
-            "version" to project.version,
-            "coreVersion" to coreVersion,
-            "packeteventsVersion" to packetEventsVersion
-        )
-
+    filesMatching(listOf("velocity-plugin.json", "platform.properties")) {
+        expand(inputs.properties)
     }
 
 }

From d761cb1cfd7cc7967cf34c4d6eded1170e62897e Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 8 Jul 2026 23:44:09 +0200
Subject: [PATCH 21/82] Make use of kotlin DSL to simplify buildscript

---
 bungeecord/build.gradle.kts |  8 ++++----
 core/build.gradle.kts       |  2 +-
 spigot/build.gradle.kts     | 12 ++++--------
 velocity/build.gradle.kts   |  8 ++++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index 39e3bca..79a8761 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -60,11 +60,11 @@ tasks.processResources {
 tasks.shadowJar {
 
     // Wait for the core shadowJar to finish.
-    dependsOn(project(":core").tasks.named("shadowJar"))
+    dependsOn(":core:shadowJar")
 
-    archiveBaseName.set("CoralGate-Bungeecord")
-    archiveVersion.set(project.version.toString())
-    archiveClassifier.set("")
+    archiveBaseName = "CoralGate-Bungeecord"
+    archiveVersion = project.version.toString()
+    archiveClassifier = ""
 
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 6035f37..28f6c65 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -58,7 +58,7 @@ tasks.processResources {
 
 tasks.shadowJar {
 
-    archiveClassifier.set("") // produce core.jar instead of core-all.jar
+    archiveClassifier = "" // produce core.jar instead of core-all.jar
 
     relocate("dev.dejvokep.boostedyaml", "cloud.gteam.coralgate.libs.boostedyaml")
 
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index fd41be6..8a80e0e 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -64,11 +64,11 @@ tasks.processResources {
 tasks.shadowJar {
 
     // Wait for the core shadowJar to finish.
-    dependsOn(project(":core").tasks.named("shadowJar"))
+    dependsOn(":core:shadowJar")
 
-    archiveBaseName.set("CoralGate-Spigot")
-    archiveVersion.set(project.version.toString())
-    archiveClassifier.set("")
+    archiveBaseName = "CoralGate-Spigot"
+    archiveVersion = project.version.toString()
+    archiveClassifier = ""
 
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
@@ -82,10 +82,6 @@ tasks.shadowJar {
 
 }
 
-tasks.compileJava {
-    dependsOn(project(":core").tasks.named("jar"))
-}
-
 tasks.build {
     dependsOn(tasks.shadowJar)
 }
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index eb9a97b..e7fc08c 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -63,11 +63,11 @@ tasks.processResources {
 tasks.shadowJar {
 
     // Wait for the core shadowJar to finish.
-    mustRunAfter(project(":core").tasks.named("shadowJar"))
+    dependsOn(":core:shadowJar")
 
-    archiveBaseName.set("CoralGate-Velocity")
-    archiveVersion.set(project.version.toString())
-    archiveClassifier.set("")
+    archiveBaseName = "CoralGate-Velocity"
+    archiveVersion = project.version.toString()
+    archiveClassifier = ""
 
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")

From 3483bcc6336e126420abcd7945620cfb5d8f964d Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 9 Jul 2026 10:25:14 +0200
Subject: [PATCH 22/82] Fixed properties not applying to platform.properties

---
 spigot/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 8a80e0e..1ad69f4 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -55,7 +55,7 @@ tasks.processResources {
     inputs.property("packeteventsVersion", libs.versions.packetevents.get())
 
     // Replaces placeholders in BOTH yml files.
-    filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
+    filesMatching(listOf("plugin.yml", "paper-plugin.yml", "platform.properties")) {
         expand(inputs.properties)
     }
 

From 9b63105032c33e4d92a6e15e9a1b2f8bb30f6b1e Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 9 Jul 2026 11:27:39 +0200
Subject: [PATCH 23/82] Fixes issue #29

---
 .../cloud/gteam/coralgate/VelocityPlugin.java     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
index 3ac6128..953f9b5 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
@@ -35,6 +35,7 @@
 import org.bstats.velocity.Metrics;
 import revxrsal.commands.Lamp;
 import revxrsal.commands.velocity.VelocityLamp;
+import revxrsal.commands.velocity.VelocityVisitors;
 import revxrsal.commands.velocity.actor.VelocityCommandActor;
 
 import java.nio.file.Path;
@@ -42,28 +43,28 @@
 
 public final class VelocityPlugin {
 
-    private final Metrics.Factory metricsFactory;
+    private final CorePlugin corePlugin = new CorePlugin();
 
     private final Path dataDirectory;
+    private final Metrics.Factory metricsFactory;
 
     @Inject
-    public VelocityPlugin(final ProxyServer server, final @DataDirectory Path dataDirectory, final Metrics.Factory metricsFactory) {
+    public VelocityPlugin(final ProxyServer proxyServer, final @DataDirectory Path dataDirectory, final Metrics.Factory metricsFactory) {
 
         this.dataDirectory = dataDirectory;
+        // Load bStats metrics factory.
+        this.metricsFactory = metricsFactory;
 
         // Load commands.
-        final Lamp<VelocityCommandActor> lamp = VelocityLamp.builder(this, server)
+        final Lamp<VelocityCommandActor> lamp = VelocityLamp.builder(this, proxyServer)
                 .permissionFactory(new PermissionFactory(new VelocityPermissionChecker()))
                 .build();
         lamp.register(new CoralGateCommand(this.corePlugin));
 
-        // Load bStats metrics factory.
-        this.metricsFactory = metricsFactory;
+        lamp.accept(VelocityVisitors.brigadier(proxyServer));
 
     }
 
-    private final CorePlugin corePlugin = new CorePlugin();
-
     @Subscribe
     public void onProxyInitialization(final ProxyInitializeEvent proxyInitializeEvent) {
 

From 7f8cd1c7d36953bdd276f8042f822aa0f5e12489 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 9 Jul 2026 14:01:07 +0200
Subject: [PATCH 24/82] Removed no longer used config related commands.

---
 .../coralgate/commands/CoralGateCommand.java  | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
index 65d60b0..38a7ad5 100644
--- a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
+++ b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
@@ -57,7 +57,6 @@ public void help(final CommandActor actor) {
         actor.sendRawMessage("");
         actor.sendRawMessage(" - /coralgate§8|cg§r help §7- Show this menu.");
         actor.sendRawMessage(" - /coralgate§8|cg§r version§8|ver§r §7- Show versions.");
-        actor.sendRawMessage(" - /coralgate§8|cg§r config§8|cfg§r reload§8|rl§r §7- Reload the config.");
         actor.sendRawMessage("");
         actor.sendRawMessage("§bHaving troubles ? Need help ? Found a bug ?");
         actor.sendRawMessage("§7Join our Discord: §bhttps://discord.gteam.cloud");
@@ -101,31 +100,4 @@ public void version(final CommandActor actor) {
 
     }
 
-    // /coralgate|cg config|cfg reload|rl.
-    @Subcommand({"config reload", "config rl", "cfg reload", "cfg rl"})
-    @Description("Reload the configuration file of CoralGate.")
-    @CommandPermission("coralgate.commands.config.reload")
-    public void configReload(final CommandActor actor) {
-
-        final ConfigManager configManager = this.corePlugin.getConfigManager();
-        ConfigModel config = configManager.getConfig();
-
-        actor.sendRawMessage(config.getNormalPrefix() + "Reloading configuration file...");
-
-        // Get latest config version.
-        final String latestConfigVersion = this.corePlugin.getConfigManager().getLatestConfigVersion();
-
-        configManager.load();
-        // Update config with latest load.
-        config = configManager.getConfig();
-
-        // Compare current config version and latest version and alert the user if necessary.
-        if (!Objects.equals(latestConfigVersion, config.getConfigVersion())) {
-            actor.sendRawMessage(config.getWarningPrefix() + "Please consider upgrading your configuration file to the latest version: '" + latestConfigVersion + "'. Your configuration file is at version '" + config.getConfigVersion() + "'.");
-        }
-
-        actor.sendRawMessage(config.getNormalPrefix() + "Configuration file reloaded!");
-
-    }
-
 }

From 79e059abbb114cb4c9677c675890012576d776ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Rosner?= <kontakt@rafi67000.xyz>
Date: Thu, 9 Jul 2026 18:02:28 +0200
Subject: [PATCH 25/82] Fix shadow warnings by setting duplicates strategy

---
 bungeecord/build.gradle.kts | 4 ++++
 core/build.gradle.kts       | 4 ++++
 spigot/build.gradle.kts     | 4 ++++
 velocity/build.gradle.kts   | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index 79a8761..694ec20 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -73,6 +73,10 @@ tasks.shadowJar {
     exclude("META-INF/*.DSA")
     exclude("META-INF/*.RSA")
 
+    filesMatching("META-INF/*.kotlin_module") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
 }
 
 tasks.build {
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 28f6c65..4f5a7a8 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -62,6 +62,10 @@ tasks.shadowJar {
 
     relocate("dev.dejvokep.boostedyaml", "cloud.gteam.coralgate.libs.boostedyaml")
 
+    filesMatching("META-INF/*.kotlin_module") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
 }
 
 tasks.build {
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 1ad69f4..24e660e 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -80,6 +80,10 @@ tasks.shadowJar {
     exclude("META-INF/*.DSA")
     exclude("META-INF/*.RSA")
 
+    filesMatching("META-INF/*.kotlin_module") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
 }
 
 tasks.build {
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index e7fc08c..45c990b 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -76,6 +76,10 @@ tasks.shadowJar {
     exclude("META-INF/*.DSA")
     exclude("META-INF/*.RSA")
 
+    filesMatching("META-INF/*.kotlin_module") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
 }
 
 tasks.build {

From 6ba83d34460cad81927a0300be5eeda35ef485b5 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 12:25:29 +0200
Subject: [PATCH 26/82] changed pe and lamp order

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c8ef833..5194a57 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 coreVersion = "0.4.3-SNAPSHOT"
 
-lamp = "4.0.0-rc.17"
 packetevents = "2.13.0"
+lamp = "4.0.0-rc.17"
 bstats = "3.2.1"
 
 jankson = "1.2.3"

From 35ae56246f373677c937be38856605d4b7eb60f2 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 12:34:15 +0200
Subject: [PATCH 27/82] extra space tickling my brain

---
 gradle/libs.versions.toml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5194a57..bfe443d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -47,6 +47,5 @@ spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "spigot" }
 bungeecord-api = { module = "net.md-5:bungeecord-api", version.ref = "bungeecord" }
 velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" }
 
-
 [plugins]
-shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
\ No newline at end of file
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }

From 6dba8f6904e3e92606d51684f40a2371b6d7e7b3 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 12:58:39 +0200
Subject: [PATCH 28/82] Made more professional and cleaner

---
 README.md | 448 +++++++++++-------------------------------------------
 1 file changed, 88 insertions(+), 360 deletions(-)

diff --git a/README.md b/README.md
index e79a80a..3989f3c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [//]: # (Main image, centered)
 <p align="center">
-  <img width="300" src="https://github.com/GTeamx/CoralGate/blob/prod/assets/coralgate_logo.png?raw=true">
+  <img width="300" src="https://github.com/GTeamX/CoralGate/blob/prod/assets/coralgate_logo.png?raw=true" alt="CoralGate Logo">
 </p>
 
 [//]: # (Main title, centered)
@@ -9,406 +9,134 @@
 [//]: # (Shield.io badges, main basic stuff, centered)
 <div align="center">
 
-  <a href="">![GitHub Release](https://img.shields.io/github/v/release/GTeamX/CoralGate?sort=date&display_name=tag&style=for-the-badge&label=Latest%20Release&color=55FFFF)</a>
-  <a href="">![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/GTeamX/CoralGate/latest/total?sort=date&style=for-the-badge&label=Latest%20Downloads)</a>
+  <a href="https://github.com/GTeamX/CoralGate/releases">![GitHub Release](https://img.shields.io/github/v/release/GTeamX/CoralGate?sort=date&display_name=tag&style=for-the-badge&label=Latest%20Release&color=55FFFF)</a>
+  <a href="https://github.com/GTeamX/CoralGate/releases">![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/GTeamX/CoralGate/latest/total?sort=date&style=for-the-badge&label=Latest%20Downloads)</a>
   <br>
-  <a href="">![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/GTeamX/CoralGate/total?style=for-the-badge&label=Total%20Downloads)</a>
-  <a href="">![GitHub License](https://img.shields.io/github/license/GTeamX/CoralGate?style=for-the-badge)</a>
+  <a href="https://github.com/GTeamX/CoralGate/releases">![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/GTeamX/CoralGate/total?style=for-the-badge&label=Total%20Downloads)</a>
+  <a href="https://github.com/GTeamX/CoralGate/blob/prod/LICENSE">![GitHub License](https://img.shields.io/github/license/GTeamX/CoralGate?style=for-the-badge)</a>
   <br>
-  <a href="">![GitHub commits since latest release](https://img.shields.io/github/commits-since/GTeamX/CoralGate/latest?sort=date&style=for-the-badge&label=commits%20since%20release)</a>
-  <a href="">![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/GTeamX/CoralGate/dev?style=for-the-badge&label='dev'%20branch%20commits)</a>
+  <a href="https://github.com/GTeamX/CoralGate/actions">![GitHub branch check runs](https://img.shields.io/github/check-runs/GTeamX/CoralGate/prod?style=for-the-badge&label='prod'%20branch%20checks)</a>
+  <a href="https://github.com/GTeamX/CoralGate/actions">![GitHub branch check runs](https://img.shields.io/github/check-runs/GTeamX/CoralGate/dev?style=for-the-badge&label='dev'%20branch%20checks)</a>
   <br>
-  <a href="">![GitHub branch check runs](https://img.shields.io/github/check-runs/GTeamX/CoralGate/prod?style=for-the-badge&label='prod'%20branch%20checks)</a>
-  <a href="">![GitHub branch check runs](https://img.shields.io/github/check-runs/GTeamX/CoralGate/dev?style=for-the-badge&label='dev'%20branch%20checks)</a>
-  <br>
-  <a href="">![GitHub Repo stars](https://img.shields.io/github/stars/GTeamX/CoralGate?style=for-the-badge)</a>
-  <a href="">![GitHub watchers](https://img.shields.io/github/watchers/GTeamX/CoralGate?style=for-the-badge)</a>
-  <a href="">![GitHub forks](https://img.shields.io/github/forks/GTeamX/CoralGate?style=for-the-badge)</a>
-  <a href="">![Discord](https://img.shields.io/discord/1046001788106575912?style=for-the-badge&label=Discord)</a>
+  <a href="https://github.com/GTeamX/CoralGate/stargazers">![GitHub Repo stars](https://img.shields.io/github/stars/GTeamX/CoralGate?style=for-the-badge)</a>
+  <a href="https://github.com/GTeamX/CoralGate/watchers">![GitHub watchers](https://img.shields.io/github/watchers/GTeamX/CoralGate?style=for-the-badge)</a>
+  <a href="https://github.com/GTeamX/CoralGate/forks">![GitHub forks](https://img.shields.io/github/forks/GTeamX/CoralGate?style=for-the-badge)</a>
+  <a href="https://discord.gteam.cloud">![Discord](https://img.shields.io/discord/1046001788106575912?style=for-the-badge&label=Discord)</a>
 
 </div>
 
 On-the-fly packet inspection and real-time IP verification for Minecraft servers and networks.
 
-CoralGate acts as a high-performance application firewall for your Minecraft infrastructure. By analyzing incoming packets: malicious payloads, scanners and bots are blocked before they truly reach your server. It secures your network across every layer, from spoofing your MOTD to appear as a "no-namer" server, all the way to checking proper packet order and even checking certain incoming connection fields.
+CoralGate acts as a high-performance application firewall for your Minecraft infrastructure. By analyzing incoming packets: malicious payloads, scanners and bots are blocked before they truly reach your server. It secures your servers by spoofing your MOTD to appear as a generic server, checks proper packet order and even checking certain incoming connection fields.
 
 If you wish to get support, test or have any questions about CoralGate, make sure to join our [Discord server](https://discord.gteam.cloud)!
 
-## ✅ Supported platforms/versions
-
-<table>
-  <thead>
-    <tr>
-      <th align="left"></th>
-      <th align="center">&lt;&nbsp;1.8</th>
-      <th align="center">1.8</th>
-      <th align="center">1.8.3</th>
-      <th align="center">1.8.8</th>
-      <th align="center">1.9</th>
-      <th align="center">1.9.1</th>
-      <th align="center">1.9.2</th>
-      <th align="center">1.9.3/4</th>
-      <th align="center">1.10.x</th>
-      <th align="center">1.11</th>
-      <th align="center">1.11.x</th>
-      <th align="center">1.12</th>
-      <th align="center">1.12.1</th>
-      <th align="center">1.12.2</th>
-      <th align="center">1.13</th>
-      <th align="center">1.13.1</th>
-      <th align="center">1.13.2</th>
-      <th align="center">1.14</th>
-      <th align="center">1.14.1</th>
-      <th align="center">1.14.2</th>
-      <th align="center">1.14.3</th>
-      <th align="center">1.14.4</th>
-      <th align="center">1.15</th>
-      <th align="center">1.15.1</th>
-      <th align="center">1.15.2</th>
-      <th align="center">1.16</th>
-      <th align="center">1.16.1</th>
-      <th align="center">1.16.2</th>
-      <th align="center">1.16.3</th>
-      <th align="center">1.16.4/5</th>
-      <th align="center">1.17</th>
-      <th align="center">1.17.1</th>
-      <th align="center">1.18</th>
-      <th align="center">1.18.1</th>
-      <th align="center">1.18.2</th>
-      <th align="center">1.19</th>
-      <th align="center">1.19.1/2</th>
-      <th align="center">1.19.3</th>
-      <th align="center">1.19.4</th>
-      <th align="center">1.20/.1</th>
-      <th align="center">1.20.2</th>
-      <th align="center">1.20.3/4</th>
-      <th align="center">1.20.5/6</th>
-      <th align="center">1.21/.1</th>
-      <th align="center">1.21.2/3</th>
-      <th align="center">1.21.4</th>
-      <th align="center">1.21.5</th>
-      <th align="center">1.21.6</th>
-      <th align="center">1.21.7/8</th>
-      <th align="center">1.21.9/10</th>
-      <th align="center">1.21.11</th>
-      <th align="center">26.1.x</th>
-      <th align="center">26.2</th>
-      <th align="center">&gt;&nbsp;26.2</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><b>Spigot</b></td>
-      <td align="center" colspan="2">❌</td>
-      <td align="center">⚠️</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❓</td>
-    </tr>
-    <tr>
-      <td><b>Paper</b></td>
-      <td align="center" colspan="3">❌</td>
-      <td align="center">✅</td>
-      <td align="center" colspan="3">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center" colspan="2">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">⚠️</td>
-      <td align="center">⚠️</td>
-      <td align="center">⚠️</td>
-      <td align="center">⚠️</td>
-      <td align="center">⚠️</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❓</td>
-    </tr>
-    <tr>
-      <td><b>BungeeCord</b></td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❌</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">✅</td>
-      <td align="center">❓</td>
-    </tr>
-    <tr>
-      <td><b>Velocity</b></td>
-      <td align="center">❌</td>
-      <td align="center" colspan="53">❓</td>
-    </tr>
-    <tr>
-      <td><b>Sponge</b></td>
-      <td align="center" colspan="54">❌</td>
-    </tr>
-    <tr>
-      <td><b>Fabric</b></td>
-      <td align="center" colspan="54">❌</td>
-    </tr>
-    <tr>
-      <td><b>Forge</b></td>
-      <td align="center" colspan="54">❌</td>
-    </tr>
-    <tr>
-      <td><b>NeoForge</b></td>
-      <td align="center" colspan="54">❌</td>
-    </tr>
-  </tbody>
-</table>
+## Supported Platforms
+
+CoralGate supports a wide range of Minecraft server implementations.
+
+| Platform       | 1.8.x | 1.9.x – 1.15.x | 1.16.x – 1.20.x | 1.21.x | 26.x | &gt; 26.2 |
+|----------------|:-----:|:--------------:|:---------------:|:------:|:----:|:---------:|
+| **Spigot**     |  ⚠️   |       ✅        |        ✅        |   ✅    |  ✅   |     ❓     |
+| **Paper**      |   ✅   |       ✅        |       ⚠️        |   ✅    |  ✅   |     ❓     |
+| **BungeeCord** |   ✅   |       ✅        |        ✅        |   ✅    |  ✅   |     ❓     |
+| **Velocity**   |   ❓   |       ❓        |        ❓        |   ❓    |  ❓   |     ❓     |
+| **Sponge**     |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |
+| **Fabric**     |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |
+| **Forge**      |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |
+| **NeoForge**   |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |
 
 <details>
-<summary><b>📋 Versions notes</b></summary>
+<summary><i>View platform compatibility notes.</i></summary>
 
 **Spigot**:
-- 1.8 throws an exception on any player join, not supported.
-- 1.8.3 works with an outdated packetevents version (2.10.1).
-- 1.9.1 jar cannot be downloaded or built.
-- 1.16 jar cannot be downloaded or built.
-- 1.19.3 throws java.lang.RuntimeException: The received byte array length is longer than maximum allowed (8742 > 512) for LOGIN_START wrapper.
+- **< 1.8.3:** not supported.
+- **1.8.3:** works with an outdated packetevents version (2.10.1).
+- **1.19.3:** not supported (broken server jar).
 
 **Paper**:
-- Only 1.8.8 build exists.
-- Only 1.9.4 build exists.
-- Only 1.11.2 build exists.
-- Only 1.12.2 build works (S3 bucket unreachable for 1.12/.1).
-- Only 1.16.x build exists.
-- Only 1.18.x build exists.
-- 1.19.3 throws java.lang.RuntimeException: The received byte array length is longer than maximum allowed (8742 > 512) for LOGIN_START wrapper.
-- 1.19.4 use Spigot version.
-- 1.20 use Spigot version.
-- 1.20.1 use Spigot version.
-- 1.20.2 use Spigot version.
-- 1.20.4 use Spigot version.
-- 1.20.5 use Spigot version.
-
-**BungeeCord**:
-- 1.9.1 jar cannot be downloaded or built.
-- 1.16 jar cannot be downloaded or built.
-</details>
-
-*Legend:*
-- ✅: *Fully supported.*
-- ⚠️: *Partially supported (missing features, using outdated dependencies, buggy or not fully tested...).*
-- ❓: *Unknown compatibility, not tested at all.*
-- ❌: *Not supported.*
-
-## ⬇️ Installation
-
-This installation procedure is platform independant, it is the same for every supported platform above:
-- Download the latest version of [packetevents](https://github.com/retrooper/packetevents/releases).
-- Download the latest version of CoralGate for your platform *(see download mirrors bellow)*.
-- Put both plugins in your "plugins" folder situated at the root of your server jar.
-- Restart your server.
-
-CoralGate is now protecting your server from scanners!
+- **1.19.3:** not supported (broken server jar).
+- **1.19.4 - 1.20.x:** not supported (broken modern 'paper-plugin.yml').
 
-## 🔄 Updates
+*Sponge, Fabric, Forge, NeoForge and any hybrid server platform is not officially supported.*
+</details>
 
-Updates are released on a non-fixed schedule. Therefore update may appear at any given time, whereas to fix issues or add new features.
-The update process is the same as the installation process. To update your configuration file please take a look bellow for further instructions.
+<details>
+<summary><i>View fully detailed platform and version support list.</i></summary>
+
+| Platform       | <1.8 | 1.8 | 1.8.3 | 1.8.8 | 1.9 | 1.9.1 | 1.9.2 | 1.9.3/4 | 1.10.x | 1.11 | 1.11.x | 1.12 | 1.12.1 | 1.12.2 | 1.13 | 1.13.1 | 1.13.2 | 1.14 | 1.14.1 | 1.14.2 | 1.14.3 | 1.14.4 | 1.15 | 1.15.1 | 1.15.2 | 1.16 | 1.16.1 | 1.16.2 | 1.16.3 | 1.16.4/5 | 1.17 | 1.17.1 | 1.18 | 1.18.1 | 1.18.2 | 1.19 | 1.19.1/2 | 1.19.3 | 1.19.4 | 1.20/.1 | 1.20.2 | 1.20.3/4 | 1.20.5/6 | 1.21/.1 | 1.21.2/3 | 1.21.4 | 1.21.5 | 1.21.6 | 1.21.7/8 | 1.21.9/10 | 1.21.11 | 26.1.x | 26.2 | &gt;26.2 |
+|:---------------|:----:|:---:|:-----:|:-----:|:---:|:-----:|:-----:|:-------:|:------:|:----:|:------:|:----:|:------:|:------:|:----:|:------:|:------:|:----:|:------:|:------:|:------:|:------:|:----:|:------:|:------:|:----:|:------:|:------:|:------:|:--------:|:----:|:------:|:----:|:------:|:------:|:----:|:--------:|:------:|:------:|:-------:|:------:|:--------:|:--------:|:-------:|:--------:|:------:|:------:|:------:|:--------:|:---------:|:-------:|:------:|:----:|:--------:|
+| **Spigot**     |  ❌   |  ❌  |  ⚠️   |   ✅   |  ✅  |   ❌   |   ✅   |    ✅    |   ✅    |  ✅   |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |  ❌   |   ✅    |   ✅    |   ✅    |    ✅     |  ✅   |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |    ✅     |   ❌    |   ✅    |    ✅    |   ✅    |    ✅     |    ✅     |    ✅    |    ✅     |   ✅    |   ✅    |   ✅    |    ✅     |     ✅     |    ✅    |   ✅    |  ✅   |    ❓     |
+| **Paper**      |  ❌   |  ❌  |   ❌   |   ✅   |  ❌  |   ❌   |   ❌   |    ✅    |   ✅    |  ❌   |   ✅    |  ❌   |   ❌    |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |  ❌   |   ✅    |   ✅    |   ✅    |    ✅     |  ✅   |   ✅    |  ❌   |   ✅    |   ✅    |  ✅   |    ✅     |   ❌    |   ❌    |    ❌    |   ❌    |    ❌     |    ❌     |    ✅    |    ✅     |   ✅    |   ✅    |   ✅    |    ✅     |     ✅     |    ✅    |   ✅    |  ✅   |    ❓     |
+| **BungeeCord** |  ❌   |  ✅  |   ✅   |   ✅   |  ✅  |   ❌   |   ✅   |    ✅    |   ✅    |  ✅   |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |   ✅    |   ✅    |  ✅   |   ✅    |   ✅    |  ❌   |   ✅    |   ✅    |   ✅    |    ✅     |  ✅   |   ✅    |  ✅   |   ✅    |   ✅    |  ✅   |    ✅     |   ✅    |   ✅    |    ✅    |   ❌    |    ✅     |    ✅     |    ✅    |    ✅     |   ✅    |   ✅    |   ✅    |    ✅     |     ✅     |    ✅    |   ✅    |  ✅   |    ❓     |
+| **Velocity**   |  ❌   |  ❓  |   ❓   |   ❓   |  ❓  |   ❓   |   ❓   |    ❓    |   ❓    |  ❓   |   ❓    |  ❓   |   ❓    |   ❓    |  ❓   |   ❓    |   ❓    |  ❓   |   ❓    |   ❓    |   ❓    |   ❓    |  ❓   |   ❓    |   ❓    |  ❓   |   ❓    |   ❓    |   ❓    |    ❓     |  ❓   |   ❓    |  ❓   |   ❓    |   ❓    |  ❓   |    ❓     |   ❓    |   ❓    |    ❓    |   ❓    |    ❓     |    ❓     |    ❓    |    ❓     |   ❓    |   ❓    |   ❓    |    ❓     |     ❓     |    ❓    |   ❓    |  ❓   |    ❓     |
+| **Sponge**     |  ❌   |  ❌  |   ❌   |   ❌   |  ❌  |   ❌   |   ❌   |    ❌    |   ❌    |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |    ❌     |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |    ❌     |   ❌    |   ❌    |    ❌    |   ❌    |    ❌     |    ❌     |    ❌    |    ❌     |   ❌    |   ❌    |   ❌    |    ❌     |     ❌     |    ❌    |   ❌    |  ❌   |    ❌     |
+| **Fabric**     |  ❌   |  ❌  |   ❌   |   ❌   |  ❌  |   ❌   |   ❌   |    ❌    |   ❌    |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |    ❌     |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |    ❌     |   ❌    |   ❌    |    ❌    |   ❌    |    ❌     |    ❌     |    ❌    |    ❌     |   ❌    |   ❌    |   ❌    |    ❌     |     ❌     |    ❌    |   ❌    |  ❌   |    ❌     |
+| **Forge**      |  ❌   |  ❌  |   ❌   |   ❌   |  ❌  |   ❌   |   ❌   |    ❌    |   ❌    |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |    ❌     |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |    ❌     |   ❌    |   ❌    |    ❌    |   ❌    |    ❌     |    ❌     |    ❌    |    ❌     |   ❌    |   ❌    |   ❌    |    ❌     |     ❌     |    ❌    |   ❌    |  ❌   |    ❌     |
+| **NeoForge**   |  ❌   |  ❌  |   ❌   |   ❌   |  ❌  |   ❌   |   ❌   |    ❌    |   ❌    |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |   ❌    |   ❌    |   ❌    |    ❌     |  ❌   |   ❌    |  ❌   |   ❌    |   ❌    |  ❌   |    ❌     |   ❌    |   ❌    |    ❌    |   ❌    |    ❌     |    ❌     |    ❌    |    ❌     |   ❌    |   ❌    |   ❌    |    ❌     |     ❌     |    ❌    |   ❌    |  ❌   |    ❌     |
 
-## ✏️ Configuration file
+</details>
 
-CoralGate has a very extensive and complete configuration file, situated in your plugins folder under the CoralGate folder. The file is named 'config.yml'.
-Every default value is marked in the comments above the field with explanation on it's impact.
+## Installation
 
-If you ever mess up your configuration file, delete it and restart your server. The default configuration will be loaded.
+This installation procedure is platform independent, it is the same for every supported platform above:
+1. Download the latest version of [packetevents](https://github.com/retrooper/packetevents/releases).
+2. Download the latest version of CoralGate for your platform *(see download mirrors below)*.
+3. Put both plugins in your "plugins" folder situated at the root of your server jar.
+4. Restart your server.
 
-If you recently updated CoralGate and get a warning saying your configuration file is outdated, delete your configuration file and let the new default configuration appear. To ensure you loose none of your settings, we advise you make a backup of your config.yml file beforehand.
+CoralGate is now protecting your server from scanners!
 
-## 🔔 Releases
+## Download Mirrors
 
-CoralGate has a built-in update checker, however it will not automatically install nor download the update, it will only send a message telling you if you are up to date or not.
 To prevent any malware from infecting your server, only download CoralGate from our **trusted sources**:
-- [Official GitHub](https://github.com/GTeamx/CoralGate/releases)
-
-Feel free to compile CoralGate yourself, however note that using a build from the dev branch will prevent you from getting support. If you want features or fixes to be added to CoralGate, please follow the [Issues/Feature request](https://github.com/GTeamx/CoralGate?tab=readme-ov-file#-issuesfeature-request) section.
+- [Official GitHub](https://github.com/GTeamX/CoralGate/releases)
 
-## 🚧 API
+## Configuration
 
-CoralGate uses it's own API to determine if an IP is malicious or not.
+CoralGate has a very extensive and complete configuration file, situated in your plugins folder under the CoralGate folder. The file is named `config.yml`.
+Every default value is marked in the comments above the field with explanation on its impact.
 
-The API is hosted in Germarny and all data is processed within this country. This API doesn't require any key or subscription to be used. You can use it for free manually too.
-
-To use the API manually, use the base URL: https://api.gteam.cloud/coralgate/v2/enter-ip-here
+If you ever mess up your configuration file, delete it and restart your server. The default configuration will be loaded.
 
-Simply replace "enter-ip-here" by the IP you wish to verify.<br>
-E.g.: https://api.gteam.cloud/coralgate/v2/185.65.134.164 *(This is a known malicious ip address)*<br>
-E.g.: https://api.gteam.cloud/coralgate/v2/9.9.9.9 *(This is not a malicious ip address)*<br>
+## API
 
-The API supports both IPv4 and IPv6 and has currently **2** major versions:
-- v2 *(latest)*
-- v1
+CoralGate utilizes a proprietary, custom-built API hosted in Germany (fully GDPR-compliant) to determine IP reputation. The API is free, requires no authentication keys, and supports both IPv4 and IPv6.
 
-## 🚷 API false positives
+You can manually query the API using the following structure:
+`https://api.gteam.cloud/coralgate/v2/<ip_address>`
 
-If your API, ISP, domain name or holders get blocked by our API and therefore from the CoralGate powered servers, contact us on [Discord](https://discord.gteam.cloud) via our ticket system.<br>
+**Examples:**
+- `https://api.gteam.cloud/coralgate/v2/185.65.134.164` *(Returns malicious)*
+- `https://api.gteam.cloud/coralgate/v2/9.9.9.9` *(Returns safe)*
 
-Provide the impacted ip address(es) and further explanation on the usage behind the ip address(es). Our support team will try their best to help you and get you unblocked from CoralGate.
+### False Positives
 
-*Please note that we detect and block ip addresses that exerce the following behavior/service:*
-- Port scanning
-- IP scanning
-- Crawlers
-- MOTD fetchers
-- Online player count fetchers/monitors
-- VPN/Proxy
-- TOR
-- Hosting services
-- Cloud providers
-- Bots
-- Server finders/scanners (shodan, OpenHeimer...)
-....
+If your ISP, domain name, or personal IP is falsely flagged and blocked from CoralGate-protected servers, please open a ticket on our [Discord](https://discord.gteam.cloud). Provide the affected IP addresses and their primary use case, and our support team will assist with whitelisting.
 
-*Some services are exempt from these rules, such as:*
-- Voting sites
-- Server lists
+**Traffic routinely blocked by the API:**
+Port/IP scanners, crawlers, MOTD/player-count fetchers, VPNs, proxies, TOR exit nodes, and automated hosting services (e.g., Shodan, OpenHeimer).
 
-## 🎯 Issues/Feature request
+**Traffic exempt from blocking:**
+Known voting sites and verified server lists.
 
-Before opening an issue or feature request make sure you follow our templates.<br>
-If your issue/feature request goes unotice, you can open a ticket on our [Discord](https://discord.gteam.cloud) server or bump it.
+## Contributing & Support
 
-## 🔃 Contributing
+**Issues & Feature Requests:**
+Please utilize the provided GitHub templates when opening an issue or requesting a feature. If your ticket requires urgent attention, you may reference it in our Discord support channels.
 
-Before contributing, please make sure that you follow our conventions (naming scheme, indentation) and that your code works.<br>
-Make sure to also precise on what platform and version your test was ran, with other plugins/mods installed (if applicable).
+**Contributing:**
+We welcome pull requests. Ensure your code follows our existing naming conventions and indentation standards. When submitting a PR, detail the platform, exact version, and any other relevant plugins used during your testing.
 
-## 📎 Special Credits
+## Credits & License
 
-Special credits to [retrooper](https://github.com/retrooper) for making [packetevents](https://github.com/retrooper/packetevents) that we are using to analyze packets!<br>
-Thank you so much for your amazing work and dedication!
+CoralGate is built on top of these incredible open-source projects:
 
-## 📜 License
+* [packetevents](https://github.com/retrooper/packetevents) by [retrooper](https://github.com/retrooper) - Powers our core packet analysis.
+* [Lamp](https://github.com/Revxrsal/lamp) by [Revxrsal](https://github.com/Revxrsal) - Handles our cross-platform command ecosystem.
+* [bStats](https://github.com/Bastian/bStats) by [Bastian Oppermann](https://github.com/Bastian) - Provides anonymous usage metrics.
+* [Jankson](https://github.com/falkreon/Jankson) by [Falkreon](https://github.com/falkreon) - Parses our API JSON results.
+* [async-http-client](https://github.com/AsyncHttpClient/async-http-client) by [Aayush Atharva](https://github.com/hyperxpro) - Powers our network API queries and update checks.
+* [boosted-yaml](https://github.com/dejvokep/boosted-yaml) by [dejvokep](https://github.com/dejvokep) - Drives our internal configuration engine.
 
-This project is licensed under GNU General Public License v3.0 (GPL).
+This project is licensed under the [GNU General Public License v3.0 (GPL)](LICENSE).

From 0c5882a9e10087b2b61b1b928089106ffea34892 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:27:32 +0200
Subject: [PATCH 29/82] Removed unused client brand config settings

---
 .../gteam/coralgate/config/ConfigManager.java |  1 -
 .../gteam/coralgate/config/ConfigModel.java   | 10 ----------
 core/src/main/resources/config.yml            | 19 +------------------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
index 868923c..590427c 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
@@ -99,7 +99,6 @@ private void mapFields() {
         this.config.setApiTriggerFieldValue(this.document.getString("api-settings.trigger-field-value", "true"));
 
         this.config.setIgnoreLocalAddresses(this.document.getBoolean("filter-settings.ignore-local-addresses", true));
-        this.config.setAllowedClientBrands(this.document.getStringList("filter-settings.allowed-client-brands", Arrays.asList("vanilla", "fabric", "forge", "neoforge", "quilt", "lunarclient", "badlion", "feather", "labymod4", "cheatbreaker", "geyser")));
 
     }
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
index 007499e..9dea06b 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
@@ -55,8 +55,6 @@ private static class FilterSettings {
 
         private boolean ignoreLocalAddresses = true;
 
-        private List<String> allowedClientBrands = Arrays.asList("vanilla", "fabric", "forge", "neoforge", "quilt", "lunarclient", "badlion", "feather", "labymod4", "cheatbreaker", "Geyser");
-
     }
 
     public void setConfigVersion(final String version) {
@@ -155,12 +153,4 @@ public boolean isIgnoreLocalAddresses() {
         return this.filterSettings.ignoreLocalAddresses;
     }
 
-    public List<String> getAllowedClientBrands() {
-        return this.filterSettings.allowedClientBrands;
-    }
-
-    public void setAllowedClientBrands(final List<String> allowedClientBrands) {
-        this.filterSettings.allowedClientBrands = allowedClientBrands;
-    }
-
 }
diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index 25fd448..57f3cb3 100644
--- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml
@@ -6,7 +6,7 @@
 # You need to restart your server in order to fully apply changes!
 
 # Config file version. DO NOT CHANGE THIS!
-version: "0.2.2"
+version: "0.2.3"
 
 # Per category message prefixes.
 prefixes:
@@ -87,20 +87,3 @@ filter-settings:
   # Expected value type: Boolean
   # Expected value: true
   ignore-local-addresses: true
-
-  # Client brands which are allowed to connect.
-  # This contains the big majority of widely used clients.
-  # If any is missing, feel free to add it.
-  # If the client brand you want to allow doesn't send a proper name, feel free to disable the client brand check.
-  allowed-client-brands:
-    - vanilla
-    - fabric
-    - forge
-    - neoforge
-    - quilt
-    - lunarclient
-    - badlion
-    - feather
-    - labymod4
-    - cheatbreaker
-    - geyser
\ No newline at end of file

From a3194347796d37f5df1654f6ac2822ba4cf7fb1e Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:28:32 +0200
Subject: [PATCH 30/82] Optimized imports

---
 core/build.gradle.kts                                         | 2 --
 .../main/java/cloud/gteam/coralgate/config/ConfigManager.java | 1 -
 .../main/java/cloud/gteam/coralgate/config/ConfigModel.java   | 3 ---
 .../main/java/cloud/gteam/coralgate/update/UpdateChecker.java | 2 --
 scanner/src/Main.java                                         | 4 +++-
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 4f5a7a8..c03da74 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.shadowJar
-
 plugins {
 
     `java-library`
diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
index 590427c..d6e718f 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
@@ -28,7 +28,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
 
 public class ConfigManager {
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
index 9dea06b..ad36eda 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigModel.java
@@ -18,9 +18,6 @@
 
 package cloud.gteam.coralgate.config;
 
-import java.util.Arrays;
-import java.util.List;
-
 public class ConfigModel {
 
     private String version;
diff --git a/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java b/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
index 50c61f0..410edab 100644
--- a/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
+++ b/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
@@ -26,9 +26,7 @@
 
 import java.io.IOException;
 import java.util.Objects;
-import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class UpdateChecker {
 
diff --git a/scanner/src/Main.java b/scanner/src/Main.java
index 8cdb604..7e73ae8 100644
--- a/scanner/src/Main.java
+++ b/scanner/src/Main.java
@@ -30,7 +30,9 @@
  */
 
 import java.io.*;
-import java.net.*;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

From 4db252ede4d23525d86cfd4eee0e5d97cf2ec2f2 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:32:32 +0200
Subject: [PATCH 31/82] Added privacy section to comply with Modrinth

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 3989f3c..21f33ec 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,15 @@ Port/IP scanners, crawlers, MOTD/player-count fetchers, VPNs, proxies, TOR exit
 **Traffic exempt from blocking:**
 Known voting sites and verified server lists.
 
+### Privacy & Disclosure
+
+By default, CoralGate automatically verifies the reputation of connecting players to block malicious traffic.
+
+* **Data Transmitted:** When a player attempts to join, their IP address is sent via a secure GET request to our proprietary API.
+* **Endpoint:** `https://api.gteam.cloud/coralgate/v2/<ip_address>`
+* **Privacy:** The API is hosted in Germany (fully GDPR-compliant). No personally identifiable information (PII) beyond the IP is processed, and data is used strictly for real-time risk assessment.
+* **Opt-Out:** You can entirely disable this external API lookup or route requests through your own custom endpoint by modifying the `config.yml` file.
+
 ## Contributing & Support
 
 **Issues & Feature Requests:**

From ad8e71ca54f00cd686a3f9cd15ec62d7ae25885a Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:14:16 +0200
Subject: [PATCH 32/82] Undid optimized import

---
 core/build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index c03da74..4f5a7a8 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.kotlin.dsl.shadowJar
+
 plugins {
 
     `java-library`

From cc21c8f67e079f701ff6fbf1c90cf33557d67b84 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:15:04 +0200
Subject: [PATCH 33/82] Fixed colors for velocity

---
 .../coralgate/commands/CoralGateCommand.java  | 101 ++++++++++++------
 1 file changed, 69 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
index 38a7ad5..1ba5d0f 100644
--- a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
+++ b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
@@ -28,6 +28,8 @@
 import revxrsal.commands.annotation.Subcommand;
 import revxrsal.commands.command.CommandActor;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 @Command({"coralgate", "cg"})
@@ -48,20 +50,34 @@ public void help(final CommandActor actor) {
         final ConfigManager configManager = this.corePlugin.getConfigManager();
         final ConfigModel config = configManager.getConfig();
 
-        actor.sendRawMessage("§7-----------------------------------------------------");
-        actor.sendRawMessage("");
-        actor.sendRawMessage(config.getNormalPrefix() + "§f" + this.corePlugin.getPlatformProperties().getProperty("platform-version") + " | §7§o(" + this.corePlugin.getPlatformProperties().getProperty("core-version") + ")§r");
-        actor.sendRawMessage("§7Made by XIII___ and Vagdedes2 with(out) love!");
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7Available commands:");
-        actor.sendRawMessage("");
-        actor.sendRawMessage(" - /coralgate§8|cg§r help §7- Show this menu.");
-        actor.sendRawMessage(" - /coralgate§8|cg§r version§8|ver§r §7- Show versions.");
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§bHaving troubles ? Need help ? Found a bug ?");
-        actor.sendRawMessage("§7Join our Discord: §bhttps://discord.gteam.cloud");
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7-----------------------------------------------------");
+        final String[] lines = {
+                "§7-----------------------------------------------------",
+                "",
+                config.getNormalPrefix() + "§f" + this.corePlugin.getPlatformProperties().getProperty("platform-version") + " | §7§o(" + this.corePlugin.getPlatformProperties().getProperty("core-version") + ")§r",
+                "§7Made by XIII___ and Vagdedes2 with(out) love!",
+                "",
+                "§7Available commands:",
+                "",
+                " - /coralgate§8|cg§r help §7- Show this menu.",
+                " - /coralgate§8|cg§r version§8|ver§r §7- Show versions.",
+                "",
+                "§bHaving troubles ? Need help ? Found a bug ?",
+                "§7Join our Discord: §bhttps://discord.gteam.cloud",
+                "",
+                "§7-----------------------------------------------------"
+        };
+
+        for (String line : lines) {
+
+            // Velocity only sees colors via "&" and not "§".
+            // However, other platforms only see colors via "§", so we'll have to handle this specifically for Velocity.
+            if (this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
+                line = line.replace("§", "&");
+            }
+
+            actor.reply(line);
+
+        }
 
     }
 
@@ -76,27 +92,48 @@ public void version(final CommandActor actor) {
 
         final String currentVersion = this.corePlugin.getPlatformProperties().getProperty("core-version") + "_" + this.corePlugin.getPlatformProperties().getProperty("platform-version");
 
-        actor.sendRawMessage("§7-----------------------------------------------------");
-        actor.sendRawMessage("");
-        actor.sendRawMessage(config.getNormalPrefix() + "§fVersions information");
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7Platform: §f" + this.corePlugin.getPlatformProperties().getProperty("platform-name"));
-        actor.sendRawMessage("§7Version: " + (Objects.equals(this.corePlugin.getUpdateChecker().getLatestVersion(), currentVersion) ? "§a" : "§e") + this.corePlugin.getPlatformProperties().getProperty("platform-version"));
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7Core version: " + (Objects.equals(this.corePlugin.getUpdateChecker().getLatestVersion(), currentVersion) ? "§a" : "§e") + this.corePlugin.getPlatformProperties().getProperty("core-version"));
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7Configuration version: §f" + (Objects.equals(this.corePlugin.getConfigManager().getLatestConfigVersion(), config.getConfigVersion()) ? "§a" : "§e") + config.getConfigVersion());
-        actor.sendRawMessage("");
+        final String versionColor = Objects.equals(this.corePlugin.getUpdateChecker().getLatestVersion(), currentVersion) ? "§a" : "§e";
+        final String configColor = Objects.equals(this.corePlugin.getConfigManager().getLatestConfigVersion(), config.getConfigVersion()) ? "§a" : "§e";
+        final String packeteventsColor = PacketEvents.getAPI().getVersion().toString().equals(this.corePlugin.getPlatformProperties().getProperty("packetevents-version")) ? "§a" : "§e";
+
+        // Create an array list so we can freely handle conditional statements with {} blocks
+        final List<String> lines = new ArrayList<>();
+
+        lines.add("§7-----------------------------------------------------");
+        lines.add("");
+        lines.add(config.getNormalPrefix() + "§fVersions information");
+        lines.add("");
+        lines.add("§7Platform: §f" + this.corePlugin.getPlatformProperties().getProperty("platform-name"));
+        lines.add("§7Version: " + versionColor + this.corePlugin.getPlatformProperties().getProperty("platform-version"));
+        lines.add("");
+        lines.add("§7Core version: " + versionColor + this.corePlugin.getPlatformProperties().getProperty("core-version"));
+        lines.add("");
+        lines.add("§7Configuration version: §f" + configColor + config.getConfigVersion());
+        lines.add("");
+
         if (config.isAllowApiUsage()) {
-            actor.sendRawMessage("§7API host: §f" + config.getApiHost());
-            actor.sendRawMessage("§7API version: §f" + config.getApiVersion());
+            lines.add("§7API host: §f" + config.getApiHost());
+            lines.add("§7API version: §f" + config.getApiVersion());
         } else {
-            actor.sendRawMessage("§7API usage is disabled.");
+            lines.add("§7API usage is disabled.");
+        }
+
+        lines.add("");
+        lines.add("§7packetevents version: " + packeteventsColor + this.corePlugin.getPlatformProperties().getProperty("packetevents-version"));
+        lines.add("");
+        lines.add("§7-----------------------------------------------------");
+
+        for (String line : lines) {
+
+            // Velocity only sees colors via "&" and not "§".
+            // However, other platforms only see colors via "§", so we'll have to handle this specifically for Velocity.
+            if (this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
+                line = line.replace("§", "&");
+            }
+
+            actor.reply(line);
+
         }
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7packetevents version: " + (PacketEvents.getAPI().getVersion().toString().equals(this.corePlugin.getPlatformProperties().getProperty("packetevents-version")) ? "§a" : "§e") + this.corePlugin.getPlatformProperties().getProperty("packetevents-version"));
-        actor.sendRawMessage("");
-        actor.sendRawMessage("§7-----------------------------------------------------");
 
     }
 

From 397f9b18e080b9b5dea4009cd5a43ff4d65c0c07 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:15:21 +0200
Subject: [PATCH 34/82] Dynamically changing platform name if on paper

---
 .../java/cloud/gteam/coralgate/SpigotPlugin.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
index b48d982..0928e31 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
@@ -32,6 +32,8 @@
 import revxrsal.commands.bukkit.BukkitLamp;
 import revxrsal.commands.bukkit.actor.BukkitCommandActor;
 
+import java.util.Properties;
+
 public final class SpigotPlugin extends JavaPlugin {
 
     private final CorePlugin corePlugin = new CorePlugin();
@@ -48,8 +50,20 @@ public void onEnable() {
         // Start bStats.
         new Metrics(this, 29439);
 
+        // Get properties early to modify the platform name later on if needed.
+        final Properties platformProperties = PlatformUtils.loadProperties(this.getClass());
+
+        // Paper's bootstrapper context class is only present when loaded via paper-plugin.yml
+        // If it exists we're running as 'paper'.
+        try {
+
+            Class.forName("io.papermc.paper.plugin.bootstrap.BootstrapContext");
+            platformProperties.setProperty("platform-name", "paper");
+
+        } catch (final ClassNotFoundException ignored) {}
+
         // Load core.
-        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), Bukkit.getOnlineMode(), "server.properties", PlatformUtils.loadProperties(this.getClass()));
+        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), Bukkit.getOnlineMode(), "server.properties", platformProperties);
 
         // Load commands.
         final Lamp<BukkitCommandActor> bukkitCommandActor = BukkitLamp.builder(this)

From 97adbdf7efce0956e55152b972a56f952e698a39 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:15:37 +0200
Subject: [PATCH 35/82] undo

---
 core/build.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 4f5a7a8..c03da74 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.kotlin.dsl.shadowJar
-
 plugins {
 
     `java-library`

From 4ebcb1846a7ba348d388629b53e4c29640b95fb9 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:21:18 +0200
Subject: [PATCH 36/82] Added fool proof color

---
 .../cloud/gteam/coralgate/commands/CoralGateCommand.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
index 1ba5d0f..0b4e7df 100644
--- a/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
+++ b/core/src/main/java/cloud/gteam/coralgate/commands/CoralGateCommand.java
@@ -73,6 +73,9 @@ public void help(final CommandActor actor) {
             // However, other platforms only see colors via "§", so we'll have to handle this specifically for Velocity.
             if (this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
                 line = line.replace("§", "&");
+            } else {
+                // Fool-proof in case somebody put "&" in their config for prefixes.
+                line = line.replace("&", "§");
             }
 
             actor.reply(line);
@@ -129,6 +132,9 @@ public void version(final CommandActor actor) {
             // However, other platforms only see colors via "§", so we'll have to handle this specifically for Velocity.
             if (this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
                 line = line.replace("§", "&");
+            } else {
+                // Fool-proof in case somebody put "&" in their config for prefixes.
+                line = line.replace("&", "§");
             }
 
             actor.reply(line);

From c52cc00ceb6ed771010186b14019619d5334cdb1 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 15:28:24 +0200
Subject: [PATCH 37/82] Fixed thread blocking update check

---
 .../java/cloud/gteam/coralgate/CorePlugin.java | 17 ++++-------------
 .../gteam/coralgate/update/UpdateChecker.java  | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java b/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
index 850819b..b863b2f 100644
--- a/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
+++ b/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
@@ -27,6 +27,7 @@
 import java.io.File;
 import java.util.Objects;
 import java.util.Properties;
+import java.util.concurrent.Executors;
 import java.util.logging.Logger;
 
 public final class CorePlugin {
@@ -105,6 +106,8 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
             logger.info("API loading skipped (disabled by config).");
         }
 
+        logger.info("Reading online-mode and compression threshold...");
+
         this.onlineMode = onlineMode;
 
         this.compressionThreshold = ConfigUtils.getCompressionThreshold(configFileName);
@@ -113,19 +116,7 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
 
         this.updateChecker = new UpdateChecker(this);
 
-        this.updateChecker.isUpToDate().thenAccept(upToDate -> {
-
-            try {
-                Thread.sleep(3000);
-            } catch (final InterruptedException ignored) {}
-
-            if (upToDate) {
-                CorePlugin.getLogger().info("CoralGate is up to date!");
-            } else {
-                CorePlugin.getLogger().warning("You are behind updates on CoralGate! Latest version is '" + this.updateChecker.getLatestVersion() + "'. You are on '" + this.platformProperties.getProperty("platform-version") + "'.");
-            }
-
-        });
+        Executors.newSingleThreadScheduledExecutor().schedule(() -> this.updateChecker.checkForUpdates(), 3, java.util.concurrent.TimeUnit.SECONDS);
 
         logger.info("CoralGate is ready to use!");
 
diff --git a/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java b/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
index 410edab..7d4af2d 100644
--- a/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
+++ b/core/src/main/java/cloud/gteam/coralgate/update/UpdateChecker.java
@@ -47,7 +47,7 @@ public UpdateChecker(final CorePlugin corePlugin) {
                 .build());
     }
 
-    public CompletableFuture<Boolean> isUpToDate() {
+    private CompletableFuture<Boolean> isUpToDate() {
 
         final String currentVersion = this.corePlugin.getPlatformProperties().getProperty("platform-version");
 
@@ -100,6 +100,22 @@ public CompletableFuture<Boolean> isUpToDate() {
 
     }
 
+    public void checkForUpdates() {
+
+        CorePlugin.getLogger().info("Checking for updates, please wait...");
+
+        isUpToDate().thenAccept(upToDate -> {
+
+            if (upToDate) {
+                CorePlugin.getLogger().info("CoralGate is up to date!");
+            } else {
+                CorePlugin.getLogger().warning("You are behind updates on CoralGate! Latest version is '" + getLatestVersion() + "'. You are on '" + this.corePlugin.getPlatformProperties().getProperty("platform-version") + "'.");
+            }
+
+        });
+
+    }
+
     public void shutdown() {
 
         // Forcefully cancel any HTTP callbacks still hanging around.

From 14c1c1595d7e9a2b89212b552cd18ec4126fbf9f Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 16:42:15 +0200
Subject: [PATCH 38/82] Updated scanner legit motd scan

---
 scanner/src/Main.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scanner/src/Main.java b/scanner/src/Main.java
index 7e73ae8..130cbc3 100644
--- a/scanner/src/Main.java
+++ b/scanner/src/Main.java
@@ -123,10 +123,10 @@ private static Outcome testLegitStatus() throws IOException {
             boolean pingOk = pongPayload == pingPayload;
 
             String info = describeMotd(json);
-            if (!forged && pingOk) {
-                return Outcome.pass("Real server data received as expected. " + info);
+            if (forged && pingOk) {
+                return Outcome.pass("Forged server data received as expected. " + info);
             }
-            return Outcome.fail("Legit traffic was treated as suspicious! forgedMotd=" + forged
+            return Outcome.fail("Legit traffic wasn't sent forged motd on first request! motd=" + forged
                     + " pingEchoOk=" + pingOk + " raw=" + truncate(json));
         } catch (IOException e) {
             return Outcome.fail("Legit connection was unexpectedly blocked/closed: " + e);

From 0c9516a39c8d3dc654df3e3b0f16b4eb4bf9ec47 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 17:29:20 +0200
Subject: [PATCH 39/82] Made API async again

---
 .../cloud/gteam/coralgate/api/APIManager.java | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
index c135d91..e6539c7 100644
--- a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
@@ -61,47 +61,48 @@ public APIManager(final CorePlugin corePlugin) {
         this.jankson = Jankson.builder().build();
     }
 
-    public boolean isIpBlocked(final String ipAddress) {
+    public CompletableFuture<Boolean> isIpBlocked(final String ipAddress) {
 
         // Get IP from cache before fetching from API.
         final CacheEntry entry = this.ipCache.get(ipAddress);
 
         // Serve cache if available.
         if (entry != null && !entry.isExpired(this.cacheTime)) {
-            return entry.isBlocked();
+            return CompletableFuture.completedFuture(entry.isBlocked());
         }
 
-        // Cache not available, fetch from API synchronously.
-        boolean result = fetchFromApi(ipAddress);
-
-        if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) {
-            this.ipCache.put(ipAddress, new CacheEntry(result));
-        }
-
-        return result;
+        // Cache not available, fetch from API.
+        return fetchFromApi(ipAddress).thenApply(result -> {
+            if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) this.ipCache.put(ipAddress, new CacheEntry(result));
+            return result;
+        });
 
     }
 
-    public boolean isIpBlockedCache(final String ipAddress) {
+    public boolean isIpCached(final String ipAddress) {
         final CacheEntry entry = this.ipCache.get(ipAddress);
-        return entry != null && !entry.isExpired(this.cacheTime) && !entry.isBlocked();
+        return entry != null && entry.isExpired(this.cacheTime);
+    }
+
+    public boolean isIpCachedBlocked(final String ipAddress) {
+        return isIpCached(ipAddress) && this.ipCache.get(ipAddress).isBlocked();
     }
 
     public void reportIp(final String ipAddress) {
         fetchFromApi(ipAddress);
     }
 
-    private boolean fetchFromApi(final String ipAddress) {
+    private CompletableFuture<Boolean> fetchFromApi(final String ipAddress) {
 
         if (!this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) {
-            return false; // Not blocked.
+            return CompletableFuture.completedFuture(false); // Not blocked.
         }
 
         try {
 
             final InetAddress inetAddress = InetAddress.getByName(ipAddress);
             if (inetAddress.isSiteLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isLinkLocalAddress()) {
-                return false; // Not blocked.
+                return CompletableFuture.completedFuture(false); // Not blocked.
             }
 
         } catch (final UnknownHostException e) {
@@ -110,7 +111,7 @@ private boolean fetchFromApi(final String ipAddress) {
             this.healthStatus = false;
 
             // Not blocked.
-            return false;
+            return CompletableFuture.completedFuture(false);
 
         }
 
@@ -129,7 +130,7 @@ private boolean fetchFromApi(final String ipAddress) {
         this.pendingFutures.add(future);
         future.whenComplete((res, exception) -> this.pendingFutures.remove(future));
 
-        return future.join();
+        return future;
 
     }
 

From 3b2359b53cf1db48b5b3e40c80a94b321a043740 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 18:32:08 +0200
Subject: [PATCH 40/82] Updated forged version

---
 scanner/src/Main.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scanner/src/Main.java b/scanner/src/Main.java
index 130cbc3..90c4fb1 100644
--- a/scanner/src/Main.java
+++ b/scanner/src/Main.java
@@ -67,7 +67,8 @@ public final class Main {
     private static final int INVALID_LOCAL_PORT     = 10000;
 
     // Fingerprint of NetworkProcessor#getForgedMOTD()
-    private static final String FORGED_MARKER_1 = "Paper 26.2";
+    private static final String FORGED_VERSION = "26.2";
+    private static final String FORGED_MARKER_1 = "Paper " + FORGED_VERSION;
     private static final String FORGED_MARKER_2 = "\"protocol\":776";
     private static final String FORGED_MARKER_3 = "\"enforcesSecureChat\":true";
 
@@ -204,10 +205,10 @@ private static Outcome testSuspiciousPortBotUsername() throws IOException {
 
             if (resp.id == 0x00) { // Disconnect Packet ID
                 String message = readString(new ByteArrayInputStream(resp.data));
-                if (message.contains("26.2")) {
+                if (message.contains(FORGED_VERSION)) {
                     return Outcome.pass("Bot rejected with expected forged string. Decoded text: \"" + message + "\"");
                 }
-                return Outcome.fail("Bot disconnected, but reason did not match forged version '26.2'! Got: \"" + message + "\"");
+                return Outcome.fail("Bot disconnected, but reason did not match forged version '" + FORGED_VERSION + "'! Got: \"" + message + "\"");
             }
 
             return Outcome.fail("Bot-like username was not rejected! got packet id=" + resp.id
@@ -249,10 +250,10 @@ private static Outcome testLegitPortBotUsername() throws IOException {
 
             if (resp.id == 0x00) { // Disconnect Packet ID
                 String message = readString(new ByteArrayInputStream(resp.data));
-                if (message.contains("26.2")) {
+                if (message.contains(FORGED_VERSION)) {
                     return Outcome.pass("Bot rejected with expected forged string on legit port. Decoded text: \"" + message + "\"");
                 }
-                return Outcome.fail("Bot disconnected, but reason did not match forged version '26.2'! Got: \"" + message + "\"");
+                return Outcome.fail("Bot disconnected, but reason did not match forged version '" + FORGED_VERSION + "'! Got: \"" + message + "\"");
             }
 
             return Outcome.fail("Bot-like username was NOT rejected even on a legit port! got packet id="

From ce2c677a4a15bcdc74e7dc0ea1c8eb534be54529 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 18:32:30 +0200
Subject: [PATCH 41/82] Properly fetching IP Code more readable

---
 .../cloud/gteam/coralgate/api/APIManager.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
index e6539c7..59e933d 100644
--- a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
@@ -73,8 +73,13 @@ public CompletableFuture<Boolean> isIpBlocked(final String ipAddress) {
 
         // Cache not available, fetch from API.
         return fetchFromApi(ipAddress).thenApply(result -> {
-            if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) this.ipCache.put(ipAddress, new CacheEntry(result));
+
+            if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) {
+                this.ipCache.put(ipAddress, new CacheEntry(result));
+            }
+
             return result;
+
         });
 
     }
@@ -88,8 +93,16 @@ public boolean isIpCachedBlocked(final String ipAddress) {
         return isIpCached(ipAddress) && this.ipCache.get(ipAddress).isBlocked();
     }
 
-    public void reportIp(final String ipAddress) {
-        fetchFromApi(ipAddress);
+    public void checkIp(final String ipAddress) {
+        fetchFromApi(ipAddress).thenApply(result -> {
+
+            if (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage()) {
+                this.ipCache.put(ipAddress, new CacheEntry(result));
+            }
+
+            return null;
+
+        });
     }
 
     private CompletableFuture<Boolean> fetchFromApi(final String ipAddress) {

From 9f3bbc391fc4a41589701004087839691e98f96a Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 18:34:01 +0200
Subject: [PATCH 42/82] Implemented API check Updated forged version (most
 popular) Changed some packet send order

---
 .../coralgate/processor/NetworkProcessor.java | 82 +++++++++++++++----
 1 file changed, 65 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index 9e81358..343991c 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -127,6 +127,10 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
             if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.STATUS
                     && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.STATUS) {
 
+                // Forcefully check the IP so it can receive the real MOTD next time (if it's legit/safe).
+                // This also allows us to "pre cache" when the client will actually join the server.
+                this.corePlugin.getApiManager().checkIp(ipAddress);
+
                 if (isBadPacket) {
 
                     // Decide reason based on port.
@@ -179,14 +183,14 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         if (packetTypeCommon == PacketType.Status.Client.REQUEST) {
 
             final boolean badHandshake = this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Handshaking.Client.HANDSHAKE;
-            final boolean sendForgedMOTD = isBadPacket || badHandshake;
+            final boolean sendForgedMOTD = isBadPacket
+                    || badHandshake
+                    || (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage() && !this.corePlugin.getApiManager().isIpCached(ipAddress)) // Force forged MOTD for IPs that are not yet processed by the API.
+                    || this.corePlugin.getApiManager().isIpCachedBlocked(ipAddress); // Send forged MOTD if the IP is blocked by the API.
 
             // Either suspicious port or bad handshake.
             if (sendForgedMOTD) {
 
-                // Send forged MOTD.
-                packetUser.sendPacketSilently(new WrapperStatusServerResponse(getForgedMOTD()));
-
                 // Custom logging based off port number.
                 //noinspection ExtractMethodRecommender
                 String reason = isInvalidPort
@@ -206,6 +210,9 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
                 // Log the violation, report the IP to CoralGate API, cancel the packet and send forged MOTD.
                 log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
 
+                // Send forged MOTD.
+                packetUser.sendPacketSilently(new WrapperStatusServerResponse(getForgedMOTD()));
+
             }
 
             // Block further logic.
@@ -218,14 +225,14 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         if (packetTypeCommon == PacketType.Status.Client.PING) {
 
             final boolean badHandshake = this.connectionState.getOrDefault(inetSocketAddress, null) != PacketType.Handshaking.Client.HANDSHAKE;
-            final boolean sendForgedPong = isBadPacket || badHandshake;
+            final boolean sendForgedPong = isBadPacket
+                    || badHandshake
+                    || (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage() && !this.corePlugin.getApiManager().isIpCached(ipAddress)) // Force forged pong for IPs that are not yet processed by the API.
+                    || this.corePlugin.getApiManager().isIpCachedBlocked(ipAddress); // Send forged pong if the IP is blocked by the API.
 
             // Either suspicious port or bad handshake.
             if (sendForgedPong) {
 
-                // Send forged pong.
-                packetUser.sendPacketSilently(new WrapperStatusServerPong(new WrapperStatusClientPing(packetReceiveEvent).getTime()));
-
                 // Custom logging based off port number.
                 //noinspection ExtractMethodRecommender
                 String reason = isInvalidPort
@@ -245,6 +252,9 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
                 // Log the violation, report the IP to CoralGate API, cancel the packet and send forged pong.
                 log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
 
+                // Send forged pong.
+                packetUser.sendPacketSilently(new WrapperStatusServerPong(new WrapperStatusClientPing(packetReceiveEvent).getTime()));
+
             }
 
             // Block further logic.
@@ -284,13 +294,51 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
             verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Handshaking.Client.HANDSHAKE, packetTypeCommon, "Missing proper handshake.");
 
-            final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
+            // The state validation failed, no need to run a check against the API.
+            if (packetReceiveEvent.isCancelled()) {
+                return; // Block further logic.
+            }
 
-            // Filter debug usernames.
-            if (wrapperLoginClientLoginStart.getUsername().startsWith("Player")) {
+            // Either if health checking is disabled or if the API is truly healthy.
+            if (!this.corePlugin.getConfigManager().getConfig().isApiHealthCheck() || this.corePlugin.getApiManager().isHealthy()) {
 
-                // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Bot-like username pattern detected.", true);
+                // Cancel the packet to send it later.
+                packetReceiveEvent.setCancelled(true);
+
+                // Cache wrapper and data to reconstruct and send it back later.
+                final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
+
+                // Cache username, it's being used twice. Save some CPU for the rest of us!!!1111!!1!1!
+                final String username = wrapperLoginClientLoginStart.getUsername();
+
+                // Filter debug usernames.
+                if (username.startsWith("Player")) {
+
+                    // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                    log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Bot-like username pattern detected.", true);
+
+                    // The connection is closed and the packet dropped, no need to run a check against the API.
+                    // Block further logic.
+                    return;
+
+                }
+
+                // Fetch API async.
+                this.corePlugin.getApiManager().isIpBlocked(ipAddress).thenAccept(blocked -> {
+
+                    if (blocked) {
+
+                        // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                        log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "IP is blocked by the API.", true);
+
+                    } else {
+
+                        // Process the packet again, the player is verified by the API.
+                        packetUser.receivePacketSilently(new WrapperLoginClientLoginStart(wrapperLoginClientLoginStart.getClientVersion(), username, wrapperLoginClientLoginStart.getSignatureData().orElse(null), wrapperLoginClientLoginStart.getPlayerUUID().orElse(null)));
+
+                    }
+
+                });
 
             }
 
@@ -443,7 +491,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
                 if (disconnectReasonString.contains(serverVersion)) {
 
                     // Replace the real server's version by the spoofed one.
-                    final String newDisconnectReason = disconnectReasonString.replace(serverVersion, "26.2");
+                    final String newDisconnectReason = disconnectReasonString.replace(serverVersion, "1.21.11");
 
                     // Reconstruct reason with spoofed server version.
                     final Component safeDisconnectReason = Component.text()
@@ -514,7 +562,7 @@ private void log(final PacketReceiveEvent packetReceiveEvent, final InetSocketAd
         }
 
         // Report IP to CoralGate's API.
-        this.corePlugin.getApiManager().reportIp(ipAddress);
+        this.corePlugin.getApiManager().checkIp(ipAddress);
 
         packetReceiveEvent.setCancelled(true);
         if (closeConnection) {
@@ -532,7 +580,7 @@ private void log(final PacketSendEvent packetSendEvent, final InetSocketAddress
         CorePlugin.getLogger().severe(reason + " Closing connection from " + inetSocketAddress + ". [S->C | " + packetSendEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
 
         // Report IP to CoralGate's API.
-        this.corePlugin.getApiManager().reportIp(ipAddress);
+        this.corePlugin.getApiManager().checkIp(ipAddress);
 
         packetSendEvent.setCancelled(true);
         packetSendEvent.getUser().closeConnection();
@@ -571,7 +619,7 @@ private void verifyAndTransitionState(final PacketSendEvent packetSendEvent, fin
     }
 
     private String getForgedMOTD() {
-        return "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"Paper 26.2\",\"protocol\":776},\"enforcesSecureChat\":true}";
+        return "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"Paper 1.21.11\",\"protocol\":776},\"enforcesSecureChat\":true}";
     }
 
     private boolean exemptLocalIpAddress(final InetSocketAddress inetSocketAddress) {

From 76e4044b038fad0df053c4e920d23e665fd47efb Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 23:25:34 +0200
Subject: [PATCH 43/82] Fix-ish (not proud) of async API fetching for proxies
 (issue #34)

---
 .../coralgate/processor/NetworkProcessor.java | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index 343991c..7466e80 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -121,16 +121,16 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
             this.connectionState.put(inetSocketAddress, packetTypeCommon);
 
+            // Forcefully check the IP so it can receive the real MOTD next time (if it's legit/safe).
+            // This also allows us to "pre cache" when the client will actually join the server.
+            this.corePlugin.getApiManager().checkIp(ipAddress);
+
             final WrapperHandshakingClientHandshake wrapperHandshakingClientHandshake = new WrapperHandshakingClientHandshake(packetReceiveEvent);
 
             // Drop the packet if it's suspicious and if it's a STATUS packet.
             if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.STATUS
                     && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.STATUS) {
 
-                // Forcefully check the IP so it can receive the real MOTD next time (if it's legit/safe).
-                // This also allows us to "pre cache" when the client will actually join the server.
-                this.corePlugin.getApiManager().checkIp(ipAddress);
-
                 if (isBadPacket) {
 
                     // Decide reason based on port.
@@ -303,7 +303,13 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
             if (!this.corePlugin.getConfigManager().getConfig().isApiHealthCheck() || this.corePlugin.getApiManager().isHealthy()) {
 
                 // Cancel the packet to send it later.
-                packetReceiveEvent.setCancelled(true);
+                // This dynamic 'cancel and send later' method only works on Spigot/Paper. It doesn't work on Proxies.
+                // We'll just need to pre-cache the API results in advance (HANDSHAKE, REQUEST, PING).
+                // This will cause players not be able to seemlessly connect and will cause "Diconnected." messages...
+                // TODO: find better solution
+                if (!this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")) {
+                    packetReceiveEvent.setCancelled(true);
+                }
 
                 // Cache wrapper and data to reconstruct and send it back later.
                 final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
@@ -331,7 +337,7 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
                         // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
                         log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "IP is blocked by the API.", true);
 
-                    } else {
+                    } else if (!this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")) { // TODO: same problem describe above...
 
                         // Process the packet again, the player is verified by the API.
                         packetUser.receivePacketSilently(new WrapperLoginClientLoginStart(wrapperLoginClientLoginStart.getClientVersion(), username, wrapperLoginClientLoginStart.getSignatureData().orElse(null), wrapperLoginClientLoginStart.getPlayerUUID().orElse(null)));
@@ -619,7 +625,7 @@ private void verifyAndTransitionState(final PacketSendEvent packetSendEvent, fin
     }
 
     private String getForgedMOTD() {
-        return "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"Paper 1.21.11\",\"protocol\":776},\"enforcesSecureChat\":true}";
+        return "{\"description\":{\"text\":\"\",\"extra\":[\"A Minecraft Server\"]},\"players\":{\"max\":20,\"online\":0},\"version\":{\"name\":\"Paper 1.21.11\",\"protocol\":774},\"enforcesSecureChat\":true}";
     }
 
     private boolean exemptLocalIpAddress(final InetSocketAddress inetSocketAddress) {

From f12e1740a82ec4d8b069e5e614e5aeea077adce5 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Sun, 12 Jul 2026 23:25:50 +0200
Subject: [PATCH 44/82] Made protocol version match new forged version

---
 scanner/src/Main.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scanner/src/Main.java b/scanner/src/Main.java
index 90c4fb1..9edb0a8 100644
--- a/scanner/src/Main.java
+++ b/scanner/src/Main.java
@@ -67,9 +67,9 @@ public final class Main {
     private static final int INVALID_LOCAL_PORT     = 10000;
 
     // Fingerprint of NetworkProcessor#getForgedMOTD()
-    private static final String FORGED_VERSION = "26.2";
+    private static final String FORGED_VERSION = "1.21.11";
     private static final String FORGED_MARKER_1 = "Paper " + FORGED_VERSION;
-    private static final String FORGED_MARKER_2 = "\"protocol\":776";
+    private static final String FORGED_MARKER_2 = "\"protocol\":774";
     private static final String FORGED_MARKER_3 = "\"enforcesSecureChat\":true";
 
     private static int passCount = 0;
@@ -82,7 +82,7 @@ public static void main(String[] args) throws Exception {
         }
         HOST = args[0];
         PORT = Integer.parseInt(args[1]);
-        PROTOCOL = args.length >= 3 ? Integer.parseInt(args[2]) : 776;
+        PROTOCOL = args.length >= 3 ? Integer.parseInt(args[2]) : 774;
         if (args.length >= 4) TIMEOUT_MS = Integer.parseInt(args[3]);
 
         banner();

From aa7d3a5102aa267e8bbd7f11251eaa83e843013b Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 8 Jul 2026 23:07:30 +0200
Subject: [PATCH 45/82] WIP: pipeline injection

---
 .../cloud/gteam/coralgate/SpigotPlugin.java   |  13 ++
 .../coralgate/injector/CoralGateInjector.java | 123 ++++++++++++++++++
 .../PreChannelInitializer_v1_12.java          |  35 +++++
 .../PreChannelInitializer_v1_8.java           |  17 +++
 .../connection/ServerChannelHandler.java      |  68 ++++++++++
 .../ServerConnectionInitializer.java          |  36 +++++
 .../injector/handlers/CoralGateDecoder.java   | 111 ++++++++++++++++
 7 files changed, 403 insertions(+)
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
index 0928e31..956a9bb 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
@@ -21,6 +21,7 @@
 import cloud.gteam.coralgate.commands.CoralGateCommand;
 import cloud.gteam.coralgate.commands.SpigotPermissionChecker;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
+import cloud.gteam.coralgate.injector.CoralGateInjector;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.PlatformUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -38,15 +39,25 @@ public final class SpigotPlugin extends JavaPlugin {
 
     private final CorePlugin corePlugin = new CorePlugin();
 
+    private final CoralGateInjector injector = new CoralGateInjector();
+
     @Override
     public void onLoad() {
         PacketEvents.getAPI().getEventManager().registerListener(
                 new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+
+        if (!injector.isServerBound()) {
+            injector.inject();
+        }
     }
 
     @Override
     public void onEnable() {
 
+        if (!injector.hasInjected) {
+            injector.inject();
+        }
+
         // Start bStats.
         new Metrics(this, 29439);
 
@@ -76,6 +87,8 @@ public void onEnable() {
     @Override
     public void onDisable() {
 
+        this.injector.uninject();
+
         this.corePlugin.onDisable();
 
     }
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java
new file mode 100644
index 0000000..b99c0f7
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java
@@ -0,0 +1,123 @@
+package cloud.gteam.coralgate.injector;
+
+import cloud.gteam.coralgate.CorePlugin;
+import cloud.gteam.coralgate.injector.connection.ServerChannelHandler;
+import com.github.retrooper.packetevents.util.reflection.ReflectionObject;
+import io.github.retrooper.packetevents.util.InjectedList;
+import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelPipeline;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class CoralGateInjector {
+    public static String DECODER_NAME = "cg-decoder";
+    public static String CONNECTION_HANDLER_NAME = "cg-connection-handler";
+    public static String SERVER_CHANNEL_HANDLER_NAME = "cg-connection-initializer";
+
+    //Channels that process connecting clients.
+    public final Set<Channel> injectedConnectionChannels = new HashSet<>();
+    private int connectionChannelsListIndex = -1;
+
+    public boolean hasInjected = false;
+
+    public boolean isServerBound() {
+        //We want to check if the server has been bound to the port already.
+        Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
+        if (serverConnection != null) {
+            ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
+            //There should only be 2 lists.
+            for (int i = 0; i < 2; i++) {
+                List<?> list = reflectServerConnection.readList(i);
+                for (Object value : list) {
+                    if (value instanceof ChannelFuture) {
+                        connectionChannelsListIndex = i;
+                        //Found the right list.
+                        //It has connection channels, so the server has been bound.
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+
+    public void inject() {
+        Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
+        if (serverConnection != null) {
+            ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
+            List<ChannelFuture> connectionChannelFutures = reflectServerConnection.readList(connectionChannelsListIndex);
+            InjectedList<ChannelFuture> wrappedList = new InjectedList<>(connectionChannelFutures, future -> {
+                //Each time a channel future is added, we run this.
+                //This is automatically also ran for the elements already added before we wrapped the list.
+                Channel channel = future.channel();
+                //Inject into the server connection channel.
+                injectServerChannel(channel);
+                //Make sure to store it, so we can uninject later on.
+                injectedConnectionChannels.add(channel);
+            });
+            //Replace the list with our wrapped one.
+            reflectServerConnection.writeList(connectionChannelsListIndex, wrappedList);
+
+            hasInjected = true;
+        }
+    }
+
+
+    public void uninject() {
+        //Uninject our connection handler from these connection channels.
+        for (Channel connectionChannel : injectedConnectionChannels) {
+            uninjectServerChannel(connectionChannel);
+        }
+        injectedConnectionChannels.clear();
+        Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
+        if (serverConnection != null) {
+            ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
+            List<ChannelFuture> connectionChannelFutures = reflectServerConnection.readList(connectionChannelsListIndex);
+            if (connectionChannelFutures instanceof InjectedList) {
+                //Let us unwrap this. We no longer want to listen to connecting channels.
+                reflectServerConnection.writeList(connectionChannelsListIndex,
+                        ((InjectedList<ChannelFuture>) connectionChannelFutures).originalList());
+            }
+        }
+    }
+
+    private void injectServerChannel(Channel serverChannel) {
+        ChannelPipeline pipeline = serverChannel.pipeline();
+        ChannelHandler connectionHandler = pipeline.get(CoralGateInjector.CONNECTION_HANDLER_NAME);
+        if (connectionHandler != null) {
+            //Why does it already exist? Remove it.
+            pipeline.remove(CoralGateInjector.CONNECTION_HANDLER_NAME);
+        }
+        //Make sure we handle connections after ProtocolSupport.
+        if (pipeline.get("SpigotNettyServerChannelHandler#0") != null) {
+            pipeline.addAfter("SpigotNettyServerChannelHandler#0", CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+        }
+        //Make sure we handle connections after Geyser.
+        else if (pipeline.get("floodgate-init") != null) {
+            pipeline.addAfter("floodgate-init", CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+        }
+        //Some forks add a handler which adds the other necessary vanilla handlers like (decoder, encoder, etc...)
+        else if (pipeline.get("MinecraftPipeline#0") != null) {
+            pipeline.addAfter("MinecraftPipeline#0", CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+        }
+        //Otherwise, make sure we are first.
+        else {
+            pipeline.addFirst(CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+        }
+    }
+
+    private void uninjectServerChannel(Channel serverChannel) {
+        if (serverChannel.pipeline().get(CoralGateInjector.CONNECTION_HANDLER_NAME) != null) {
+            serverChannel.pipeline().remove(CoralGateInjector.CONNECTION_HANDLER_NAME);
+        } else {
+            CorePlugin.getLogger().warning("Failed to uninject server channel, handler not found");
+        }
+    }
+
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
new file mode 100644
index 0000000..10154e9
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
@@ -0,0 +1,35 @@
+package cloud.gteam.coralgate.injector.connection;
+
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelPipeline;
+import io.netty.util.internal.logging.InternalLogger;
+import io.netty.util.internal.logging.InternalLoggerFactory;
+
+public class PreChannelInitializer_v1_12 extends ChannelInboundHandlerAdapter {
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(io.netty.channel.ChannelInitializer.class);
+
+    @Override
+    public void channelRegistered(ChannelHandlerContext ctx) {
+        try {
+            ServerConnectionInitializer.initChannel(ctx.channel(), ConnectionState.HANDSHAKING);
+        } catch (Throwable t) {
+            exceptionCaught(ctx, t);
+        } finally {
+            ChannelPipeline pipeline = ctx.pipeline();
+            if (pipeline.context(this) != null) {
+                pipeline.remove(this);
+            }
+        }
+
+        ctx.pipeline().fireChannelRegistered();
+    }
+
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable t) {
+        logger.warn("Failed to initialize a channel. Closing: " + ctx.channel(), t);
+        ctx.close();
+    }
+}
\ No newline at end of file
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
new file mode 100644
index 0000000..65ae03c
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
@@ -0,0 +1,17 @@
+package cloud.gteam.coralgate.injector.connection;
+
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+
+public class PreChannelInitializer_v1_8 extends ChannelInitializer<Channel> {
+    @Override
+    protected void initChannel(Channel channel) {
+        channel.pipeline().addLast(new ChannelInitializer<Channel>() {
+            @Override
+            protected void initChannel(Channel channel) {
+                ServerConnectionInitializer.initChannel(channel, ConnectionState.HANDSHAKING);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
new file mode 100644
index 0000000..5a539bf
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
@@ -0,0 +1,68 @@
+package cloud.gteam.coralgate.injector.connection;
+
+import cloud.gteam.coralgate.injector.CoralGateInjector;
+import com.github.retrooper.packetevents.util.PEVersion;
+import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.Version;
+
+import java.util.Map;
+
+import static io.github.retrooper.packetevents.injector.connection.ServerChannelHandler.*;
+
+public class ServerChannelHandler extends ChannelInboundHandlerAdapter {
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        if (!(msg instanceof Channel)) return;
+
+        Channel channel = (Channel) msg;
+        //Resolve netty version only once.
+
+        if (NETTY_VERSION == null && !CHECKED_NETTY_VERSION) {
+            NETTY_VERSION = resolveNettyVersion();
+            CHECKED_NETTY_VERSION = true;
+        }
+
+//        Depends on netty version. If we cannot resolve that we just check server version.
+        if ((NETTY_VERSION != null && NETTY_VERSION.isNewerThan(MODERN_NETTY_VERSION))
+                || SpigotReflectionUtil.V_1_12_OR_HIGHER) {
+            channel.pipeline().addLast(CoralGateInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_12());
+        } else {
+            channel.pipeline().addFirst(CoralGateInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_8());
+        }
+        super.channelRead(ctx, msg);
+    }
+
+
+    private static PEVersion resolveNettyVersion() {
+        Map<String, Version> nettyArtifacts = Version.identify();
+
+        Version version = nettyArtifacts.getOrDefault("netty-common", nettyArtifacts.get("netty-all"));
+
+        if (version == null && !nettyArtifacts.isEmpty()) {
+            version = nettyArtifacts.values().iterator().next();
+        }
+
+        if (version != null) {
+            String stringVersion = version.artifactVersion();
+
+            // Remove the ".Final" from the version by just removing any words (non numbers or dots)
+            stringVersion = stringVersion.replaceAll("[^\\d.]", "");
+
+            // Make sure stringVersion only contains 3 values like 4.2.0 but not 4.2.0.2
+            String[] splitVersion = stringVersion.split("\\.");
+            if (splitVersion.length > 3) {
+                stringVersion = splitVersion[0] + "." + splitVersion[1] + "." + splitVersion[2];
+            }
+
+            // If the string ends with a dot, remove it
+            stringVersion = stringVersion.endsWith(".") ? stringVersion.substring(0, stringVersion.length() - 1) : stringVersion;
+
+            return PEVersion.fromString(stringVersion);
+        }
+        return null;
+    }
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
new file mode 100644
index 0000000..254d1b0
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -0,0 +1,36 @@
+package cloud.gteam.coralgate.injector.connection;
+
+import cloud.gteam.coralgate.injector.CoralGateInjector;
+import cloud.gteam.coralgate.injector.handlers.CoralGateDecoder;
+import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import com.github.retrooper.packetevents.util.FakeChannelUtil;
+import io.netty.channel.Channel;
+
+import java.util.NoSuchElementException;
+
+
+public class ServerConnectionInitializer {
+
+    public static void initChannel(Channel ch, ConnectionState connectionState) {
+        if (FakeChannelUtil.isFakeChannel(ch)) {
+            return;
+        }
+
+        User user = new User(ch, connectionState, null, new UserProfile(null, null));
+
+        relocateHandlers(ch, user);
+    }
+
+    public static void relocateHandlers(Channel ctx, User user) {
+        try {
+            CoralGateDecoder decoder = new CoralGateDecoder(user);
+            ctx.pipeline().addBefore("legacy_query", CoralGateInjector.DECODER_NAME, decoder);
+        } catch (NoSuchElementException ex) {
+            String handlers = ChannelHelper.pipelineHandlerNamesAsString(ctx);
+            throw new IllegalStateException("CoralGateInjector failed to add a decoder to the netty pipeline. Pipeline handlers: " + handlers, ex);
+        }
+    }
+}
\ No newline at end of file
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java
new file mode 100644
index 0000000..c6aee03
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java
@@ -0,0 +1,111 @@
+package cloud.gteam.coralgate.injector.handlers;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.PacketReceiveEvent;
+import com.github.retrooper.packetevents.event.simple.PacketHandshakeReceiveEvent;
+import com.github.retrooper.packetevents.exception.PacketProcessException;
+import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.util.ExceptionUtil;
+import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+
+import java.util.List;
+
+public class CoralGateDecoder extends MessageToMessageDecoder<ByteBuf> {
+    public User user;
+
+    public CoralGateDecoder(User user) {
+        this.user = user;
+    }
+
+    public void read(ChannelHandlerContext ctx, ByteBuf input, List<Object> out) {
+        try {
+            handleServerBoundPacket(ctx.channel(), user, input);
+            out.add(ByteBufHelper.retain(input));
+        } catch (Throwable e) {
+            // We must be sure all the exceptions caused by our handlers are PacketProcessExceptions
+            // In the case we have thrown an exception that is not a PacketProcessException, let's wrap it in order to
+            // allow exceptionCaught to handle it properly
+            if (ExceptionUtil.isException(e, PacketProcessException.class)) {
+                throw e;
+            } else {
+                throw new PacketProcessException(e);
+            }
+        }
+    }
+
+    static void handleServerBoundPacket(
+            Object channel, User user, Object buffer
+    ) {
+        int preProcessIndex = ByteBufHelper.readerIndex(buffer);
+
+        PacketReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(channel, user, null, buffer, true);
+
+        int processIndex = ByteBufHelper.readerIndex(buffer);
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> ByteBufHelper.readerIndex(buffer, processIndex));
+        if (!packetReceiveEvent.isCancelled()) {
+            //Did they ever use a wrapper?
+            if (packetReceiveEvent.getLastUsedWrapper() != null) {
+                //Rewrite the buffer
+                ByteBufHelper.clear(buffer);
+                packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
+                packetReceiveEvent.getLastUsedWrapper().write();
+            } else {
+                //If no wrappers were used, just pass on the original buffer.
+                //Correct the reader index, basically what the next handler is expecting.
+                ByteBufHelper.readerIndex(buffer, preProcessIndex);
+            }
+        } else {
+            //Cancelling the packet, lets clear the buffer
+            ByteBufHelper.clear(buffer);
+        }
+        if (packetReceiveEvent.hasPostTasks()) {
+            for (Runnable task : packetReceiveEvent.getPostTasks()) {
+                task.run();
+            }
+        }
+    }
+
+    @Override
+    public void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+        if (buffer.isReadable()) {
+            read(ctx, buffer, out);
+        }
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+        // If we didn't cause the exception, let the server handle it.
+        if (!ExceptionUtil.isException(cause, PacketProcessException.class)) {
+            super.exceptionCaught(ctx, cause);
+            return;
+        }
+
+        boolean debug = PacketEvents.getAPI().getSettings().isDebugEnabled() || SpigotReflectionUtil.isMinecraftServerInstanceDebugging();
+        // We log exceptions only if the server is in debug mode.
+        if (debug) {
+            if (PacketEvents.getAPI().getSettings().isFullStackTraceEnabled()) {
+                String state = user != null ? user.getDecoderState().name() : "null";
+                String clientVersion = user != null ? user.getClientVersion().getReleaseName() : "null";
+
+                PacketEvents.getAPI().getLogManager().warn("An error occurred while processing a packet from "
+                        + user.getProfile().getName() + " (state: " + state + ", clientVersion: " + clientVersion +
+                        ", serverVersion: " + PacketEvents.getAPI().getServerManager().getVersion().getReleaseName() + ")", cause);
+            } else {
+                PacketEvents.getAPI().getLogManager().warn(cause.getMessage());
+            }
+        }
+
+        if (PacketEvents.getAPI().getSettings().isKickOnPacketExceptionEnabled()) {
+            ctx.channel().close();
+
+            if (user != null && user.getProfile().getName() != null) {
+                PacketEvents.getAPI().getLogManager().warn("Disconnected " + user.getProfile().getName() + " due to an invalid packet!");
+            }
+        }
+    }
+
+}
\ No newline at end of file

From 1c336fe157a1c16f598cbc6962ea3ca98a1e14bb Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 8 Jul 2026 23:07:41 +0200
Subject: [PATCH 46/82] ugly temporary trick so it works

---
 spigot/build.gradle.kts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 24e660e..7a9d442 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -43,7 +43,9 @@ dependencies {
     compileOnly(libs.spigot.api)
 
     // Core implementation.
-    implementation(project(":core"))
+    implementation(project(":core")) {
+        exclude("io.netty")
+    }
 
 }
 
@@ -70,11 +72,13 @@ tasks.shadowJar {
     archiveVersion = project.version.toString()
     archiveClassifier = ""
 
+    exclude("io/netty/**")
+
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
 
     // Relocate netty.
-    relocate("io.netty", "cloud.gteam.coralgate.libs.netty")
+//    relocate("io.netty", "cloud.gteam.coralgate.libs.netty")
 
     exclude("META-INF/*.SF")
     exclude("META-INF/*.DSA")

From 71c1411bcc8c7ec9178dbe2f24b8824df8d431aa Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Sun, 12 Jul 2026 19:47:22 +0200
Subject: [PATCH 47/82] Use kotlin DSL instead of explicit set

---
 bungeecord/build.gradle.kts | 2 +-
 core/build.gradle.kts       | 2 +-
 spigot/build.gradle.kts     | 2 +-
 velocity/build.gradle.kts   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index 694ec20..d1ea262 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 java {
 
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion = JavaLanguageVersion.of(8)
     }
 
     sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index c03da74..37f95de 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -11,7 +11,7 @@ version = libs.versions.coreVersion.get()
 java {
 
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion = JavaLanguageVersion.of(8)
     }
 
     sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 7a9d442..bb778e9 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 java {
 
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion = JavaLanguageVersion.of(8)
     }
 
     sourceCompatibility = JavaVersion.VERSION_1_8
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 45c990b..9af93f6 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 java {
 
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion = JavaLanguageVersion.of(17)
     }
 
     sourceCompatibility = JavaVersion.VERSION_17

From 320bebfafcfa7fb5a74cbbef99c003a77029d73a Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Sun, 12 Jul 2026 20:04:11 +0200
Subject: [PATCH 48/82] Properly handle netty

---
 bungeecord/build.gradle.kts | 12 +++++++++++-
 core/build.gradle.kts       |  5 +++++
 spigot/build.gradle.kts     | 17 ++++++++++-------
 velocity/build.gradle.kts   | 12 +++++++++++-
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
index d1ea262..85ebaeb 100644
--- a/bungeecord/build.gradle.kts
+++ b/bungeecord/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
     compileOnly(libs.bungeecord.api)
 
     // Core implementation.
-    implementation(project(path = ":core", configuration = "shadow"))
+    compileOnly(project(":core"))
 
 }
 
@@ -57,6 +57,14 @@ tasks.processResources {
     }
 }
 
+// A trick so netty used by async-http-client is always
+// relocated, but netty used by injector is always provided by platform (spigot, bungeecord, velocity)
+val coreProvider = provider { project(":core").tasks.shadowJar.flatMap { it.archiveFile } }
+
+tasks.jar {
+    enabled = false // only shadowJar is used
+}
+
 tasks.shadowJar {
 
     // Wait for the core shadowJar to finish.
@@ -66,6 +74,8 @@ tasks.shadowJar {
     archiveVersion = project.version.toString()
     archiveClassifier = ""
 
+    from(zipTree(coreProvider)) // include shadowed core
+
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 37f95de..d109d73 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -54,11 +54,16 @@ tasks.processResources {
 
 }
 
+tasks.jar {
+    enabled = false // only shadowJar is used
+}
+
 tasks.shadowJar {
 
     archiveClassifier = "" // produce core.jar instead of core-all.jar
 
     relocate("dev.dejvokep.boostedyaml", "cloud.gteam.coralgate.libs.boostedyaml")
+    relocate("io.netty", "cloud.gteam.coralgate.libs.netty")
 
     filesMatching("META-INF/*.kotlin_module") {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index bb778e9..1751d34 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -43,9 +43,7 @@ dependencies {
     compileOnly(libs.spigot.api)
 
     // Core implementation.
-    implementation(project(":core")) {
-        exclude("io.netty")
-    }
+    compileOnly(project(":core"))
 
 }
 
@@ -63,6 +61,14 @@ tasks.processResources {
 
 }
 
+// A trick so netty used by async-http-client is always
+// relocated, but netty used by injector is always provided by platform (spigot, bungeecord, velocity)
+val coreProvider = provider { project(":core").tasks.shadowJar.flatMap { it.archiveFile } }
+
+tasks.jar {
+    enabled = false // only shadowJar is used
+}
+
 tasks.shadowJar {
 
     // Wait for the core shadowJar to finish.
@@ -72,14 +78,11 @@ tasks.shadowJar {
     archiveVersion = project.version.toString()
     archiveClassifier = ""
 
-    exclude("io/netty/**")
+    from(zipTree(coreProvider)) // include shadowed core
 
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
 
-    // Relocate netty.
-//    relocate("io.netty", "cloud.gteam.coralgate.libs.netty")
-
     exclude("META-INF/*.SF")
     exclude("META-INF/*.DSA")
     exclude("META-INF/*.RSA")
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
index 9af93f6..842ce22 100644
--- a/velocity/build.gradle.kts
+++ b/velocity/build.gradle.kts
@@ -41,7 +41,7 @@ dependencies {
     compileOnly(libs.velocity.api)
 
     // Core implementation.
-    implementation(project(":core"))
+    compileOnly(project(":core"))
 
 }
 
@@ -60,6 +60,14 @@ tasks.processResources {
 
 }
 
+// A trick so netty used by async-http-client is always
+// relocated, but netty used by injector is always provided by platform (spigot, bungeecord, velocity)
+val coreProvider = provider { project(":core").tasks.shadowJar.flatMap { it.archiveFile } }
+
+tasks.jar {
+    enabled = false // only shadowJar is used
+}
+
 tasks.shadowJar {
 
     // Wait for the core shadowJar to finish.
@@ -69,6 +77,8 @@ tasks.shadowJar {
     archiveVersion = project.version.toString()
     archiveClassifier = ""
 
+    from(zipTree(coreProvider)) // include shadowed core
+
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
 

From 42de59f3d577d6a6047fed1773d01f853a86b0a4 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Sun, 12 Jul 2026 21:43:42 +0200
Subject: [PATCH 49/82] Add velocity implementation of pipeline injection

---
 .../cloud/gteam/coralgate/VelocityPlugin.java |   9 +-
 .../coralgate/injector/VelocityInjector.java  | 111 ++++++++++++++++++
 .../ServerConnectionInitializer.java          |  43 +++++++
 .../VelocityChannelInitializer.java           |  53 +++++++++
 .../injector/handlers/VelocityDecoder.java    |  79 +++++++++++++
 5 files changed, 294 insertions(+), 1 deletion(-)
 create mode 100644 velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
 create mode 100644 velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
 create mode 100644 velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java
 create mode 100644 velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java

diff --git a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
index 953f9b5..ed5cb14 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
@@ -21,6 +21,7 @@
 import cloud.gteam.coralgate.commands.CoralGateCommand;
 import cloud.gteam.coralgate.commands.VelocityPermissionChecker;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
+import cloud.gteam.coralgate.injector.VelocityInjector;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.ConfigUtils;
 import cloud.gteam.coralgate.utils.PlatformUtils;
@@ -44,7 +45,7 @@
 public final class VelocityPlugin {
 
     private final CorePlugin corePlugin = new CorePlugin();
-
+    private final VelocityInjector injector;
     private final Path dataDirectory;
     private final Metrics.Factory metricsFactory;
 
@@ -55,6 +56,8 @@ public VelocityPlugin(final ProxyServer proxyServer, final @DataDirectory Path d
         // Load bStats metrics factory.
         this.metricsFactory = metricsFactory;
 
+        this.injector = new VelocityInjector(proxyServer);
+
         // Load commands.
         final Lamp<VelocityCommandActor> lamp = VelocityLamp.builder(this, proxyServer)
                 .permissionFactory(new PermissionFactory(new VelocityPermissionChecker()))
@@ -68,6 +71,8 @@ public VelocityPlugin(final ProxyServer proxyServer, final @DataDirectory Path d
     @Subscribe
     public void onProxyInitialization(final ProxyInitializeEvent proxyInitializeEvent) {
 
+        injector.inject();
+
         // Start bStats.
         this.metricsFactory.make(this, 29439);
 
@@ -83,6 +88,8 @@ public void onProxyInitialization(final ProxyInitializeEvent proxyInitializeEven
     @Subscribe
     public void onProxyShutdown(final ProxyShutdownEvent proxyShutdownEvent) {
 
+        this.injector.uninject();
+
         this.corePlugin.onDisable();
 
     }
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
new file mode 100644
index 0000000..93bfa1a
--- /dev/null
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
@@ -0,0 +1,111 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector;
+
+import cloud.gteam.coralgate.CorePlugin;
+import cloud.gteam.coralgate.injector.connection.VelocityChannelInitializer;
+import com.github.retrooper.packetevents.util.reflection.Reflection;
+import com.github.retrooper.packetevents.util.reflection.ReflectionObject;
+import com.velocitypowered.api.proxy.ProxyServer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import org.jetbrains.annotations.ApiStatus;
+import org.spongepowered.configurate.util.CheckedConsumer;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.function.Supplier;
+
+@ApiStatus.Internal
+public class VelocityInjector {
+
+    public static String DECODER_NAME = "cg-decoder";
+
+    private static Class<?> CONNECTION_MANAGER_CLASS, SERVER_INITIALIZER_HOLDER_CLASS;
+    private static Method SET_SERVER_INTIIALIZER;
+
+    public boolean hasInjected = false;
+
+    private final ProxyServer server;
+
+    public VelocityInjector(ProxyServer server) {
+        this.server = server;
+    }
+
+    public void inject() {
+        if (CONNECTION_MANAGER_CLASS == null) {
+            CONNECTION_MANAGER_CLASS = Reflection.getClassByNameWithoutException("com.velocitypowered.proxy.network.ConnectionManager");
+            SERVER_INITIALIZER_HOLDER_CLASS = Reflection.getClassByNameWithoutException("com.velocitypowered.proxy.network.ServerChannelInitializerHolder");
+            SET_SERVER_INTIIALIZER = Reflection.getMethod(SERVER_INITIALIZER_HOLDER_CLASS, 0, ChannelInitializer.class);
+        }
+        Supplier<ChannelInitializer<Channel>> initializerHolder = getServerChannelInitializerHolder();
+        ChannelInitializer<Channel> wrappedProxyInitializer = initializerHolder.get();
+        VelocityChannelInitializer initializer = new VelocityChannelInitializer(wrappedProxyInitializer);
+        try {
+            SET_SERVER_INTIIALIZER.invoke(initializerHolder, initializer);
+            hasInjected = true;
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void uninject() {
+        Supplier<ChannelInitializer<Channel>> holder = this.getServerChannelInitializerHolder();
+        ChannelInitializer<?> wrapper = holder.get();
+        CheckedConsumer<ChannelInitializer<Channel>, ReflectiveOperationException> uninjector = (initializer) -> {
+            CorePlugin.getLogger().info("Uninjecting from Velocity channel initializer...");
+            SET_SERVER_INTIIALIZER.invoke(holder, initializer);
+        };
+
+        try {
+            while (true) {
+                // Check if it's our initializer, could be wrapped by other plugins
+                if (wrapper instanceof VelocityChannelInitializer wrappedInitializer) {
+                    uninjector.accept(wrappedInitializer.getWrappedInitializer());
+                    break;
+                } else {
+                    // walk up wrapper tree, if possible to find a single matching field
+                    // this accounts for other plugins (e.g. ViaVersion) also replacing the injector, which may
+                    // wrap our already wrapped injector
+                    Field field = Reflection.getField(wrapper.getClass(), ChannelInitializer.class, 0);
+                    if (field == null) {
+                        throw new IllegalStateException("Can't unwrap foreign channel initializer: " + wrapper);
+                    }
+                    field.setAccessible(true);
+                    ChannelInitializer<?> thisWrapper = wrapper;
+                    wrapper = (ChannelInitializer<?>) field.get(thisWrapper);
+                    uninjector = initializer -> {
+                        field.set(thisWrapper, initializer);
+                        CorePlugin.getLogger().info("Uninjected from plugin channel initializer " + thisWrapper);
+                    };
+                }
+            }
+        } catch (ReflectiveOperationException exception) {
+            throw new RuntimeException("Failed to uninject from frontend pipeline", exception);
+        }
+    }
+
+    private Supplier<ChannelInitializer<Channel>> getServerChannelInitializerHolder() {
+        ReflectionObject reflectServer = new ReflectionObject(server);
+        Object connectionManager = reflectServer.readObject(0, CONNECTION_MANAGER_CLASS);
+        ReflectionObject reflectConnectionManager = new ReflectionObject(connectionManager);
+        return (Supplier<ChannelInitializer<Channel>>) reflectConnectionManager.readObject(0, SERVER_INITIALIZER_HOLDER_CLASS);
+    }
+}
\ No newline at end of file
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
new file mode 100644
index 0000000..e32641b
--- /dev/null
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -0,0 +1,43 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.connection;
+
+import cloud.gteam.coralgate.injector.VelocityInjector;
+import cloud.gteam.coralgate.injector.handlers.VelocityDecoder;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import io.netty.channel.Channel;
+
+public class ServerConnectionInitializer {
+    public static void addChannelHandlers(Channel channel, VelocityDecoder decoder) {
+        channel.pipeline().addBefore("legacy-ping-decoder", VelocityInjector.DECODER_NAME, decoder);
+    }
+
+    public static void initChannel(Channel channel, ConnectionState state) {
+        User user = new User(channel, state, null, new UserProfile(null, null));
+
+        VelocityDecoder decoder = new VelocityDecoder(user);
+        addChannelHandlers(channel, decoder);
+    }
+
+    public static void destroyChannel(Channel channel) {
+        channel.pipeline().remove(VelocityInjector.DECODER_NAME);
+    }
+}
\ No newline at end of file
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java
new file mode 100644
index 0000000..29aaa03
--- /dev/null
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java
@@ -0,0 +1,53 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.connection;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Method;
+
+public class VelocityChannelInitializer extends ChannelInitializer<Channel> {
+    private static Method INIT_CHANNEL;
+    private final ChannelInitializer<Channel> wrappedInitializer;
+
+    public VelocityChannelInitializer(ChannelInitializer<Channel> wrappedInitializer) {
+        this.wrappedInitializer = wrappedInitializer;
+    }
+
+    @Override
+    protected void initChannel(@NotNull Channel channel) throws Exception {
+        if (INIT_CHANNEL == null) {
+            INIT_CHANNEL = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
+            INIT_CHANNEL.setAccessible(true);
+        }
+        INIT_CHANNEL.invoke(wrappedInitializer, channel);
+
+        if (PacketEvents.getAPI().isTerminated()) return;
+        ServerConnectionInitializer.initChannel(channel, ConnectionState.HANDSHAKING);
+    }
+
+    public ChannelInitializer<Channel> getWrappedInitializer() {
+        return wrappedInitializer;
+    }
+
+}
\ No newline at end of file
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
new file mode 100644
index 0000000..f514a2b
--- /dev/null
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
@@ -0,0 +1,79 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.handlers;
+
+import cloud.gteam.coralgate.injector.connection.ServerConnectionInitializer;
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.simple.PacketHandshakeReceiveEvent;
+import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
+import com.github.retrooper.packetevents.protocol.player.User;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class VelocityDecoder extends MessageToMessageDecoder<ByteBuf> {
+    public User user;
+
+    public VelocityDecoder(User user) {
+        this.user = user;
+    }
+
+    public void read(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> output) throws Exception {
+
+        int firstReaderIndex = byteBuf.readerIndex();
+        PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), user, null, byteBuf, false);
+        int readerIndex = byteBuf.readerIndex();
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(readerIndex));
+        if (!packetReceiveEvent.isCancelled()) {
+            if (packetReceiveEvent.getLastUsedWrapper() != null) {
+                ByteBufHelper.clear(packetReceiveEvent.getByteBuf());
+                packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
+                packetReceiveEvent.getLastUsedWrapper().write();
+            }
+            byteBuf.readerIndex(firstReaderIndex);
+            output.add(byteBuf.retain());
+        } else {
+            //Cancelling the packet, lets clear the buffer
+            ByteBufHelper.clear(byteBuf);
+        }
+        if (packetReceiveEvent.hasPostTasks()) {
+            for (Runnable task : packetReceiveEvent.getPostTasks()) {
+                task.run();
+            }
+        }
+
+    }
+
+    @Override
+    public void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+        if (buffer.isReadable()) {
+            read(ctx, buffer, out);
+        }
+    }
+
+    @Override
+    public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
+        ServerConnectionInitializer.destroyChannel(ctx.channel());
+        super.channelInactive(ctx);
+    }
+
+}
\ No newline at end of file

From de28b980f431b169f8d133286437f643c2b54a92 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Sun, 12 Jul 2026 21:45:23 +0200
Subject: [PATCH 50/82] Refactor spigot implementation of pipeline injection

---
 .../cloud/gteam/coralgate/SpigotPlugin.java    |  4 ++--
 ...alGateInjector.java => SpigotInjector.java} | 18 +++++++++---------
 .../connection/ServerChannelHandler.java       |  6 +++---
 .../ServerConnectionInitializer.java           |  9 ++++-----
 ...oralGateDecoder.java => SpigotDecoder.java} |  4 ++--
 5 files changed, 20 insertions(+), 21 deletions(-)
 rename spigot/src/main/java/cloud/gteam/coralgate/injector/{CoralGateInjector.java => SpigotInjector.java} (86%)
 rename spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/{CoralGateDecoder.java => SpigotDecoder.java} (97%)

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
index 956a9bb..6045383 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
@@ -21,7 +21,7 @@
 import cloud.gteam.coralgate.commands.CoralGateCommand;
 import cloud.gteam.coralgate.commands.SpigotPermissionChecker;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
-import cloud.gteam.coralgate.injector.CoralGateInjector;
+import cloud.gteam.coralgate.injector.SpigotInjector;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.PlatformUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -39,7 +39,7 @@ public final class SpigotPlugin extends JavaPlugin {
 
     private final CorePlugin corePlugin = new CorePlugin();
 
-    private final CoralGateInjector injector = new CoralGateInjector();
+    private final SpigotInjector injector = new SpigotInjector();
 
     @Override
     public void onLoad() {
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
similarity index 86%
rename from spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java
rename to spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
index b99c0f7..9a34a0f 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/CoralGateInjector.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
@@ -14,7 +14,7 @@
 import java.util.List;
 import java.util.Set;
 
-public class CoralGateInjector {
+public class SpigotInjector {
     public static String DECODER_NAME = "cg-decoder";
     public static String CONNECTION_HANDLER_NAME = "cg-connection-handler";
     public static String SERVER_CHANNEL_HANDLER_NAME = "cg-connection-initializer";
@@ -89,32 +89,32 @@ public void uninject() {
 
     private void injectServerChannel(Channel serverChannel) {
         ChannelPipeline pipeline = serverChannel.pipeline();
-        ChannelHandler connectionHandler = pipeline.get(CoralGateInjector.CONNECTION_HANDLER_NAME);
+        ChannelHandler connectionHandler = pipeline.get(SpigotInjector.CONNECTION_HANDLER_NAME);
         if (connectionHandler != null) {
             //Why does it already exist? Remove it.
-            pipeline.remove(CoralGateInjector.CONNECTION_HANDLER_NAME);
+            pipeline.remove(SpigotInjector.CONNECTION_HANDLER_NAME);
         }
         //Make sure we handle connections after ProtocolSupport.
         if (pipeline.get("SpigotNettyServerChannelHandler#0") != null) {
-            pipeline.addAfter("SpigotNettyServerChannelHandler#0", CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+            pipeline.addAfter("SpigotNettyServerChannelHandler#0", SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
         }
         //Make sure we handle connections after Geyser.
         else if (pipeline.get("floodgate-init") != null) {
-            pipeline.addAfter("floodgate-init", CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+            pipeline.addAfter("floodgate-init", SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
         }
         //Some forks add a handler which adds the other necessary vanilla handlers like (decoder, encoder, etc...)
         else if (pipeline.get("MinecraftPipeline#0") != null) {
-            pipeline.addAfter("MinecraftPipeline#0", CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+            pipeline.addAfter("MinecraftPipeline#0", SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
         }
         //Otherwise, make sure we are first.
         else {
-            pipeline.addFirst(CoralGateInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
+            pipeline.addFirst(SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
         }
     }
 
     private void uninjectServerChannel(Channel serverChannel) {
-        if (serverChannel.pipeline().get(CoralGateInjector.CONNECTION_HANDLER_NAME) != null) {
-            serverChannel.pipeline().remove(CoralGateInjector.CONNECTION_HANDLER_NAME);
+        if (serverChannel.pipeline().get(SpigotInjector.CONNECTION_HANDLER_NAME) != null) {
+            serverChannel.pipeline().remove(SpigotInjector.CONNECTION_HANDLER_NAME);
         } else {
             CorePlugin.getLogger().warning("Failed to uninject server channel, handler not found");
         }
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
index 5a539bf..d6689c1 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
@@ -1,6 +1,6 @@
 package cloud.gteam.coralgate.injector.connection;
 
-import cloud.gteam.coralgate.injector.CoralGateInjector;
+import cloud.gteam.coralgate.injector.SpigotInjector;
 import com.github.retrooper.packetevents.util.PEVersion;
 import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
 import io.netty.channel.Channel;
@@ -29,9 +29,9 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
 //        Depends on netty version. If we cannot resolve that we just check server version.
         if ((NETTY_VERSION != null && NETTY_VERSION.isNewerThan(MODERN_NETTY_VERSION))
                 || SpigotReflectionUtil.V_1_12_OR_HIGHER) {
-            channel.pipeline().addLast(CoralGateInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_12());
+            channel.pipeline().addLast(SpigotInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_12());
         } else {
-            channel.pipeline().addFirst(CoralGateInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_8());
+            channel.pipeline().addFirst(SpigotInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_8());
         }
         super.channelRead(ctx, msg);
     }
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
index 254d1b0..b0455c1 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -1,7 +1,7 @@
 package cloud.gteam.coralgate.injector.connection;
 
-import cloud.gteam.coralgate.injector.CoralGateInjector;
-import cloud.gteam.coralgate.injector.handlers.CoralGateDecoder;
+import cloud.gteam.coralgate.injector.SpigotInjector;
+import cloud.gteam.coralgate.injector.handlers.SpigotDecoder;
 import com.github.retrooper.packetevents.netty.channel.ChannelHelper;
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.player.User;
@@ -11,7 +11,6 @@
 
 import java.util.NoSuchElementException;
 
-
 public class ServerConnectionInitializer {
 
     public static void initChannel(Channel ch, ConnectionState connectionState) {
@@ -26,8 +25,8 @@ public static void initChannel(Channel ch, ConnectionState connectionState) {
 
     public static void relocateHandlers(Channel ctx, User user) {
         try {
-            CoralGateDecoder decoder = new CoralGateDecoder(user);
-            ctx.pipeline().addBefore("legacy_query", CoralGateInjector.DECODER_NAME, decoder);
+            SpigotDecoder decoder = new SpigotDecoder(user);
+            ctx.pipeline().addBefore("legacy_query", SpigotInjector.DECODER_NAME, decoder);
         } catch (NoSuchElementException ex) {
             String handlers = ChannelHelper.pipelineHandlerNamesAsString(ctx);
             throw new IllegalStateException("CoralGateInjector failed to add a decoder to the netty pipeline. Pipeline handlers: " + handlers, ex);
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
similarity index 97%
rename from spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java
rename to spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
index c6aee03..7cc6c2b 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/CoralGateDecoder.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
@@ -14,10 +14,10 @@
 
 import java.util.List;
 
-public class CoralGateDecoder extends MessageToMessageDecoder<ByteBuf> {
+public class SpigotDecoder extends MessageToMessageDecoder<ByteBuf> {
     public User user;
 
-    public CoralGateDecoder(User user) {
+    public SpigotDecoder(User user) {
         this.user = user;
     }
 

From 896d12d9d2ca634b61f51516f2b18d1ec3ac57e4 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Sun, 12 Jul 2026 21:46:27 +0200
Subject: [PATCH 51/82] Include packetevents license header in borrowed code

---
 .../coralgate/injector/SpigotInjector.java     | 18 ++++++++++++++++++
 .../PreChannelInitializer_v1_12.java           | 18 ++++++++++++++++++
 .../connection/PreChannelInitializer_v1_8.java | 18 ++++++++++++++++++
 .../connection/ServerChannelHandler.java       | 18 ++++++++++++++++++
 .../ServerConnectionInitializer.java           | 18 ++++++++++++++++++
 .../injector/handlers/SpigotDecoder.java       | 18 ++++++++++++++++++
 6 files changed, 108 insertions(+)

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
index 9a34a0f..c2765b5 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
 package cloud.gteam.coralgate.injector;
 
 import cloud.gteam.coralgate.CorePlugin;
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
index 10154e9..e58c872 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
 package cloud.gteam.coralgate.injector.connection;
 
 import com.github.retrooper.packetevents.protocol.ConnectionState;
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
index 65ae03c..6016f8a 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
 package cloud.gteam.coralgate.injector.connection;
 
 import com.github.retrooper.packetevents.protocol.ConnectionState;
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
index d6689c1..bd564a3 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
 package cloud.gteam.coralgate.injector.connection;
 
 import cloud.gteam.coralgate.injector.SpigotInjector;
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
index b0455c1..2f4db8b 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
 package cloud.gteam.coralgate.injector.connection;
 
 import cloud.gteam.coralgate.injector.SpigotInjector;
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
index 7cc6c2b..b505a5c 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
@@ -1,3 +1,21 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
 package cloud.gteam.coralgate.injector.handlers;
 
 import com.github.retrooper.packetevents.PacketEvents;

From f666241bf94b5edbb28ead0180a76aebf25c6245 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Sun, 12 Jul 2026 23:52:35 +0200
Subject: [PATCH 52/82] Fix a typo

---
 .../cloud/gteam/coralgate/injector/VelocityInjector.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
index 93bfa1a..fdd401c 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
@@ -39,7 +39,7 @@ public class VelocityInjector {
     public static String DECODER_NAME = "cg-decoder";
 
     private static Class<?> CONNECTION_MANAGER_CLASS, SERVER_INITIALIZER_HOLDER_CLASS;
-    private static Method SET_SERVER_INTIIALIZER;
+    private static Method SET_SERVER_INITIALIZER;
 
     public boolean hasInjected = false;
 
@@ -53,13 +53,13 @@ public void inject() {
         if (CONNECTION_MANAGER_CLASS == null) {
             CONNECTION_MANAGER_CLASS = Reflection.getClassByNameWithoutException("com.velocitypowered.proxy.network.ConnectionManager");
             SERVER_INITIALIZER_HOLDER_CLASS = Reflection.getClassByNameWithoutException("com.velocitypowered.proxy.network.ServerChannelInitializerHolder");
-            SET_SERVER_INTIIALIZER = Reflection.getMethod(SERVER_INITIALIZER_HOLDER_CLASS, 0, ChannelInitializer.class);
+            SET_SERVER_INITIALIZER = Reflection.getMethod(SERVER_INITIALIZER_HOLDER_CLASS, 0, ChannelInitializer.class);
         }
         Supplier<ChannelInitializer<Channel>> initializerHolder = getServerChannelInitializerHolder();
         ChannelInitializer<Channel> wrappedProxyInitializer = initializerHolder.get();
         VelocityChannelInitializer initializer = new VelocityChannelInitializer(wrappedProxyInitializer);
         try {
-            SET_SERVER_INTIIALIZER.invoke(initializerHolder, initializer);
+            SET_SERVER_INITIALIZER.invoke(initializerHolder, initializer);
             hasInjected = true;
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
@@ -71,7 +71,7 @@ public void uninject() {
         ChannelInitializer<?> wrapper = holder.get();
         CheckedConsumer<ChannelInitializer<Channel>, ReflectiveOperationException> uninjector = (initializer) -> {
             CorePlugin.getLogger().info("Uninjecting from Velocity channel initializer...");
-            SET_SERVER_INTIIALIZER.invoke(holder, initializer);
+            SET_SERVER_INITIALIZER.invoke(holder, initializer);
         };
 
         try {

From 188f333ec9c7df71b3faa06cbc56bb2cfa87a031 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Mon, 13 Jul 2026 00:49:52 +0200
Subject: [PATCH 53/82] Inject first before registering PacketEvents listener

---
 .../src/main/java/cloud/gteam/coralgate/SpigotPlugin.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
index 6045383..e56dd65 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
@@ -43,12 +43,12 @@ public final class SpigotPlugin extends JavaPlugin {
 
     @Override
     public void onLoad() {
-        PacketEvents.getAPI().getEventManager().registerListener(
-                new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
-
         if (!injector.isServerBound()) {
             injector.inject();
         }
+
+        PacketEvents.getAPI().getEventManager().registerListener(
+                new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
     }
 
     @Override

From 4503aa8572324690207a2f822bf74cdff73ce5ce Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Mon, 13 Jul 2026 00:51:08 +0200
Subject: [PATCH 54/82] Add bungeecord implementation of pipeline injection

---
 .../cloud/gteam/coralgate/BungeePlugin.java   |   3 +
 .../coralgate/injector/BungeeInjector.java    | 100 ++++++++++++++++++
 .../connection/BungeeChannelInitializer.java  |  54 ++++++++++
 .../ServerConnectionInitializer.java          |  45 ++++++++
 .../injector/handlers/BungeeDecoder.java      |  81 ++++++++++++++
 5 files changed, 283 insertions(+)
 create mode 100644 bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
 create mode 100644 bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java
 create mode 100644 bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
 create mode 100644 bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java b/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
index 80df399..9f32c24 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
@@ -21,6 +21,7 @@
 import cloud.gteam.coralgate.commands.BungeePermissionChecker;
 import cloud.gteam.coralgate.commands.CoralGateCommand;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
+import cloud.gteam.coralgate.injector.BungeeInjector;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.PlatformUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -34,9 +35,11 @@
 public final class BungeePlugin extends Plugin {
 
     private final CorePlugin corePlugin = new CorePlugin();
+    private final BungeeInjector injector = new BungeeInjector();
 
     @Override
     public void onLoad() {
+        injector.inject();
         PacketEvents.getAPI().getEventManager().registerListener(
                 new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
     }
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
new file mode 100644
index 0000000..f197d62
--- /dev/null
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
@@ -0,0 +1,100 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2022 ViaVersion and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector;
+
+import cloud.gteam.coralgate.injector.connection.BungeeChannelInitializer;
+import com.github.retrooper.packetevents.util.reflection.Reflection;
+import io.github.retrooper.packetevents.injector.SetWrapper;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import net.md_5.bungee.api.ProxyServer;
+
+import java.lang.reflect.Field;
+import java.util.Set;
+
+public class BungeeInjector  {
+    public static String DECODER_NAME = "cg-decoder";
+    private static final Field LISTENERS_FIELD;
+
+    static {
+        LISTENERS_FIELD = Reflection.getField(ProxyServer.getInstance().getClass(), "listeners");
+        LISTENERS_FIELD.setAccessible(true);
+    }
+
+    public void injectChannel(Channel channel) {
+        Field initializerField = null;
+        ChannelHandler bootstrapAcceptor = null;
+        for (String channelName : channel.pipeline().names()) {
+            if (channelName.contains("QueryHandler")) {
+                return; // query handler, abort injection
+            }
+
+            ChannelHandler handler = channel.pipeline().get(channelName);
+            if (handler == null) continue;
+            try {
+                Field f = handler.getClass().getDeclaredField("childHandler");
+                f.setAccessible(true);
+                bootstrapAcceptor = handler;
+                initializerField = f;
+            } catch (Exception ignore) {
+            }
+        }
+
+        if (bootstrapAcceptor == null) {
+            bootstrapAcceptor = channel.pipeline().first();
+            try {
+                initializerField = bootstrapAcceptor.getClass().getDeclaredField("childHandler");
+                initializerField.setAccessible(true);
+            } catch (NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        ChannelInitializer<Channel> newInitializer;
+        try {
+            newInitializer = new BungeeChannelInitializer(initializerField.get(bootstrapAcceptor));
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            initializerField.set(bootstrapAcceptor, newInitializer);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public void inject() {
+        try {
+            Set<Channel> listeners = (Set<Channel>) LISTENERS_FIELD.get(ProxyServer.getInstance());
+
+            for (Channel channel : listeners) {
+                injectChannel(channel);
+            }
+
+            Set<Channel> wrapper = new SetWrapper<>(listeners, this::injectChannel);
+            LISTENERS_FIELD.set(ProxyServer.getInstance(), wrapper);
+
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java
new file mode 100644
index 0000000..0f43766
--- /dev/null
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java
@@ -0,0 +1,54 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.connection;
+
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Method;
+
+public class BungeeChannelInitializer extends ChannelInitializer<Channel> {
+    private static final Method INIT_CHANNEL_METHOD;
+
+    static {
+        try {
+            INIT_CHANNEL_METHOD = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
+            INIT_CHANNEL_METHOD.setAccessible(true);
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    private final Object oldInitializer;
+    public BungeeChannelInitializer(Object oldInitializer) {
+        this.oldInitializer = oldInitializer;
+    }
+
+    @Override
+    protected void initChannel(@NotNull Channel channel) throws Exception {
+        if (!channel.isActive()) return;
+        INIT_CHANNEL_METHOD.invoke(oldInitializer, channel);
+
+        //No injection if "legacy-decoder" is not present.
+        if (channel.pipeline().get("legacy-decoder") == null) return;
+
+        ServerConnectionInitializer.initChannel(channel, ConnectionState.HANDSHAKING);
+    }
+}
\ No newline at end of file
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
new file mode 100644
index 0000000..f2891b9
--- /dev/null
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -0,0 +1,45 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.connection;
+
+import cloud.gteam.coralgate.injector.BungeeInjector;
+import cloud.gteam.coralgate.injector.handlers.BungeeDecoder;
+import com.github.retrooper.packetevents.protocol.ConnectionState;
+import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.protocol.player.UserProfile;
+import io.netty.channel.Channel;
+
+public class ServerConnectionInitializer {
+
+    public static void addChannelHandlers(Channel channel, BungeeDecoder decoder) {
+        channel.pipeline().addBefore("legacy-decoder", BungeeInjector.DECODER_NAME, decoder);
+    }
+
+    public static void initChannel(Channel channel, ConnectionState state) {
+        User user = new User(channel, state, null, new UserProfile(null, null));
+
+        BungeeDecoder decoder = new BungeeDecoder(user);
+        addChannelHandlers(channel, decoder);
+    }
+
+    public static void destroyChannel(Channel channel) {
+        channel.pipeline().remove(BungeeInjector.DECODER_NAME);
+    }
+
+}
\ No newline at end of file
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
new file mode 100644
index 0000000..a5c9c33
--- /dev/null
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
@@ -0,0 +1,81 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2022 retrooper and contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.handlers;
+
+import cloud.gteam.coralgate.injector.connection.ServerConnectionInitializer;
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.simple.PacketHandshakeReceiveEvent;
+import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
+import com.github.retrooper.packetevents.protocol.player.User;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.MessageToMessageDecoder;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class BungeeDecoder extends MessageToMessageDecoder<ByteBuf> {
+    public User user;
+
+    public BungeeDecoder(User user) {
+        this.user = user;
+    }
+
+    public void read(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> output) throws Exception {
+
+        int firstReaderIndex = byteBuf.readerIndex();
+
+        PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), user, null, byteBuf, false);
+
+        int readerIndex = byteBuf.readerIndex();
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(readerIndex));
+        if (!packetReceiveEvent.isCancelled()) {
+            if (packetReceiveEvent.getLastUsedWrapper() != null) {
+                ByteBufHelper.clear(byteBuf);
+                packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
+                packetReceiveEvent.getLastUsedWrapper().write();
+            }
+            byteBuf.readerIndex(firstReaderIndex);
+            output.add(byteBuf.retain());
+        } else {
+            //Cancelling the packet, lets clear the buffer
+            ByteBufHelper.clear(byteBuf);
+        }
+        if (packetReceiveEvent.hasPostTasks()) {
+            for (Runnable task : packetReceiveEvent.getPostTasks()) {
+                task.run();
+            }
+        }
+
+    }
+
+    @Override
+    public void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+        if (buffer.isReadable()) {
+            read(ctx, buffer, out);
+        }
+    }
+
+    @Override
+    public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
+        ServerConnectionInitializer.destroyChannel(ctx.channel());
+        super.channelInactive(ctx);
+    }
+
+}
\ No newline at end of file

From d6835087c37a922ca182e7d6b22881bb6e906cf6 Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Mon, 13 Jul 2026 01:02:27 +0200
Subject: [PATCH 55/82] Correct grammar

---
 spigot/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts
index 1751d34..0302c59 100644
--- a/spigot/build.gradle.kts
+++ b/spigot/build.gradle.kts
@@ -54,7 +54,7 @@ tasks.processResources {
     inputs.property("coreVersion", libs.versions.coreVersion.get())
     inputs.property("packeteventsVersion", libs.versions.packetevents.get())
 
-    // Replaces placeholders in BOTH yml files.
+    // Replaces placeholders.
     filesMatching(listOf("plugin.yml", "paper-plugin.yml", "platform.properties")) {
         expand(inputs.properties)
     }

From fa1c17cba567a5b36bcf244569e10258bf6486c8 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Mon, 13 Jul 2026 09:52:37 +0200
Subject: [PATCH 56/82] Made fields final, cleanup code, made more readable

---
 .../cloud/gteam/coralgate/BungeePlugin.java   |   8 +-
 .../coralgate/injector/BungeeInjector.java    |  52 ++++---
 .../connection/BungeeChannelInitializer.java  |  31 +++--
 .../ServerConnectionInitializer.java          |  12 +-
 .../injector/handlers/BungeeDecoder.java      |  38 +++--
 .../cloud/gteam/coralgate/SpigotPlugin.java   |  14 +-
 .../coralgate/injector/SpigotInjector.java    | 130 +++++++++++-------
 .../PreChannelInitializer_v1_12.java          |  22 ++-
 .../PreChannelInitializer_v1_8.java           |  12 +-
 .../connection/ServerChannelHandler.java      |  34 +++--
 .../ServerConnectionInitializer.java          |  21 +--
 .../injector/handlers/SpigotDecoder.java      |  95 ++++++++-----
 .../cloud/gteam/coralgate/VelocityPlugin.java |   2 +-
 .../coralgate/injector/VelocityInjector.java  |  64 ++++++---
 .../ServerConnectionInitializer.java          |  14 +-
 .../VelocityChannelInitializer.java           |  21 ++-
 .../injector/handlers/VelocityDecoder.java    |  40 ++++--
 17 files changed, 399 insertions(+), 211 deletions(-)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java b/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
index 9f32c24..ed32041 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
@@ -39,9 +39,11 @@ public final class BungeePlugin extends Plugin {
 
     @Override
     public void onLoad() {
-        injector.inject();
-        PacketEvents.getAPI().getEventManager().registerListener(
-                new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+
+        this.injector.inject();
+
+        PacketEvents.getAPI().getEventManager().registerListener(new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+
     }
 
     @Override
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
index f197d62..a01d914 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
@@ -30,71 +30,89 @@
 import java.util.Set;
 
 public class BungeeInjector  {
-    public static String DECODER_NAME = "cg-decoder";
+
+    public static final String DECODER_NAME = "cg-decoder";
     private static final Field LISTENERS_FIELD;
 
     static {
+
         LISTENERS_FIELD = Reflection.getField(ProxyServer.getInstance().getClass(), "listeners");
         LISTENERS_FIELD.setAccessible(true);
+
     }
 
-    public void injectChannel(Channel channel) {
+    public void injectChannel(final Channel channel) {
+
         Field initializerField = null;
         ChannelHandler bootstrapAcceptor = null;
         for (String channelName : channel.pipeline().names()) {
+
             if (channelName.contains("QueryHandler")) {
-                return; // query handler, abort injection
+                return; // query handler, abort injection.
+            }
+
+            final ChannelHandler handler = channel.pipeline().get(channelName);
+            if (handler == null) {
+                continue;
             }
 
-            ChannelHandler handler = channel.pipeline().get(channelName);
-            if (handler == null) continue;
             try {
-                Field f = handler.getClass().getDeclaredField("childHandler");
+
+                final Field f = handler.getClass().getDeclaredField("childHandler");
                 f.setAccessible(true);
                 bootstrapAcceptor = handler;
                 initializerField = f;
-            } catch (Exception ignore) {
-            }
+
+            } catch (final Exception ignored) {}
+
         }
 
         if (bootstrapAcceptor == null) {
+
             bootstrapAcceptor = channel.pipeline().first();
             try {
+
                 initializerField = bootstrapAcceptor.getClass().getDeclaredField("childHandler");
                 initializerField.setAccessible(true);
-            } catch (NoSuchFieldException e) {
+
+            } catch (final NoSuchFieldException e) {
                 throw new RuntimeException(e);
             }
+
         }
 
-        ChannelInitializer<Channel> newInitializer;
+        final ChannelInitializer<Channel> newInitializer;
         try {
             newInitializer = new BungeeChannelInitializer(initializerField.get(bootstrapAcceptor));
-        } catch (IllegalAccessException e) {
+        } catch (final IllegalAccessException e) {
             throw new RuntimeException(e);
         }
 
         try {
             initializerField.set(bootstrapAcceptor, newInitializer);
-        } catch (IllegalAccessException e) {
+        } catch (final IllegalAccessException e) {
             throw new RuntimeException(e);
         }
 
     }
 
     public void inject() {
+
         try {
-            Set<Channel> listeners = (Set<Channel>) LISTENERS_FIELD.get(ProxyServer.getInstance());
 
-            for (Channel channel : listeners) {
+            final Set<Channel> listeners = (Set<Channel>) LISTENERS_FIELD.get(ProxyServer.getInstance());
+
+            for (final Channel channel : listeners) {
                 injectChannel(channel);
             }
 
-            Set<Channel> wrapper = new SetWrapper<>(listeners, this::injectChannel);
+            final Set<Channel> wrapper = new SetWrapper<>(listeners, this::injectChannel);
             LISTENERS_FIELD.set(ProxyServer.getInstance(), wrapper);
 
-        } catch (IllegalAccessException e) {
+        } catch (final IllegalAccessException e) {
             e.printStackTrace();
         }
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java
index 0f43766..ad4b5f8 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java
@@ -26,29 +26,44 @@
 import java.lang.reflect.Method;
 
 public class BungeeChannelInitializer extends ChannelInitializer<Channel> {
+
     private static final Method INIT_CHANNEL_METHOD;
 
     static {
+
         try {
+
             INIT_CHANNEL_METHOD = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
             INIT_CHANNEL_METHOD.setAccessible(true);
-        } catch (NoSuchMethodException e) {
+
+        } catch (final NoSuchMethodException e) {
             throw new RuntimeException(e);
         }
+
     }
+
     private final Object oldInitializer;
-    public BungeeChannelInitializer(Object oldInitializer) {
+
+    public BungeeChannelInitializer(final Object oldInitializer) {
         this.oldInitializer = oldInitializer;
     }
 
     @Override
-    protected void initChannel(@NotNull Channel channel) throws Exception {
-        if (!channel.isActive()) return;
-        INIT_CHANNEL_METHOD.invoke(oldInitializer, channel);
+    protected void initChannel(final @NotNull Channel channel) throws Exception {
 
-        //No injection if "legacy-decoder" is not present.
-        if (channel.pipeline().get("legacy-decoder") == null) return;
+        if (!channel.isActive()) {
+            return;
+        }
+
+        INIT_CHANNEL_METHOD.invoke(this.oldInitializer, channel);
+
+        // No injection if "legacy-decoder" is not present.
+        if (channel.pipeline().get("legacy-decoder") == null) {
+            return;
+        }
 
         ServerConnectionInitializer.initChannel(channel, ConnectionState.HANDSHAKING);
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
index f2891b9..b3fa1ee 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -27,19 +27,19 @@
 
 public class ServerConnectionInitializer {
 
-    public static void addChannelHandlers(Channel channel, BungeeDecoder decoder) {
+    public static void addChannelHandlers(final Channel channel, final BungeeDecoder decoder) {
         channel.pipeline().addBefore("legacy-decoder", BungeeInjector.DECODER_NAME, decoder);
     }
 
-    public static void initChannel(Channel channel, ConnectionState state) {
-        User user = new User(channel, state, null, new UserProfile(null, null));
+    public static void initChannel(final Channel channel, final ConnectionState state) {
 
-        BungeeDecoder decoder = new BungeeDecoder(user);
+        final BungeeDecoder decoder = new BungeeDecoder(new User(channel, state, null, new UserProfile(null, null)));
         addChannelHandlers(channel, decoder);
+
     }
 
-    public static void destroyChannel(Channel channel) {
+    public static void destroyChannel(final Channel channel) {
         channel.pipeline().remove(BungeeInjector.DECODER_NAME);
     }
 
-}
\ No newline at end of file
+}
diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
index a5c9c33..f406968 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
@@ -31,51 +31,65 @@
 import java.util.List;
 
 public class BungeeDecoder extends MessageToMessageDecoder<ByteBuf> {
-    public User user;
 
-    public BungeeDecoder(User user) {
+    public final User user;
+
+    public BungeeDecoder(final User user) {
         this.user = user;
     }
 
-    public void read(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> output) throws Exception {
+    public void read(final ChannelHandlerContext ctx, final ByteBuf byteBuf, final List<Object> output) throws Exception {
 
-        int firstReaderIndex = byteBuf.readerIndex();
+        final int firstReaderIndex = byteBuf.readerIndex();
 
-        PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), user, null, byteBuf, false);
+        final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
 
-        int readerIndex = byteBuf.readerIndex();
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(readerIndex));
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
         if (!packetReceiveEvent.isCancelled()) {
+
             if (packetReceiveEvent.getLastUsedWrapper() != null) {
+
                 ByteBufHelper.clear(byteBuf);
                 packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
                 packetReceiveEvent.getLastUsedWrapper().write();
+
             }
+
             byteBuf.readerIndex(firstReaderIndex);
             output.add(byteBuf.retain());
+
         } else {
-            //Cancelling the packet, lets clear the buffer
+
+            // Cancelling the packet, lets clear the buffer.
             ByteBufHelper.clear(byteBuf);
+
         }
+
         if (packetReceiveEvent.hasPostTasks()) {
-            for (Runnable task : packetReceiveEvent.getPostTasks()) {
+
+            for (final Runnable task : packetReceiveEvent.getPostTasks()) {
                 task.run();
             }
+
         }
 
     }
 
     @Override
-    public void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+    public void decode(final ChannelHandlerContext ctx, final ByteBuf buffer, final List<Object> out) throws Exception {
+
         if (buffer.isReadable()) {
             read(ctx, buffer, out);
         }
+
     }
 
     @Override
-    public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
+    public void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+
         ServerConnectionInitializer.destroyChannel(ctx.channel());
         super.channelInactive(ctx);
+
     }
 
-}
\ No newline at end of file
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
index e56dd65..850f79c 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
@@ -43,19 +43,21 @@ public final class SpigotPlugin extends JavaPlugin {
 
     @Override
     public void onLoad() {
-        if (!injector.isServerBound()) {
-            injector.inject();
+
+        if (!this.injector.isServerBound()) {
+            this.injector.inject();
         }
 
-        PacketEvents.getAPI().getEventManager().registerListener(
-                new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+        PacketEvents.getAPI().getEventManager().registerListener(new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+
     }
 
     @Override
     public void onEnable() {
 
-        if (!injector.hasInjected) {
-            injector.inject();
+        // Inject for LEGACY_SERVER_LIST_PING.
+        if (!this.injector.hasInjected) {
+            this.injector.inject();
         }
 
         // Start bStats.
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
index c2765b5..765a123 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/SpigotInjector.java
@@ -33,109 +33,137 @@
 import java.util.Set;
 
 public class SpigotInjector {
-    public static String DECODER_NAME = "cg-decoder";
-    public static String CONNECTION_HANDLER_NAME = "cg-connection-handler";
-    public static String SERVER_CHANNEL_HANDLER_NAME = "cg-connection-initializer";
 
-    //Channels that process connecting clients.
+    public static final String DECODER_NAME = "cg-decoder";
+    public static final String CONNECTION_HANDLER_NAME = "cg-connection-handler";
+    public static final String SERVER_CHANNEL_HANDLER_NAME = "cg-connection-initializer";
+
+    // Channels that process connecting clients.
     public final Set<Channel> injectedConnectionChannels = new HashSet<>();
     private int connectionChannelsListIndex = -1;
 
     public boolean hasInjected = false;
 
     public boolean isServerBound() {
-        //We want to check if the server has been bound to the port already.
-        Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
+
+        // We want to check if the server has been bound to the port already.
+        final Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
         if (serverConnection != null) {
-            ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
-            //There should only be 2 lists.
+
+            final ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
+
+            // There should only be 2 lists.
             for (int i = 0; i < 2; i++) {
-                List<?> list = reflectServerConnection.readList(i);
-                for (Object value : list) {
+
+                final List<?> list = reflectServerConnection.readList(i);
+                for (final Object value : list) {
+
                     if (value instanceof ChannelFuture) {
-                        connectionChannelsListIndex = i;
-                        //Found the right list.
-                        //It has connection channels, so the server has been bound.
+
+                        this.connectionChannelsListIndex = i;
+                        // Found the right list.
+                        // It has connection channels, so the server has been bound.
                         return true;
+
                     }
+
                 }
+
             }
+
         }
+
         return false;
-    }
 
+    }
 
     public void inject() {
-        Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
+
+        final Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
         if (serverConnection != null) {
-            ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
-            List<ChannelFuture> connectionChannelFutures = reflectServerConnection.readList(connectionChannelsListIndex);
-            InjectedList<ChannelFuture> wrappedList = new InjectedList<>(connectionChannelFutures, future -> {
-                //Each time a channel future is added, we run this.
-                //This is automatically also ran for the elements already added before we wrapped the list.
-                Channel channel = future.channel();
-                //Inject into the server connection channel.
+
+            final ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
+            final List<ChannelFuture> connectionChannelFutures = reflectServerConnection.readList(this.connectionChannelsListIndex);
+            final InjectedList<ChannelFuture> wrappedList = new InjectedList<>(connectionChannelFutures, future -> {
+
+                // Each time a channel future is added, we run this.
+                // This is automatically also ran for the elements already added before we wrapped the list.
+                final Channel channel = future.channel();
+                // Inject into the server connection channel.
                 injectServerChannel(channel);
-                //Make sure to store it, so we can uninject later on.
-                injectedConnectionChannels.add(channel);
+                // Make sure to store it, so we can uninject later on.
+                this.injectedConnectionChannels.add(channel);
+
             });
-            //Replace the list with our wrapped one.
-            reflectServerConnection.writeList(connectionChannelsListIndex, wrappedList);
 
-            hasInjected = true;
+            // Replace the list with our wrapped one.
+            reflectServerConnection.writeList(this.connectionChannelsListIndex, wrappedList);
+
+            this.hasInjected = true;
+
         }
-    }
 
+    }
 
     public void uninject() {
-        //Uninject our connection handler from these connection channels.
-        for (Channel connectionChannel : injectedConnectionChannels) {
+
+        // Uninject our connection handler from these connection channels.
+        for (final Channel connectionChannel : this.injectedConnectionChannels) {
             uninjectServerChannel(connectionChannel);
         }
-        injectedConnectionChannels.clear();
-        Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
+
+        this.injectedConnectionChannels.clear();
+
+        final Object serverConnection = SpigotReflectionUtil.getMinecraftServerConnectionInstance();
         if (serverConnection != null) {
-            ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
-            List<ChannelFuture> connectionChannelFutures = reflectServerConnection.readList(connectionChannelsListIndex);
+
+            final ReflectionObject reflectServerConnection = new ReflectionObject(serverConnection);
+            final List<ChannelFuture> connectionChannelFutures = reflectServerConnection.readList(this.connectionChannelsListIndex);
             if (connectionChannelFutures instanceof InjectedList) {
-                //Let us unwrap this. We no longer want to listen to connecting channels.
-                reflectServerConnection.writeList(connectionChannelsListIndex,
-                        ((InjectedList<ChannelFuture>) connectionChannelFutures).originalList());
+
+                // Let us unwrap this. We no longer want to listen to connecting channels.
+                reflectServerConnection.writeList(this.connectionChannelsListIndex, ((InjectedList<ChannelFuture>) connectionChannelFutures).originalList());
+
             }
+
         }
+
     }
 
-    private void injectServerChannel(Channel serverChannel) {
-        ChannelPipeline pipeline = serverChannel.pipeline();
-        ChannelHandler connectionHandler = pipeline.get(SpigotInjector.CONNECTION_HANDLER_NAME);
-        if (connectionHandler != null) {
-            //Why does it already exist? Remove it.
+    private void injectServerChannel(final Channel serverChannel) {
+
+        final ChannelPipeline pipeline = serverChannel.pipeline();
+        if (pipeline.get(SpigotInjector.CONNECTION_HANDLER_NAME) != null) {
+
+            // Why does it already exist? Remove it.
             pipeline.remove(SpigotInjector.CONNECTION_HANDLER_NAME);
+
         }
-        //Make sure we handle connections after ProtocolSupport.
+
+        // Make sure we handle connections after ProtocolSupport.
         if (pipeline.get("SpigotNettyServerChannelHandler#0") != null) {
             pipeline.addAfter("SpigotNettyServerChannelHandler#0", SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
         }
-        //Make sure we handle connections after Geyser.
+
+        // Make sure we handle connections after Geyser.
         else if (pipeline.get("floodgate-init") != null) {
             pipeline.addAfter("floodgate-init", SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
-        }
-        //Some forks add a handler which adds the other necessary vanilla handlers like (decoder, encoder, etc...)
-        else if (pipeline.get("MinecraftPipeline#0") != null) {
+        } else if (pipeline.get("MinecraftPipeline#0") != null) { // Some forks add a handler which adds the other necessary vanilla handlers like (decoder, encoder, etc...)
             pipeline.addAfter("MinecraftPipeline#0", SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
-        }
-        //Otherwise, make sure we are first.
-        else {
+        } else { // Otherwise, make sure we are first.
             pipeline.addFirst(SpigotInjector.CONNECTION_HANDLER_NAME, new ServerChannelHandler());
         }
+
     }
 
-    private void uninjectServerChannel(Channel serverChannel) {
+    private void uninjectServerChannel(final Channel serverChannel) {
+
         if (serverChannel.pipeline().get(SpigotInjector.CONNECTION_HANDLER_NAME) != null) {
             serverChannel.pipeline().remove(SpigotInjector.CONNECTION_HANDLER_NAME);
         } else {
             CorePlugin.getLogger().warning("Failed to uninject server channel, handler not found");
         }
+
     }
 
 }
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
index e58c872..d0785d7 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
@@ -21,33 +21,41 @@
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 public class PreChannelInitializer_v1_12 extends ChannelInboundHandlerAdapter {
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(io.netty.channel.ChannelInitializer.class);
+
+    private static final InternalLogger logger = InternalLoggerFactory.getInstance(ChannelInitializer.class);
 
     @Override
-    public void channelRegistered(ChannelHandlerContext ctx) {
+    public void channelRegistered(final ChannelHandlerContext ctx) {
+
         try {
             ServerConnectionInitializer.initChannel(ctx.channel(), ConnectionState.HANDSHAKING);
-        } catch (Throwable t) {
+        } catch (final Throwable t) {
             exceptionCaught(ctx, t);
         } finally {
-            ChannelPipeline pipeline = ctx.pipeline();
+
+            final ChannelPipeline pipeline = ctx.pipeline();
             if (pipeline.context(this) != null) {
                 pipeline.remove(this);
             }
+
         }
 
         ctx.pipeline().fireChannelRegistered();
-    }
 
+    }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable t) {
+    public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable t) {
+
         logger.warn("Failed to initialize a channel. Closing: " + ctx.channel(), t);
         ctx.close();
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
index 6016f8a..b9ba106 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_8.java
@@ -23,13 +23,19 @@
 import io.netty.channel.ChannelInitializer;
 
 public class PreChannelInitializer_v1_8 extends ChannelInitializer<Channel> {
+
     @Override
-    protected void initChannel(Channel channel) {
+    protected void initChannel(final Channel channel) {
+
         channel.pipeline().addLast(new ChannelInitializer<Channel>() {
+
             @Override
-            protected void initChannel(Channel channel) {
+            protected void initChannel(final Channel channel) {
                 ServerConnectionInitializer.initChannel(channel, ConnectionState.HANDSHAKING);
             }
+
         });
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
index bd564a3..3f29715 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerChannelHandler.java
@@ -33,30 +33,37 @@
 public class ServerChannelHandler extends ChannelInboundHandlerAdapter {
 
     @Override
-    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        if (!(msg instanceof Channel)) return;
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
 
-        Channel channel = (Channel) msg;
-        //Resolve netty version only once.
+        if (!(msg instanceof Channel)) {
+            return;
+        }
+
+        final Channel channel = (Channel) msg;
 
+        // Resolve netty version only once.
         if (NETTY_VERSION == null && !CHECKED_NETTY_VERSION) {
+
             NETTY_VERSION = resolveNettyVersion();
             CHECKED_NETTY_VERSION = true;
+
         }
 
-//        Depends on netty version. If we cannot resolve that we just check server version.
+        // Depends on netty version. If we cannot resolve that we just check server version.
         if ((NETTY_VERSION != null && NETTY_VERSION.isNewerThan(MODERN_NETTY_VERSION))
                 || SpigotReflectionUtil.V_1_12_OR_HIGHER) {
             channel.pipeline().addLast(SpigotInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_12());
         } else {
             channel.pipeline().addFirst(SpigotInjector.SERVER_CHANNEL_HANDLER_NAME, new PreChannelInitializer_v1_8());
         }
+
         super.channelRead(ctx, msg);
-    }
 
+    }
 
     private static PEVersion resolveNettyVersion() {
-        Map<String, Version> nettyArtifacts = Version.identify();
+
+        final Map<String, Version> nettyArtifacts = Version.identify();
 
         Version version = nettyArtifacts.getOrDefault("netty-common", nettyArtifacts.get("netty-all"));
 
@@ -65,22 +72,27 @@ private static PEVersion resolveNettyVersion() {
         }
 
         if (version != null) {
+
             String stringVersion = version.artifactVersion();
 
-            // Remove the ".Final" from the version by just removing any words (non numbers or dots)
+            // Remove the ".Final" from the version by just removing any words (non numbers or dots).
             stringVersion = stringVersion.replaceAll("[^\\d.]", "");
 
-            // Make sure stringVersion only contains 3 values like 4.2.0 but not 4.2.0.2
-            String[] splitVersion = stringVersion.split("\\.");
+            // Make sure stringVersion only contains 3 values like 4.2.0 but not 4.2.0.2.
+            final String[] splitVersion = stringVersion.split("\\.");
             if (splitVersion.length > 3) {
                 stringVersion = splitVersion[0] + "." + splitVersion[1] + "." + splitVersion[2];
             }
 
-            // If the string ends with a dot, remove it
+            // If the string ends with a dot, remove it.
             stringVersion = stringVersion.endsWith(".") ? stringVersion.substring(0, stringVersion.length() - 1) : stringVersion;
 
             return PEVersion.fromString(stringVersion);
+
         }
+
         return null;
+
     }
+
 }
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
index 2f4db8b..4ff69ac 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -31,23 +31,24 @@
 
 public class ServerConnectionInitializer {
 
-    public static void initChannel(Channel ch, ConnectionState connectionState) {
+    public static void initChannel(final Channel ch, final ConnectionState connectionState) {
+
         if (FakeChannelUtil.isFakeChannel(ch)) {
             return;
         }
 
-        User user = new User(ch, connectionState, null, new UserProfile(null, null));
+        relocateHandlers(ch, new User(ch, connectionState, null, new UserProfile(null, null)));
 
-        relocateHandlers(ch, user);
     }
 
-    public static void relocateHandlers(Channel ctx, User user) {
+    public static void relocateHandlers(final Channel ctx, final User user) {
+
         try {
-            SpigotDecoder decoder = new SpigotDecoder(user);
-            ctx.pipeline().addBefore("legacy_query", SpigotInjector.DECODER_NAME, decoder);
-        } catch (NoSuchElementException ex) {
-            String handlers = ChannelHelper.pipelineHandlerNamesAsString(ctx);
-            throw new IllegalStateException("CoralGateInjector failed to add a decoder to the netty pipeline. Pipeline handlers: " + handlers, ex);
+            ctx.pipeline().addBefore("legacy_query", SpigotInjector.DECODER_NAME, new SpigotDecoder(user));
+        } catch (final NoSuchElementException e) {
+            throw new IllegalStateException("CoralGateInjector failed to add a decoder to the netty pipeline. Pipeline handlers: " + ChannelHelper.pipelineHandlerNamesAsString(ctx), e);
         }
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
index b505a5c..abb3b6e 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
@@ -33,97 +33,126 @@
 import java.util.List;
 
 public class SpigotDecoder extends MessageToMessageDecoder<ByteBuf> {
-    public User user;
 
-    public SpigotDecoder(User user) {
+    public final User user;
+
+    public SpigotDecoder(final User user) {
         this.user = user;
     }
 
-    public void read(ChannelHandlerContext ctx, ByteBuf input, List<Object> out) {
+    public void read(final ChannelHandlerContext ctx, final ByteBuf input, final List<Object> out) {
+
         try {
-            handleServerBoundPacket(ctx.channel(), user, input);
+
+            handleServerBoundPacket(ctx.channel(), this.user, input);
             out.add(ByteBufHelper.retain(input));
-        } catch (Throwable e) {
-            // We must be sure all the exceptions caused by our handlers are PacketProcessExceptions
+
+        } catch (final Throwable t) {
+
+            // We must be sure all the exceptions caused by our handlers are PacketProcessExceptions.
             // In the case we have thrown an exception that is not a PacketProcessException, let's wrap it in order to
-            // allow exceptionCaught to handle it properly
-            if (ExceptionUtil.isException(e, PacketProcessException.class)) {
-                throw e;
+            // allow exceptionCaught to handle it properly.
+            if (ExceptionUtil.isException(t, PacketProcessException.class)) {
+                throw t;
             } else {
-                throw new PacketProcessException(e);
+                throw new PacketProcessException(t);
             }
+
         }
+
     }
 
-    static void handleServerBoundPacket(
-            Object channel, User user, Object buffer
-    ) {
-        int preProcessIndex = ByteBufHelper.readerIndex(buffer);
+    public static void handleServerBoundPacket(final Object channel, final User user, final Object buffer) {
+
+        final int preProcessIndex = ByteBufHelper.readerIndex(buffer);
+
+        final PacketReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(channel, user, null, buffer, true);
 
-        PacketReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(channel, user, null, buffer, true);
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> ByteBufHelper.readerIndex(buffer, ByteBufHelper.readerIndex(buffer)));
 
-        int processIndex = ByteBufHelper.readerIndex(buffer);
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> ByteBufHelper.readerIndex(buffer, processIndex));
         if (!packetReceiveEvent.isCancelled()) {
-            //Did they ever use a wrapper?
+
+            // Did they ever use a wrapper?
             if (packetReceiveEvent.getLastUsedWrapper() != null) {
-                //Rewrite the buffer
+
+                // Rewrite the buffer.
                 ByteBufHelper.clear(buffer);
                 packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
                 packetReceiveEvent.getLastUsedWrapper().write();
+
             } else {
-                //If no wrappers were used, just pass on the original buffer.
-                //Correct the reader index, basically what the next handler is expecting.
+
+                // If no wrappers were used, just pass on the original buffer.
+                // Correct the reader index, basically what the next handler is expecting.
                 ByteBufHelper.readerIndex(buffer, preProcessIndex);
+
             }
+
         } else {
-            //Cancelling the packet, lets clear the buffer
+
+            // Cancelling the packet, lets clear the buffer.
             ByteBufHelper.clear(buffer);
+
         }
+
         if (packetReceiveEvent.hasPostTasks()) {
-            for (Runnable task : packetReceiveEvent.getPostTasks()) {
+
+            for (final Runnable task : packetReceiveEvent.getPostTasks()) {
                 task.run();
             }
+
         }
+
     }
 
     @Override
-    public void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+    public void decode(final ChannelHandlerContext ctx, final ByteBuf buffer, final List<Object> out) throws Exception {
+
         if (buffer.isReadable()) {
             read(ctx, buffer, out);
         }
+
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
+
         // If we didn't cause the exception, let the server handle it.
         if (!ExceptionUtil.isException(cause, PacketProcessException.class)) {
+
             super.exceptionCaught(ctx, cause);
             return;
+
         }
 
-        boolean debug = PacketEvents.getAPI().getSettings().isDebugEnabled() || SpigotReflectionUtil.isMinecraftServerInstanceDebugging();
         // We log exceptions only if the server is in debug mode.
-        if (debug) {
+        if (PacketEvents.getAPI().getSettings().isDebugEnabled() || SpigotReflectionUtil.isMinecraftServerInstanceDebugging()) {
+
             if (PacketEvents.getAPI().getSettings().isFullStackTraceEnabled()) {
-                String state = user != null ? user.getDecoderState().name() : "null";
-                String clientVersion = user != null ? user.getClientVersion().getReleaseName() : "null";
+
+                final String state = this.user != null ? this.user.getDecoderState().name() : "null";
+                final String clientVersion = this.user != null ? this.user.getClientVersion().getReleaseName() : "null";
 
                 PacketEvents.getAPI().getLogManager().warn("An error occurred while processing a packet from "
-                        + user.getProfile().getName() + " (state: " + state + ", clientVersion: " + clientVersion +
+                        + this.user.getProfile().getName() + " (state: " + state + ", clientVersion: " + clientVersion +
                         ", serverVersion: " + PacketEvents.getAPI().getServerManager().getVersion().getReleaseName() + ")", cause);
+
             } else {
                 PacketEvents.getAPI().getLogManager().warn(cause.getMessage());
             }
+
         }
 
         if (PacketEvents.getAPI().getSettings().isKickOnPacketExceptionEnabled()) {
+
             ctx.channel().close();
 
-            if (user != null && user.getProfile().getName() != null) {
-                PacketEvents.getAPI().getLogManager().warn("Disconnected " + user.getProfile().getName() + " due to an invalid packet!");
+            if (this.user != null && this.user.getProfile().getName() != null) {
+                PacketEvents.getAPI().getLogManager().warn("Disconnected " + this.user.getProfile().getName() + " due to an invalid packet!");
             }
+
         }
+
     }
 
-}
\ No newline at end of file
+}
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
index ed5cb14..e4adaca 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
@@ -71,7 +71,7 @@ public VelocityPlugin(final ProxyServer proxyServer, final @DataDirectory Path d
     @Subscribe
     public void onProxyInitialization(final ProxyInitializeEvent proxyInitializeEvent) {
 
-        injector.inject();
+        this.injector.inject();
 
         // Start bStats.
         this.metricsFactory.make(this, 29439);
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
index fdd401c..552ab9b 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/VelocityInjector.java
@@ -36,7 +36,7 @@
 @ApiStatus.Internal
 public class VelocityInjector {
 
-    public static String DECODER_NAME = "cg-decoder";
+    public static final String DECODER_NAME = "cg-decoder";
 
     private static Class<?> CONNECTION_MANAGER_CLASS, SERVER_INITIALIZER_HOLDER_CLASS;
     private static Method SET_SERVER_INITIALIZER;
@@ -45,67 +45,93 @@ public class VelocityInjector {
 
     private final ProxyServer server;
 
-    public VelocityInjector(ProxyServer server) {
+    public VelocityInjector(final ProxyServer server) {
         this.server = server;
     }
 
     public void inject() {
+
         if (CONNECTION_MANAGER_CLASS == null) {
+
             CONNECTION_MANAGER_CLASS = Reflection.getClassByNameWithoutException("com.velocitypowered.proxy.network.ConnectionManager");
             SERVER_INITIALIZER_HOLDER_CLASS = Reflection.getClassByNameWithoutException("com.velocitypowered.proxy.network.ServerChannelInitializerHolder");
             SET_SERVER_INITIALIZER = Reflection.getMethod(SERVER_INITIALIZER_HOLDER_CLASS, 0, ChannelInitializer.class);
+
         }
-        Supplier<ChannelInitializer<Channel>> initializerHolder = getServerChannelInitializerHolder();
-        ChannelInitializer<Channel> wrappedProxyInitializer = initializerHolder.get();
-        VelocityChannelInitializer initializer = new VelocityChannelInitializer(wrappedProxyInitializer);
+
+        final Supplier<ChannelInitializer<Channel>> initializerHolder = getServerChannelInitializerHolder();
+        final ChannelInitializer<Channel> wrappedProxyInitializer = initializerHolder.get();
+        final VelocityChannelInitializer initializer = new VelocityChannelInitializer(wrappedProxyInitializer);
         try {
+
             SET_SERVER_INITIALIZER.invoke(initializerHolder, initializer);
             hasInjected = true;
-        } catch (IllegalAccessException | InvocationTargetException e) {
+
+        } catch (final IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
+
     }
 
     public void uninject() {
-        Supplier<ChannelInitializer<Channel>> holder = this.getServerChannelInitializerHolder();
+
+        final Supplier<ChannelInitializer<Channel>> holder = this.getServerChannelInitializerHolder();
         ChannelInitializer<?> wrapper = holder.get();
         CheckedConsumer<ChannelInitializer<Channel>, ReflectiveOperationException> uninjector = (initializer) -> {
+
             CorePlugin.getLogger().info("Uninjecting from Velocity channel initializer...");
             SET_SERVER_INITIALIZER.invoke(holder, initializer);
+
         };
 
         try {
+
             while (true) {
-                // Check if it's our initializer, could be wrapped by other plugins
+
+                // Check if it's our initializer, could be wrapped by other plugins.
                 if (wrapper instanceof VelocityChannelInitializer wrappedInitializer) {
+
                     uninjector.accept(wrappedInitializer.getWrappedInitializer());
                     break;
+
                 } else {
-                    // walk up wrapper tree, if possible to find a single matching field
-                    // this accounts for other plugins (e.g. ViaVersion) also replacing the injector, which may
-                    // wrap our already wrapped injector
-                    Field field = Reflection.getField(wrapper.getClass(), ChannelInitializer.class, 0);
+
+                    // Walk up wrapper tree, if possible to find a single matching field.
+                    // This accounts for other plugins (e.g. ViaVersion) also replacing the injector, which may
+                    // wrap our already wrapped injector.
+                    final Field field = Reflection.getField(wrapper.getClass(), ChannelInitializer.class, 0);
                     if (field == null) {
                         throw new IllegalStateException("Can't unwrap foreign channel initializer: " + wrapper);
                     }
+
                     field.setAccessible(true);
-                    ChannelInitializer<?> thisWrapper = wrapper;
+
+                    final ChannelInitializer<?> thisWrapper = wrapper;
                     wrapper = (ChannelInitializer<?>) field.get(thisWrapper);
                     uninjector = initializer -> {
+
                         field.set(thisWrapper, initializer);
                         CorePlugin.getLogger().info("Uninjected from plugin channel initializer " + thisWrapper);
+
                     };
+
                 }
+
             }
-        } catch (ReflectiveOperationException exception) {
-            throw new RuntimeException("Failed to uninject from frontend pipeline", exception);
+
+        } catch (final ReflectiveOperationException e) {
+            throw new RuntimeException("Failed to uninject from frontend pipeline", e);
         }
+
     }
 
     private Supplier<ChannelInitializer<Channel>> getServerChannelInitializerHolder() {
-        ReflectionObject reflectServer = new ReflectionObject(server);
-        Object connectionManager = reflectServer.readObject(0, CONNECTION_MANAGER_CLASS);
-        ReflectionObject reflectConnectionManager = new ReflectionObject(connectionManager);
+
+        final ReflectionObject reflectServer = new ReflectionObject(server);
+        final Object connectionManager = reflectServer.readObject(0, CONNECTION_MANAGER_CLASS);
+        final ReflectionObject reflectConnectionManager = new ReflectionObject(connectionManager);
         return (Supplier<ChannelInitializer<Channel>>) reflectConnectionManager.readObject(0, SERVER_INITIALIZER_HOLDER_CLASS);
+
     }
-}
\ No newline at end of file
+
+}
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
index e32641b..d2e2af1 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -26,18 +26,20 @@
 import io.netty.channel.Channel;
 
 public class ServerConnectionInitializer {
-    public static void addChannelHandlers(Channel channel, VelocityDecoder decoder) {
+
+    public static void addChannelHandlers(final Channel channel, final VelocityDecoder decoder) {
         channel.pipeline().addBefore("legacy-ping-decoder", VelocityInjector.DECODER_NAME, decoder);
     }
 
-    public static void initChannel(Channel channel, ConnectionState state) {
-        User user = new User(channel, state, null, new UserProfile(null, null));
+    public static void initChannel(final Channel channel, final ConnectionState state) {
 
-        VelocityDecoder decoder = new VelocityDecoder(user);
+        final VelocityDecoder decoder = new VelocityDecoder(new User(channel, state, null, new UserProfile(null, null)));
         addChannelHandlers(channel, decoder);
+
     }
 
-    public static void destroyChannel(Channel channel) {
+    public static void destroyChannel(final Channel channel) {
         channel.pipeline().remove(VelocityInjector.DECODER_NAME);
     }
-}
\ No newline at end of file
+
+}
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java
index 29aaa03..6b5dc21 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/connection/VelocityChannelInitializer.java
@@ -27,27 +27,36 @@
 import java.lang.reflect.Method;
 
 public class VelocityChannelInitializer extends ChannelInitializer<Channel> {
+
     private static Method INIT_CHANNEL;
     private final ChannelInitializer<Channel> wrappedInitializer;
 
-    public VelocityChannelInitializer(ChannelInitializer<Channel> wrappedInitializer) {
+    public VelocityChannelInitializer(final ChannelInitializer<Channel> wrappedInitializer) {
         this.wrappedInitializer = wrappedInitializer;
     }
 
     @Override
-    protected void initChannel(@NotNull Channel channel) throws Exception {
+    protected void initChannel(final @NotNull Channel channel) throws Exception {
+
         if (INIT_CHANNEL == null) {
+
             INIT_CHANNEL = ChannelInitializer.class.getDeclaredMethod("initChannel", Channel.class);
             INIT_CHANNEL.setAccessible(true);
+
+        }
+
+        INIT_CHANNEL.invoke(this.wrappedInitializer, channel);
+
+        if (PacketEvents.getAPI().isTerminated()) {
+            return;
         }
-        INIT_CHANNEL.invoke(wrappedInitializer, channel);
 
-        if (PacketEvents.getAPI().isTerminated()) return;
         ServerConnectionInitializer.initChannel(channel, ConnectionState.HANDSHAKING);
+
     }
 
     public ChannelInitializer<Channel> getWrappedInitializer() {
-        return wrappedInitializer;
+        return this.wrappedInitializer;
     }
 
-}
\ No newline at end of file
+}
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
index f514a2b..f3f2134 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
@@ -31,49 +31,65 @@
 import java.util.List;
 
 public class VelocityDecoder extends MessageToMessageDecoder<ByteBuf> {
-    public User user;
 
-    public VelocityDecoder(User user) {
+    public final User user;
+
+    public VelocityDecoder(final User user) {
         this.user = user;
     }
 
-    public void read(ChannelHandlerContext ctx, ByteBuf byteBuf, List<Object> output) throws Exception {
+    public void read(final ChannelHandlerContext ctx, final ByteBuf byteBuf, final List<Object> output) throws Exception {
+
+        final int firstReaderIndex = byteBuf.readerIndex();
+
+        final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
 
-        int firstReaderIndex = byteBuf.readerIndex();
-        PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), user, null, byteBuf, false);
-        int readerIndex = byteBuf.readerIndex();
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(readerIndex));
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
         if (!packetReceiveEvent.isCancelled()) {
+
             if (packetReceiveEvent.getLastUsedWrapper() != null) {
+
                 ByteBufHelper.clear(packetReceiveEvent.getByteBuf());
                 packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
                 packetReceiveEvent.getLastUsedWrapper().write();
+
             }
+
             byteBuf.readerIndex(firstReaderIndex);
             output.add(byteBuf.retain());
+
         } else {
-            //Cancelling the packet, lets clear the buffer
+
+            // Cancelling the packet, lets clear the buffer.
             ByteBufHelper.clear(byteBuf);
+
         }
+
         if (packetReceiveEvent.hasPostTasks()) {
-            for (Runnable task : packetReceiveEvent.getPostTasks()) {
+
+            for (final Runnable task : packetReceiveEvent.getPostTasks()) {
                 task.run();
             }
+
         }
 
     }
 
     @Override
-    public void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception {
+    public void decode(final ChannelHandlerContext ctx, final ByteBuf buffer, final List<Object> out) throws Exception {
+
         if (buffer.isReadable()) {
             read(ctx, buffer, out);
         }
+
     }
 
     @Override
-    public void channelInactive(@NotNull ChannelHandlerContext ctx) throws Exception {
+    public void channelInactive(final @NotNull ChannelHandlerContext ctx) throws Exception {
+
         ServerConnectionInitializer.destroyChannel(ctx.channel());
         super.channelInactive(ctx);
+
     }
 
-}
\ No newline at end of file
+}

From d4f692e161d3f328f479fdb54c71f60e5e51ea6e Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Mon, 13 Jul 2026 15:22:35 +0200
Subject: [PATCH 57/82] Removed platform-type to use PE's built in isProxy
 boolean

---
 bungeecord/src/main/resources/platform.properties | 1 -
 spigot/src/main/resources/platform.properties     | 1 -
 velocity/src/main/resources/platform.properties   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/bungeecord/src/main/resources/platform.properties b/bungeecord/src/main/resources/platform.properties
index 69b49b7..91d4b12 100644
--- a/bungeecord/src/main/resources/platform.properties
+++ b/bungeecord/src/main/resources/platform.properties
@@ -1,5 +1,4 @@
 platform-name=${name}
-platform-type=proxy
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file
diff --git a/spigot/src/main/resources/platform.properties b/spigot/src/main/resources/platform.properties
index d255182..91d4b12 100644
--- a/spigot/src/main/resources/platform.properties
+++ b/spigot/src/main/resources/platform.properties
@@ -1,5 +1,4 @@
 platform-name=${name}
-platform-type=backend
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file
diff --git a/velocity/src/main/resources/platform.properties b/velocity/src/main/resources/platform.properties
index 69b49b7..91d4b12 100644
--- a/velocity/src/main/resources/platform.properties
+++ b/velocity/src/main/resources/platform.properties
@@ -1,5 +1,4 @@
 platform-name=${name}
-platform-type=proxy
 platform-version=${version}
 core-version=${coreVersion}
 packetevents-version=${packeteventsVersion}
\ No newline at end of file

From bd1aaec68ac8242ac94b36f57fff78345ddc719f Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Mon, 13 Jul 2026 15:24:16 +0200
Subject: [PATCH 58/82] Did a cleaner fix for API, now running on LOGIN_SUCCESS
 for proxies only. Removed platform-type to use PE's built in isProxy boolean

---
 .../coralgate/processor/NetworkProcessor.java | 116 ++++++++++++------
 1 file changed, 79 insertions(+), 37 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index 7466e80..a9f8a92 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -33,6 +33,7 @@
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
 import com.github.retrooper.packetevents.wrapper.login.client.WrapperLoginClientLoginStart;
 import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerDisconnect;
+import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerEncryptionRequest;
 import com.github.retrooper.packetevents.wrapper.status.client.WrapperStatusClientPing;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerPong;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerResponse;
@@ -294,57 +295,60 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
             verifyAndTransitionState(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, PacketType.Handshaking.Client.HANDSHAKE, packetTypeCommon, "Missing proper handshake.");
 
-            // The state validation failed, no need to run a check against the API.
-            if (packetReceiveEvent.isCancelled()) {
-                return; // Block further logic.
-            }
+            // This only works on Spigot/Paper due to a bug on BungeeCord/Velocity with packetevents.
+            // Proxies pass the API check when reaching "LOGIN_SUCCESS (S->C). It's the only place where it will work like LOGIN_START.
+            // Note: this does cause information about ENCRYPTION_REQUEST and SET_COMPRESSION to leak towards the player...
+            // See issues: https://github.com/GTeamX/CoralGate/issues/34 and https://github.com/retrooper/packetevents/issues/1465
+            // TODO: find better solution/fix PE issue
+            if (!PacketEvents.getAPI().getInjector().isProxy()) {
+
+                // The state validation failed, no need to run a check against the API.
+                if (packetReceiveEvent.isCancelled()) {
+                    return; // Block further logic.
+                }
 
-            // Either if health checking is disabled or if the API is truly healthy.
-            if (!this.corePlugin.getConfigManager().getConfig().isApiHealthCheck() || this.corePlugin.getApiManager().isHealthy()) {
+                // Either if health checking is disabled or if the API is truly healthy.
+                if (!this.corePlugin.getConfigManager().getConfig().isApiHealthCheck() || this.corePlugin.getApiManager().isHealthy()) {
 
-                // Cancel the packet to send it later.
-                // This dynamic 'cancel and send later' method only works on Spigot/Paper. It doesn't work on Proxies.
-                // We'll just need to pre-cache the API results in advance (HANDSHAKE, REQUEST, PING).
-                // This will cause players not be able to seemlessly connect and will cause "Diconnected." messages...
-                // TODO: find better solution
-                if (!this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")) {
+                    // Cancel the packet to send it later.
                     packetReceiveEvent.setCancelled(true);
-                }
 
-                // Cache wrapper and data to reconstruct and send it back later.
-                final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
+                    // Cache wrapper and data to reconstruct and send it back later.
+                    final WrapperLoginClientLoginStart wrapperLoginClientLoginStart = new WrapperLoginClientLoginStart(packetReceiveEvent);
 
-                // Cache username, it's being used twice. Save some CPU for the rest of us!!!1111!!1!1!
-                final String username = wrapperLoginClientLoginStart.getUsername();
+                    // Cache username, it's being used twice. Save some CPU for the rest of us!!!1111!!1!1!
+                    final String username = wrapperLoginClientLoginStart.getUsername();
 
-                // Filter debug usernames.
-                if (username.startsWith("Player")) {
+                    // Filter debug usernames.
+                    if (username.startsWith("Player")) {
 
-                    // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                    log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Bot-like username pattern detected.", true);
+                        // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                        log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Bot-like username pattern detected.", true);
 
-                    // The connection is closed and the packet dropped, no need to run a check against the API.
-                    // Block further logic.
-                    return;
+                        // The connection is closed and the packet dropped, no need to run a check against the API.
+                        // Block further logic.
+                        return;
 
-                }
+                    }
 
-                // Fetch API async.
-                this.corePlugin.getApiManager().isIpBlocked(ipAddress).thenAccept(blocked -> {
+                    // Fetch API async.
+                    this.corePlugin.getApiManager().isIpBlocked(ipAddress).thenAccept(blocked -> {
 
-                    if (blocked) {
+                        if (blocked) {
 
-                        // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
-                        log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "IP is blocked by the API.", true);
+                            // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                            log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "IP is blocked by the API.", true);
 
-                    } else if (!this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")) { // TODO: same problem describe above...
+                        } else {
 
-                        // Process the packet again, the player is verified by the API.
-                        packetUser.receivePacketSilently(new WrapperLoginClientLoginStart(wrapperLoginClientLoginStart.getClientVersion(), username, wrapperLoginClientLoginStart.getSignatureData().orElse(null), wrapperLoginClientLoginStart.getPlayerUUID().orElse(null)));
+                            // Process the packet again, the player is verified by the API.
+                            packetUser.receivePacketSilently(new WrapperLoginClientLoginStart(wrapperLoginClientLoginStart.getClientVersion(), username, wrapperLoginClientLoginStart.getSignatureData().orElse(null), wrapperLoginClientLoginStart.getPlayerUUID().orElse(null)));
 
-                    }
+                        }
 
-                });
+                    });
+
+                }
 
             }
 
@@ -382,7 +386,7 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         // However, if we're on a proxy, the server version is marked as 1.8 since it's the lowest Bungee supports (when it could be anything else).
         // Therefore, we should base ourselves off the client's version ONLY if we are running on a proxy.
         final boolean useLoginSuccessAck = PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)
-                || (this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")
+                || (PacketEvents.getAPI().getInjector().isProxy()
                 && packetUser.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_2));
 
         final PacketTypeCommon expectedFinalState = useLoginSuccessAck
@@ -475,6 +479,44 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
             // If something is wrong, log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
             verifyAndTransitionState(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, requiredPacketTypeCommon, packetTypeCommon, "Missing set compression procedure.");
 
+            // This fix is really only for proxies. The API check run way earlier for the Spigot/Paper versions.
+            if (PacketEvents.getAPI().getInjector().isProxy()) {
+
+                // The state validation failed, no need to run a check against the API.
+                if (packetSendEvent.isCancelled()) {
+                    return; // Block further logic.
+                }
+
+                // Either if health checking is disabled or if the API is truly healthy.
+                if (!this.corePlugin.getConfigManager().getConfig().isApiHealthCheck() || this.corePlugin.getApiManager().isHealthy()) {
+
+                    // Cancel the packet to send it later.
+                    packetSendEvent.setCancelled(true);
+
+                    // Cache wrapper and data to reconstruct and send it back later.
+                    final WrapperLoginServerEncryptionRequest wrapperLoginServerEncryptionRequest = new WrapperLoginServerEncryptionRequest(packetSendEvent);
+
+                    // Fetch API async.
+                    this.corePlugin.getApiManager().isIpBlocked(ipAddress).thenAccept(blocked -> {
+
+                        if (blocked) {
+
+                            // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
+                            log(packetSendEvent, inetSocketAddress, ipAddress, packetTypeCommon, "IP is blocked by the API.");
+
+                        } else {
+
+                            // Process the packet again, the player is verified by the API.
+                            packetSendEvent.getUser().sendPacketSilently(new WrapperLoginServerEncryptionRequest(wrapperLoginServerEncryptionRequest.getServerId(), wrapperLoginServerEncryptionRequest.getPublicKeyBytes(), wrapperLoginServerEncryptionRequest.getVerifyToken(), wrapperLoginServerEncryptionRequest.isShouldAuthenticate()));
+
+                        }
+
+                    });
+
+                }
+
+            }
+
             // Block further logic.
             return;
 
@@ -524,7 +566,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         // However, if we're on a proxy, the server version is marked as 1.8 since it's the lowest Bungee supports (when it could be anything else).
         // Therefore, we should base ourselves off the client's version ONLY if we are running on a proxy.
         final boolean useLoginSuccessAck = PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)
-                || (this.corePlugin.getPlatformProperties().getProperty("platform-type").equals("proxy")
+                || (PacketEvents.getAPI().getInjector().isProxy()
                 && packetSendEvent.getUser().getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_20_2));
 
         final PacketTypeCommon expectedFinalState = useLoginSuccessAck

From c03d6770a70c132282a16c3340ce4544bd03e38b Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Mon, 13 Jul 2026 15:42:03 +0200
Subject: [PATCH 59/82] Fixed using the right wrapper (issue #34)

---
 .../cloud/gteam/coralgate/processor/NetworkProcessor.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index a9f8a92..c871958 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -33,7 +33,7 @@
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
 import com.github.retrooper.packetevents.wrapper.login.client.WrapperLoginClientLoginStart;
 import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerDisconnect;
-import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerEncryptionRequest;
+import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerLoginSuccess;
 import com.github.retrooper.packetevents.wrapper.status.client.WrapperStatusClientPing;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerPong;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerResponse;
@@ -494,7 +494,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
                     packetSendEvent.setCancelled(true);
 
                     // Cache wrapper and data to reconstruct and send it back later.
-                    final WrapperLoginServerEncryptionRequest wrapperLoginServerEncryptionRequest = new WrapperLoginServerEncryptionRequest(packetSendEvent);
+                    final WrapperLoginServerLoginSuccess wrapperLoginServerLoginSuccess = new WrapperLoginServerLoginSuccess(packetSendEvent);
 
                     // Fetch API async.
                     this.corePlugin.getApiManager().isIpBlocked(ipAddress).thenAccept(blocked -> {
@@ -507,7 +507,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
                         } else {
 
                             // Process the packet again, the player is verified by the API.
-                            packetSendEvent.getUser().sendPacketSilently(new WrapperLoginServerEncryptionRequest(wrapperLoginServerEncryptionRequest.getServerId(), wrapperLoginServerEncryptionRequest.getPublicKeyBytes(), wrapperLoginServerEncryptionRequest.getVerifyToken(), wrapperLoginServerEncryptionRequest.isShouldAuthenticate()));
+                            packetSendEvent.getUser().sendPacketSilently(new WrapperLoginServerLoginSuccess(wrapperLoginServerLoginSuccess.getUserProfile(), wrapperLoginServerLoginSuccess.getSessionId(), wrapperLoginServerLoginSuccess.isStrictErrorHandling()));
 
                         }
 

From 5897bc4791a9f968304d05e820b3abee15ba9123 Mon Sep 17 00:00:00 2001
From: XIII___ <81795405+XIII-MC@users.noreply.github.com>
Date: Tue, 14 Jul 2026 08:38:09 +0200
Subject: [PATCH 60/82] Clarify packet inspection description in README

Updated the description to replace 'checks' with 'verifies' for clarity.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 21f33ec..13cc04b 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
 
 On-the-fly packet inspection and real-time IP verification for Minecraft servers and networks.
 
-CoralGate acts as a high-performance application firewall for your Minecraft infrastructure. By analyzing incoming packets: malicious payloads, scanners and bots are blocked before they truly reach your server. It secures your servers by spoofing your MOTD to appear as a generic server, checks proper packet order and even checking certain incoming connection fields.
+CoralGate acts as a high-performance application firewall for your Minecraft infrastructure. By analyzing incoming packets: malicious payloads, scanners and bots are blocked before they truly reach your server. It secures your servers by spoofing your MOTD to appear as a generic server, verifies proper packet order and even checks certain incoming connection fields.
 
 If you wish to get support, test or have any questions about CoralGate, make sure to join our [Discord server](https://discord.gteam.cloud)!
 

From 8b183fbfb5617cd155f2caa5064dc7621d6bf6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Rosner?= <kontakt@rafi67000.xyz>
Date: Wed, 15 Jul 2026 23:29:54 +0200
Subject: [PATCH 61/82] Decode only legacy ping packet

---
 .../coralgate/injector/handlers/BungeeDecoder.java   | 10 ++++++++++
 .../coralgate/injector/handlers/SpigotDecoder.java   | 12 +++++++++++-
 .../coralgate/injector/handlers/VelocityDecoder.java | 11 +++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
index f406968..c0793e8 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
@@ -42,6 +42,16 @@ public void read(final ChannelHandlerContext ctx, final ByteBuf byteBuf, final L
 
         final int firstReaderIndex = byteBuf.readerIndex();
 
+        try {
+            int id = ByteBufHelper.readVarInt(byteBuf);
+
+            if (id != 0xFE) return;
+        } catch (Exception e) {
+            return;
+        } finally {
+            byteBuf.readerIndex(firstReaderIndex);
+        }
+
         final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
 
         PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
index abb3b6e..33353f6 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
@@ -62,10 +62,20 @@ public void read(final ChannelHandlerContext ctx, final ByteBuf input, final Lis
 
     }
 
-    public static void handleServerBoundPacket(final Object channel, final User user, final Object buffer) {
+    public static void handleServerBoundPacket(final Object channel, final User user, final ByteBuf buffer) {
 
         final int preProcessIndex = ByteBufHelper.readerIndex(buffer);
 
+        try {
+            int id = ByteBufHelper.readVarInt(buffer);
+
+            if (id != 0xFE) return;
+        } catch (Exception e) {
+            return;
+        } finally {
+            buffer.readerIndex(preProcessIndex);
+        }
+
         final PacketReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(channel, user, null, buffer, true);
 
         PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> ByteBufHelper.readerIndex(buffer, ByteBufHelper.readerIndex(buffer)));
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
index f3f2134..f373a6e 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
@@ -22,6 +22,7 @@
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.simple.PacketHandshakeReceiveEvent;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
+import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.User;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -42,6 +43,16 @@ public void read(final ChannelHandlerContext ctx, final ByteBuf byteBuf, final L
 
         final int firstReaderIndex = byteBuf.readerIndex();
 
+        try {
+            int id = ByteBufHelper.readVarInt(byteBuf);
+
+            if (id != 0xFE) return;
+        } catch (Exception e) {
+            return;
+        } finally {
+            byteBuf.readerIndex(firstReaderIndex);
+        }
+
         final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
 
         PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));

From 438f679c507a34e65d5a496e8787d4129851c151 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 16 Jul 2026 21:54:01 +0200
Subject: [PATCH 62/82] Fixed cache check bad boolean

---
 core/src/main/java/cloud/gteam/coralgate/api/APIManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
index 59e933d..cfc7d8c 100644
--- a/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/api/APIManager.java
@@ -86,7 +86,7 @@ public CompletableFuture<Boolean> isIpBlocked(final String ipAddress) {
 
     public boolean isIpCached(final String ipAddress) {
         final CacheEntry entry = this.ipCache.get(ipAddress);
-        return entry != null && entry.isExpired(this.cacheTime);
+        return entry != null && !entry.isExpired(this.cacheTime);
     }
 
     public boolean isIpCachedBlocked(final String ipAddress) {

From d204939113020af5022141c00a3de00065e43ef9 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 16 Jul 2026 21:55:12 +0200
Subject: [PATCH 63/82] Added "this." to the timestamp var for uniformity
 across the project

---
 core/src/main/java/cloud/gteam/coralgate/api/CacheEntry.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/api/CacheEntry.java b/core/src/main/java/cloud/gteam/coralgate/api/CacheEntry.java
index 5d84ef7..f2e3882 100644
--- a/core/src/main/java/cloud/gteam/coralgate/api/CacheEntry.java
+++ b/core/src/main/java/cloud/gteam/coralgate/api/CacheEntry.java
@@ -33,7 +33,7 @@ public boolean isBlocked() {
     }
 
     public boolean isExpired(final long duration) {
-        return (System.currentTimeMillis() - timestamp) > duration;
+        return (System.currentTimeMillis() - this.timestamp) > duration;
     }
 
 }

From 9001df7b51ab7a9358b2fe900540c7ae13671910 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2026 23:13:58 +0000
Subject: [PATCH 64/82] bump com.gradleup.shadow from 9.5.1 to 9.6.0 in the
 dev-deps group

Bumps the dev-deps group with 1 update: [com.gradleup.shadow](https://github.com/GradleUp/shadow).


Updates `com.gradleup.shadow` from 9.5.1 to 9.6.0
- [Release notes](https://github.com/GradleUp/shadow/releases)
- [Commits](https://github.com/GradleUp/shadow/compare/9.5.1...9.6.0)

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 9.6.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dev-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bfe443d..8790420 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ spigot = "1.8.8-R0.1-SNAPSHOT"
 bungeecord = "1.16-R0.4"
 velocity = "3.4.0"
 
-shadow = "9.5.1"
+shadow = "9.6.0"
 
 [libraries]
 

From dd9b7591a33326a17d99e21dffab5828e0a003c9 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 16 Jul 2026 22:54:57 +0200
Subject: [PATCH 65/82] Potential fix for #37, spoofing version when running on
 a proxy

---
 .../coralgate/processor/NetworkProcessor.java | 125 +++++++++++++++---
 1 file changed, 104 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index c871958..8c352e3 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -30,15 +30,20 @@
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
 import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.player.User;
+import com.github.retrooper.packetevents.wrapper.configuration.server.WrapperConfigServerDisconnect;
 import com.github.retrooper.packetevents.wrapper.handshaking.client.WrapperHandshakingClientHandshake;
 import com.github.retrooper.packetevents.wrapper.login.client.WrapperLoginClientLoginStart;
 import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerDisconnect;
 import com.github.retrooper.packetevents.wrapper.login.server.WrapperLoginServerLoginSuccess;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerDisconnect;
 import com.github.retrooper.packetevents.wrapper.status.client.WrapperStatusClientPing;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerPong;
 import com.github.retrooper.packetevents.wrapper.status.server.WrapperStatusServerResponse;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.Style;
+import net.kyori.adventure.text.format.TextDecoration;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -144,8 +149,8 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
                             ? "Invalid protocol version."
                             : reason;
 
-                    // Don't close the connection yet.
-                    log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
+                    // Don't cancel the packet else the REQUEST/PING fail.
+                    CorePlugin.getLogger().warning(reason + " Keep an eye on " + inetSocketAddress + ". [C->S | " + packetReceiveEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName() + "]");
 
                 }
 
@@ -415,6 +420,8 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         final String ipAddress = inetSocketAddress.getHostString();
         final PacketTypeCommon packetTypeCommon = packetSendEvent.getPacketType();
 
+        System.out.println(packetSendEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName());
+
         // Whitelisted packets.
         if (packetTypeCommon == PacketType.Status.Server.RESPONSE || packetTypeCommon == PacketType.Status.Server.PONG) {
             return;
@@ -523,38 +530,58 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         }
 
         // Fired when a connection is closed.
+        // From the tests I've run, this gets triggered on Spigot/Paper (all the time).
         if (packetTypeCommon == PacketType.Login.Server.DISCONNECT) {
 
             final WrapperLoginServerDisconnect wrapperLoginServerDisconnect = new WrapperLoginServerDisconnect(packetSendEvent);
 
-            final Component disconnectReason = wrapperLoginServerDisconnect.getReason();
-            final String serverVersion = PacketEvents.getAPI().getServerManager().getVersion().getReleaseName();
+            // Process DISCONNECT on a separate function, both PLAY, LOGIN and CONFIGURATION DISCONNECT share the same logic.
+            final Component safeDisconnectReason = processDisconnect(wrapperLoginServerDisconnect.getReason());
 
-            if (disconnectReason instanceof TextComponent) {
+            // Set the new reason and tell packetevents to re-encode the packet and send it.
+            wrapperLoginServerDisconnect.setReason(safeDisconnectReason);
 
-                final TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
-                final String disconnectReasonString = disconnectReasonTextComponent.content();
+            packetSendEvent.markForReEncode(true);
 
-                // Intercept "Outdated server! I'm still on X.XX.X" messages to not show the server's version.
-                if (disconnectReasonString.contains(serverVersion)) {
+            // Block further logic.
+            return;
 
-                    // Replace the real server's version by the spoofed one.
-                    final String newDisconnectReason = disconnectReasonString.replace(serverVersion, "1.21.11");
+        }
 
-                    // Reconstruct reason with spoofed server version.
-                    final Component safeDisconnectReason = Component.text()
-                            .content(newDisconnectReason)
-                            .style(disconnectReasonTextComponent.style())
-                            .build();
+        // Fired when a connection is closed.
+        // From the tests I've run, this gets triggered on Velocity ("Outdated client!")
+        // TODO: Check bungee
+        if (packetTypeCommon == PacketType.Play.Server.DISCONNECT && this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
 
-                    // Set the new reason and tell packetevents to re-encode the packet and send it.
-                    wrapperLoginServerDisconnect.setReason(safeDisconnectReason);
+            final WrapperPlayServerDisconnect wrapperPlayServerDisconnect = new WrapperPlayServerDisconnect(packetSendEvent);
 
-                    packetSendEvent.markForReEncode(true);
+            // Process DISCONNECT on a separate function, both PLAY, LOGIN and CONFIGURATION DISCONNECT share the same logic.
+            final Component safeDisconnectReason = processDisconnect(wrapperPlayServerDisconnect.getReason());
 
-                }
+            // Set the new reason and tell packetevents to re-encode the packet and send it.
+            wrapperPlayServerDisconnect.setReason(safeDisconnectReason);
 
-            }
+            packetSendEvent.markForReEncode(true);
+
+            // Block further logic.
+            return;
+
+        }
+
+        // Fired when a connection is closed.
+        // From the tests I've run, this gets triggered on Velocity ("Outdated server!")
+        // TODO: Check bungee
+        if (packetTypeCommon == PacketType.Configuration.Server.DISCONNECT && this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
+
+            final WrapperConfigServerDisconnect wrapperConfigServerDisconnect = new WrapperConfigServerDisconnect(packetSendEvent);
+
+            // Process DISCONNECT on a separate function, both PLAY, LOGIN and CONFIGURATION DISCONNECT share the same logic.
+            final Component safeDisconnectReason = processDisconnect(wrapperConfigServerDisconnect.getReason());
+
+            // Set the new reason and tell packetevents to re-encode the packet and send it.
+            wrapperConfigServerDisconnect.setReason(safeDisconnectReason);
+
+            packetSendEvent.markForReEncode(true);
 
             // Block further logic.
             return;
@@ -684,4 +711,60 @@ private boolean exemptLocalIpAddress(final InetSocketAddress inetSocketAddress)
 
     }
 
+    private Component processDisconnect(final Component disconnectReason) {
+
+        if (disconnectReason instanceof TextComponent) {
+
+            final TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
+            final String disconnectReasonString = disconnectReasonTextComponent.content();
+
+            // This MUST match every of the normal "Outdated...!" message.
+            // This ensures no server whatsoever can match this kind of kick message.
+            final Style style = disconnectReasonTextComponent.style();
+
+            // All decorations must be NOT_SET.
+            if (style.decoration(TextDecoration.OBFUSCATED) != TextDecoration.State.NOT_SET
+                    || style.decoration(TextDecoration.BOLD) != TextDecoration.State.NOT_SET
+                    || style.decoration(TextDecoration.STRIKETHROUGH) != TextDecoration.State.NOT_SET
+                    || style.decoration(TextDecoration.UNDERLINED) != TextDecoration.State.NOT_SET
+                    || style.decoration(TextDecoration.ITALIC) != TextDecoration.State.NOT_SET) {
+                return disconnectReason;
+            }
+
+            // Color must be exactly Red (#FF5555).
+            if (!NamedTextColor.RED.equals(style.color())) {
+                return disconnectReason;
+            }
+
+            // Click, Hover, Insertion, Font, and Shadow Color must be null/not set.
+            if (style.clickEvent() != null
+                    || style.hoverEvent() != null
+                    || style.insertion() != null
+                    || style.font() != null) {
+                return disconnectReason;
+            }
+
+            // Must have no children.
+            if (!disconnectReasonTextComponent.children().isEmpty()) {
+                return disconnectReason;
+            }
+
+            // Use a regex to match any number and everything after.
+            // This ensures the version is completed changed no matter what's after.
+            // This helps for versions like "1.21.11 Unobfuscated".
+            final String newDisconnectReason = disconnectReasonString.replaceAll("\\d.*", "1.21.11");
+
+            // Reconstruct reason with spoofed server version.
+            return Component.text()
+                    .content(newDisconnectReason)
+                    .style(disconnectReasonTextComponent.style())
+                    .build();
+
+        }
+
+        // In case something fails, but this is unsafe.
+        return disconnectReason;
+
+    }
+
 }

From d1bf4bebc10d7aa855d99264fa131fc274259f16 Mon Sep 17 00:00:00 2001
From: Vagdedes2 | DukeinPro <70439145+Vagdedes2@users.noreply.github.com>
Date: Fri, 17 Jul 2026 15:30:58 +0200
Subject: [PATCH 66/82] Remade the processDisconnect to support Bungee

---
 .../coralgate/processor/NetworkProcessor.java | 71 ++++++++-----------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index 8c352e3..1ae6885 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -48,6 +48,8 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class NetworkProcessor implements PacketListener {
@@ -154,8 +156,8 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
                 }
 
-            // Drop the packet if it's suspicious, close connection if it's invalid.
-            // Only if it's a LOGIN packet.
+                // Drop the packet if it's suspicious, close connection if it's invalid.
+                // Only if it's a LOGIN packet.
             } else if (wrapperHandshakingClientHandshake.getIntention() == WrapperHandshakingClientHandshake.ConnectionIntention.LOGIN
                     && wrapperHandshakingClientHandshake.getNextConnectionState() == ConnectionState.LOGIN) {
 
@@ -170,7 +172,7 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
                     // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
                     log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, true);
 
-                // Log an alert but don't close the connection.
+                    // Log an alert but don't close the connection.
                 } else if (isSuspiciousPort) {
 
                     // Don't cancel the packet else the LOGIN_START procedure fails.
@@ -550,8 +552,8 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         // Fired when a connection is closed.
         // From the tests I've run, this gets triggered on Velocity ("Outdated client!")
-        // TODO: Check bungee
-        if (packetTypeCommon == PacketType.Play.Server.DISCONNECT && this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
+        // This gets triggered on Bungee
+        if (packetTypeCommon == PacketType.Play.Server.DISCONNECT && (this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity") || this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("bungeecord"))) {
 
             final WrapperPlayServerDisconnect wrapperPlayServerDisconnect = new WrapperPlayServerDisconnect(packetSendEvent);
 
@@ -570,7 +572,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         // Fired when a connection is closed.
         // From the tests I've run, this gets triggered on Velocity ("Outdated server!")
-        // TODO: Check bungee
+        // This doesn't get triggered by Bungee
         if (packetTypeCommon == PacketType.Configuration.Server.DISCONNECT && this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
 
             final WrapperConfigServerDisconnect wrapperConfigServerDisconnect = new WrapperConfigServerDisconnect(packetSendEvent);
@@ -715,50 +717,37 @@ private Component processDisconnect(final Component disconnectReason) {
 
         if (disconnectReason instanceof TextComponent) {
 
-            final TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
-            final String disconnectReasonString = disconnectReasonTextComponent.content();
+            TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
+            final String disconnectReasonTextComponentContent = disconnectReasonTextComponent.content();
+            final List<Component> newChildren = new ArrayList<>();
 
-            // This MUST match every of the normal "Outdated...!" message.
-            // This ensures no server whatsoever can match this kind of kick message.
-            final Style style = disconnectReasonTextComponent.style();
+            for (Component childComponent : disconnectReasonTextComponent.children()) {
+                if (childComponent instanceof TextComponent) {
+                    TextComponent childTextComponent = (TextComponent) childComponent;
+                    final String childTextComponentContent = childTextComponent.content();
 
-            // All decorations must be NOT_SET.
-            if (style.decoration(TextDecoration.OBFUSCATED) != TextDecoration.State.NOT_SET
-                    || style.decoration(TextDecoration.BOLD) != TextDecoration.State.NOT_SET
-                    || style.decoration(TextDecoration.STRIKETHROUGH) != TextDecoration.State.NOT_SET
-                    || style.decoration(TextDecoration.UNDERLINED) != TextDecoration.State.NOT_SET
-                    || style.decoration(TextDecoration.ITALIC) != TextDecoration.State.NOT_SET) {
-                return disconnectReason;
-            }
+                    if (childTextComponentContent.contains("Outdated")) {
+                        childTextComponent = childTextComponent.content(childTextComponentContent.replaceAll("\\d.*", "1.21.11"));
+                    }
 
-            // Color must be exactly Red (#FF5555).
-            if (!NamedTextColor.RED.equals(style.color())) {
-                return disconnectReason;
-            }
+                    newChildren.add(childTextComponent);
 
-            // Click, Hover, Insertion, Font, and Shadow Color must be null/not set.
-            if (style.clickEvent() != null
-                    || style.hoverEvent() != null
-                    || style.insertion() != null
-                    || style.font() != null) {
-                return disconnectReason;
-            }
+                } else {
+
+                    newChildren.add(childComponent);
+
+                }
 
-            // Must have no children.
-            if (!disconnectReasonTextComponent.children().isEmpty()) {
-                return disconnectReason;
             }
 
-            // Use a regex to match any number and everything after.
-            // This ensures the version is completed changed no matter what's after.
-            // This helps for versions like "1.21.11 Unobfuscated".
-            final String newDisconnectReason = disconnectReasonString.replaceAll("\\d.*", "1.21.11");
+            disconnectReasonTextComponent = disconnectReasonTextComponent.children(newChildren);
+
+            if (disconnectReasonTextComponentContent.contains("Outdated")) {
+                disconnectReasonTextComponent = disconnectReasonTextComponent.content(disconnectReasonTextComponentContent.replaceAll("\\d.*", "1.21.11"));
+            }
 
             // Reconstruct reason with spoofed server version.
-            return Component.text()
-                    .content(newDisconnectReason)
-                    .style(disconnectReasonTextComponent.style())
-                    .build();
+            return disconnectReasonTextComponent;
 
         }
 

From edb35d5bdd9d2ca68cd9b0c360cc2e2c6e69300b Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Fri, 17 Jul 2026 16:38:19 +0200
Subject: [PATCH 67/82] Fixes #37, now works on BungeeCord

---
 .../coralgate/processor/NetworkProcessor.java | 134 ++++++++++++++----
 1 file changed, 106 insertions(+), 28 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index 1ae6885..b945cf9 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -48,8 +48,9 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class NetworkProcessor implements PacketListener {
@@ -422,8 +423,6 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         final String ipAddress = inetSocketAddress.getHostString();
         final PacketTypeCommon packetTypeCommon = packetSendEvent.getPacketType();
 
-        System.out.println(packetSendEvent.getPacketType().getClass().getDeclaringClass().getSimpleName() + "." + packetTypeCommon.getName());
-
         // Whitelisted packets.
         if (packetTypeCommon == PacketType.Status.Server.RESPONSE || packetTypeCommon == PacketType.Status.Server.PONG) {
             return;
@@ -532,7 +531,7 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         }
 
         // Fired when a connection is closed.
-        // From the tests I've run, this gets triggered on Spigot/Paper (all the time).
+        // From the tests I've run, this gets triggered on Spigot/Paper (all the time) and BungeeCord ("Outdated server!").
         if (packetTypeCommon == PacketType.Login.Server.DISCONNECT) {
 
             final WrapperLoginServerDisconnect wrapperLoginServerDisconnect = new WrapperLoginServerDisconnect(packetSendEvent);
@@ -551,9 +550,8 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
         }
 
         // Fired when a connection is closed.
-        // From the tests I've run, this gets triggered on Velocity ("Outdated client!")
-        // This gets triggered on Bungee
-        if (packetTypeCommon == PacketType.Play.Server.DISCONNECT && (this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity") || this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("bungeecord"))) {
+        // From the tests I've run, this gets triggered on Velocity ("Outdated client!") and BungeeCord ("Outdated client!").
+        if (packetTypeCommon == PacketType.Play.Server.DISCONNECT && PacketEvents.getAPI().getInjector().isProxy()) {
 
             final WrapperPlayServerDisconnect wrapperPlayServerDisconnect = new WrapperPlayServerDisconnect(packetSendEvent);
 
@@ -572,7 +570,6 @@ public void onPacketSend(final PacketSendEvent packetSendEvent) {
 
         // Fired when a connection is closed.
         // From the tests I've run, this gets triggered on Velocity ("Outdated server!")
-        // This doesn't get triggered by Bungee
         if (packetTypeCommon == PacketType.Configuration.Server.DISCONNECT && this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("velocity")) {
 
             final WrapperConfigServerDisconnect wrapperConfigServerDisconnect = new WrapperConfigServerDisconnect(packetSendEvent);
@@ -717,37 +714,105 @@ private Component processDisconnect(final Component disconnectReason) {
 
         if (disconnectReason instanceof TextComponent) {
 
-            TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
-            final String disconnectReasonTextComponentContent = disconnectReasonTextComponent.content();
-            final List<Component> newChildren = new ArrayList<>();
+            final TextComponent disconnectReasonTextComponent = (TextComponent) disconnectReason;
 
-            for (Component childComponent : disconnectReasonTextComponent.children()) {
-                if (childComponent instanceof TextComponent) {
-                    TextComponent childTextComponent = (TextComponent) childComponent;
-                    final String childTextComponentContent = childTextComponent.content();
+            // Spigot, Paper and Velocity work this way.
+            // BungeeCord loooooveeess to do it their way, we have it handle it specifically.
+            // TODO: directly take the kick message from spigot.yml if running on a backend.
+            if (!this.corePlugin.getPlatformProperties().getProperty("platform-name").equals("bungeecord")) {
 
-                    if (childTextComponentContent.contains("Outdated")) {
-                        childTextComponent = childTextComponent.content(childTextComponentContent.replaceAll("\\d.*", "1.21.11"));
-                    }
+                // This MUST match every of the normal "Outdated...!" message.
+                // This ensures no server whatsoever can match this kind of kick message.
+                final Style style = disconnectReasonTextComponent.style();
+
+                // Determine expected color based on server type.
+                // If it's directly running on a backend, it's white (null) by default.
+                // On Velocity, it's red by default.
+                final NamedTextColor expectedNamedTextColor = (PacketEvents.getAPI().getInjector().isProxy()
+                        ? NamedTextColor.RED
+                        : null);
+
+                // Style must be clean/default and color must be exactly Red (#FF5555).
+                if (!isCleanStyle(style) || !Objects.equals(style.color(), expectedNamedTextColor)) {
+                    return disconnectReason;
+                }
+
+                // Must have no children.
+                if (!disconnectReasonTextComponent.children().isEmpty()) {
+                    return disconnectReason;
+                }
 
-                    newChildren.add(childTextComponent);
+                final String disconnectReasonString = disconnectReasonTextComponent.content();
 
-                } else {
+                // Determine regex based on server type.
+                // If it's directly running on a backend, it's safe to assume the server version is used in the kick message.
+                // However, on Velocity this isn't the case.
+                final String versionRegex = (PacketEvents.getAPI().getInjector().isProxy()
+                        ? "\\d.*"
+                        : PacketEvents.getAPI().getServerManager().getVersion().getReleaseName().replace(".", "\\.") + ".*");
 
-                    newChildren.add(childComponent);
+                // Use a regex to match any number and everything after.
+                // This ensures the version is completed changed no matter what's after.
+                // This helps for versions like "1.21.11 Unobfuscated".
+                final String newDisconnectReason = disconnectReasonString.replaceAll(versionRegex, "1.21.11");
 
+                // Reconstruct reason with spoofed server version.
+                return Component.text()
+                        .content(newDisconnectReason)
+                        .style(disconnectReasonTextComponent.style())
+                        .build();
+
+
+            // Specific logic for BungeeCord nested kick messages.
+            } else {
+
+                // BungeeCord nested kick message layout handling
+                final List<Component> children = disconnectReasonTextComponent.children();
+
+                // A classic native kick structure requires the root to have exactly 2 children:
+                // Child 0: "Kicked whilst connecting to lobby: " (Red).
+                // Child 1: "Outdated client! Please use 1.20.1" (White).
+                if (children.size() != 2) {
+                    return disconnectReason;
                 }
 
-            }
+                final Component kickMessage = children.get(0);
+                final Component outdatedMessage = children.get(1);
 
-            disconnectReasonTextComponent = disconnectReasonTextComponent.children(newChildren);
+                if (kickMessage instanceof TextComponent && outdatedMessage instanceof TextComponent) {
 
-            if (disconnectReasonTextComponentContent.contains("Outdated")) {
-                disconnectReasonTextComponent = disconnectReasonTextComponent.content(disconnectReasonTextComponentContent.replaceAll("\\d.*", "1.21.11"));
-            }
+                    final TextComponent kickMessageTextComponent = (TextComponent) kickMessage;
+                    final TextComponent outdatedMessageTextComponent = (TextComponent) outdatedMessage;
 
-            // Reconstruct reason with spoofed server version.
-            return disconnectReasonTextComponent;
+                    // This MUST match every of the normal "Outdated...!" message.
+                    // This ensures no server whatsoever can match this kind of kick message.
+                    final Style kickMessageStyle = kickMessageTextComponent.style();
+                    final Style outdatedMessageStyle = outdatedMessageTextComponent.style();
+
+                    // Style must be clean/default and color must be exactly Red (#FF5555).
+                    if (!isCleanStyle(kickMessageStyle) || !NamedTextColor.RED.equals(kickMessageStyle.color())) {
+                        return disconnectReason;
+                    }
+
+                    // Style must be clean/default and color must be exactly White (#FFFFFF).
+                    if (!isCleanStyle(outdatedMessageStyle) || !NamedTextColor.WHITE.equals(outdatedMessageStyle.color())) {
+                        return disconnectReason;
+                    }
+
+                    final String disconnectReasonString = outdatedMessageTextComponent.content();
+
+                    // Use a regex to match any number and everything after.
+                    // This ensures the version is completed changed no matter what's after.
+                    // This helps for versions like "1.21.11 Unobfuscated".
+                    final String newDisconnectReason = disconnectReasonString.replaceAll("\\d.*", "1.21.11");
+                    final TextComponent newOutdatedMessageTextComponent = outdatedMessageTextComponent.content(newDisconnectReason);
+
+                    // Reconstruct reason with spoofed server version.
+                    return disconnectReasonTextComponent.children(Arrays.asList(kickMessageTextComponent, newOutdatedMessageTextComponent));
+
+                }
+
+            }
 
         }
 
@@ -756,4 +821,17 @@ private Component processDisconnect(final Component disconnectReason) {
 
     }
 
+    // Made for less repetitiveness across the processDisconnect function.
+    private boolean isCleanStyle(final Style style) {
+        return style.decoration(TextDecoration.OBFUSCATED) == TextDecoration.State.NOT_SET
+                && style.decoration(TextDecoration.BOLD) == TextDecoration.State.NOT_SET
+                && style.decoration(TextDecoration.STRIKETHROUGH) == TextDecoration.State.NOT_SET
+                && style.decoration(TextDecoration.UNDERLINED) == TextDecoration.State.NOT_SET
+                && style.decoration(TextDecoration.ITALIC) == TextDecoration.State.NOT_SET
+                && style.clickEvent() == null
+                && style.hoverEvent() == null
+                && style.insertion() == null
+                && style.font() == null;
+    }
+
 }

From fd3071b070f7dfb193aff77bbb9f56d61c6c0f62 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:01:13 +0200
Subject: [PATCH 68/82] Fixed bungee netty injection

---
 .../injector/handlers/BungeeDecoder.java      | 74 ++++++++++++++-----
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
index c0793e8..cb49bda 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeDecoder.java
@@ -41,37 +41,75 @@ public BungeeDecoder(final User user) {
     public void read(final ChannelHandlerContext ctx, final ByteBuf byteBuf, final List<Object> output) throws Exception {
 
         final int firstReaderIndex = byteBuf.readerIndex();
+        final int readable = byteBuf.readableBytes();
 
-        try {
-            int id = ByteBufHelper.readVarInt(byteBuf);
+        boolean isLegacyServerListPing = false;
+        boolean isBareSingleByte = false;
 
-            if (id != 0xFE) return;
-        } catch (Exception e) {
-            return;
-        } finally {
-            byteBuf.readerIndex(firstReaderIndex);
-        }
+        // Detect every legacy server list ping variant by peeking bytes directly (never consuming
+        // the reader index), rather than parsing a VarInt. A VarInt read would throw on the
+        // single-byte pre-1.4 variant since there's no second byte to complete it.
+        if (readable >= 1 && byteBuf.getUnsignedByte(firstReaderIndex) == 0xFE) {
 
-        final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
+            // Bare single 0xFE, nothing trailing, pre-1.4 clients (1.1, 1.2, 1.3).
+            if (readable == 1) {
 
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
-        if (!packetReceiveEvent.isCancelled()) {
+                isLegacyServerListPing = true;
+
+                // Bare single 0xFE, pre-1.4 clients (1.1, 1.2, 1.3).
+                // NOTE: packetevents' PacketHandshakeReceiveEvent/ProtocolPacketEvent cannot be
+                // constructed for a 1-byte buffer (it throws trying to read a packet id), so this
+                // variant is handled directly here and never routed through the event system.
+                isBareSingleByte = true;
+
+            } else if (byteBuf.getUnsignedByte(firstReaderIndex + 1) == 0x01) {
+
+                if (readable == 2) {
 
-            if (packetReceiveEvent.getLastUsedWrapper() != null) {
+                    // FE 01, nothing trailing, 1.4/1.5 clients.
+                    isLegacyServerListPing = true;
 
-                ByteBufHelper.clear(byteBuf);
-                packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
-                packetReceiveEvent.getLastUsedWrapper().write();
+                } else if (readable >= 3 && byteBuf.getUnsignedByte(firstReaderIndex + 2) == 0xFA) {
+
+                    // FE 01 FA ..., 1.6 clients.
+                    isLegacyServerListPing = true;
+
+                }
 
             }
 
-            byteBuf.readerIndex(firstReaderIndex);
+        }
+
+        if (!isLegacyServerListPing) {
+
             output.add(byteBuf.retain());
+            return;
 
-        } else {
+        }
 
-            // Cancelling the packet, lets clear the buffer.
+        if (isBareSingleByte) {
+
+            // Can't fire a PacketHandshakeReceiveEvent for this, just drop it silently.
+            // If you need NetworkProcessor to see/respond to this variant too, that logic
+            // needs to move here instead (can't go through packetevents' event system).
             ByteBufHelper.clear(byteBuf);
+            return;
+
+        }
+
+        final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
+
+        // No action is taken about the legacy packet here.
+        // NetworkProcessor receives the packet (like any other packet), and then decides what to do,
+        // including which legacy reply format to use (it re-derives that from the buffer itself).
+        // If the packet is canceled, it's cleared. Else we just pass it as any normal packet would.
+        if (packetReceiveEvent.isCancelled()) {
+            ByteBufHelper.clear(byteBuf);
+        } else {
+
+            byteBuf.readerIndex(firstReaderIndex);
+            output.add(byteBuf.retain());
 
         }
 

From 40858ac5626c371c84041e672496f52c551d507f Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:02:07 +0200
Subject: [PATCH 69/82] Added support for older versions

---
 .../injector/handlers/SpigotDecoder.java      | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
index 33353f6..940ce69 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotDecoder.java
@@ -65,15 +65,39 @@ public void read(final ChannelHandlerContext ctx, final ByteBuf input, final Lis
     public static void handleServerBoundPacket(final Object channel, final User user, final ByteBuf buffer) {
 
         final int preProcessIndex = ByteBufHelper.readerIndex(buffer);
+        final int readable = ByteBufHelper.readableBytes(buffer);
+        boolean isLegacyServerListPing = false;
 
-        try {
-            int id = ByteBufHelper.readVarInt(buffer);
+        // Detect every legacy server list ping variant by peeking bytes directly (never consuming
+        // the reader index), rather than parsing a VarInt. A VarInt read would throw on the
+        // single-byte pre-1.4 variant since there's no second byte to complete it.
+        if (readable >= 1 && ByteBufHelper.getUnsignedByte(buffer, preProcessIndex) == 0xFE) {
+
+            // Bare single 0xFE, nothing trailing, pre-1.4 clients (1.1, 1.2, 1.3).
+            if (readable == 1) {
+
+                isLegacyServerListPing = true;
+
+            } else if (ByteBufHelper.getUnsignedByte(buffer, preProcessIndex + 1) == 0x01) {
+
+                if (readable == 2) {
+
+                    // FE 01, nothing trailing, 1.4/1.5 clients.
+                    isLegacyServerListPing = true;
+
+                } else if (readable >= 3 && ByteBufHelper.getUnsignedByte(buffer, preProcessIndex + 2) == 0xFA) {
+
+                    // FE 01 FA ..., 1.6 clients.
+                    isLegacyServerListPing = true;
+
+                }
+
+            }
+
+        }
 
-            if (id != 0xFE) return;
-        } catch (Exception e) {
+        if (!isLegacyServerListPing) {
             return;
-        } finally {
-            buffer.readerIndex(preProcessIndex);
         }
 
         final PacketReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(channel, user, null, buffer, true);

From ab7ac6c5331d084b871d4fdccdc95f3499d5a043 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:02:20 +0200
Subject: [PATCH 70/82] Fixed velocity netty injection

---
 .../injector/handlers/VelocityDecoder.java    | 57 ++++++++++++-------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
index f373a6e..99cd898 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityDecoder.java
@@ -22,7 +22,6 @@
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.simple.PacketHandshakeReceiveEvent;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
-import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.player.User;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -42,37 +41,57 @@ public VelocityDecoder(final User user) {
     public void read(final ChannelHandlerContext ctx, final ByteBuf byteBuf, final List<Object> output) throws Exception {
 
         final int firstReaderIndex = byteBuf.readerIndex();
+        final int readable = byteBuf.readableBytes();
+        boolean isLegacyServerListPing = false;
 
-        try {
-            int id = ByteBufHelper.readVarInt(byteBuf);
+        // Detect every legacy server list ping variant by peeking bytes directly (never consuming
+        // the reader index), rather than parsing a VarInt. A VarInt read would throw on the
+        // single-byte pre-1.4 variant since there's no second byte to complete it.
+        if (readable >= 1 && byteBuf.getUnsignedByte(firstReaderIndex) == 0xFE) {
 
-            if (id != 0xFE) return;
-        } catch (Exception e) {
-            return;
-        } finally {
-            byteBuf.readerIndex(firstReaderIndex);
-        }
+            // Bare single 0xFE, nothing trailing, pre-1.4 clients (1.1, 1.2, 1.3).
+            if (readable == 1) {
 
-        final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
+                isLegacyServerListPing = true;
 
-        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
-        if (!packetReceiveEvent.isCancelled()) {
+            } else if (byteBuf.getUnsignedByte(firstReaderIndex + 1) == 0x01) {
+
+                if (readable == 2) {
 
-            if (packetReceiveEvent.getLastUsedWrapper() != null) {
+                    // FE 01, nothing trailing, 1.4/1.5 clients.
+                    isLegacyServerListPing = true;
 
-                ByteBufHelper.clear(packetReceiveEvent.getByteBuf());
-                packetReceiveEvent.getLastUsedWrapper().writeVarInt(packetReceiveEvent.getPacketId());
-                packetReceiveEvent.getLastUsedWrapper().write();
+                } else if (readable >= 3 && byteBuf.getUnsignedByte(firstReaderIndex + 2) == 0xFA) {
+
+                    // FE 01 FA ..., 1.6 clients.
+                    isLegacyServerListPing = true;
+
+                }
 
             }
 
-            byteBuf.readerIndex(firstReaderIndex);
+        }
+
+        if (!isLegacyServerListPing) {
+
             output.add(byteBuf.retain());
+            return;
 
-        } else {
+        }
 
-            // Cancelling the packet, lets clear the buffer.
+        final PacketHandshakeReceiveEvent packetReceiveEvent = new PacketHandshakeReceiveEvent(ctx.channel(), this.user, null, byteBuf, false);
+        PacketEvents.getAPI().getEventManager().callEvent(packetReceiveEvent, () -> byteBuf.readerIndex(byteBuf.readerIndex()));
+
+        // No action is taken about the legacy packet here.
+        // NetworkProcessor receives the packet (like any other packet), and then decides what to do,
+        // including which legacy reply format to use (it re-derives that from the buffer itself).
+        // If the packet is canceled, it's cleared. Else we just pass it as any normal packet would.
+        if (packetReceiveEvent.isCancelled()) {
             ByteBufHelper.clear(byteBuf);
+        } else {
+
+            byteBuf.readerIndex(firstReaderIndex);
+            output.add(byteBuf.retain());
 
         }
 

From c7fb1bcd4935bc6256b75d27e6edebb95d130d38 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:02:40 +0200
Subject: [PATCH 71/82] Spoofing version for older versions kick message

---
 .../handlers/BungeeLegacyKickRewriter.java    | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeLegacyKickRewriter.java

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeLegacyKickRewriter.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeLegacyKickRewriter.java
new file mode 100644
index 0000000..c8ba101
--- /dev/null
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeLegacyKickRewriter.java
@@ -0,0 +1,60 @@
+package cloud.gteam.coralgate.injector.handlers;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOutboundHandlerAdapter;
+import io.netty.channel.ChannelPromise;
+
+import java.nio.charset.StandardCharsets;
+
+public class BungeeLegacyKickRewriter extends ChannelOutboundHandlerAdapter {
+
+    public BungeeLegacyKickRewriter() {}
+
+    @Override
+    public void write(final ChannelHandlerContext ctx, final Object msg, final ChannelPromise promise) throws Exception {
+
+        if (!(msg instanceof ByteBuf)) {
+            super.write(ctx, msg, promise);
+            return;
+        }
+
+        final ByteBuf buf = (ByteBuf) msg;
+
+        final int readable = buf.readableBytes();
+
+        // Legacy kick shape: 0xFF + short length (UTF-16 char count) + UTF-16BE string.
+        if (readable < 3 || (buf.getUnsignedByte(buf.readerIndex()) != 0xFF)) {
+
+            super.write(ctx, msg, promise);
+            return;
+
+        }
+
+        final int readerIndex = buf.readerIndex();
+        final byte[] raw = new byte[readable];
+        buf.getBytes(readerIndex, raw);
+
+        final String decoded = new String(raw, 3, readable - 3, StandardCharsets.UTF_16BE);
+        if (!decoded.startsWith("§cOutdated client! Please use ")) {
+
+            super.write(ctx, msg, promise);
+            return;
+
+        }
+
+        final String rewritten = "§cOutdated client! Please use " + "1.21.11"; // TODO: make it read from config.
+        final byte[] rewrittenBytes = rewritten.getBytes(StandardCharsets.UTF_16BE);
+
+        final ByteBuf newBuf = ctx.alloc().buffer();
+        newBuf.writeByte(0xFF);
+        newBuf.writeShort(rewritten.length());
+        newBuf.writeBytes(rewrittenBytes);
+
+        // We're replacing this buffer entirely, release the original.
+        buf.release();
+        super.write(ctx, newBuf, promise);
+
+    }
+
+}

From 7322f41a81f9ceb9936c612dc33972f13e47f9b3 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:02:58 +0200
Subject: [PATCH 72/82] Simplified code

---
 .../connection/PreChannelInitializer_v1_12.java  | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
index d0785d7..7693e69 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/connection/PreChannelInitializer_v1_12.java
@@ -23,20 +23,20 @@
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
-import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
 public class PreChannelInitializer_v1_12 extends ChannelInboundHandlerAdapter {
 
-    private static final InternalLogger logger = InternalLoggerFactory.getInstance(ChannelInitializer.class);
-
     @Override
     public void channelRegistered(final ChannelHandlerContext ctx) {
 
         try {
             ServerConnectionInitializer.initChannel(ctx.channel(), ConnectionState.HANDSHAKING);
         } catch (final Throwable t) {
-            exceptionCaught(ctx, t);
+
+            InternalLoggerFactory.getInstance(ChannelInitializer.class).warn("Failed to initialize a channel. Closing: " + ctx.channel(), t);
+            ctx.close();
+
         } finally {
 
             final ChannelPipeline pipeline = ctx.pipeline();
@@ -50,12 +50,4 @@ public void channelRegistered(final ChannelHandlerContext ctx) {
 
     }
 
-    @Override
-    public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable t) {
-
-        logger.warn("Failed to initialize a channel. Closing: " + ctx.channel(), t);
-        ctx.close();
-
-    }
-
 }

From 51c126c79c9fe04184f2b5375c1f4599d0cc74af Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:04:23 +0200
Subject: [PATCH 73/82] Added channel for older disconnect on bungee

---
 .../injector/connection/ServerConnectionInitializer.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
index b3fa1ee..54cd06c 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/ServerConnectionInitializer.java
@@ -20,6 +20,7 @@
 
 import cloud.gteam.coralgate.injector.BungeeInjector;
 import cloud.gteam.coralgate.injector.handlers.BungeeDecoder;
+import cloud.gteam.coralgate.injector.handlers.BungeeLegacyKickRewriter;
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.protocol.player.UserProfile;
@@ -29,6 +30,7 @@ public class ServerConnectionInitializer {
 
     public static void addChannelHandlers(final Channel channel, final BungeeDecoder decoder) {
         channel.pipeline().addBefore("legacy-decoder", BungeeInjector.DECODER_NAME, decoder);
+        channel.pipeline().addFirst("cg-legacy-kick-rewriter", new BungeeLegacyKickRewriter());
     }
 
     public static void initChannel(final Channel channel, final ConnectionState state) {

From 93201aea9a4646a839a82db04cee5dd711f5aadb Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:04:45 +0200
Subject: [PATCH 74/82] Added handling for older legacy pings

---
 .../coralgate/processor/NetworkProcessor.java | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
index b945cf9..56477a5 100644
--- a/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
+++ b/core/src/main/java/cloud/gteam/coralgate/processor/NetworkProcessor.java
@@ -19,12 +19,14 @@
 package cloud.gteam.coralgate.processor;
 
 import cloud.gteam.coralgate.CorePlugin;
+import cloud.gteam.coralgate.injector.NettyResponder;
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.event.PacketListener;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.event.PacketSendEvent;
 import com.github.retrooper.packetevents.event.UserDisconnectEvent;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
 import com.github.retrooper.packetevents.protocol.ConnectionState;
 import com.github.retrooper.packetevents.protocol.packettype.PacketType;
 import com.github.retrooper.packetevents.protocol.packettype.PacketTypeCommon;
@@ -80,8 +82,7 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
         // Match MOTD related packets.
         final boolean isMOTDPacket = packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE
                 || packetTypeCommon == PacketType.Status.Client.REQUEST
-                || packetTypeCommon == PacketType.Status.Client.PING
-                || packetTypeCommon == PacketType.Handshaking.Client.LEGACY_SERVER_LIST_PING;
+                || packetTypeCommon == PacketType.Status.Client.PING;
 
         // Match login sequence related packets.
         final boolean isLoginSequencePacket = packetTypeCommon == PacketType.Handshaking.Client.HANDSHAKE
@@ -97,7 +98,9 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
             // If the client's version/protocol version is invalid.
             //noinspection ConstantValue
-            if (packetReceiveEvent.getUser().getClientVersion() == null || packetReceiveEvent.getUser().getClientVersion().getProtocolVersion() <= 4) {
+            if (packetReceiveEvent.getUser().getClientVersion() == null
+                    || packetReceiveEvent.getUser().getClientVersion().getProtocolVersion() < ClientVersion.getOldest().getProtocolVersion()
+                    || packetReceiveEvent.getUser().getClientVersion().getProtocolVersion() > ClientVersion.getLatest().getProtocolVersion()) {
 
                 // Log the violation, report the IP to CoralGate API, cancel the packet and close the connection.
                 log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, "Invalid protocol version.", !isMOTDPacket);
@@ -271,14 +274,40 @@ public void onPacketReceive(final PacketReceiveEvent packetReceiveEvent) {
 
         }
 
-        // TODO: find some way to block this cuz PE ain't seeing the goddamn packet
-        // TODO: Netty pipeline injection?
         // Legacy ping exposes information like MOTD, version & player count.
-        // No wrapper exists for it so we'll have to drop the packet.
+        // We have to use the NettyResponder to send packet a forged (or not) response.
         if (packetTypeCommon == PacketType.Handshaking.Client.LEGACY_SERVER_LIST_PING) {
 
-            // Cancel the packet.
-            packetReceiveEvent.setCancelled(true);
+            // Do not use "isBadPacket", it includes "isInvalidProtocol". Since we don't allow < 1.7 and this packet is for older netty-less versions, it will trigger "isInvalidProtocol".
+            // Simply use "isSuspiciousPort" part of "isBadPacket".
+            final boolean sendForgedPong = isSuspiciousPort
+                    || (this.corePlugin.getConfigManager().getConfig().isAllowApiUsage() && !this.corePlugin.getApiManager().isIpCached(ipAddress)) // Force forged pong for IPs that are not yet processed by the API.
+                    || this.corePlugin.getApiManager().isIpCachedBlocked(ipAddress); // Send forged pong if the IP is blocked by the API.
+
+            // Suspicious port.
+            if (sendForgedPong) {
+
+                // Custom logging based off port number.
+                final String reason = isInvalidPort
+                        ? "Invalid port used by client."
+                        : "Suspicious port used by client.";
+
+                // Log the violation, report the IP to CoralGate API, cancel the packet and send forged response.
+                log(packetReceiveEvent, inetSocketAddress, ipAddress, packetTypeCommon, reason, false);
+
+                // This is for older legacy pings.
+                final boolean isOldLegacyPing = ByteBufHelper.readableBytes(packetReceiveEvent.getByteBuf()) == 1;
+
+                final NettyResponder nettyResponder = this.corePlugin.getNettyResponder();
+
+                // Send forged response using NettyResponder.
+                if (isOldLegacyPing) {
+                    nettyResponder.sendOldLegacyPingResponse(packetUser, "A Minecraft Server", 0, 20);
+                } else {
+                    nettyResponder.sendLegacyPingResponse(packetUser, 774, "1.21.11", "A Minecraft Server", 0, 20);
+                }
+
+            }
 
             // Block further logic.
             return;

From a17146460c5a82c714de18d6fc36025564b89930 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:06:33 +0200
Subject: [PATCH 75/82] Added netty responders to send forged legacy ping
 response

---
 .../handlers/BungeeNettyResponder.java        | 70 +++++++++++++++++++
 .../coralgate/injector/NettyResponder.java    | 31 ++++++++
 .../handlers/SpigotNettyResponder.java        | 70 +++++++++++++++++++
 .../handlers/VelocityNettyResponder.java      | 70 +++++++++++++++++++
 4 files changed, 241 insertions(+)
 create mode 100644 bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java
 create mode 100644 core/src/main/java/cloud/gteam/coralgate/injector/NettyResponder.java
 create mode 100644 spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java
 create mode 100644 velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java
new file mode 100644
index 0000000..e491d89
--- /dev/null
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of CoralGate - https://github.com/GTeamX/CoralGate
+ * Copyright (C) 2026 GTeamX (GTeam) and it's contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.handlers;
+
+import cloud.gteam.coralgate.injector.NettyResponder;
+import com.github.retrooper.packetevents.protocol.player.User;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+
+import java.nio.charset.StandardCharsets;
+
+public class BungeeNettyResponder implements NettyResponder {
+
+    public BungeeNettyResponder() {}
+
+    @Override
+    public void sendLegacyPingResponse(final User user, final int protocolVersion, final String serverVersion, final String motd, final int onlinePlayers, final int maxPlayers) {
+
+        final String response = "§1\0"
+                + protocolVersion + "\0"
+                + serverVersion + "\0"
+                + motd + "\0"
+                + onlinePlayers + "\0"
+                + maxPlayers;
+        write(user, response);
+
+    }
+
+    @Override
+    public void sendOldLegacyPingResponse(final User user, final String motd, final int onlinePlayers, final int maxPlayers) {
+
+        final String response = motd + "§" + onlinePlayers + "§" + maxPlayers;
+        write(user, response);
+
+    }
+
+    private void write(final User user, final String response) {
+
+        final Channel channel = (Channel) user.getChannel();
+        final byte[] responseBytes = response.getBytes(StandardCharsets.UTF_16BE);
+
+        final ByteBuf buf = channel.alloc().buffer();
+        buf.writeByte(0xFF);
+        buf.writeShort(response.length());
+        buf.writeBytes(responseBytes);
+
+        channel.pipeline().firstContext()
+                .writeAndFlush(buf)
+                .addListener((ChannelFuture f) -> f.channel().close());
+
+    }
+
+}
diff --git a/core/src/main/java/cloud/gteam/coralgate/injector/NettyResponder.java b/core/src/main/java/cloud/gteam/coralgate/injector/NettyResponder.java
new file mode 100644
index 0000000..56e5ca9
--- /dev/null
+++ b/core/src/main/java/cloud/gteam/coralgate/injector/NettyResponder.java
@@ -0,0 +1,31 @@
+/*
+ * This file is part of CoralGate - https://github.com/GTeamX/CoralGate
+ * Copyright (C) 2026 GTeamX (GTeam) and it's contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector;
+
+import com.github.retrooper.packetevents.protocol.player.User;
+
+public interface NettyResponder {
+
+    // 1.4+ format: "§1\0protocol\0version\0motd\0online\0max".
+    void sendLegacyPingResponse(final User user, final int protocolVersion, final String serverVersion, final String motd, final int onlinePlayers, final int maxPlayers);
+
+    // Pre-1.4 (<=1.3) format: "motd§online§max", no §1 prefix, no protocol/version fields.
+    void sendOldLegacyPingResponse(final User user, final String motd, final int onlinePlayers, final int maxPlayers);
+
+}
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java
new file mode 100644
index 0000000..06ba619
--- /dev/null
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of CoralGate - https://github.com/GTeamX/CoralGate
+ * Copyright (C) 2026 GTeamX (GTeam) and it's contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.handlers;
+
+import cloud.gteam.coralgate.injector.NettyResponder;
+import com.github.retrooper.packetevents.protocol.player.User;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+
+import java.nio.charset.StandardCharsets;
+
+public class SpigotNettyResponder implements NettyResponder {
+
+    public SpigotNettyResponder() {}
+
+    @Override
+    public void sendLegacyPingResponse(final User user, final int protocolVersion, final String serverVersion, final String motd, final int onlinePlayers, final int maxPlayers) {
+
+        final String response = "§1\0"
+                + protocolVersion + "\0"
+                + serverVersion + "\0"
+                + motd + "\0"
+                + onlinePlayers + "\0"
+                + maxPlayers;
+        write(user, response);
+
+    }
+
+    @Override
+    public void sendOldLegacyPingResponse(final User user, final String motd, final int onlinePlayers, final int maxPlayers) {
+
+        final String response = motd + "§" + onlinePlayers + "§" + maxPlayers;
+        write(user, response);
+
+    }
+
+    private void write(final User user, final String response) {
+
+        final Channel channel = (Channel) user.getChannel();
+        final byte[] responseBytes = response.getBytes(StandardCharsets.UTF_16BE);
+
+        final ByteBuf buf = channel.alloc().buffer();
+        buf.writeByte(0xFF);
+        buf.writeShort(response.length());
+        buf.writeBytes(responseBytes);
+
+        channel.pipeline().firstContext()
+                .writeAndFlush(buf)
+                .addListener((ChannelFuture f) -> f.channel().close());
+
+    }
+
+}
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java
new file mode 100644
index 0000000..2d34e52
--- /dev/null
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java
@@ -0,0 +1,70 @@
+/*
+ * This file is part of CoralGate - https://github.com/GTeamX/CoralGate
+ * Copyright (C) 2026 GTeamX (GTeam) and it's contributors
+ *
+ * This 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 <http://www.gnu.org/licenses/>.
+ */
+
+package cloud.gteam.coralgate.injector.handlers;
+
+import cloud.gteam.coralgate.injector.NettyResponder;
+import com.github.retrooper.packetevents.protocol.player.User;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+
+import java.nio.charset.StandardCharsets;
+
+public class VelocityNettyResponder implements NettyResponder {
+
+    public VelocityNettyResponder() {}
+
+    @Override
+    public void sendLegacyPingResponse(final User user, final int protocolVersion, final String serverVersion, final String motd, final int onlinePlayers, final int maxPlayers) {
+
+        final String response = "§1\0"
+                + protocolVersion + "\0"
+                + serverVersion + "\0"
+                + motd + "\0"
+                + onlinePlayers + "\0"
+                + maxPlayers;
+        write(user, response);
+
+    }
+
+    @Override
+    public void sendOldLegacyPingResponse(final User user, final String motd, final int onlinePlayers, final int maxPlayers) {
+
+        final String response = motd + "§" + onlinePlayers + "§" + maxPlayers;
+        write(user, response);
+
+    }
+
+    private void write(final User user, final String response) {
+
+        final Channel channel = (Channel) user.getChannel();
+        final byte[] responseBytes = response.getBytes(StandardCharsets.UTF_16BE);
+
+        final ByteBuf buf = channel.alloc().buffer();
+        buf.writeByte(0xFF);
+        buf.writeShort(response.length());
+        buf.writeBytes(responseBytes);
+
+        channel.pipeline().firstContext()
+                .writeAndFlush(buf)
+                .addListener((ChannelFuture f) -> f.channel().close());
+
+    }
+
+}

From ae6dda0e19adbe58caf6557f243a7b947e3d2b02 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:07:01 +0200
Subject: [PATCH 76/82] Added netty responders to send forged legacy ping
 response

---
 .../main/java/cloud/gteam/coralgate/BungeePlugin.java |  3 ++-
 .../main/java/cloud/gteam/coralgate/CorePlugin.java   | 11 ++++++++++-
 .../main/java/cloud/gteam/coralgate/SpigotPlugin.java |  3 ++-
 .../java/cloud/gteam/coralgate/VelocityPlugin.java    |  3 ++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java b/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
index ed32041..ee07961 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java
@@ -22,6 +22,7 @@
 import cloud.gteam.coralgate.commands.CoralGateCommand;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
 import cloud.gteam.coralgate.injector.BungeeInjector;
+import cloud.gteam.coralgate.injector.handlers.BungeeNettyResponder;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.PlatformUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -53,7 +54,7 @@ public void onEnable() {
         new Metrics(this, 29439);
 
         // Load core.
-        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), this.getProxy().getConfig().isOnlineMode(), "config.yml", PlatformUtils.loadProperties(this.getClass()));
+        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), this.getProxy().getConfig().isOnlineMode(), "config.yml", PlatformUtils.loadProperties(this.getClass()), new BungeeNettyResponder());
 
         // Load commands.
         final Lamp<BungeeCommandActor> bukkitCommandActor = BungeeLamp.builder(this)
diff --git a/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java b/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
index b863b2f..b697d2b 100644
--- a/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
+++ b/core/src/main/java/cloud/gteam/coralgate/CorePlugin.java
@@ -20,6 +20,7 @@
 
 import cloud.gteam.coralgate.api.APIManager;
 import cloud.gteam.coralgate.config.ConfigManager;
+import cloud.gteam.coralgate.injector.NettyResponder;
 import cloud.gteam.coralgate.update.UpdateChecker;
 import cloud.gteam.coralgate.utils.ConfigUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -41,11 +42,13 @@ public final class CorePlugin {
 
     private Properties platformProperties;
 
+    private NettyResponder nettyResponder;
+
     private ConfigManager configManager;
     private APIManager apiManager;
     private UpdateChecker updateChecker;
 
-    public void onEnable(final Logger logger, final File dataFolder, final boolean onlineMode, final String configFileName, final Properties platformProperties) {
+    public void onEnable(final Logger logger, final File dataFolder, final boolean onlineMode, final String configFileName, final Properties platformProperties, final NettyResponder nettyResponder) {
 
         CorePlugin.logger = logger;
 
@@ -55,6 +58,8 @@ public void onEnable(final Logger logger, final File dataFolder, final boolean o
 
         logger.info("Loading platform '" + platformProperties.getProperty("platform-name") + "' version '" + platformProperties.getProperty("platform-version") + "', implemented against core version '" + platformProperties.getProperty("core-version") + "'...");
 
+        this.nettyResponder = nettyResponder;
+
         final String peCoreVersion = platformProperties.getProperty("packetevents-version");
         final String peServerVersion = PacketEvents.getAPI().getVersion().toString();
 
@@ -154,6 +159,10 @@ public Properties getPlatformProperties() {
         return this.platformProperties;
     }
 
+    public NettyResponder getNettyResponder() {
+        return this.nettyResponder;
+    }
+
     public ConfigManager getConfigManager() {
         return this.configManager;
     }
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
index 850f79c..789888a 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/SpigotPlugin.java
@@ -22,6 +22,7 @@
 import cloud.gteam.coralgate.commands.SpigotPermissionChecker;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
 import cloud.gteam.coralgate.injector.SpigotInjector;
+import cloud.gteam.coralgate.injector.handlers.SpigotNettyResponder;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.PlatformUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -76,7 +77,7 @@ public void onEnable() {
         } catch (final ClassNotFoundException ignored) {}
 
         // Load core.
-        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), Bukkit.getOnlineMode(), "server.properties", platformProperties);
+        this.corePlugin.onEnable(this.getLogger(), getDataFolder(), Bukkit.getOnlineMode(), "server.properties", platformProperties, new SpigotNettyResponder());
 
         // Load commands.
         final Lamp<BukkitCommandActor> bukkitCommandActor = BukkitLamp.builder(this)
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
index e4adaca..5178aaa 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/VelocityPlugin.java
@@ -22,6 +22,7 @@
 import cloud.gteam.coralgate.commands.VelocityPermissionChecker;
 import cloud.gteam.coralgate.commands.permissions.PermissionFactory;
 import cloud.gteam.coralgate.injector.VelocityInjector;
+import cloud.gteam.coralgate.injector.handlers.VelocityNettyResponder;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.ConfigUtils;
 import cloud.gteam.coralgate.utils.PlatformUtils;
@@ -81,7 +82,7 @@ public void onProxyInitialization(final ProxyInitializeEvent proxyInitializeEven
                 new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
 
         // Load core.
-        this.corePlugin.onEnable(Logger.getLogger("CoralGate"), this.dataDirectory.toFile(), ConfigUtils.isOnlineMode("velocity.toml"), "velocity.toml", PlatformUtils.loadProperties(this.getClass()));
+        this.corePlugin.onEnable(Logger.getLogger("CoralGate"), this.dataDirectory.toFile(), ConfigUtils.isOnlineMode("velocity.toml"), "velocity.toml", PlatformUtils.loadProperties(this.getClass()), new VelocityNettyResponder());
 
     }
 

From 8d62260f833953c137ed6f3fbc007130a6c52d2c Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:08:06 +0200
Subject: [PATCH 77/82] Made latest version match config version

---
 .../main/java/cloud/gteam/coralgate/config/ConfigManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
index d6e718f..acc5782 100644
--- a/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
+++ b/core/src/main/java/cloud/gteam/coralgate/config/ConfigManager.java
@@ -31,7 +31,7 @@
 
 public class ConfigManager {
 
-    private final String latestConfigVersion = "0.2.2";
+    private final String latestConfigVersion = "0.2.3";
 
     private final String configFileName;
     private final File configFile;

From abc9cad6bece66418435190b2e979c8c0cbacea5 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Wed, 22 Jul 2026 14:21:29 +0200
Subject: [PATCH 78/82] Better exception logging logic

---
 .../java/cloud/gteam/coralgate/injector/BungeeInjector.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
index a01d914..12342f1 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java
@@ -110,7 +110,7 @@ public void inject() {
             LISTENERS_FIELD.set(ProxyServer.getInstance(), wrapper);
 
         } catch (final IllegalAccessException e) {
-            e.printStackTrace();
+            throw new RuntimeException("Failed to inject custom listeners into ProxyServer instance. See error: ", e);
         }
 
     }

From a1fdfa256df558b509d9dee263507eb02c45ec1e Mon Sep 17 00:00:00 2001
From: rafi67000 <kontakt@rafi67000.xyz>
Date: Wed, 22 Jul 2026 22:11:52 +0200
Subject: [PATCH 79/82] Use predefined ChannelFutureListener#CLOSE

---
 .../coralgate/injector/handlers/BungeeNettyResponder.java     | 4 ++--
 .../coralgate/injector/handlers/SpigotNettyResponder.java     | 4 ++--
 .../coralgate/injector/handlers/VelocityNettyResponder.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java
index e491d89..91aed4d 100644
--- a/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java
+++ b/bungeecord/src/main/java/cloud/gteam/coralgate/injector/handlers/BungeeNettyResponder.java
@@ -22,7 +22,7 @@
 import com.github.retrooper.packetevents.protocol.player.User;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 
 import java.nio.charset.StandardCharsets;
 
@@ -63,7 +63,7 @@ private void write(final User user, final String response) {
 
         channel.pipeline().firstContext()
                 .writeAndFlush(buf)
-                .addListener((ChannelFuture f) -> f.channel().close());
+                .addListener(ChannelFutureListener.CLOSE);
 
     }
 
diff --git a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java
index 06ba619..f80f452 100644
--- a/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java
+++ b/spigot/src/main/java/cloud/gteam/coralgate/injector/handlers/SpigotNettyResponder.java
@@ -22,7 +22,7 @@
 import com.github.retrooper.packetevents.protocol.player.User;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 
 import java.nio.charset.StandardCharsets;
 
@@ -63,7 +63,7 @@ private void write(final User user, final String response) {
 
         channel.pipeline().firstContext()
                 .writeAndFlush(buf)
-                .addListener((ChannelFuture f) -> f.channel().close());
+                .addListener(ChannelFutureListener.CLOSE);
 
     }
 
diff --git a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java
index 2d34e52..0d4ce07 100644
--- a/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java
+++ b/velocity/src/main/java/cloud/gteam/coralgate/injector/handlers/VelocityNettyResponder.java
@@ -22,7 +22,7 @@
 import com.github.retrooper.packetevents.protocol.player.User;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
 
 import java.nio.charset.StandardCharsets;
 
@@ -63,7 +63,7 @@ private void write(final User user, final String response) {
 
         channel.pipeline().firstContext()
                 .writeAndFlush(buf)
-                .addListener((ChannelFuture f) -> f.channel().close());
+                .addListener(ChannelFutureListener.CLOSE);
 
     }
 

From 56ba887569aa56a52c87d61108def9f881499914 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2026 23:13:54 +0000
Subject: [PATCH 80/82] Bump com.gradleup.shadow from 9.6.0 to 9.6.1 in the
 dev-deps group

Bumps the dev-deps group with 1 update: [com.gradleup.shadow](https://github.com/GradleUp/shadow).


Updates `com.gradleup.shadow` from 9.6.0 to 9.6.1
- [Release notes](https://github.com/GradleUp/shadow/releases)
- [Commits](https://github.com/GradleUp/shadow/compare/9.6.0...9.6.1)

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 9.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dev-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8790420..be7cfdb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ spigot = "1.8.8-R0.1-SNAPSHOT"
 bungeecord = "1.16-R0.4"
 velocity = "3.4.0"
 
-shadow = "9.6.0"
+shadow = "9.6.1"
 
 [libraries]
 

From 1a645b421a50b14ff4743dc8f43c96aad7dbc06b Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 30 Jul 2026 11:04:12 +0200
Subject: [PATCH 81/82] Validated Velocity support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 13cc04b..b587f6b 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ CoralGate supports a wide range of Minecraft server implementations.
 | **Spigot**     |  ⚠️   |       ✅        |        ✅        |   ✅    |  ✅   |     ❓     |
 | **Paper**      |   ✅   |       ✅        |       ⚠️        |   ✅    |  ✅   |     ❓     |
 | **BungeeCord** |   ✅   |       ✅        |        ✅        |   ✅    |  ✅   |     ❓     |
-| **Velocity**   |   ❓   |       ❓        |        ❓        |   ❓    |  ❓   |     ❓     |
+| **Velocity**   |   ✅   |       ✅        |        ✅        |   ✅    |  ✅   |     ❓     |
 | **Sponge**     |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |
 | **Fabric**     |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |
 | **Forge**      |   ❌   |       ❌        |        ❌        |   ❌    |  ❌   |     ❌     |

From a7c70a05898f165fca67ca341563f2ef60916b62 Mon Sep 17 00:00:00 2001
From: XIII-MC <81795405+XIII-MC@users.noreply.github.com>
Date: Thu, 30 Jul 2026 11:04:28 +0200
Subject: [PATCH 82/82] Bumped version

---
 build.gradle.kts          | 2 +-
 gradle/libs.versions.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 023301f..389ed16 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 subprojects {
 
     group = "cloud.gteam"
-    version = "0.3.2-SNAPSHOT"
+    version = "0.4.0"
 
     repositories {
         mavenCentral()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index be7cfdb..bb434c0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-coreVersion = "0.4.3-SNAPSHOT"
+coreVersion = "0.5.0"
 
 packetevents = "2.13.0"
 lamp = "4.0.0-rc.17"