Fix dropping items

Author: Gjum

spockbot/mcdata/windows.py

@@ -199,8 +199,11 @@ def __init__(self, slot, button=constants.INV_BUTTON_LEFT):
                 'Clicking with button %s not implemented' % button)
 
     def get_packet(self, inv_plugin):
+        slot_nr = self.slot.slot_nr
+        if self.slot == inv_plugin.cursor_slot:
+            slot_nr = constants.INV_OUTSIDE_WINDOW
         return {
-            'slot': self.slot.slot_nr,
+            'slot': slot_nr,
             'button': self.button,
             'mode': 0,
             'clicked_item': self.slot.get_dict(),
@@ -209,13 +212,19 @@ def get_packet(self, inv_plugin):
     def apply(self, inv_plugin):
         clicked = self.slot
         cursor = inv_plugin.cursor_slot
-        if self.button == constants.INV_BUTTON_LEFT:
+        if clicked == cursor:
+            if self.button == constants.INV_BUTTON_LEFT:
+                clicked.amount = 0
+            elif self.button == constants.INV_BUTTON_RIGHT:
+                clicked.amount -= 1
+            self.cleanup_if_empty(clicked)
+        elif self.button == constants.INV_BUTTON_LEFT:
             if clicked.stacks_with(cursor):
                 self.transfer(cursor, clicked, cursor.amount)
             else:
                 self.swap_slots(cursor, clicked)
         elif self.button == constants.INV_BUTTON_RIGHT:
-            if cursor.item_id == constants.INV_ITEMID_EMPTY:
+            if cursor.is_empty:
                 # transfer half, round up
                 self.transfer(clicked, cursor, (clicked.amount + 1) // 2)
             elif clicked.is_empty or clicked.stacks_with(cursor):
@@ -233,27 +242,24 @@ def __init__(self, slot, drop_stack=False):
         self.drop_stack = drop_stack
 
     def get_packet(self, inv_plugin):
-        if self.slot == inv_plugin.active_slot:
-            slot_nr = constants.INV_OUTSIDE_WINDOW  # drop cursor slot
-        elif inv_plugin.cursor_slot.item_id != constants.INV_ITEMID_EMPTY:
-            return None  # can't drop while holding an item
-        else:  # default case
-            slot_nr = self.slot.slot_nr
+        if self.slot == inv_plugin.cursor_slot:
+            raise ValueError("Can't drop cursor slot, use SingleClick")
+        if not inv_plugin.cursor_slot.is_empty:
+            raise ValueError("Can't drop other slots: cursor slot is occupied")
+
         return {
-            'slot': slot_nr,
+            'slot': self.slot.slot_nr,
             'button': 1 if self.drop_stack else 0,
             'mode': 4,
             'clicked_item': inv_plugin.cursor_slot.get_dict(),
         }
 
     def apply(self, inv_plugin):
-        if inv_plugin.cursor_slot.is_empty:
-            if self.drop_stack:
-                self.slot.amount = 0
-            else:
-                self.slot.amount -= 1
-            self.cleanup_if_empty(self.slot)
-        # else: cursor not empty, can't drop while holding an item
+        if self.drop_stack:
+            self.slot.amount = 0
+        else:
+            self.slot.amount -= 1
+        self.cleanup_if_empty(self.slot)
 
 
 class Window(object):

spockbot/plugins/helpers/inventory.py

@@ -86,7 +86,7 @@ def click_slot(self, slot, right=False):
 
         Args:
             slot (Slot): The clicked slot. Can be ``Slot`` instance or integer.
-                         Set to ``inventory.cursor_slot`` or -999
+                         Set to ``inventory.cursor_slot``
                          for clicking outside the window.
         """
         if isinstance(slot, int):
@@ -96,10 +96,32 @@ def click_slot(self, slot, right=False):
         return self.send_click(windows.SingleClick(slot, button))
 
     def drop_slot(self, slot=None, drop_stack=False):
-        if slot is None:  # drop held item
-            slot = self.active_slot
+        """
+        Drop one or all items of the slot.
+
+        Does not wait for confirmation from the server. If you want that,
+        use a ``Task`` and ``yield inventory.async.drop_slot()`` instead.
+
+        If ``slot`` is None, drops the ``cursor_slot`` or, if that's empty,
+        the currently held item (``active_slot``).
+
+        Args:
+            slot (Optional[Slot]): The dropped slot. Can be None, integer,
+                                   or ``Slot`` instance.
+
+        Returns:
+            int: The action ID of the click
+        """
+        if slot is None:
+            if self.cursor_slot.is_empty:
+                slot = self.active_slot
+            else:
+                slot = self.cursor_slot
         elif isinstance(slot, int):  # also allow slot nr
             slot = self.window.slots[slot]
+        if slot == self.cursor_slot:
+            # dropping items from cursor is done via normal click
+            return self.click_slot(self.cursor_slot, not drop_stack)
         return self.send_click(windows.DropClick(slot, drop_stack))
 
     def close_window(self):