Initial 1.21.11 support

UserNugget · UserNugget · commit c0995dc1e6b6 · 2025-12-09T19:36:49.000+03:00
diff --git a/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java b/api/src/main/java/net/elytrium/limboapi/api/chunk/BlockEntityVersion.java
@@ -31,7 +31,8 @@ public enum BlockEntityVersion {
   MINECRAFT_1_21_5(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_5)),
   MINECRAFT_1_21_6(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_6)),
   MINECRAFT_1_21_7(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_7)),
-  MINECRAFT_1_21_9(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_9));
+  MINECRAFT_1_21_9(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_9)),
+  MINECRAFT_1_21_11(EnumSet.of(ProtocolVersion.MINECRAFT_1_21_11));
 
   private static final EnumMap<ProtocolVersion, BlockEntityVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
   private static final Map<String, BlockEntityVersion> KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values()));
diff --git a/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java b/api/src/main/java/net/elytrium/limboapi/api/material/WorldVersion.java
@@ -35,7 +35,8 @@ public enum WorldVersion {
   MINECRAFT_1_21_5(ProtocolVersion.MINECRAFT_1_21_5),
   MINECRAFT_1_21_6(ProtocolVersion.MINECRAFT_1_21_6),
   MINECRAFT_1_21_7(ProtocolVersion.MINECRAFT_1_21_7),
-  MINECRAFT_1_21_9(EnumSet.range(ProtocolVersion.MINECRAFT_1_21_9, ProtocolVersion.MAXIMUM_VERSION));
+  MINECRAFT_1_21_9(ProtocolVersion.MINECRAFT_1_21_9),
+  MINECRAFT_1_21_11(EnumSet.range(ProtocolVersion.MINECRAFT_1_21_11, ProtocolVersion.MAXIMUM_VERSION));
 
   private static final EnumMap<ProtocolVersion, WorldVersion> MC_VERSION_TO_ITEM_VERSIONS = new EnumMap<>(ProtocolVersion.class);
   private static final Map<String, WorldVersion> KEY_LOOKUP = Map.copyOf(EnumUniverse.createProtocolLookup(values()));
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -134,7 +134,8 @@ enum MinecraftVersion {
   MINECRAFT_1_21_5(770),
   MINECRAFT_1_21_6(771),
   MINECRAFT_1_21_7(772),
-  MINECRAFT_1_21_9(773)
+  MINECRAFT_1_21_9(773),
+  MINECRAFT_1_21_11(774)
 
   public static final List<MinecraftVersion> WORLD_VERSIONS = List.of(
     MINECRAFT_1_13,
@@ -155,7 +156,8 @@ enum MinecraftVersion {
     MINECRAFT_1_21_5,
     MINECRAFT_1_21_6,
     MINECRAFT_1_21_7,
-    MINECRAFT_1_21_9
+    MINECRAFT_1_21_9,
+    MINECRAFT_1_21_11
   )
 
   public static final MinecraftVersion MINIMUM_VERSION = MINECRAFT_1_7_2
@@ -214,7 +216,9 @@ File downloadVersionManifest(String version) {
   this.println("> Downloading ${version} manifest...")
 
   Object manifest = new JsonSlurper().parse(versionManifestFile)
-  def optional = manifest.versions.stream().filter({ it.id == version }).findFirst()
+
+  // TODO: remove
+  def optional = manifest.versions.stream().filter({ version == "1.21.11" ? it.id == version + "-rc3" : it.id == version }).findFirst()
   if (optional.empty()) {
     throw new RuntimeException("Couldn't find version: ${version}")
   }
diff --git a/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java b/plugin/src/main/java/net/elytrium/limboapi/LimboAPI.java
@@ -128,7 +128,7 @@
 @SuppressFBWarnings("MS_EXPOSE_REP")
 public class LimboAPI implements LimboFactory {
 
-  private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 773;
+  private static final int SUPPORTED_MAXIMUM_PROTOCOL_VERSION_NUMBER = 774;
 
   @MonotonicNonNull
   private static Logger LOGGER;
diff --git a/plugin/src/main/java/net/elytrium/limboapi/Settings.java b/plugin/src/main/java/net/elytrium/limboapi/Settings.java
@@ -87,7 +87,7 @@ public static class MAIN {
         "1_7_2, 1_7_6, 1_8, 1_9, 1_9_1, 1_9_2, 1_9_4, 1_10, 1_11, 1_11_1, 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, 1_17, 1_17_1, 1_18, 1_18_2, 1_19, 1_19_1, 1_19_3,",
-        "1_20, 1_20_2, 1_20_3, 1_20_5, 1_21, 1_21_2, 1_21_4, 1_21_5, 1_21_6, 1_21_7, 1_21_9, LATEST"
+        "1_20, 1_20_2, 1_20_3, 1_20_5, 1_21, 1_21_2, 1_21_4, 1_21_5, 1_21_6, 1_21_7, 1_21_9, 1_21_11, LATEST"
     })
     public String PREPARE_MIN_VERSION = "1_7_2";
     public String PREPARE_MAX_VERSION = "LATEST";
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MoveOnGroundOnlyPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MoveOnGroundOnlyPacket.java
@@ -55,12 +55,12 @@ public boolean handle(MinecraftSessionHandler handler) {
   }
 
   @Override
-  public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 1;
   }
 
   @Override
-  public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 1;
   }
 
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MovePacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MovePacket.java
@@ -70,12 +70,12 @@ public boolean handle(MinecraftSessionHandler handler) {
   }
 
   @Override
-  public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return version.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0 ? 41 : 33;
   }
 
   @Override
-  public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 33;
   }
 
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MovePositionOnlyPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MovePositionOnlyPacket.java
@@ -65,12 +65,12 @@ public boolean handle(MinecraftSessionHandler handler) {
   }
 
   @Override
