Support up to Minecraft 1.20.6

Author: robinbraemer

api/build.gradle.kts

@@ -1,5 +1,16 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 dependencies {
     api("com.google.code.gson", "gson", Versions.gsonVersion)
 
     compileOnly("io.netty", "netty-transport", Versions.nettyVersion)
 }
+
+tasks {
+    named<Jar>("jar") {
+        archiveClassifier.set("")
+    }
+    named<ShadowJar>("shadowJar") {
+        archiveClassifier.set("shaded")
+    }
+}

build-logic/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "build-logic"

build-logic/src/main/kotlin/Versions.kt

@@ -26,7 +26,7 @@
 object Versions {
     const val spigotVersion = "1.19.4-R0.1-SNAPSHOT"
     const val configUtilsVersion = "1.0-SNAPSHOT"
-    const val guiceVersion = "5.0.1"
+    const val guiceVersion = "6.0.0"
     const val nettyVersion = "4.1.49.Final"
     const val snakeyamlVersion = "1.28"
     const val cloudVersion = "1.5.0"
@@ -35,7 +35,7 @@ object Versions {
     const val viaVersionVersion = "4.0.0"
     const val gRPCVersion = "1.44.0"
     const val protocVersion = "3.19.4"
-    const val bstatsVersion = "3.0.0"
+    const val bstatsVersion = "3.0.2"
     const val gsonVersion = "2.8.6"
 
     const val checkerQual = "3.19.0"

bungee/build.gradle.kts

@@ -1,4 +1,4 @@
-var bungeeCommit = "master-SNAPSHOT"
+var bungeeVersion = "1.20-R0.3-SNAPSHOT"
 var gsonVersion = "2.8.0"
 var guavaVersion = "21.0"
 
@@ -17,6 +17,6 @@ relocate("io.leangen.geantyref")
 relocate("org.yaml")
 
 // these dependencies are already present on the platform
-provided("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeCommit)
+provided("net.md-5", "bungeecord-proxy", bungeeVersion)
 provided("com.google.code.gson", "gson", gsonVersion)
 provided("com.google.guava", "guava", guavaVersion)

core/src/main/java/com/minekube/connect/addon/DebugAddon.java

@@ -29,13 +29,13 @@
 import com.google.inject.name.Named;
 import com.minekube.connect.addon.debug.ChannelInDebugHandler;
 import com.minekube.connect.addon.debug.ChannelOutDebugHandler;
-import com.minekube.connect.addon.debug.StateChangeDetector;
 import com.minekube.connect.api.inject.InjectorAddon;
 import com.minekube.connect.api.logger.ConnectLogger;
 import com.minekube.connect.config.ConnectConfig;
 import com.minekube.connect.util.Utils;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelPipeline;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public final class DebugAddon implements InjectorAddon {
     @Inject private ConnectConfig config;
@@ -57,16 +57,14 @@ public final class DebugAddon implements InjectorAddon {
     public void onInject(Channel channel, boolean toServer) {
         logger.info("Successfully called onInject. To server? " + toServer);
 
-        StateChangeDetector changeDetector = new StateChangeDetector(
-                channel, packetEncoder, packetDecoder, logger
-        );
+        AtomicInteger packetCount = new AtomicInteger();
 
         channel.pipeline().addBefore(
                 packetEncoder, "connect_debug_out",
-                new ChannelOutDebugHandler(platformName, toServer, changeDetector, logger)
+                new ChannelOutDebugHandler(platformName, toServer, packetCount, logger)
         ).addBefore(
                 packetDecoder, "connect_debug_in",
-                new ChannelInDebugHandler(platformName, toServer, changeDetector, logger)
+                new ChannelInDebugHandler(platformName, toServer, packetCount, logger)
         );
     }
 

core/src/main/java/com/minekube/connect/addon/debug/ChannelInDebugHandler.java

@@ -26,44 +26,44 @@
 package com.minekube.connect.addon.debug;
 
 import com.minekube.connect.api.logger.ConnectLogger;
+import com.minekube.connect.util.Utils;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Sharable
 public final class ChannelInDebugHandler extends SimpleChannelInboundHandler<ByteBuf> {
     private final String direction;
     private final ConnectLogger logger;
 
     private final boolean toServer;
-    private final StateChangeDetector changeDetector;
+    private final AtomicInteger packetCount;
 
     public ChannelInDebugHandler(
             String implementationType,
             boolean toServer,
-            StateChangeDetector changeDetector,
+            AtomicInteger changeDetector,
             ConnectLogger logger) {
         this.direction = (toServer ? "Server -> " : "Player -> ") + implementationType;
         this.logger = logger;
         this.toServer = toServer;
-        this.changeDetector = changeDetector;
+        this.packetCount = changeDetector;
     }
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) {
         try {
             int index = msg.readerIndex();
 
-            if (changeDetector.shouldPrintPacket(msg, !toServer)) {
+            if (packetCount.getAndIncrement() < Utils.MAX_DEBUG_PACKET_COUNT) {
                 logger.info("{} {}:\n{}",
                         direction,
-                        changeDetector.getCurrentState(),
+                        packetCount.get(),
                         ByteBufUtil.prettyHexDump(msg)
                 );
-
-                changeDetector.checkPacket(msg, !toServer);
             }
 
             // reset index

core/src/main/java/com/minekube/connect/addon/debug/ChannelOutDebugHandler.java

@@ -26,46 +26,45 @@
 package com.minekube.connect.addon.debug;
 
 import com.minekube.connect.api.logger.ConnectLogger;
+import com.minekube.connect.util.Utils;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Sharable
 public final class ChannelOutDebugHandler extends MessageToByteEncoder<ByteBuf> {
     private final String direction;
     private final ConnectLogger logger;
 
     private final boolean toServer;
-    private final StateChangeDetector changeDetector;
+    private final AtomicInteger packetCount;
 
     public ChannelOutDebugHandler(
             String implementationType,
             boolean toServer,
-            StateChangeDetector changeDetector,
+            AtomicInteger changeDetector,
             ConnectLogger logger) {
         this.direction = implementationType + (toServer ? " -> Server" : " -> Player");
         this.logger = logger;
         this.toServer = toServer;
-        this.changeDetector = changeDetector;
+        this.packetCount = changeDetector;
     }
 
     @Override
     protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) {
         try {
             int index = msg.readerIndex();
 
-            if (changeDetector.shouldPrintPacket(msg, toServer)) {
+            if (packetCount.getAndIncrement() < Utils.MAX_DEBUG_PACKET_COUNT) {
                 logger.info(
                         "{} {}:\n{}",
                         direction,
-                        changeDetector.getCurrentState(),
+                        packetCount.get(),
                         ByteBufUtil.prettyHexDump(msg)
                 );
-
-                // proxy acts as a client when it connects to a server
-                changeDetector.checkPacket(msg, toServer);
             }
 
             // reset index