Fix dupe, doubble click and shift click

pumpkin-inventory/src/container_click.rs

@@ -2,6 +2,7 @@ use crate::InventoryError;
 use pumpkin_protocol::server::play::SlotActionType;
 use pumpkin_world::item::ItemStack;
 
+#[derive(Debug)]
 pub struct Click {
     pub slot: Slot,
     pub click_type: ClickType,
@@ -18,7 +19,7 @@ impl Click {
                 click_type: ClickType::CreativePickItem,
                 slot: Slot::Normal(slot.try_into().or(Err(InventoryError::InvalidSlot))?),
             }),
-            SlotActionType::Throw => Self::new_drop_item(button),
+            SlotActionType::Throw => Self::new_drop_item(button, slot),
             SlotActionType::QuickCraft => Self::new_drag_item(button, slot),
             SlotActionType::PickupAll => Ok(Self {
                 click_type: ClickType::DoubleClick,
@@ -66,15 +67,22 @@ impl Click {
         })
     }
 
-    fn new_drop_item(button: i8) -> Result<Self, InventoryError> {
+    fn new_drop_item(button: i8, slot: i16) -> Result<Self, InventoryError> {
         let drop_type = match button {
             0 => DropType::SingleItem,
             1 => DropType::FullStack,
             _ => Err(InventoryError::InvalidPacket)?,
         };
+        let slot = match slot {
+            -999 => Slot::OutsideInventory,
+            _ => {
+                let slot = slot.try_into().unwrap_or(0);
+                Slot::Normal(slot)
+            }
+        };
         Ok(Self {
             click_type: ClickType::DropType(drop_type),
-            slot: Slot::OutsideInventory,
+            slot,
         })
     }
 
@@ -120,7 +128,7 @@ pub enum KeyClick {
     Slot(u8),
     Offhand,
 }
-#[derive(Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
 pub enum Slot {
     Normal(usize),
     OutsideInventory,

pumpkin-inventory/src/player.rs

@@ -122,6 +122,10 @@ impl PlayerInventory {
         self.selected + 36
     }
 
+    pub fn increment_state_id(&mut self) {
+        self.state_id = self.state_id % 100 + 1;
+    }
+
     pub fn held_item(&self) -> Option<&ItemStack> {
         debug_assert!((0..9).contains(&self.selected));
         self.items[self.selected as usize + 36 - 9].as_ref()

pumpkin-protocol/src/server/play/click_container.rs

@@ -6,6 +6,7 @@ use serde::de::SeqAccess;
 use serde::{Deserialize, de};
 
 #[server_packet(PLAY_CONTAINER_CLICK)]
+#[derive(Debug)]
 pub struct SClickContainer {
     pub window_id: VarInt,
     pub state_id: VarInt,
@@ -86,7 +87,7 @@ impl<'de> Deserialize<'de> for SClickContainer {
     }
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub enum SlotActionType {
     /// Performs a normal slot click. This can pickup or place items in the slot, possibly merging the cursor stack into the slot, or swapping the slot stack with the cursor stack if they can't be merged.
     Pickup,

pumpkin-world/src/item/categories.rs

@@ -1,68 +1,70 @@
+use pumpkin_data::item::Item;
+
 use crate::item::ItemStack;
 
 impl ItemStack {
     pub fn is_sword(&self) -> bool {
         [
-            818, // Wooden
-            823, // Stone
-            828, // Gold
-            833, // Iron
-            838, // Diamond
-            843, // Netherite
+            Item::WOODEN_SWORD.id,    // Wooden
+            Item::STONE_SWORD.id,     // Stone
+            Item::GOLDEN_SWORD.id,    // Gold
+            Item::IRON_SWORD.id,      // Iron
+            Item::DIAMOND_SWORD.id,   // Diamond
+            Item::NETHERITE_SWORD.id, // Netherite
         ]
         .contains(&self.item.id)
     }
 
     pub fn is_helmet(&self) -> bool {
         [
             // Leather
-            856, // Netherite
-            876, // Turtle helmet
-            794, // Chainmail
-            860, // Diamond
-            868, // Gold
-            872, // Iron
-            864,
+            Item::NETHERITE_HELMET.id, // Netherite
+            Item::TURTLE_HELMET.id,    // Turtle helmet
+            Item::CHAINMAIL_HELMET.id, // Chainmail
+            Item::DIAMOND_HELMET.id,   // Diamond
+            Item::GOLDEN_HELMET.id,    // Gold
+            Item::IRON_HELMET.id,      // Iron
+            Item::LEATHER_HELMET.id,
         ]
         .contains(&self.item.id)
     }
 
     pub fn is_chestplate(&self) -> bool {
         [
             // Leather
-            857, // Netherite
-            877, // Chainmail
-            861, // Diamond
-            869, // Gold
-            873, // Iron
-            865, // Elytra
-            773,
+            Item::NETHERITE_CHESTPLATE.id, // Netherite
+            Item::CHAINMAIL_CHESTPLATE.id, // Chainmail
+            Item::DIAMOND_CHESTPLATE.id,   // Diamond
+            Item::GOLDEN_CHESTPLATE.id,    // Gold
+            Item::IRON_CHESTPLATE.id,      // Iron
+            Item::ELYTRA.id,               // Elytra
+            Item::LEATHER_CHESTPLATE.id,
         ]
         .contains(&self.item.id)
     }
 
     pub fn is_leggings(&self) -> bool {
         [
             // Leather
-            858, // Netherite
-            878, // Chainmail
-            862, // Diamond
-            870, // Gold
-            874, // Iron
-            866,
+            Item::NETHERITE_LEGGINGS.id, // Netherite
+            Item::CHAINMAIL_LEGGINGS.id, // Chainmail
+            Item::DIAMOND_LEGGINGS.id,   // Diamond
+            Item::GOLDEN_LEGGINGS.id,    // Gold
+            Item::IRON_LEGGINGS.id,      // Iron
+            Item::LEATHER_LEGGINGS.id,
         ]
         .contains(&self.item.id)
     }
 
     pub fn is_boots(&self) -> bool {
         [
             // Leather
-            859, // Netherite
-            879, // Chainmail
-            863, // Diamond
-            871, // Gold
-            875, // Iron
-            867,
+            Item::NETHERITE_BOOTS.id, // Netherite
+            Item::CHAINMAIL_BOOTS.id, // Chainmail
+            Item::DIAMOND_BOOTS.id,   // Diamond
+            Item::GOLDEN_BOOTS.id,    // Gold
+            Item::IRON_BOOTS.id,      // Iron
+            Item::LEATHER_BOOTS.id,
         ]
         .contains(&self.item.id)
     }