amulet-core 1.9.20__tar.gz → 1.9.22__tar.gz

{amulet-core-1.9.20 → amulet_core-1.9.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 1.9.20
+Version: 1.9.22
 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.
@@ -16,6 +16,7 @@ Requires-Dist: pymctranslate~=1.2
 Requires-Dist: portalocker~=2.4
 Requires-Dist: amulet-leveldb~=1.0b0
 Requires-Dist: platformdirs~=3.1
+Requires-Dist: lz4~=4.3
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2023-09-29T11:29:40+0100",
+ "date": "2024-04-29T13:55:26+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "b673f749bf1c348e31bf0594e71ffa30f6ea8519",
- "version": "1.9.20"
+ "full-revisionid": "ac72c15417c9bd86d9332d7a6488311ad1cb30ab",
+ "version": "1.9.22"
 }
 '''  # END VERSION_JSON
 

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/history/history_manager/database.py

@@ -153,9 +153,9 @@ class DatabaseHistoryManager(ContainerHistoryManager):
                 ].get_current_entry()
             else:
                 # If it has not been loaded request it from the raw database.
-                entry = self._temporary_database[
-                    key
-                ] = self._get_register_original_entry(key)
+                entry = self._temporary_database[key] = (
+                    self._get_register_original_entry(key)
+                )
         if entry is None:
             raise self.DoesNotExistError
         return entry

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/level/base_level/clone.py

@@ -116,13 +116,13 @@ def clone(
             )
 
             last_src: Optional[Tuple[int, int]] = None
-            src_chunk: Optional[
-                Chunk
-            ] = None  # None here means the chunk does not exist or failed to load. Treat it as if it was air.
+            src_chunk: Optional[Chunk] = (
+                None  # None here means the chunk does not exist or failed to load. Treat it as if it was air.
+            )
             last_dst: Optional[Tuple[int, int]] = None
-            dst_chunk: Optional[
-                Chunk
-            ] = None  # None here means the chunk failed to load. Do not modify it.
+            dst_chunk: Optional[Chunk] = (
+                None  # None here means the chunk failed to load. Do not modify it.
+            )
 
             sum_progress = 0
             volumes = tuple(

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/partial_3d_array/bounded_partial_3d_array.py

@@ -252,8 +252,7 @@ class BoundedPartial3DArray(BasePartial3DArray):
     @overload
     def __getitem__(
         self, slices: Tuple[IntegerType, IntegerType, IntegerType]
-    ) -> Union[int, bool]:
-        ...
+    ) -> Union[int, bool]: ...
 
     @overload
     def __getitem__(
@@ -263,14 +262,12 @@ class BoundedPartial3DArray(BasePartial3DArray):
             Union[IntegerType, slice],
             Union[IntegerType, slice],
         ],
-    ) -> "BoundedPartial3DArray":
-        ...
+    ) -> "BoundedPartial3DArray": ...
 
     @overload
     def __getitem__(
         self, slices: Union[numpy.ndarray, "BoundedPartial3DArray"]
-    ) -> numpy.ndarray:
-        ...
+    ) -> numpy.ndarray: ...
 
     def __getitem__(self, item):
         """
@@ -386,16 +383,14 @@ class BoundedPartial3DArray(BasePartial3DArray):
             Union[IntegerType, slice],
         ],
         value: Union[int, bool, numpy.ndarray, "BoundedPartial3DArray"],
-    ):
-        ...
+    ): ...
 
     @overload
     def __setitem__(
         self,
         item: Union[numpy.ndarray, "BoundedPartial3DArray"],
         value: Union[int, bool, numpy.ndarray],
-    ):
-        ...
+    ): ...
 
     def __setitem__(self, item, value):
         """

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/partial_3d_array/unbounded_partial_3d_array.py

@@ -141,8 +141,9 @@ class UnboundedPartial3DArray(BasePartial3DArray):
             self[slices][:, :, :] = value
 
     @overload
-    def __getitem__(self, slices: Tuple[IntegerType, IntegerType, IntegerType]) -> int:
-        ...
+    def __getitem__(
+        self, slices: Tuple[IntegerType, IntegerType, IntegerType]
+    ) -> int: ...
 
     @overload
     def __getitem__(
@@ -152,8 +153,7 @@ class UnboundedPartial3DArray(BasePartial3DArray):
             Union[IntegerType, slice],
             Union[IntegerType, slice],
         ],
-    ) -> "BoundedPartial3DArray":
-        ...
+    ) -> "BoundedPartial3DArray": ...
 
     def __getitem__(self, item):
         """

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/registry/biome_manager.py

@@ -80,18 +80,15 @@ class BiomeManager(BaseRegistry):
         yield from enumerate(self._index_to_biome)
 
     @overload
-    def __getitem__(self, item: BiomeType) -> int:
-        ...
+    def __getitem__(self, item: BiomeType) -> int: ...
 
     @overload
-    def __getitem__(self, item: Int) -> BiomeType:
-        ...
+    def __getitem__(self, item: Int) -> BiomeType: ...
 
     @overload
     def __getitem__(
         self, item: Iterable[Union[Int, BiomeType]]
-    ) -> List[Union[BiomeType, Int]]:
-        ...
+    ) -> List[Union[BiomeType, Int]]: ...
 
     def __getitem__(self, item):
         """

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/registry/block_manager.py

@@ -82,16 +82,15 @@ class BlockManager(BaseRegistry):
         yield from enumerate(self._index_to_block)
 
     @overload
-    def __getitem__(self, item: Block) -> int:
-        ...
+    def __getitem__(self, item: Block) -> int: ...
 
     @overload
-    def __getitem__(self, item: Int) -> Block:
-        ...
+    def __getitem__(self, item: Int) -> Block: ...
 
     @overload
-    def __getitem__(self, item: Iterable[Union[Int, Block]]) -> List[Union[Block, Int]]:
-        ...
+    def __getitem__(
+        self, item: Iterable[Union[Int, Block]]
+    ) -> List[Union[Block, Int]]: ...
 
     def __getitem__(self, item):
         """

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/selection/box.py

@@ -599,9 +599,7 @@ class SelectionBox(AbstractBaseSelection):
             points_array.T,
         ).T[:, :3]
 
-    def _iter_transformed_boxes(
-        self, transform: numpy.ndarray
-    ) -> Generator[
+    def _iter_transformed_boxes(self, transform: numpy.ndarray) -> Generator[
         Tuple[
             float,  # progress
             SelectionBox,  # The sub-chunk box.

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/selection/group.py

@@ -136,12 +136,10 @@ class SelectionGroup(AbstractBaseSelection):
         return bool(self._selection_boxes)
 
     @overload
-    def __getitem__(self, item: int) -> SelectionBox:
-        ...
+    def __getitem__(self, item: int) -> SelectionBox: ...
 
     @overload
-    def __getitem__(self, item: slice) -> SelectionGroup:
-        ...
+    def __getitem__(self, item: slice) -> SelectionGroup: ...
 
     def __getitem__(self, item):
         """Get the selection box at the given index."""

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/wrapper/chunk/interface.py

@@ -276,13 +276,11 @@ class Interface(ABC):
 
     @overload
     @staticmethod
-    def check_type(obj: CompoundTag, key: str, dtype: Type[AnyNBT]) -> bool:
-        ...
+    def check_type(obj: CompoundTag, key: str, dtype: Type[AnyNBT]) -> bool: ...
 
     @overload
     @staticmethod
-    def check_type(obj: ListTag, key: int, dtype: Type[AnyNBT]) -> bool:
-        ...
+    def check_type(obj: ListTag, key: int, dtype: Type[AnyNBT]) -> bool: ...
 
     @staticmethod
     def check_type(
@@ -298,8 +296,7 @@ class Interface(ABC):
         key: str,
         dtype: Type[AnyNBT],
         default: Optional[AnyNBT] = None,
-    ) -> Optional[AnyNBT]:
-        ...
+    ) -> Optional[AnyNBT]: ...
 
     @overload
     def get_obj(
@@ -308,8 +305,7 @@ class Interface(ABC):
         key: int,
         dtype: Type[AnyNBT],
         default: Optional[AnyNBT] = None,
-    ) -> Optional[AnyNBT]:
-        ...
+    ) -> Optional[AnyNBT]: ...
 
     def get_obj(
         self, obj, key, dtype: Type[AnyNBT], default: Optional[AnyNBT] = None

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/api/wrapper/format_wrapper.py

@@ -27,6 +27,7 @@ import PyMCTranslate
 from amulet.api import level as api_level, wrapper as api_wrapper
 from amulet.api.chunk import Chunk
 from amulet.api.registry import BlockManager
+from amulet.api.block import UniversalAirBlock
 from amulet.api.errors import (
     ChunkLoadError,
     ChunkDoesNotExist,
@@ -621,6 +622,7 @@ class FormatWrapper(Generic[VersionNumberT], ABC):
             )
         else:
             chunk._block_palette = BlockManager()
+            chunk._block_palette.get_add_block(UniversalAirBlock)
 
         def get_chunk_callback(_: int, __: int) -> Chunk:
             # conversion from universal should not require any data outside the block

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/anvil_world/format.py

@@ -24,6 +24,7 @@ import portalocker
 from amulet_nbt import (
     IntTag,
     LongTag,
+    FloatTag,
     DoubleTag,
     StringTag,
     ListTag,
@@ -728,7 +729,7 @@ class AnvilFormat(WorldFormatWrapper[VersionNumberInt]):
         if (
             isinstance(rot_data, ListTag)
             and len(rot_data) == 2
-            and rot_data.list_data_type == DoubleTag.tag_id
+            and rot_data.list_data_type == FloatTag.tag_id
         ):
             rotation = tuple(map(float, rot_data))
             rotation = tuple(

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/anvil_world/region.py

@@ -12,6 +12,7 @@ import re
 import threading
 import logging
 from enum import IntEnum
+import lz4.block as lz4_block
 
 from amulet_nbt import NamedTag, load as load_nbt
 
@@ -33,6 +34,7 @@ class RegionFileVersion(IntEnum):
     VERSION_GZIP = 1
     VERSION_DEFLATE = 2
     VERSION_NONE = 3
+    VERSION_LZ4 = 4
 
 
 def _validate_region_coords(cx: int, cz: int):
@@ -47,6 +49,50 @@ def _compress(data: NamedTag) -> bytes:
     return b"\x02" + zlib.compress(data)
 
 
+LZ4_HEADER = struct.Struct("<8sBiii")
+LZ4_MAGIC = b"LZ4Block"
+COMPRESSION_METHOD_RAW = 0x10
+COMPRESSION_METHOD_LZ4 = 0x20
+
+
+def _decompress_lz4(data: bytes) -> bytes:
+    """The LZ4 compression format is a sequence of LZ4 blocks with some header data."""
+    # https://github.com/lz4/lz4-java/blob/7c931bef32d179ec3d3286ee71638b23ebde3459/src/java/net/jpountz/lz4/LZ4BlockInputStream.java#L200
+    decompressed: list[bytes] = []
+    index = 0
+    while index < len(data):
+        magic, token, compressed_length, original_length, checksum = LZ4_HEADER.unpack(
+            data[index : index + LZ4_HEADER.size]
+        )
+        index += LZ4_HEADER.size
+        compression_method = token & 0xF0
+        if (
+            magic != LZ4_MAGIC
+            or original_length < 0
+            or compressed_length < 0
+            or (original_length == 0 and compressed_length != 0)
+            or (original_length != 0 and compressed_length == 0)
+            or (
+                compression_method == COMPRESSION_METHOD_RAW
+                and original_length != compressed_length
+            )
+        ):
+            raise ValueError("LZ4 compressed block is corrupted.")
+        if compression_method == COMPRESSION_METHOD_RAW:
+            decompressed.append(data[index : index + original_length])
+            index += original_length
+        elif compression_method == COMPRESSION_METHOD_LZ4:
+            decompressed.append(
+                lz4_block.decompress(
+                    data[index : index + compressed_length], original_length
+                )
+            )
+            index += compressed_length
+        else:
+            raise ValueError("LZ4 compressed block is corrupted.")
+    return b"".join(decompressed)
+
+
 def _decompress(data: bytes) -> NamedTag:
     """Convert a bytes object into an NBTFile"""
     compress_type, data = data[0], data[1:]
@@ -56,6 +102,8 @@ def _decompress(data: bytes) -> NamedTag:
         return load_nbt(zlib.decompress(data), compressed=False)
     elif compress_type == RegionFileVersion.VERSION_NONE:
         return load_nbt(data, compressed=False)
+    elif compress_type == RegionFileVersion.VERSION_LZ4:
+        return load_nbt(_decompress_lz4(data), compressed=False)
     raise ChunkLoadError(f"Invalid compression type {compress_type}")
 
 

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/construction/format_wrapper.py

@@ -371,9 +371,9 @@ class ConstructionFormatWrapper(StructureFormatWrapper[VersionNumberTuple]):
                     ),
                 }
             )
-            section_index_table: List[
-                Tuple[int, int, int, int, int, int, int, int]
-            ] = []
+            section_index_table: List[Tuple[int, int, int, int, int, int, int, int]] = (
+                []
+            )
             if self._section_version == 0:
                 for section_list in self._chunk_to_section.values():
                     for section in section_list:

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/leveldb_world/dimension.py

@@ -172,9 +172,9 @@ class LevelDBDimensionManager:
             with suppress(KeyError):
                 digp_key = b"digp" + prefix
                 digp = self._db.get(digp_key)
-                chunk_data[
-                    b"digp"
-                ] = b""  # The presence of this key signals to the put method that this should be created and written
+                chunk_data[b"digp"] = (
+                    b""  # The presence of this key signals to the put method that this should be created and written
+                )
                 for i in range(0, (len(digp) // 8) * 8, 8):
                     actor_key = b"actorprefix" + digp[i : i + 8]
                     try:

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/leveldb_world/interface/chunk/base_leveldb_interface.py

@@ -135,9 +135,9 @@ class BaseLevelDBInterface(Interface):
             for key in chunk_data.copy().keys():
                 if len(key) == 2 and key[0:1] == b"\x2F":
                     cy = struct.unpack("b", key[1:2])[0]
-                    subchunks[
-                        self._chunk_key_to_sub_chunk(cy, bounds[0] >> 4)
-                    ] = chunk_data.pop(key)
+                    subchunks[self._chunk_key_to_sub_chunk(cy, bounds[0] >> 4)] = (
+                        chunk_data.pop(key)
+                    )
             chunk.blocks, chunk_palette = self._load_subchunks(subchunks)
         elif self._features["terrain"] == "30array":
             section_data = chunk_data.pop(b"\x30", None)
@@ -274,9 +274,9 @@ class BaseLevelDBInterface(Interface):
         )
         min_y = bounds[0] // 16
         for cy, sub_chunk in terrain.items():
-            chunk_data[
-                b"\x2F" + self._get_sub_chunk_storage_byte(cy, min_y)
-            ] = sub_chunk
+            chunk_data[b"\x2F" + self._get_sub_chunk_storage_byte(cy, min_y)] = (
+                sub_chunk
+            )
 
         # chunk status
         if self._features["finalised_state"] == "int0-2":

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/mcstructure/format_wrapper.py

@@ -71,11 +71,6 @@ class MCStructureFormatWrapper(StructureFormatWrapper[VersionNumberTuple]):
     ):
         if not overwrite and os.path.isfile(self.path):
             raise ObjectWriteError(f"There is already a file at {self.path}")
-        translator_version = self.translation_manager.get_version(
-            "bedrock", (999, 999, 999)
-        )
-        self._platform = translator_version.platform
-        self._version = translator_version.version_number
         self._chunks = {}
         self._set_selection(bounds)
         self._is_open = True

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/formats/sponge_schem/format_wrapper.py

@@ -322,9 +322,7 @@ class SpongeSchemFormatWrapper(StructureFormatWrapper[VersionNumberInt]):
                 raise SpongeSchemWriteError(
                     "The structure is too large to be exported to a Sponge Schematic file. It must be 2^16 - 1 at most in each dimension."
                 )
-            overflowed_shape = [
-                s if s < 2**15 else s - 2**16 for s in selection.shape
-            ]
+            overflowed_shape = [s if s < 2**15 else s - 2**16 for s in selection.shape]
             tag = CompoundTag(
                 {
                     "Version": IntTag(2),

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet/level/interfaces/chunk/anvil/anvil_3463.py

@@ -13,7 +13,7 @@ class Anvil3463Interface(ParentInterface):
 
     @staticmethod
     def minor_is_valid(key: int):
-        return 3454 <= key < 3580
+        return 3454 <= key <= 3900
 
 
 export = Anvil3463Interface

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 1.9.20
+Version: 1.9.22
 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.
@@ -16,6 +16,7 @@ Requires-Dist: pymctranslate~=1.2
 Requires-Dist: portalocker~=2.4
 Requires-Dist: amulet-leveldb~=1.0b0
 Requires-Dist: platformdirs~=3.1
+Requires-Dist: lz4~=4.3
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.3.0; extra == "docs"

{amulet-core-1.9.20 → amulet_core-1.9.22}/amulet_core.egg-info/requires.txt

@@ -4,6 +4,7 @@ pymctranslate~=1.2
 portalocker~=2.4
 amulet-leveldb~=1.0b0
 platformdirs~=3.1
+lz4~=4.3
 
 [dev]
 black>=22.3

{amulet-core-1.9.20 → amulet_core-1.9.22}/setup.cfg

@@ -21,6 +21,7 @@ install_requires =
 	portalocker~=2.4
 	amulet-leveldb~=1.0b0
 	platformdirs~=3.1
+	lz4~=4.3
 packages = find:
 
 [options.packages.find]