Basic layout added

gamingrobot · gamingrobot · commit b0a42ee0e4ad · 2015-08-22T15:30:32.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 build/
 dist/
-minecraft_data.egg-info
+minecraft_data.egg-info
+*.pyc
+__pycache__
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
-[submodule "data/1.9"]
-	path = data/1.9
-	url = https://github.com/PrismarineJS/minecraft-data.git
-	branch = 1.9
-[submodule "data/1.8"]
-	path = data/1.8
+[submodule "minecraft_data/v1_8/data"]
+	path = minecraft_data/v1_8/data
 	url = https://github.com/PrismarineJS/minecraft-data.git
 	branch = 1.8
+[submodule "minecraft_data/v1_9/data"]
+	path = minecraft_data/v1_9/data
+	url = https://github.com/PrismarineJS/minecraft-data.git
+	branch = 1.9
diff --git a/example.py b/example.py
@@ -1,3 +1,7 @@
-from minecraft_data import recipes
+from minecraft_data.v1_8 import recipes
 
-print(recipes["5"][0])
+print(recipes["5"][0])
+
+from minecraft_data.v1_9 import recipes as recipes2
+
+print(recipes2["5"][0])
diff --git a/minecraft_data/__init__.py b/minecraft_data/__init__.py
@@ -1,15 +0,0 @@
-import json
-
-
-def read_json(name, version):
-    f = open('data/'+version+'/enums/'+name+'.json', 'r')
-    return json.loads(f.read())
-
-blocks = read_json('blocks', '1.8')
-biomes = read_json('biomes', '1.8')
-items = read_json('items', '1.8')
-recipes = read_json('recipes', '1.8')
-instruments = read_json('instruments', '1.8')
-materials = read_json('materials', '1.8')
-entities = read_json('entities', '1.8')
-protocol = read_json('protocol', '1.8')
diff --git a/minecraft_data/tools/__init__.py b/minecraft_data/tools/__init__.py
@@ -0,0 +1,13 @@
+import json
+import os
+from glob import glob
+
+
+def convert(dir):
+    data = dict()
+    for filename in glob(os.path.join(dir, "data/enums/")+"*.json"):
+        with open(filename) as fp:
+            base = os.path.splitext(os.path.basename(filename))[0]
+            doc = json.load(fp)
+            data[base] = doc
+    return data
diff --git a/minecraft_data/v1_8/__init__.py b/minecraft_data/v1_8/__init__.py
@@ -0,0 +1,9 @@
+import os
+import sys
+
+from minecraft_data.tools import convert
+
+_dir = os.path.dirname(__file__)
+
+for filename, data in convert(_dir).items():
+    setattr(sys.modules[__name__], filename, data)
diff --git a/minecraft_data/v1_8/data b/minecraft_data/v1_8/data
diff --git a/minecraft_data/v1_9/__init__.py b/minecraft_data/v1_9/__init__.py
@@ -0,0 +1,9 @@
+import os
+import sys
+
+from minecraft_data.tools import convert
+
+_dir = os.path.dirname(__file__)
+
+for filename, data in convert(_dir).items():
+    setattr(sys.modules[__name__], filename, data)
diff --git a/minecraft_data/v1_9/data b/minecraft_data/v1_9/data
