feat: add support for 1.21.11 (#3578)

Author: Alcado047

build.gradle.kts

@@ -6,15 +6,15 @@ plugins {
     `java-library`
     `maven-publish`
     `signing`
-    id("com.gradleup.shadow") version "9.0.2"
+    id("com.gradleup.shadow") version "9.3.0"
     id("io.github.patrick.remapper") version "1.4.2"
-    id("com.vanniktech.maven.publish") version "0.34.0"
+    id("com.vanniktech.maven.publish") version "0.35.0"
 }
 
 group = "net.dmulloy2"
 description = "Provides access to the Minecraft protocol"
 
-val mcVersion = "1.21.10"
+val mcVersion = "1.21.11"
 val isSnapshot = version.toString().endsWith("-SNAPSHOT")
 val commitHash = System.getenv("COMMIT_SHA") ?: ""
 val isCI = commitHash.isNotEmpty()
@@ -45,27 +45,22 @@ repositories {
 }
 
 dependencies {
-    implementation("net.bytebuddy:byte-buddy:1.17.8")
+    implementation("net.bytebuddy:byte-buddy:1.18.2")
     compileOnly("org.spigotmc:spigot-api:${mcVersion}-R0.1-SNAPSHOT")
     compileOnly("org.spigotmc:spigot:${mcVersion}-R0.1-SNAPSHOT:remapped-mojang")
-    compileOnly("io.netty:netty-all:4.0.23.Final")
-    /* 
-     * TODO(fix): once you update kyori:adventure-text-serializer-gson please uncomment the TODO in
-     * com.comphenix.protocol.wrappers.WrappedComponentStyleTest if the following issue got fixed:
-     * https://github.com/KyoriPowered/adventure/issues/1194
-     */
-    compileOnly("net.kyori:adventure-text-serializer-gson:4.21.0")
+    compileOnly("io.netty:netty-all:4.2.8.Final")
+    compileOnly("net.kyori:adventure-text-serializer-gson:4.25.0")
     compileOnly("com.googlecode.json-simple:json-simple:1.1.1")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.0")
-    testImplementation("org.mockito:mockito-core:5.6.0")
-    testImplementation("io.netty:netty-common:4.1.97.Final")
-    testImplementation("io.netty:netty-transport:4.1.97.Final")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:6.0.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.0.1")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.1")
+    testImplementation("org.mockito:mockito-core:5.21.0")
+    testImplementation("io.netty:netty-common:4.2.8.Final")
+    testImplementation("io.netty:netty-transport:4.2.8.Final")
     testImplementation("org.spigotmc:spigot:${mcVersion}-R0.1-SNAPSHOT:remapped-mojang")
-    testImplementation("net.kyori:adventure-text-serializer-gson:4.14.0")
-    testImplementation("net.kyori:adventure-text-serializer-plain:4.14.0")
+    testImplementation("net.kyori:adventure-text-serializer-gson:4.25.0")
+    testImplementation("net.kyori:adventure-text-serializer-plain:4.25.0")
 }
 
 java {

src/main/java/com/comphenix/protocol/PacketType.java

@@ -147,7 +147,7 @@ public static class Server extends PacketTypeEnum {
             public static final PacketType UNLOAD_CHUNK =                 new PacketType(PROTOCOL, SENDER, 0x25, "ForgetLevelChunk", "UnloadChunk", "SPacketUnloadChunk");
             public static final PacketType GAME_STATE_CHANGE =            new PacketType(PROTOCOL, SENDER, 0x26, "GameEvent", "GameStateChange", "SPacketChangeGameState");
             public static final PacketType GAME_TEST_HIGHLIGHT_POS =      new PacketType(PROTOCOL, SENDER, 0x27, "GameTestHighlightPos");
-            public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x28, "HorseScreenOpen", "OpenWindowHorse");
+            public static final PacketType OPEN_WINDOW_HORSE =            new PacketType(PROTOCOL, SENDER, 0x28, "MountScreenOpen", "HorseScreenOpen", "OpenWindowHorse");
             public static final PacketType HURT_ANIMATION =               new PacketType(PROTOCOL, SENDER, 0x29, "HurtAnimation", "ClientboundHurtAnimationPacket");
             public static final PacketType INITIALIZE_BORDER =            new PacketType(PROTOCOL, SENDER, 0x2A, "InitializeBorder");
             public static final PacketType KEEP_ALIVE =                   new PacketType(PROTOCOL, SENDER, 0x2B, "KeepAlive", "SPacketKeepAlive");

src/main/java/com/comphenix/protocol/injector/netty/channel/NettyChannelProxy.java

@@ -5,6 +5,7 @@
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelConfig;
 import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelId;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelProgressivePromise;
@@ -33,6 +34,11 @@ public NettyChannelProxy(Channel delegate, EventLoop eventLoop, NettyChannelInje
         this.injector = injector;
     }
 
+    @Override
+    public ChannelId id() {
+        return this.delegate.id();
+    }
+
     @Override
     public EventLoop eventLoop() {
         return this.eventLoop;
@@ -238,6 +244,11 @@ public <T> Attribute<T> attr(AttributeKey<T> key) {
         return this.delegate.attr(key);
     }
 
+    @Override
+    public <T> boolean hasAttr(AttributeKey<T> attributeKey) {
+        return this.delegate.hasAttr(attributeKey);
+    }
+
     @Override
     public int compareTo(@NotNull Channel o) {
         return this.delegate.compareTo(o);

src/main/java/com/comphenix/protocol/injector/netty/channel/NettyEventLoopProxy.java

@@ -251,6 +251,11 @@ public ChannelFuture register(Channel channel) {
         return this.delegate.register(channel);
     }
 
+    @Override
+    public ChannelFuture register(ChannelPromise channelPromise) {
+        return this.delegate.register(channelPromise);
+    }
+
     @Override
     public ChannelFuture register(Channel channel, ChannelPromise promise) {
         return this.delegate.register(channel, promise);

src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java

@@ -921,15 +921,15 @@ public static Class<?> getDataWatcherRegistryClass() {
     }
 
     public static Class<?> getMinecraftKeyClass() {
-        return getMinecraftClass("resources.MinecraftKey", "resources.ResourceLocation", "MinecraftKey");
+        return getMinecraftClass("resources.MinecraftKey", "resources.Identifier", "resources.ResourceLocation", "MinecraftKey");
     }
 
     public static Class<?> getMobEffectListClass() {
-        return getMinecraftClass("world.effect.MobEffectList", "MobEffectList", "world.effect.MobEffect");
+        return getMinecraftClass("world.effect.MobEffectList", "MobEffectList", "world.effect.MobEffect", "world.effect.MobEffects");
     }
 
     public static Class<?> getSoundEffectClass() {
-        return getNullableNMS("sounds.SoundEffect", "sounds.SoundEvent", "SoundEffect");
+        return getNullableNMS("sounds.SoundEffect", "sounds.SoundEvent", "SoundEffect", "sounds.SoundEvents");
     }
 
     /**

src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java

@@ -36,6 +36,11 @@
  * @author Kristian
  */
 public final class MinecraftVersion implements Comparable<MinecraftVersion>, Serializable {
+    /**
+     * Version 1.21.11 - mounts of mayhem
+     */
+    public static final MinecraftVersion v1_21_11 = new MinecraftVersion("1.21.11");
+
     /**
      * Version 1.21.10 - hotfix for 1.21.9
      */
@@ -179,7 +184,7 @@ public final class MinecraftVersion implements Comparable<MinecraftVersion>, Ser
     /**
      * The latest release version of minecraft.
      */
-    public static final MinecraftVersion LATEST = v1_21_10;
+    public static final MinecraftVersion LATEST = v1_21_11;
 
     // used when serializing
     private static final long serialVersionUID = -8695133558996459770L;