merge main

1 files changed, 4 insertions, 15 deletions

diff --git a/azalea-protocol/src/packets/game/serverbound_container_click_packet.rs b/azalea-protocol/src/packets/game/serverbound_container_click_packet.rs
index 768d3f94..119af220 100755
--- a/azalea-protocol/src/packets/game/serverbound_container_click_packet.rs
+++ b/azalea-protocol/src/packets/game/serverbound_container_click_packet.rs
@@ -1,5 +1,5 @@
 use azalea_buf::McBuf;
-use azalea_core::Slot;
+use azalea_inventory::{operations::ClickType, ItemSlot};
 use azalea_protocol_macros::ServerboundGamePacket;
 use std::collections::HashMap;
 
@@ -8,20 +8,9 @@ pub struct ServerboundContainerClickPacket {
     pub container_id: u8,
     #[var]
     pub state_id: u32,
-    pub slot_num: u16,
+    pub slot_num: i16,
     pub button_num: u8,
     pub click_type: ClickType,
-    pub changed_slots: HashMap<u16, Slot>,
-    pub carried_item: Slot,
-}
-
-#[derive(McBuf, Clone, Copy, Debug)]
-pub enum ClickType {
-    Pickup = 0,
-    QuickMove = 1,
-    Swap = 2,
-    Clone = 3,
-    Throw = 4,
-    QuickCraft = 5,
-    PickupAll = 6,
+    pub changed_slots: HashMap<u16, ItemSlot>,
+    pub carried_item: ItemSlot,
 }