Global update 0.4.0

.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" />

build.gradle.kts

@@ -1,15 +1,7 @@
-// Project related options.
-extra["coreVersion"] = "0.4.2-rc"
-
-// Dependency related options.
-extra["lampVersion"] = "4.0.0-rc.17"
-extra["packetEventsVersion"] = "2.13.0"
-extra["bstatsVersion"] = "3.2.1"
-
 subprojects {
 
     group = "cloud.gteam"
-    version = "0.3.1-rc"
+    version = "0.4.0"
 
     repositories {
         mavenCentral()

bungeecord/build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
 
     `java-library`
-    id("com.gradleup.shadow") version "9.4.2"
+    alias(libs.plugins.shadow)
 
 }
 
 java {
 
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion = JavaLanguageVersion.of(8)
     }
 
     sourceCompatibility = JavaVersion.VERSION_1_8
@@ -31,57 +31,50 @@ 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"))
+    compileOnly(project(":core"))
 
 }
 
 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)
     }
+}
+
+// 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.
-    dependsOn(project(":core").tasks.named("shadowJar"))
+    dependsOn(":core:shadowJar")
+
+    archiveBaseName = "CoralGate-Bungeecord"
+    archiveVersion = project.version.toString()
+    archiveClassifier = ""
 
-    archiveBaseName.set("CoralGate-Bungeecord")
-    archiveVersion.set(project.version.toString())
-    archiveClassifier.set("")
+    from(zipTree(coreProvider)) // include shadowed core
 
     // Relocate bStats.
     relocate("org.bstats", "cloud.gteam.coralgate.libs.bstats")
@@ -90,6 +83,10 @@ tasks.shadowJar {
     exclude("META-INF/*.DSA")
     exclude("META-INF/*.RSA")
 
+    filesMatching("META-INF/*.kotlin_module") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
 }
 
 tasks.build {

bungeecord/src/main/java/cloud/gteam/coralgate/BungeePlugin.java

@@ -21,6 +21,8 @@
 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.injector.handlers.BungeeNettyResponder;
 import cloud.gteam.coralgate.processor.NetworkProcessor;
 import cloud.gteam.coralgate.utils.PlatformUtils;
 import com.github.retrooper.packetevents.PacketEvents;
@@ -34,11 +36,15 @@
 public final class BungeePlugin extends Plugin {
 
     private final CorePlugin corePlugin = new CorePlugin();
+    private final BungeeInjector injector = new BungeeInjector();
 
     @Override
     public void onLoad() {
-        PacketEvents.getAPI().getEventManager().registerListener(
-                new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+
+        this.injector.inject();
+
+        PacketEvents.getAPI().getEventManager().registerListener(new NetworkProcessor(getCorePlugin()), PacketListenerPriority.HIGHEST);
+
     }
 
     @Override
@@ -48,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)

bungeecord/src/main/java/cloud/gteam/coralgate/injector/BungeeInjector.java

@@ -0,0 +1,118 @@
+/*
+ * 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 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(final Channel channel) {
+
+        Field initializerField = null;
+        ChannelHandler bootstrapAcceptor = null;
+        for (String channelName : channel.pipeline().names()) {
+
+            if (channelName.contains("QueryHandler")) {
+                return; // query handler, abort injection.
+            }
+
+            final ChannelHandler handler = channel.pipeline().get(channelName);
+            if (handler == null) {
+                continue;
+            }
+
+            try {
+
+                final Field f = handler.getClass().getDeclaredField("childHandler");
+                f.setAccessible(true);
+                bootstrapAcceptor = handler;
+                initializerField = f;
+
+            } catch (final Exception ignored) {}
+
+        }
+
+        if (bootstrapAcceptor == null) {
+
+            bootstrapAcceptor = channel.pipeline().first();
+            try {
+
+                initializerField = bootstrapAcceptor.getClass().getDeclaredField("childHandler");
+                initializerField.setAccessible(true);
+
+            } catch (final NoSuchFieldException e) {
+                throw new RuntimeException(e);
+            }
+
+        }
+
+        final ChannelInitializer<Channel> newInitializer;
+        try {
+            newInitializer = new BungeeChannelInitializer(initializerField.get(bootstrapAcceptor));
+        } catch (final IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+
+        try {
+            initializerField.set(bootstrapAcceptor, newInitializer);
+        } catch (final IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public void inject() {
+
+        try {
+
+            final Set<Channel> listeners = (Set<Channel>) LISTENERS_FIELD.get(ProxyServer.getInstance());
+
+            for (final Channel channel : listeners) {
+                injectChannel(channel);
+            }
+
+            final Set<Channel> wrapper = new SetWrapper<>(listeners, this::injectChannel);
+            LISTENERS_FIELD.set(ProxyServer.getInstance(), wrapper);
+
+        } catch (final IllegalAccessException e) {
+            throw new RuntimeException("Failed to inject custom listeners into ProxyServer instance. See error: ", e);
+        }
+
+    }
+
+}

bungeecord/src/main/java/cloud/gteam/coralgate/injector/connection/BungeeChannelInitializer.java

@@ -0,0 +1,69 @@
+/*
+ * 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 (final NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    private final Object oldInitializer;
+
+    public BungeeChannelInitializer(final Object oldInitializer) {
+        this.oldInitializer = oldInitializer;
+    }
+
+    @Override
+    protected void initChannel(final @NotNull Channel channel) throws Exception {
+
+        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);
+
+    }
+
+}