Release 2.81.0

nickelpro · nickelpro · commit 74034a6b1f44 · 2021-03-24T05:59:35.000-04:00
diff --git a/doc/history.md b/doc/history.md
@@ -1,3 +1,7 @@
+## 2.81.0
+ * Update minecraft-data to 2.81.0
+ * Add following data: tints, blockLoot, entityLoot
+
 ## 2.74.0
  * Update minecraft-data to 2.74.0
 
diff --git a/minecraft_data/data b/minecraft_data/data
@@ -1 +1 @@
-Subproject commit e656aafb77f477d3726ed46209f0d4bb7052a04b
+Subproject commit 2b25cb297bdad56a0673ab54f2a631a9808ea3b6
diff --git a/minecraft_data/tools.py b/minecraft_data/tools.py
@@ -10,7 +10,7 @@ def convert(_dir, version, edition ='pc'):
     ret = {}
     for datum in ('recipes', 'materials', 'protocol', 'version',
             'blockCollisionShapes', 'protocolComments', 'loginPacket',
-            'commands'):
+            'commands', 'tints'):
         if datum in data:
             ret[datum] = data[datum]
     for datum in ('blocks', 'items', 'windows', 'effects', 'particles',
@@ -19,6 +19,10 @@ def convert(_dir, version, edition ='pc'):
             ret[datum] = _by_id(data[datum])
             ret[f"{datum}_name"] = _by_name(data[datum])
             ret[f"{datum}_list"] = data[datum]
+    for datum in ('blockLoot', 'entityLoot'):
+        if datum in data:
+            ret[datum] = _parse_loot(data[datum], datum)
+            ret[f"{datum}_list"] = data[datum]
     if 'entities' in data:
         ret['mobs'] = _by_id(_filter('type', 'mob', data['entities']))
         ret['objects'] = _by_id(_filter('type', 'object', data['entities']))
@@ -52,6 +56,9 @@ def _by_id(data):
 def _by_name(data):
     return _by('name', data)
 
+def _parse_loot(data, loot_string):
+    field = loot_string[:loot_string.rfind('Loot')]
+    return {d[field]: d['drops'] for d in data}
 
 def _by(key, data):
     return {item[key]: item for item in data}
diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@ def package_files(directory):
     description='Provide easy access to minecraft data in python',
     license='MIT',
     long_description=open('README.rst').read(),
-    version='2.74.0',
+    version='2.81.0',
     maintainer='Romain Beaumont',
     maintainer_email='romain.rom1@gmail.com',
     url='https://github.com/SpockBotMC/python-minecraft-data',
