25w46a

Author: basaigh

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

@@ -109,7 +109,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetContentPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetDataPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundContainerSetSlotPacket;
-import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundHorseScreenOpenPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundMountScreenOpenPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundMerchantOffersPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundOpenBookPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.inventory.ClientboundOpenScreenPacket;
@@ -231,8 +231,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 277)
-            .minecraftVersion("25w45a")
+            .protocolVersion((1 << 30) | 278)
+            .minecraftVersion("25w46a")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )
@@ -325,7 +325,7 @@ public class MinecraftCodec {
                     .registerClientboundPacket(ClientboundForgetLevelChunkPacket.class, ClientboundForgetLevelChunkPacket::new)
                     .registerClientboundPacket(ClientboundGameEventPacket.class, ClientboundGameEventPacket::new)
                     .registerClientboundPacket(ClientboundGameTestHighlightPosPacket.class, ClientboundGameTestHighlightPosPacket::new)
-                    .registerClientboundPacket(ClientboundHorseScreenOpenPacket.class, ClientboundHorseScreenOpenPacket::new)
+                    .registerClientboundPacket(ClientboundMountScreenOpenPacket.class, ClientboundMountScreenOpenPacket::new)
                     .registerClientboundPacket(ClientboundHurtAnimationPacket.class, ClientboundHurtAnimationPacket::new)
                     .registerClientboundPacket(ClientboundInitializeBorderPacket.class, ClientboundInitializeBorderPacket::new)
                     .registerClientboundPacket(ClientboundKeepAlivePacket.class, ClientboundKeepAlivePacket::new)

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

@@ -38,13 +38,15 @@ public static <T> void writeFilterable(ByteBuf buf, Filterable<T> filterable, Bi
 
     public static UseEffects readUseEffects(ByteBuf buf) {
         boolean canSprint = buf.readBoolean();
+        boolean interactVibrations = buf.readBoolean();
         float speedMultiplier = buf.readFloat();
 
-        return new UseEffects(canSprint, speedMultiplier);
+        return new UseEffects(canSprint, interactVibrations, speedMultiplier);
     }
 
     public static void writeUseEffects(ByteBuf buf, UseEffects useEffects) {
         buf.writeBoolean(useEffects.canSprint());
+        buf.writeBoolean(useEffects.interactVibrations());
         buf.writeFloat(useEffects.speedMultiplier());
     }
 

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

@@ -3,5 +3,5 @@
 import lombok.Builder;
 
 @Builder(toBuilder = true)
-public record UseEffects(boolean canSprint, float speedMultiplier) {
+public record UseEffects(boolean canSprint, boolean interactVibrations, float speedMultiplier) {
 }

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

@@ -1804,6 +1804,7 @@ public enum BuiltinSound implements Sound {
     ENTITY_ZOMBIE_HORSE_AMBIENT("entity.zombie_horse.ambient"),
     ENTITY_ZOMBIE_HORSE_ANGRY("entity.zombie_horse.angry"),
     ENTITY_ZOMBIE_HORSE_DEATH("entity.zombie_horse.death"),
+    ENTITY_ZOMBIE_HORSE_EAT("entity.zombie_horse.eat"),
     ENTITY_ZOMBIE_HORSE_HURT("entity.zombie_horse.hurt"),
     ENTITY_ZOMBIE_HURT("entity.zombie.hurt"),
     ENTITY_ZOMBIE_INFECT("entity.zombie.infect"),

…ry/ClientboundHorseScreenOpenPacket.java …ry/ClientboundMountScreenOpenPacket.javaprotocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java renamed to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundMountScreenOpenPacket.java protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundHorseScreenOpenPacket.java renamed to protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/inventory/ClientboundMountScreenOpenPacket.java

@@ -10,12 +10,12 @@
 @Data
 @With
 @AllArgsConstructor
-public class ClientboundHorseScreenOpenPacket implements MinecraftPacket {
+public class ClientboundMountScreenOpenPacket implements MinecraftPacket {
     private final int containerId;
     private final int inventoryColumns;
     private final int entityId;
 
-    public ClientboundHorseScreenOpenPacket(ByteBuf in) {
+    public ClientboundMountScreenOpenPacket(ByteBuf in) {
         this.containerId = MinecraftTypes.readVarInt(in);
         this.inventoryColumns = MinecraftTypes.readVarInt(in);
         this.entityId = in.readInt();