-  public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return version.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0 ? 33 : 25;
   }
 
   @Override
-  public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 25;
   }
 
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MoveRotationOnlyPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/MoveRotationOnlyPacket.java
@@ -61,12 +61,12 @@ public boolean handle(MinecraftSessionHandler handler) {
   }
 
   @Override
-  public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 9;
   }
 
   @Override
-  public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 9;
   }
 
diff --git a/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/TeleportConfirmPacket.java b/plugin/src/main/java/net/elytrium/limboapi/protocol/packets/c2s/TeleportConfirmPacket.java
@@ -48,12 +48,12 @@ public boolean handle(MinecraftSessionHandler handler) {
   }
 
   @Override
-  public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 5;
   }
 
   @Override
-  public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
+  public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {
     return 1;
   }
 
diff --git a/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java b/plugin/src/main/java/net/elytrium/limboapi/server/LimboImpl.java
@@ -246,7 +246,8 @@ protected void refresh() {
     this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_20_5, ProtocolVersion.MINECRAFT_1_20_5);
     this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21, ProtocolVersion.MINECRAFT_1_21);
     this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_2, ProtocolVersion.MINECRAFT_1_21_4);
-    this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_5, ProtocolVersion.MAXIMUM_VERSION);
+    this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_5, ProtocolVersion.MINECRAFT_1_21_9);
+    this.createRegistrySyncModern(configPackets, ProtocolVersion.MINECRAFT_1_21_11, ProtocolVersion.MAXIMUM_VERSION);
     if (this.shouldUpdateTags) {
       configPackets.prepare(this::createTagsUpdate, ProtocolVersion.MINECRAFT_1_20_2);
     }
@@ -1049,6 +1050,16 @@ private JoinGamePacket createJoinGamePacket(ProtocolVersion version) {
 
           registryContainer.put("minecraft:wolf_variant", this.createRegistry("minecraft:wolf_variant",
               Map.of("minecraft:ashen", wolfVariant.build())));
+
+          if (version.compareTo(ProtocolVersion.MINECRAFT_1_21_11) >= 0) {
+            // Zombie nautilus variant
+            CompoundBinaryTag zombieVariant = CompoundBinaryTag.builder()
+                .putString("asset_id", "minecraft:entity/nautilus/zombie_nautilus")
+                .put("spawn_conditions", ListBinaryTag.empty()).build();
+
+            registryContainer.put("minecraft:zombie_nautilus_variant", this.createRegistry("minecraft:zombie_nautilus_variant",
+                Map.of("minecraft:temperate", zombieVariant)));
+          }
         } else {
           CompoundBinaryTag.Builder wolfVariant = CompoundBinaryTag.builder()
               .putString("wild_texture", "minecraft:entity/wolf/wolf_ashen")

Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,12 @@ public boolean handle(MinecraftSessionHandler handler) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
`58`		`- public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`58`	`+ public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`59`	`59`	`return 1;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`		`- public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`63`	`+ public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`64`	`64`	`return 1;`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ public boolean handle(MinecraftSessionHandler handler) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
`73`		`- public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`73`	`+ public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`74`	`74`	`return version.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0 ? 41 : 33;`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`@Override`
`78`		`- public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`78`	`+ public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`79`	`79`	`return 33;`
`80`	`80`	`}`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ public boolean handle(MinecraftSessionHandler handler) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
`68`		`- public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`68`	`+ public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`69`	`69`	`return version.compareTo(ProtocolVersion.MINECRAFT_1_8) < 0 ? 33 : 25;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@Override`
`73`		`- public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`73`	`+ public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`74`	`74`	`return 25;`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,12 @@ public boolean handle(MinecraftSessionHandler handler) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`@Override`
`64`		`- public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`64`	`+ public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`65`	`65`	`return 9;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`
`69`		`- public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`69`	`+ public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`70`	`70`	`return 9;`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ public boolean handle(MinecraftSessionHandler handler) {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`@Override`
`51`		`- public int expectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`51`	`+ public int decodeExpectedMaxLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`52`	`52`	`return 5;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public int expectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
	`56`	`+ public int decodeExpectedMinLength(ByteBuf buf, ProtocolUtils.Direction direction, ProtocolVersion version) {`
`57`	`57`	`return 1;`
`58`	`58`	`}`
`59`	`59`