amulet-core 2.0a6__cp312-cp312-win_amd64.whl → 2.0a8__cp312-cp312-win_amd64.whl

amulet/utils/comment_json.py

@@ -0,0 +1,188 @@
+from json import JSONDecodeError, loads as json_loads
+from typing import TextIO, Union
+
+"""
+Some of the Bedrock json files contain comments which is not valid JSON and the standard json parser
+will throw errors. This will first try and use the vanilla json parser and fall back to the slower version if that fails.
+"""
+
+
+JSONValue = Union[str, int, float, bool, None, "JSONDict", "JSONList"]
+JSONDict = dict[str, JSONValue]
+JSONList = list[JSONValue]
+
+
+class CommentJSONDecodeError(JSONDecodeError):
+    pass
+
+
+def from_file(path: str) -> JSONValue:
+    with open(path) as f:
+        return load(f)
+
+
+def load(obj: TextIO) -> JSONValue:
+    return loads(obj.read())
+
+
+def loads(s: str) -> JSONValue:
+    try:
+        return json_loads(s)  # type: ignore
+    except JSONDecodeError:
+        return _loads(s)
+
+
+def _loads(text: str) -> JSONValue:
+    # given a valid MinecraftJSON string will return the values as python objects
+    # in this context MinecraftJSON is standard JSON but with comment blocks and
+    # line comments that would normally be illegal in standard JSON
+    _number = set("0123456789-")
+    _float = set("0123456789-.")
+    _whitespace = set(" \t\r\n")
+
+    def strip_whitespace(index: int) -> int:
+        # skips whitespace characters (<space>, <tab>, <charrage return> and <newline>)
+        # as well as block comments and line comments
+        while text[index] in _whitespace:
+            index += 1
+        if text[index] == "/":
+            if text[index + 1] == "/":
+                index += 2
+                while text[index] != "\n":
+                    index += 1
+                index = strip_whitespace(index)
+            elif text[index + 1] == "*":
+                index += 2
+                while text[index : index + 2] != "*/":
+                    index += 1
+                    if index + 1 >= len(text):
+                        raise JSONDecodeError(
+                            "expected */ but reached the end of file", text, index
+                        )
+                index += 2
+                index = strip_whitespace(index)
+            else:
+                raise JSONDecodeError(f"unexpected / at index {index}", text, index)
+        return index
+
+    def parse_json_recursive(index: int = 0) -> tuple[JSONValue, int]:
+        index = strip_whitespace(index)
+        if text[index] == "{":
+            index += 1
+            # dictionary
+            json_obj = {}
+            repeat = True
+            while repeat:
+                index = strip_whitespace(index)
+                # }"
+                if text[index] == '"':
+                    index += 1
+                    key = ""
+                    while text[index] != '"':
+                        key += text[index]
+                        index += 1
+                    index += 1
+
+                    index = strip_whitespace(index)
+
+                    if text[index] == ":":
+                        index += 1
+                    else:
+                        raise JSONDecodeError(
+                            f"expected : got {text[index]} at index {index}",
+                            text,
+                            index,
+                        )
+
+                    index = strip_whitespace(index)
+
+                    json_obj[key], index = parse_json_recursive(index)
+
+                    index = strip_whitespace(index)
+
+                    if text[index] == ",":
+                        index += 1
+                    else:
+                        repeat = False
+                else:
+                    repeat = False
+
+            if index >= len(text):
+                raise JSONDecodeError("expected } but reached end of file", text, index)
+            elif text[index] == "}":
+                index += 1
+            else:
+                raise JSONDecodeError(
+                    f"expected }} got {text[index]} at index {index}", text, index
+                )
+            return json_obj, index
+
+        elif text[index] == "[":
+            index += 1
+            # list
+            json_array = []
+            index = strip_whitespace(index)
+            repeat = text[index] != "]"
+            while repeat:
+                val, index = parse_json_recursive(index)
+                json_array.append(val)
+
+                index = strip_whitespace(index)
+
+                if text[index] == ",":
+                    index += 1
+                else:
+                    repeat = False
+                index = strip_whitespace(index)
+
+            if index >= len(text):
+                raise JSONDecodeError("expected ] but reached end of file", text, index)
+            elif text[index] == "]":
+                index += 1
+            else:
+                raise JSONDecodeError(
+                    f"expected ] got {text[index]} at index {index}", text, index
+                )
+            return json_array, index
+
+        elif text[index] == '"':
+            index += 1
+            # string
+            json_obj_list = []
+            while text[index] != '"':
+                json_obj_list.append(text[index])
+                index += 1
+            index += 1
+            return "".join(json_obj_list), index
+
+        elif text[index] in _number:
+            # number
+            json_obj_list = []
+            while text[index] in _float:
+                json_obj_list += text[index]
+                index += 1
+            if "." in json_obj_list:
+                return float("".join(json_obj_list)), index
+            else:
+                return int("".join(json_obj_list)), index
+
+        elif text[index] == "n" and text[index : index + 4] == "null":
+            index += 4
+            return None, index
+
+        elif text[index] == "t" and text[index : index + 4] == "true":
+            index += 4
+            return True, index
+
+        elif text[index] == "f" and text[index : index + 5] == "false":
+            index += 5
+            return False, index
+        else:
+            raise JSONDecodeError(
+                f'unexpected key {text[index]} at {index}. Expected {{, [, ", num, null, true or false',
+                text,
+                index,
+            )
+
+    # call recursive function and pass back python object
+    return parse_json_recursive()[0]

