Port and tune 26.3 wood farming

mosfet/jobs/grab_supplies.py

@@ -13,7 +13,6 @@ from mosfet import utils
 from mosfet import path
 from mosfet.info import blocks
 from mosfet.info import items
-from mosfet.info import mcdata
 from mosfet.info import mobs
 
 class GrabSuppliesStates:
@@ -160,8 +159,8 @@ class GrabSuppliesStates:
             print('Didnt get a window, aborting')
             self.state = self.cleanup
             return
-        if w.data.window_type != mcdata.SINGLE_CHEST:
-            print('Got wrong window, aborting')
+        if w.get('container_slots', 0) != 27:
+            print('Got wrong container size, aborting')
             self.state = self.cleanup
             return
         used_slots = self.g.game.count_inventory_slots()
@@ -173,10 +172,7 @@ class GrabSuppliesStates:
             self.state = self.cleanup
             return
 
-        w_info = mcdata.WINDOWS[w.data.window_type]
-        w_container_slots = w_info.container
-
-        for slot_num in w_container_slots:
+        for slot_num in range(w.container_slots):
             if slot_num not in w.contents:
                 continue