25w42a

Author: basaigh

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

@@ -231,8 +231,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 273)
-            .minecraftVersion("25w41a")
+            .protocolVersion((1 << 30) | 274)
+            .minecraftVersion("25w42a")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )

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

@@ -298,6 +298,7 @@ public static KineticWeapon readKineticWeapon(ByteBuf buf) {
         float minReach = buf.readFloat();
         float maxReach = buf.readFloat();
         float hitboxMargin = buf.readFloat();
+        int contactCooldownTicks = MinecraftTypes.readVarInt(buf);
         int delayTicks = MinecraftTypes.readVarInt(buf);
         KineticWeapon.Condition dismountConditions = MinecraftTypes.readNullable(buf, ItemTypes::readKineticCondition);
         KineticWeapon.Condition knockbackConditions = MinecraftTypes.readNullable(buf, ItemTypes::readKineticCondition);
@@ -307,14 +308,15 @@ public static KineticWeapon readKineticWeapon(ByteBuf buf) {
         Sound sound = MinecraftTypes.readNullable(buf, MinecraftTypes::readSound);
         Sound hitSound = MinecraftTypes.readNullable(buf, MinecraftTypes::readSound);
 
-        return new KineticWeapon(minReach, maxReach, hitboxMargin, delayTicks, dismountConditions,
+        return new KineticWeapon(minReach, maxReach, hitboxMargin, contactCooldownTicks, delayTicks, dismountConditions,
             knockbackConditions, damageConditions, forwardMovement, damageMultiplier, sound, hitSound);
     }
 
     public static void writeKineticWeapon(ByteBuf buf, KineticWeapon kineticWeapon) {
         buf.writeFloat(kineticWeapon.minReach());
         buf.writeFloat(kineticWeapon.maxReach());
         buf.writeFloat(kineticWeapon.hitboxMargin());
+        MinecraftTypes.writeVarInt(buf, kineticWeapon.contactCooldownTicks());
         MinecraftTypes.writeVarInt(buf, kineticWeapon.delayTicks());
         MinecraftTypes.writeNullable(buf, kineticWeapon.dismountConditions(), ItemTypes::writeKineticCondition);
         MinecraftTypes.writeNullable(buf, kineticWeapon.knockbackConditions(), ItemTypes::writeKineticCondition);

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

@@ -5,8 +5,8 @@
 import org.jetbrains.annotations.Nullable;
 
 @Builder(toBuilder = true)
-public record KineticWeapon(float minReach, float maxReach, float hitboxMargin, int delayTicks,
-                            @Nullable Condition dismountConditions, @Nullable Condition knockbackConditions,
+public record KineticWeapon(float minReach, float maxReach, float hitboxMargin, int contactCooldownTicks,
+                            int delayTicks, @Nullable Condition dismountConditions, @Nullable Condition knockbackConditions,
                             @Nullable Condition damageConditions, float forwardMovement, float damageMultiplier,
                             @Nullable Sound sound, @Nullable Sound hitSound) {