[wip] Add 1.21.11 item component mappings

api/src/main/java/xyz/jonesdev/sonar/api/fallback/protocol/ProtocolVersion.java

@@ -74,7 +74,8 @@ public enum ProtocolVersion {
   MINECRAFT_1_21_5(770, "1.21.5"),
   MINECRAFT_1_21_6(771, "1.21.6"),
   MINECRAFT_1_21_7(772, "1.21.7"),
-  MINECRAFT_1_21_9(773, "1.21.9");
+  MINECRAFT_1_21_9(773, "1.21.9"),
+  MINECRAFT_1_21_11(774, "1.21.11");
 
   private final int protocol;
   private final String name;

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/fallback/BukkitServerVersion.java

@@ -78,7 +78,10 @@ public enum BukkitServerVersion {
   MINECRAFT_1_21_5,
   MINECRAFT_1_21_6,
   MINECRAFT_1_21_7,
-  MINECRAFT_1_21_8;
+  MINECRAFT_1_21_8,
+  MINECRAFT_1_21_9,
+  MINECRAFT_1_21_10,
+  MINECRAFT_1_21_11;
 
   static final BukkitServerVersion[] REVERSED_VALUES;
 

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/FallbackPreparer.java

@@ -97,6 +97,7 @@ public class FallbackPreparer {
   public final FallbackPacket[] REGISTRY_SYNC_1_21_2 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_2);
   public final FallbackPacket[] REGISTRY_SYNC_1_21_4 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_4);
   public final FallbackPacket[] REGISTRY_SYNC_1_21_5 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_5);
+  public final FallbackPacket[] REGISTRY_SYNC_1_21_11 = RegistryDataPacket.of(DimensionRegistry.CODEC_1_21_11);
   public final FallbackPacket START_WRITING_CHUNKS = new GameEventPacket(13, 0);
   public final static FallbackPacket INVALID_HELD_ITEM_SLOT = new SetHeldItemPacket(-1);
   public final FallbackPacket RANDOM_KEEP_ALIVE = new FallbackPacketSnapshot(new KeepAlivePacket(RANDOM.nextInt()));
@@ -295,7 +296,9 @@ public class FallbackPreparer {
   }
 
   public static FallbackPacket[] getRegistryPackets(final @NotNull ProtocolVersion protocolVersion) {
-    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_5)) {
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_11)) {
+      return REGISTRY_SYNC_1_21_11;
+    } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_5)) {
       return REGISTRY_SYNC_1_21_5;
     } else if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_21_4)) {
       return REGISTRY_SYNC_1_21_4;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/dimension/DimensionRegistry.java

@@ -40,6 +40,7 @@ public final class DimensionRegistry {
   public final CompoundBinaryTag CODEC_1_21_2;
   public final CompoundBinaryTag CODEC_1_21_4;
   public final CompoundBinaryTag CODEC_1_21_5;
+  public final CompoundBinaryTag CODEC_1_21_11;
 
   static {
     CODEC_1_16 = getCodec("codec_1_16.nbt");
@@ -54,6 +55,7 @@ public final class DimensionRegistry {
     CODEC_1_21_2 = getCodec("codec_1_21_2.nbt");
     CODEC_1_21_4 = getCodec("codec_1_21_4.nbt");
     CODEC_1_21_5 = getCodec("codec_1_21_5.nbt");
+    CODEC_1_21_11 = getCodec("codec_1_21_11.nbt");
   }
 
   private @NotNull CompoundBinaryTag getCodec(final @NotNull String fileName) {

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/entity/EntityType.java

@@ -64,7 +64,10 @@ public enum EntityType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
       return 85;
     }
-    return 87;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_9)) {
+      return 87;
+    }
+    return 89;
   }),
   MINECART(protocolVersion -> {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_13_2)) {
@@ -106,7 +109,10 @@ public enum EntityType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_7)) {
       return 82;
     }
-    return 84;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_9)) {
+      return 84;
+    }
+    return 85;
   });
 
   private final Function<ProtocolVersion, Integer> id;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/item/ItemType.java

@@ -90,7 +90,10 @@ public enum ItemType {
     if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_4)) {
       return 36;
     }
-    return 37;
+    if (protocolVersion.lessThanOrEquals(MINECRAFT_1_21_9)) {
+      return 37;
+    }
+    return 44;
   });
 
   private final Function<ProtocolVersion, Integer> id;

common/src/main/java/xyz/jonesdev/sonar/common/fallback/protocol/packets/play/SetContainerSlotPacket.java

@@ -60,10 +60,10 @@ public final class SetContainerSlotPacket implements FallbackPacket {
       ProtocolUtil.writeVarInt(byteBuf, count);
     }
 
-    if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_13_2)) {
-      byteBuf.writeShort(itemType.getId().apply(protocolVersion));
-    } else {
+    if (protocolVersion.greaterThanOrEquals(ProtocolVersion.MINECRAFT_1_13_2)) {
       ProtocolUtil.writeVarInt(byteBuf, itemType.getId().apply(protocolVersion));
+    } else {
+      byteBuf.writeShort(itemType.getId().apply(protocolVersion));
     }
 
     if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_20_5)) {
@@ -83,8 +83,8 @@ public final class SetContainerSlotPacket implements FallbackPacket {
     } else if (protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_20_5)) {
       ProtocolUtil.writeBinaryTag(byteBuf, protocolVersion, compoundBinaryTag);
     } else {
-      ProtocolUtil.writeVarInt(byteBuf, 1); // component count to add
-      ProtocolUtil.writeVarInt(byteBuf, 0); // component count to remove
+      ProtocolUtil.writeVarInt(byteBuf, 1); // addedComponentCount
+      ProtocolUtil.writeVarInt(byteBuf, 0); // removedComponentCount
       ProtocolUtil.writeVarInt(byteBuf, itemType.getComponents().apply(protocolVersion));
       ProtocolUtil.writeVarInt(byteBuf, 0); // data
     }