Use new entities.json

SpockBotMC · Jan 10, 2016 · ae1b05d · ae1b05d
1 parent cb4d31e
commit ae1b05d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/doc/api.md b/doc/api.md
@@ -62,9 +62,13 @@ materials indexed by name
 
 ## Entities
 
-### entities
+### mobs
 
-entities indexed by id
+entities with `type == 'mob'` indexed by id
+
+### objects
+
+entities with `type == 'object'` indexed by id
 
 ### entities_name
 

diff --git a/minecraft_data/data b/minecraft_data/data
diff --git a/minecraft_data/tools.py b/minecraft_data/tools.py
@@ -18,7 +18,8 @@ def convert(dir):
         'instruments': _by_id(data['instruments']),
         'instruments_list': data['instruments'],
         'materials': data['materials'],
-        'entities': _by_id(data['entities']),
+        'mobs': _by_id(_filter('type', 'mob', data['entities'])),
+        'objects': _by_id(_filter('type', 'object', data['entities'])),
         'entities_name': _by_name(data['entities']),
         'entities_list': data['entities'],
         'protocol': data['protocol'],
@@ -64,6 +65,10 @@ def _by(key, data):
     return {item[key]: item for item in data}
 
 
+def _filter(key, val, data):
+    return [d for d in data if d[key] == val]
+
+
 def find_by(key, *args):
     for arg in args:
         if key in arg:
+2 −1		README.md
+439 −227		data/1.8/entities.json
+3 −1		data/1.8/windows.json
+497 −227		data/1.9/entities.json
+3 −1		data/1.9/windows.json
+26 −1		schemas/entities_schema.json