Implement {Block,Item}.__str__(), refactor Slot.__repr__()

Author: Gjum

spockbot/mcdata/blocks.py

@@ -51,6 +51,10 @@ def __init__(self, meta=None):
         if self.id in _block_exts:
             _block_exts[self.id](self)
 
+    def __str__(self):
+        return '%s %i:%i' % (self.display_name, self.id,
+                             getattr(self, 'metadata', 0))
+
 
 def _convert_boundingbox(bb):
     if bb == 'block':

spockbot/mcdata/items.py

@@ -34,6 +34,10 @@ def __init__(self, meta=None):
             # TODO: apply other all possible variations
             self.display_name = self.variations[self.metadata]["display_name"]
 
+    def __str__(self):
+        return '%s %i:%i' % (self.display_name, self.id,
+                             getattr(self, 'metadata', 0))
+
 
 def _make_item(item_dict):
     cls_name = '%sItem' % camel_case(str(item_dict['name']))

spockbot/mcdata/windows.py

@@ -40,7 +40,6 @@ def __init__(self, window, slot_nr, id=constants.INV_ITEMID_EMPTY,
         self.damage = damage
         self.amount = amount
         self.nbt = enchants
-
         self.item = get_item_or_block(self.item_id, self.damage) or Item()
 
     def move_to_window(self, window, slot_nr):
@@ -83,20 +82,16 @@ def __bool__(self):
         return not self.is_empty
 
     def __repr__(self):
-        vals = {
-            'name': self.item.display_name,
-            'max': self.item.stack_size,
-        }
-        vals.update(self.__dict__)
         if self.is_empty:
             s = 'empty'
         else:
-            s = '%(amount)i/%(max)i %(item_id)i:%(damage)i %(name)s' % vals
+            item = self.item
+            s = '%i/%i %s' % (self.amount, item.stack_size, str(item))
 
         if self.slot_nr != -1:
-            s += ' at %(slot_nr)i' % self.__dict__
+            s += ' at %i' % self.slot_nr
         if self.window:
-            s += ' in %(window)s' % self.__dict__
+            s += ' in %s' % self.window
         return '<Slot: %s>' % s