amulet/utils/matrix.py

@@ -1,4 +1,4 @@
-from typing import Tuple, Literal
+from typing import Literal
 import math
 import numpy
 from amulet.data_types import FloatTriplet, PointCoordinates
@@ -193,8 +193,8 @@ def inverse_transform_matrix(
 
 def decompose_transformation_matrix(
     matrix: numpy.ndarray,
-) -> Tuple[
-    Tuple[float, float, float], Tuple[float, float, float], Tuple[float, float, float]
+) -> tuple[
+    tuple[float, float, float], tuple[float, float, float], tuple[float, float, float]
 ]:
     """
     Decompose a 4x4 transformation matrix into scale, rotation and displacement tuples.

amulet/utils/numpy_helpers.py

@@ -1,11 +1,11 @@
-from typing import Tuple, TypeVar
+from typing import TypeVar
 from collections.abc import Collection
 import numpy
 
 T = TypeVar("T")
 
 
-def brute_sort_objects_no_hash(data: Collection[T]) -> Tuple[list[T], numpy.ndarray]:
+def brute_sort_objects_no_hash(data: Collection[T]) -> tuple[list[T], numpy.ndarray]:
     unique: list[T] = []
     inverse = numpy.zeros(dtype=numpy.uint32, shape=len(data))
     for i, d in enumerate(data):

amulet/utils/shareable_lock.py

@@ -289,7 +289,7 @@ class ShareableRLock:
         :raises: LockNotAcquired if the lock could not be acquired.
         """
         if not self.acquire_unique(blocking, timeout, task_manager):
-            raise LockNotAcquired
+            raise LockNotAcquired("Lock was not acquired.")
         try:
             yield
         finally:
@@ -328,7 +328,7 @@ class ShareableRLock:
         :raises: LockNotAcquired if the lock could not be acquired.
         """
         if not self.acquire_shared(blocking, timeout, task_manager):
-            raise LockNotAcquired
+            raise LockNotAcquired("Lock was not acquired.")
         try:
             yield
         finally:

amulet/utils/world_utils.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import math
-from typing import Tuple, Optional
+from typing import Optional
 import numpy
 from numpy import ndarray, zeros, uint8
 from amulet.data_types import ChunkCoordinates
@@ -9,7 +9,7 @@ from amulet.data_types import ChunkCoordinates
 
 def block_coords_to_chunk_coords(
     *args: int, sub_chunk_size: int = 16
-) -> Tuple[int, ...]:
+) -> tuple[int, ...]:
     """
     Converts the supplied block coordinates into chunk coordinates
 

amulet/version.pyi

@@ -13,10 +13,8 @@ __all__ = [
 ]
 
 class PlatformVersionContainer:
-    def __getstate__(self) -> bytes: ...
     def __init__(self, platform: str, version: VersionNumber) -> None: ...
     def __repr__(self) -> str: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     @property
     def platform(self) -> str: ...
     @property
@@ -44,7 +42,6 @@ class VersionNumber:
     def __getitem__(self, item: typing.SupportsInt) -> int: ...
     @typing.overload
     def __getitem__(self, item: slice) -> list[int]: ...
-    def __getstate__(self) -> bytes: ...
     def __gt__(self, arg0: VersionNumber) -> bool: ...
     def __hash__(self) -> int: ...
     def __init__(self, *args: typing.SupportsInt) -> None: ...
@@ -54,7 +51,6 @@ class VersionNumber:
     def __lt__(self, arg0: VersionNumber) -> bool: ...
     def __repr__(self) -> str: ...
     def __reversed__(self) -> typing.Iterator[int]: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     def __str__(self) -> str: ...
     def count(self, value: int) -> int: ...
     def cropped_version(self) -> tuple:
@@ -71,12 +67,10 @@ class VersionNumber:
         """
 
 class VersionRange:
-    def __getstate__(self) -> bytes: ...
     def __init__(
         self, platform: str, min_version: VersionNumber, max_version: VersionNumber
     ) -> None: ...
     def __repr__(self) -> str: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     def contains(self, arg0: str, arg1: VersionNumber) -> bool: ...
     @property
     def max_version(self) -> VersionNumber: ...
@@ -86,9 +80,7 @@ class VersionRange:
     def platform(self) -> str: ...
 
 class VersionRangeContainer:
-    def __getstate__(self) -> bytes: ...
     def __init__(self, version_range: VersionRange) -> None: ...
     def __repr__(self) -> str: ...
-    def __setstate__(self, arg0: bytes) -> None: ...
     @property
     def version_range(self) -> VersionRange: ...

{amulet_core-2.0a6.dist-info → amulet_core-2.0a8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 2.0a6
+Version: 2.0a8
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Home-page: https://www.amuletmc.com
 Author: James Clare, Ben Gothard et al.
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: numpy~=2.0
-Requires-Dist: amulet-nbt~=4.0a2
+Requires-Dist: amulet-nbt~=4.0a6
 Requires-Dist: portalocker~=2.4
 Requires-Dist: amulet-leveldb~=1.0b0
 Requires-Dist: platformdirs~=3.1