25w06a

Author: basaigh

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java

@@ -218,8 +218,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 232)
-            .minecraftVersion("25w05a")
+            .protocolVersion((1 << 30) | 233)
+            .minecraftVersion("25w06a")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java

@@ -664,6 +664,24 @@ public static void writePigVariant(ByteBuf buf, Holder<PigVariant> variantHolder
         });
     }
 
+    public static Holder<Key> readChickenVariant(ByteBuf buf) {
+        if (buf.readBoolean()) {
+            return Holder.ofId(MinecraftTypes.readVarInt(buf));
+        } else {
+            return Holder.ofCustom(MinecraftTypes.readResourceLocation(buf));
+        }
+    }
+
+    public static void writeChickenVariant(ByteBuf buf, Holder<Key> variant) {
+        if (variant.isId()) {
+            buf.writeBoolean(true);
+            MinecraftTypes.writeVarInt(buf, variant.id());
+        } else {
+            buf.writeBoolean(false);
+            MinecraftTypes.writeResourceLocation(buf, variant.custom());
+        }
+    }
+
     public static Holder<PaintingVariant> readPaintingVariant(ByteBuf buf) {
         return MinecraftTypes.readHolder(buf, input -> {
             return new PaintingVariant(MinecraftTypes.readVarInt(input), MinecraftTypes.readVarInt(input), MinecraftTypes.readResourceLocation(input),

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/metadata/MetadataType.java

@@ -51,6 +51,7 @@ public class MetadataType<T> {
     public static final OptionalIntMetadataType OPTIONAL_VARINT = new OptionalIntMetadataType(ObjectEntityMetadata::new);
     public static final MetadataType<Pose> POSE = new MetadataType<>(MinecraftTypes::readPose, MinecraftTypes::writePose, ObjectEntityMetadata::new);
     public static final IntMetadataType CAT_VARIANT = new IntMetadataType(MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new);
+    public static final IntMetadataType CHICKEN_VARIANT = new IntMetadataType(MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new);
     public static final IntMetadataType COW_VARIANT = new IntMetadataType(MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new);
     public static final MetadataType<Holder<WolfVariant>> WOLF_VARIANT = new MetadataType<>(MinecraftTypes::readWolfVariant, MinecraftTypes::writeWolfVariant, ObjectEntityMetadata::new);
     public static final IntMetadataType FROG_VARIANT = new IntMetadataType(MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntEntityMetadata::new);

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/DataComponentType.java

@@ -110,6 +110,7 @@ public class DataComponentType<T> {
     public static final IntComponentType RABBIT_VARIANT = new IntComponentType("rabbit/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new);
     public static final DataComponentType<Holder<PigVariant>> PIG_VARIANT = new DataComponentType<>("pig/variant", MinecraftTypes::readPigVariant, MinecraftTypes::writePigVariant, ObjectDataComponent::new);
     public static final IntComponentType COW_VARIANT = new IntComponentType("cow/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new);
+    public static final DataComponentType<Holder<Key>> CHICKEN_VARIANT = new DataComponentType<>("chicken/variant", MinecraftTypes::readChickenVariant, MinecraftTypes::writeChickenVariant, ObjectDataComponent::new);
     public static final IntComponentType FROG_VARIANT = new IntComponentType("frog/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new);
     public static final IntComponentType HORSE_VARIANT = new IntComponentType("horse/variant", MinecraftTypes::readVarInt, MinecraftTypes::writeVarInt, IntDataComponent::new);
     public static final DataComponentType<Holder<PaintingVariant>> PAINTING_VARIANT = new DataComponentType<>("painting/variant", MinecraftTypes::readPaintingVariant, MinecraftTypes::writePaintingVariant, ObjectDataComponent::new);

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java

@@ -234,6 +234,8 @@ public enum BuiltinSound implements Sound {
     ITEM_BUNDLE_INSERT("item.bundle.insert"),
     ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
     ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
+    BLOCK_CACTUS_FLOWER_BREAK("block.cactus_flower.break"),
+    BLOCK_CACTUS_FLOWER_PLACE("block.cactus_flower.place"),
     BLOCK_CAKE_ADD_CANDLE("block.cake.add_candle"),
     BLOCK_CALCITE_BREAK("block.calcite.break"),
     BLOCK_CALCITE_STEP("block.calcite.step"),
@@ -539,6 +541,7 @@ public enum BuiltinSound implements Sound {
     BLOCK_FENCE_GATE_CLOSE("block.fence_gate.close"),
     BLOCK_FENCE_GATE_OPEN("block.fence_gate.open"),
     ITEM_FIRECHARGE_USE("item.firecharge.use"),
+    BLOCK_FIREFLY_BUSH_IDLE("block.firefly_bush.idle"),
     ENTITY_FIREWORK_ROCKET_BLAST("entity.firework_rocket.blast"),
     ENTITY_FIREWORK_ROCKET_BLAST_FAR("entity.firework_rocket.blast_far"),
     ENTITY_FIREWORK_ROCKET_LARGE_BLAST("entity.firework_rocket.large_blast"),

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundBlockEventPacket.java

@@ -39,16 +39,16 @@ public class ClientboundBlockEventPacket implements MinecraftPacket {
     // Do we really want these hardcoded values?
     private static final int NOTE_BLOCK = 109;
     private static final int STICKY_PISTON = 128;
-    private static final int PISTON = 136;
-    private static final int MOB_SPAWNER = 183;
-    private static final int CHEST = 186;
-    private static final int ENDER_CHEST = 366;
-    private static final int TRAPPED_CHEST = 435;
-    private static final int END_GATEWAY = 632;
-    private static final int SHULKER_BOX_LOWER = 642;
-    private static final int SHULKER_BOX_HIGHER = 658;
-    private static final int BELL = 812;
-    private static final int DECORATED_POT = 1088;
+    private static final int PISTON = 138;
+    private static final int MOB_SPAWNER = 185;
+    private static final int CHEST = 188;
+    private static final int ENDER_CHEST = 369;
+    private static final int TRAPPED_CHEST = 438;
+    private static final int END_GATEWAY = 635;
+    private static final int SHULKER_BOX_LOWER = 645;
+    private static final int SHULKER_BOX_HIGHER = 661;
+    private static final int BELL = 815;
+    private static final int DECORATED_POT = 1091;
     private static final Logger log = LoggerFactory.getLogger(ClientboundBlockEventPacket.class);
 
     private final @NonNull Vector3i position;