25w20a

basaigh · basaigh · commit b958c389f531 · 2025-05-29T23:22:44.000+01:00
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java
@@ -1,6 +1,7 @@
 package org.geysermc.mcprotocollib.protocol.codec;
 
 import org.geysermc.mcprotocollib.protocol.data.ProtocolState;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundClearDialogPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomPayloadPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundCustomReportDetailsPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
@@ -21,6 +22,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundResetChatPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundSelectKnownPacks;
+import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundShowDialogConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundUpdateEnabledFeaturesPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundSelectKnownPacks;
@@ -49,6 +51,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSelectAdvancementsTabPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundServerDataPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSetCameraPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundShowDialogGamePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundSoundEntityPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStopSoundPacket;
@@ -156,6 +159,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundClientTickEndPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundCommandSuggestionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundCustomClickActionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundDebugSampleSubscriptionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundLockDifficultyPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundPlayerLoadedPacket;
@@ -191,6 +195,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundSignUpdatePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundTeleportToEntityPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.level.ServerboundTestInstanceBlockActionPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundChangeGameModePacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundInteractPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundMovePlayerPosRotPacket;
@@ -219,8 +224,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 249)
-            .minecraftVersion("25w19a")
+            .protocolVersion((1 << 30) | 250)
+            .minecraftVersion("25w20a")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )
@@ -259,6 +264,8 @@ public class MinecraftCodec {
                     .registerClientboundPacket(ClientboundSelectKnownPacks.class, ClientboundSelectKnownPacks::new)
                     .registerClientboundPacket(ClientboundCustomReportDetailsPacket.class, ClientboundCustomReportDetailsPacket::new)
                     .registerClientboundPacket(ClientboundServerLinksPacket.class, ClientboundServerLinksPacket::new)
+                    .registerClientboundPacket(ClientboundClearDialogPacket.class, ClientboundClearDialogPacket::new)
+                    .registerClientboundPacket(ClientboundShowDialogConfigurationPacket.class, ClientboundShowDialogConfigurationPacket::new)
                     .registerServerboundPacket(ServerboundClientInformationPacket.class, ServerboundClientInformationPacket::new)
                     .registerServerboundPacket(ServerboundCookieResponsePacket.class, ServerboundCookieResponsePacket::new)
                     .registerServerboundPacket(ServerboundCustomPayloadPacket.class, ServerboundCustomPayloadPacket::new)
@@ -400,10 +407,13 @@ public class MinecraftCodec {
                     .registerClientboundPacket(ClientboundCustomReportDetailsPacket.class, ClientboundCustomReportDetailsPacket::new)
                     .registerClientboundPacket(ClientboundServerLinksPacket.class, ClientboundServerLinksPacket::new)
                     .registerClientboundPacket(ClientboundTrackedWaypointPacket.class, ClientboundTrackedWaypointPacket::new)
+                    .registerClientboundPacket(ClientboundClearDialogPacket.class, ClientboundClearDialogPacket::new)
+                    .registerClientboundPacket(ClientboundShowDialogGamePacket.class, ClientboundShowDialogGamePacket::new)
                     .registerServerboundPacket(ServerboundAcceptTeleportationPacket.class, ServerboundAcceptTeleportationPacket::new)
                     .registerServerboundPacket(ServerboundBlockEntityTagQueryPacket.class, ServerboundBlockEntityTagQueryPacket::new)
                     .registerServerboundPacket(ServerboundSelectBundleItemPacket.class, ServerboundSelectBundleItemPacket::new)
                     .registerServerboundPacket(ServerboundChangeDifficultyPacket.class, ServerboundChangeDifficultyPacket::new)
+                    .registerServerboundPacket(ServerboundChangeGameModePacket.class, ServerboundChangeGameModePacket::new)
                     .registerServerboundPacket(ServerboundChatAckPacket.class, ServerboundChatAckPacket::new)
                     .registerServerboundPacket(ServerboundChatCommandPacket.class, ServerboundChatCommandPacket::new)
                     .registerServerboundPacket(ServerboundChatCommandSignedPacket.class, ServerboundChatCommandSignedPacket::new)
@@ -464,6 +474,7 @@ public class MinecraftCodec {
                     .registerServerboundPacket(ServerboundTestInstanceBlockActionPacket.class, ServerboundTestInstanceBlockActionPacket::new)
                     .registerServerboundPacket(ServerboundUseItemOnPacket.class, ServerboundUseItemOnPacket::new)
                     .registerServerboundPacket(ServerboundUseItemPacket.class, ServerboundUseItemPacket::new)
+                    .registerServerboundPacket(ServerboundCustomClickActionPacket.class, ServerboundCustomClickActionPacket::new)
             )
             .build();
 }
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandNode.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandNode.java
@@ -21,6 +21,11 @@ public class CommandNode {
      */
     private final boolean executable;
 
+    /**
+     * Whether restricted commands are allowed.
+     */
+    private final boolean allowsRestricted;
+
     /**
      * Child node indices.
      */
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java
@@ -56,6 +56,7 @@ public enum CommandParser {
     LOOT_TABLE,
     LOOT_PREDICATE,
     LOOT_MODIFIER,
+    DIALOG,
     UUID;
 
     private static final CommandParser[] VALUES = values();
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/SuggestionType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/SuggestionType.java
@@ -10,7 +10,6 @@
 
 public enum SuggestionType {
     ASK_SERVER,
-    ALL_RECIPES,
     AVAILABLE_SOUNDS,
     SUMMONABLE_ENTITIES;
 
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/Equippable.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/Equippable.java
@@ -9,5 +9,5 @@
 @Builder(toBuilder = true)
 public record Equippable(EquipmentSlot slot, Sound equipSound, @Nullable Key model, @Nullable Key cameraOverlay,
                          @Nullable HolderSet allowedEntities, boolean dispensable, boolean swappable, boolean damageOnHurt,
-                         boolean equipOnInteract) {
+                         boolean equipOnInteract, boolean canBeSheared, Sound shearingSound) {
 }
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/ItemTypes.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/item/component/ItemTypes.java
@@ -172,7 +172,9 @@ public static Equippable readEquippable(ByteBuf buf) {
         boolean swappable = buf.readBoolean();
         boolean damageOnHurt = buf.readBoolean();
         boolean equipOnInteract = buf.readBoolean();
-        return new Equippable(slot, equipSound, model, cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt, equipOnInteract);
+        boolean canBeSheared = buf.readBoolean();
+        Sound shearingSound = MinecraftTypes.readSound(buf);
+        return new Equippable(slot, equipSound, model, cameraOverlay, allowedEntities, dispensable, swappable, damageOnHurt, equipOnInteract, canBeSheared, shearingSound);
     }
 
     public static void writeEquippable(ByteBuf buf, Equippable equippable) {
@@ -185,6 +187,8 @@ public static void writeEquippable(ByteBuf buf, Equippable equippable) {
         buf.writeBoolean(equippable.swappable());
         buf.writeBoolean(equippable.damageOnHurt());
         buf.writeBoolean(equippable.equipOnInteract());
+        buf.writeBoolean(equippable.canBeSheared());
+        MinecraftTypes.writeSound(buf, equippable.shearingSound());
     }
 
     public static BlocksAttacks readBlocksAttacks(ByteBuf buf) {
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java
@@ -955,6 +955,7 @@ public enum BuiltinSound implements Sound {
     MUSIC_DISC_CREATOR("music_disc.creator"),
     MUSIC_DISC_CREATOR_MUSIC_BOX("music_disc.creator_music_box"),
     MUSIC_DISC_PRECIPICE("music_disc.precipice"),
+    MUSIC_DISC_TEARS("music_disc.tears"),
     MUSIC_DRAGON("music.dragon"),
     MUSIC_END("music.end"),
     MUSIC_GAME("music.game"),
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/Difficulty.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/setting/Difficulty.java
@@ -9,6 +9,6 @@ public enum Difficulty {
     private static final Difficulty[] VALUES = values();
 
     public static Difficulty from(int id) {
-        return VALUES[id];
+        return VALUES[Math.floorMod(id, VALUES.length)];
     }
 }
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundClearDialogPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundClearDialogPacket.java
@@ -0,0 +1,25 @@
+package org.geysermc.mcprotocollib.protocol.packet.common.clientbound;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+
+@Data
+@With
+@AllArgsConstructor
+public class ClientboundClearDialogPacket implements MinecraftPacket {
+
+    public ClientboundClearDialogPacket(ByteBuf in) {
+    }
+
+    @Override
+    public void serialize(ByteBuf out) {
+    }
+
+    @Override
+    public boolean shouldRunOnGameThread() {
+        return true;
+    }
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundShowDialogConfigurationPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/configuration/clientbound/ClientboundShowDialogConfigurationPacket.java
@@ -0,0 +1,30 @@
+package org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+import org.cloudburstmc.nbt.NbtMap;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+
+@Data
+@With
+@AllArgsConstructor
+public class ClientboundShowDialogConfigurationPacket implements MinecraftPacket {
+    private final NbtMap dialog;
+
+    public ClientboundShowDialogConfigurationPacket(ByteBuf in) {
+        this.dialog = MinecraftTypes.readCompoundTag(in);
+    }
+
+    @Override
+    public void serialize(ByteBuf out) {
+        MinecraftTypes.writeAnyTag(out, this.dialog);
+    }
+
+    @Override
+    public boolean shouldRunOnGameThread() {
+        return true;
+    }
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundChangeDifficultyPacket.java
@@ -6,6 +6,7 @@
 import lombok.NonNull;
 import lombok.With;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.setting.Difficulty;
 
 @Data
@@ -16,13 +17,13 @@ public class ClientboundChangeDifficultyPacket implements MinecraftPacket {
     private final boolean difficultyLocked;
 
     public ClientboundChangeDifficultyPacket(ByteBuf in) {
-        this.difficulty = Difficulty.from(in.readUnsignedByte());
+        this.difficulty = Difficulty.from(MinecraftTypes.readVarInt(in));
         this.difficultyLocked = in.readBoolean();
     }
 
     @Override
     public void serialize(ByteBuf out) {
-        out.writeByte(this.difficulty.ordinal());
+        MinecraftTypes.writeVarInt(out, this.difficulty.ordinal());
         out.writeBoolean(this.difficultyLocked);
     }
 
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacket.java
@@ -32,6 +32,7 @@ public class ClientboundCommandsPacket implements MinecraftPacket {
     private static final int FLAG_EXECUTABLE = 0x04;
     private static final int FLAG_REDIRECT = 0x08;
     private static final int FLAG_SUGGESTION_TYPE = 0x10;
+    private static final int FLAG_RESTRICTED = 0x20;
 
     private static final int NUMBER_FLAG_MIN_DEFINED = 0x01;
     private static final int NUMBER_FLAG_MAX_DEFINED = 0x02;
@@ -48,6 +49,7 @@ public ClientboundCommandsPacket(ByteBuf in) {
             byte flags = in.readByte();
             CommandType type = CommandType.from(flags & FLAG_TYPE_MASK);
             boolean executable = (flags & FLAG_EXECUTABLE) != 0;
+            boolean restricted = (flags & FLAG_RESTRICTED) != 0;
 
             int[] children = new int[MinecraftTypes.readVarInt(in)];
             for (int j = 0; j < children.length; j++) {
@@ -146,7 +148,7 @@ public ClientboundCommandsPacket(ByteBuf in) {
                 }
             }
 
-            this.nodes[i] = new CommandNode(type, executable, children, redirectIndex, name, parser, properties, suggestionType);
+            this.nodes[i] = new CommandNode(type, executable, restricted, children, redirectIndex, name, parser, properties, suggestionType);
         }
 
         this.firstNodeIndex = MinecraftTypes.readVarInt(in);
@@ -169,6 +171,10 @@ public void serialize(ByteBuf out) {
                 flags |= FLAG_SUGGESTION_TYPE;
             }
 
+            if (node.isAllowsRestricted()) {
+                flags |= FLAG_RESTRICTED;
+            }
+
             out.writeByte(flags);
 
             MinecraftTypes.writeVarInt(out, node.getChildIndices().length);
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundShowDialogGamePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundShowDialogGamePacket.java
@@ -0,0 +1,31 @@
+package org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+import org.cloudburstmc.nbt.NbtMap;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+import org.geysermc.mcprotocollib.protocol.data.game.Holder;
+
+@Data
+@With
+@AllArgsConstructor
+public class ClientboundShowDialogGamePacket implements MinecraftPacket {
+    private final Holder<NbtMap> dialog;
+
+    public ClientboundShowDialogGamePacket(ByteBuf in) {
+        this.dialog = MinecraftTypes.readHolder(in, MinecraftTypes::readCompoundTag);
+    }
+
+    @Override
+    public void serialize(ByteBuf out) {
+        MinecraftTypes.writeHolder(out, this.dialog, MinecraftTypes::writeAnyTag);
+    }
+
+    @Override
+    public boolean shouldRunOnGameThread() {
+        return true;
+    }
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundChangeDifficultyPacket.java
@@ -6,6 +6,7 @@
 import lombok.NonNull;
 import lombok.With;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
 import org.geysermc.mcprotocollib.protocol.data.game.setting.Difficulty;
 
 @Data
@@ -15,12 +16,12 @@ public class ServerboundChangeDifficultyPacket implements MinecraftPacket {
     private final @NonNull Difficulty difficulty;
 
     public ServerboundChangeDifficultyPacket(ByteBuf in) {
-        this.difficulty = Difficulty.from(in.readByte());
+        this.difficulty = Difficulty.from(MinecraftTypes.readVarInt(in));
     }
 
     @Override
     public void serialize(ByteBuf out) {
-        out.writeByte(this.difficulty.ordinal());
+        MinecraftTypes.writeVarInt(out, this.difficulty.ordinal());
     }
 
     @Override
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundCustomClickActionPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/ServerboundCustomClickActionPacket.java
@@ -0,0 +1,34 @@
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+import net.kyori.adventure.key.Key;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+import org.jetbrains.annotations.Nullable;
+
+@Data
+@With
+@AllArgsConstructor
+public class ServerboundCustomClickActionPacket implements MinecraftPacket {
+    private final Key id;
+    private final @Nullable String payload;
+
+    public ServerboundCustomClickActionPacket(ByteBuf in) {
+        this.id = MinecraftTypes.readResourceLocation(in);
+        this.payload = MinecraftTypes.readNullable(in, MinecraftTypes::readString);
+    }
+
+    @Override
+    public void serialize(ByteBuf out) {
+        MinecraftTypes.writeResourceLocation(out, this.id);
+        MinecraftTypes.writeNullable(out, this.payload, MinecraftTypes::writeString);
+    }
+
+    @Override
+    public boolean shouldRunOnGameThread() {
+        return true;
+    }
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundChangeGameModePacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundChangeGameModePacket.java
@@ -0,0 +1,30 @@
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.GameMode;
+
+@Data
+@With
+@AllArgsConstructor
+public class ServerboundChangeGameModePacket implements MinecraftPacket {
+    private final GameMode mode;
+
+    public ServerboundChangeGameModePacket(ByteBuf in) {
+        this.mode = GameMode.byId(MinecraftTypes.readVarInt(in));
+    }
+
+    @Override
+    public void serialize(ByteBuf out) {
+        MinecraftTypes.writeVarInt(out, this.mode.ordinal());
+    }
+
+    @Override
+    public boolean shouldRunOnGameThread() {
+        return true;
+    }
+}
diff --git a/protocol/src/main/resources/networkCodec.nbt b/protocol/src/main/resources/networkCodec.nbt
diff --git a/protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java b/protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundCommandsPacketTest.java

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@`
`9`	`9`	`@Builder(toBuilder = true)`
`10`	`10`	`public record Equippable(EquipmentSlot slot, Sound equipSound, @Nullable Key model, @Nullable Key cameraOverlay,`
`11`	`11`	`@Nullable HolderSet allowedEntities, boolean dispensable, boolean swappable, boolean damageOnHurt,`
`12`		`- boolean equipOnInteract) {`
	`12`	`+ boolean equipOnInteract, boolean canBeSheared, Sound shearingSound) {`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public enum Difficulty {`
`9`	`9`	`private static final Difficulty[] VALUES = values();`
`10`	`10`
`11`	`11`	`public static Difficulty from(int id) {`
`12`		`- return VALUES[id];`
	`12`	`+ return VALUES[Math.floorMod(id, VALUES.length)];`
`13`	`13`	`}`
`14`	`14`	`}`