removed (now empty) python block definition subpackage

overviewer · Jan 2, 2014 · 47a8381 · 47a8381
1 parent a924ecf
commit 47a8381
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 147 deletions.
diff --git a/overviewer/blockdefinitions.py b/overviewer/blockdefinitions.py
@@ -400,12 +400,9 @@ def add_from_path(bd, path, namemap={}):
     bd.add(bdef, blockid)
 
 def get_default():
-    bd = BlockDefinitions()
-
-    from overviewer import blocks
-    blocks.get_all(bd)
-
+    bd = BlockDefinitions()    
     blockspath = os.path.join(util.get_program_path(), "overviewer", "data", "blocks")
+
     for root, subdirs, files in os.walk(blockspath):
         del subdirs[:]
 

diff --git a/overviewer/blocks/__init__.py b/overviewer/blocks/__init__.py
diff --git a/overviewer/blocks/cubes.py b/overviewer/blocks/cubes.py
diff --git a/overviewer/blocks/glass_panes.py b/overviewer/blocks/glass_panes.py
diff --git a/overviewer/wxexplorer.py b/overviewer/wxexplorer.py
@@ -13,7 +13,6 @@
     'world',
     'isometricrenderer',
     'blockdefinitions',
-    'blocks',
     'cache'
 ]
 
@@ -30,11 +29,6 @@ def reload_all(verbose=False):
                 reload(sys.modules[name])
         verbose = False
 
-    for name in sys.modules['overviewer.blocks'].block_modules:
-        name = 'blocks.' + name
-        if not name in modules:
-            modules.append(name)
-
     for name, mod in sys.modules.items():
         if not isinstance(mod, types.ModuleType):
             continue