Item cooldowns: the sweep on a slot, and no use while one runs
Nothing tracked `ItemCooldowns`: `draw_item_decorations` passed a cooldown of 0.0 with a note that there was none to shade, and ender pearls were held back by an ad-hoc `pearl_cooldown` counter. `horizon_client::cooldowns` keeps the `use_cooldown` component's entries by cooldown group the way `Player.getCooldowns` does (start and end ticks, the percent `getCooldownPercent` returns), `ItemInfo` now carries the item's `use_cooldown`, and the game uses it where vanilla does: `ServerPlayerGameMode.useItem`/useItemOn refuse a stack on cooldown, `ItemStack.applyAfterUseComponentSideEffects` starts the entry when a use finishes (a thrown pearl, a wind charge, an eaten chorus fruit), `GuiGraphicsExtractor.itemCooldown` shades the slot, and a server's guests keep their own and are sent `ClientboundCooldownPacket` (started, and 0 when it ends), which a client applies. Fixes #1763 Co-Authored-By: [CC] <deepseek-v4.1-flash> <noreply@deepseek.com>
This commit is contained in:
@@ -176,6 +176,9 @@ packet!(
|
||||
}
|
||||
);
|
||||
packet!(ContainerSetData { container: i32 => VarInt, id: i16 => Short, value: i16 => Short });
|
||||
// ClientboundCooldownPacket: the cooldown group (an identifier) and the ticks
|
||||
// its entry lasts (0 ends it).
|
||||
packet!(Cooldown { group: String => Ident, duration: i32 => VarInt });
|
||||
packet!(ContainerSetSlot { container: i32 => VarInt, state: i32 => VarInt, slot: i16 => Short, item: Option<Stack> => Slot });
|
||||
/// A holder reference: registry id + 1, or 0 for an inline value (unsupported).
|
||||
pub struct HolderId;
|
||||
@@ -1761,6 +1764,7 @@ packet_enum!(Clientbound, crate::ids::play::clientbound {
|
||||
ContainerSetData(ContainerSetData) = CONTAINER_SET_DATA,
|
||||
ContainerSetSlot(ContainerSetSlot) = CONTAINER_SET_SLOT,
|
||||
CookieRequest(CookieRequest) = COOKIE_REQUEST,
|
||||
Cooldown(Cooldown) = COOLDOWN,
|
||||
CustomPayload(CustomPayload) = CUSTOM_PAYLOAD,
|
||||
Disconnect(Disconnect) = DISCONNECT,
|
||||
DisguisedChat(DisguisedChat) = DISGUISED_CHAT,
|
||||
@@ -2894,6 +2898,24 @@ mod tests {
|
||||
round_trip(beacon, Serverbound::encode, Serverbound::decode);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_cooldown_packet_carries_its_group_and_ticks() {
|
||||
let packet = Clientbound::Cooldown(Cooldown {
|
||||
group: "minecraft:ender_pearl".into(),
|
||||
duration: 20,
|
||||
});
|
||||
round_trip(packet, Clientbound::encode, Clientbound::decode);
|
||||
// The group is an identifier, the ticks a VarInt; a duration of 0
|
||||
// removes the entry.
|
||||
let body = Clientbound::encode(&Clientbound::Cooldown(Cooldown {
|
||||
group: "minecraft:ender_pearl".into(),
|
||||
duration: 0,
|
||||
}));
|
||||
assert_eq!(body[0], crate::ids::play::clientbound::COOLDOWN as u8);
|
||||
assert_eq!(&body[1..3], [21, b'm']);
|
||||
assert_eq!(body[body.len() - 1], 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn change_game_mode_uses_the_game_type_varint() {
|
||||
for mode in 0..=3 {
|
||||
|
||||
Reference in New Issue
Block a user