Merge pull request #206 from Gjum/fixes

Fixes

Author: Gjum

examples/basic/example.py

@@ -39,14 +39,14 @@
     },
 }
 
-# Load the plugins. Any functionality that you want to implement must be called
-# from a plugin. You can define new plugins that listen for arbitrary events
-# from the game. Furthermore, events can even be periodic timers that trigger a
-# method.
+# Load the plugins.
+# Any functionality that you want to implement must be called from a plugin.
+# You can define new plugins that listen for arbitrary events from the game.
+# Furthermore, events can even be periodic timers that trigger a method.
 plugins = default_plugins
 plugins.append(('example', ExamplePlugin))
 
-# Instantiate and start the client, which will then run and wait for events to
-# occur
+# Instantiate and start the client, which will then
+# run and wait for events to occur.
 client = Client(plugins=plugins, settings=settings)
 client.start(SERVER, 25565)

spockbot/mcdata/items.py

@@ -20,10 +20,10 @@ def get_item(item, meta=None, init=True):
 
 
 class Item(object):
-    id = -1,
-    display_name = "Item",
-    stack_size = 0,
-    name = "item",
+    id = -1
+    display_name = "Item"
+    stack_size = 0
+    name = "item"
     variations = {}
 
     def __init__(self, meta=None):

spockbot/plugins/helpers/craft.py

@@ -99,7 +99,7 @@ def craft_task(self, recipe, amount=1):
         while amount > crafted_amt + inv.cursor_slot.amount:
             yield inv.async.click_slot(result_slot)
             # TODO check that cursor is non-empty, otherwise we did not craft
-            result_stack_size = inv.cursor_slot.max_amount
+            result_stack_size = inv.cursor_slot.stack_size
             if inv.cursor_slot.amount in (prev_cursor_amt, result_stack_size):
                 # cursor full, put away
                 crafted_amt += inv.cursor_slot.amount

spockbot/plugins/helpers/interact.py

@@ -211,15 +211,15 @@ def attack_entity(self, entity):
     def mount_vehicle(self, entity):
         self.use_entity(entity)
 
-    def steer_vehicle(self, sideways=0.0, forward=0.0,
+    def steer_vehicle(self, left=0.0, forward=0.0,
                       jump=False, unmount=False):
         flags = 0
         if jump:
             flags += 1
         if unmount:
             flags += 2
         self.net.push_packet('PLAY>Steer Vehicle', {
-            'sideways': sideways,
+            'sideways': left,
             'forward': forward,
             'flags': flags,
         })

spockbot/plugins/tools/inventory_async.py

@@ -28,7 +28,7 @@ def click_slot(self, slot, *args, **kwargs):
         # TODO make sure window is not closed while clicking
 
         empty_cursor = old_cursor.is_empty
-        if old_slot.amount == old_slot.max_amount and not empty_cursor \
+        if old_slot.amount == old_slot.item.stack_size and not empty_cursor \
                 or old_slot.is_empty and empty_cursor:
             return  # no need to check