Added support for old and new nbt versions

gentlegiantJGC · Sep 17, 2024 · 9d70c60 · 9d70c60
1 parent ee65d76
commit 9d70c60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/minecraft_model_reader/api/amulet/block.py b/minecraft_model_reader/api/amulet/block.py
@@ -4,6 +4,10 @@
 import re
 from typing import Iterable, Union, Optional, Any
 import amulet_nbt
+if amulet_nbt.__major__ >= 4:
+    from amulet_nbt import read_snbt  # type: ignore
+else:
+    from amulet_nbt import from_snbt as read_snbt  # type: ignore
 
 PropertyValueType = Union[
     amulet_nbt.TAG_Byte,
@@ -302,7 +306,7 @@ def parse_blockstate_string(
 
         if snbt:
             properties_dict = {
-                k: amulet_nbt.from_snbt(v) for k, v in sorted(properties.items())
+                k: read_snbt(v) for k, v in sorted(properties.items())
             }
         else:
             properties_dict = {

diff --git a/setup.cfg b/setup.cfg
@@ -20,7 +20,7 @@ python_requires = ~=3.9
 install_requires =
     Pillow>=10.0.1
     numpy>=1.17
-    amulet-nbt~=2.0
+    amulet-nbt >= 2.0, < 5.0
     platformdirs~=3.1
 
 [options.packages.find]