Move blocks, items, mcdata, mobs to info/ folder

mosfet/bot.py

@@ -24,17 +24,17 @@ from mosfet.protocol.managers import DataManager, ChunksManager, ChatManager, Ch
 
 from munch import Munch
 
-from mosfet import blocks
 from mosfet import game
-from mosfet import items
 from mosfet import job
-from mosfet import mcdata
-from mosfet import mobs
 from mosfet import path
 from mosfet import print_help
 from mosfet import utils
 from mosfet import vector
 from mosfet import world
+from mosfet.info import blocks
+from mosfet.info import items
+from mosfet.info import mcdata
+from mosfet.info import mobs
 
 for module in [
     blocks,

mosfet/game.py

@@ -25,12 +25,12 @@ from mosfet.protocol.types import Slot
 from mosfet import print_help
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
-from mosfet import items
-from mosfet import mcdata
-from mosfet import mobs
 from mosfet import bot
 from mosfet import vector
+from mosfet.info import blocks
+from mosfet.info import items
+from mosfet.info import mcdata
+from mosfet.info import mobs
 
 class Game:
     def __init__(self, global_state):

mosfet/info/blocks.py

@@ -1,7 +1,7 @@
 import json
 import importlib
 
-from mosfet import mcdata
+from mosfet.info import mcdata
 
 MCD_BLOCKS = {}
 for d in mcdata.mcd.blocks.values():

mosfet/job.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 from mosfet.jobs import (
     cache_items,

mosfet/jobs/cache_items.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class CacheItemsStates:
     def idle(self):

mosfet/jobs/check_threats.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class CheckThreatsStates:
     def idle(self):

mosfet/jobs/clear_leaves.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class ClearLeavesStates:
     def idle(self):

mosfet/jobs/eat_food.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class EatFoodStates:
     def idle(self):

mosfet/jobs/fill_blocks.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class FillBlocksStates:
     def idle(self):

mosfet/jobs/find_gapple.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class FindGappleStates:
     def idle(self):

mosfet/jobs/gather_crop.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GatherCropStates:
     def idle(self):

mosfet/jobs/gather_sand.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GatherSandStates:
     def bair(self, p):

mosfet/jobs/gather_wart.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GatherWartStates:
     def idle(self):
@@ -48,7 +48,7 @@ class GatherWartStates:
         navpath = w.path_to_place(p, self.wart)
 
         if navpath:
-            print('Going to wart', self.crop)
+            print('Going to wart', self.wart)
             self.g.path = navpath
             self.g.look_at = utils.padd(self.wart, path.BLOCK_BELOW)
             self.state = self.going_to_wart

mosfet/jobs/gather_wood.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GatherWoodStates:
     def bair(self, p):

mosfet/jobs/grab_sand.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GrabSandStates:
     def idle(self):

mosfet/jobs/grab_sapling.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GrabSaplingStates:
     def idle(self):

mosfet/jobs/grab_supplies.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class GrabSuppliesStates:
     def idle(self):

mosfet/jobs/plant_tree.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class PlantTreeStates:
     def idle(self):

mosfet/jobs/sell_to_villager.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class SellToVillagerStates:
     def idle(self):

mosfet/jobs/sleep_with_bed.py

@@ -11,10 +11,10 @@ from mosfet.protocol.managers import ChunkNotLoadedException
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import items
+from mosfet.info import items
-from mosfet import mcdata
+from mosfet.info import mcdata
-from mosfet import mobs
+from mosfet.info import mobs
 
 class SleepWithBedStates:
     def idle(self):

mosfet/path.py

@@ -5,7 +5,7 @@ from math import hypot, sqrt
 
 from astar import AStar
 
-from mosfet import blocks
+from mosfet.info import blocks
 from mosfet import utils
 
 class AStarTimeout(Exception):

mosfet/protocol/packets.py

@@ -10,7 +10,7 @@ from minecraft.networking.types import (
 
 from .types import Nbt, Slot, Entry, Trade
 
-from mosfet import blocks
+from mosfet.info import blocks
 
 
 class ChunkDataPacket(Packet):

mosfet/utils.py

@@ -2,8 +2,8 @@ import importlib
 import collections
 from math import floor, ceil, sqrt, hypot
 
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import mcdata
+from mosfet.info import mcdata
 
 TICK = 0.05
 

mosfet/world.py

@@ -8,8 +8,8 @@ from copy import copy
 
 from mosfet import utils
 from mosfet import path
-from mosfet import blocks
+from mosfet.info import blocks
-from mosfet import mobs
+from mosfet.info import mobs
 
 class World:
     def __init__(self, global_state):