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

{amulet_core-1.9.22 → amulet_core-1.9.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 1.9.22
+Version: 1.9.23
 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.

{amulet_core-1.9.22 → amulet_core-1.9.23}/amulet/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-04-29T13:55:26+0100",
+ "date": "2024-06-12T09:42:45+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "ac72c15417c9bd86d9332d7a6488311ad1cb30ab",
- "version": "1.9.22"
+ "full-revisionid": "c526d0fe97052412dd57e58ea2ce99dd32072a4c",
+ "version": "1.9.23"
 }
 '''  # END VERSION_JSON
 

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

@@ -495,14 +495,14 @@ class AnvilFormat(WorldFormatWrapper[VersionNumberInt]):
         except StopIteration as e:
             height_changed = e.value
 
-        # light = self._calculate_light(level, changed_chunks)
-        # try:
-        #     while True:
-        #         yield next(light) / 2
-        # except StopIteration as e:
-        #     light_changed = e.value
+        light = self._calculate_light(level, changed_chunks)
+        try:
+            while True:
+                yield next(light) / 2
+        except StopIteration as e:
+            light_changed = e.value
 
-        return height_changed  # or light_changed
+        return height_changed or light_changed
 
     @staticmethod
     def _calculate_height(
@@ -553,6 +553,7 @@ class AnvilFormat(WorldFormatWrapper[VersionNumberInt]):
                     changed_ = False
                     changed_ |= chunk.misc.pop("block_light", None) is not None
                     changed_ |= chunk.misc.pop("sky_light", None) is not None
+                    changed_ |= chunk.misc.pop("isLightOn", None)
                     if changed_:
                         changed = True
                         chunk.changed = True

amulet_core-1.9.23/amulet/level/interfaces/chunk/anvil/anvil_1934.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from amulet.api.chunk import Chunk
+
+from amulet_nbt import CompoundTag, ByteTag
+
+from .base_anvil_interface import ChunkDataType, ChunkPathType
+
+from .anvil_1912 import Anvil1912Interface as ParentInterface
+
+
+class Anvil1934Interface(ParentInterface):
+    """
+    Made lighting optional
+    """
+
+    isLightOn: ChunkPathType = (
+        "region",
+        [("Level", CompoundTag), ("isLightOn", ByteTag)],
+        ByteTag,
+    )
+
+    def __init__(self):
+        super().__init__()
+        self._set_feature("light_optional", "true")
+        self._register_encoder(self._encode_is_light_on)
+        self._register_decoder(self._decode_is_light_on)
+
+    @staticmethod
+    def minor_is_valid(key: int):
+        return 1934 <= key < 2203
+
+    def _decode_is_light_on(
+        self, chunk: Chunk, data: ChunkDataType, floor_cy: int, height_cy: int
+    ):
+        chunk.misc["isLightOn"] = self.get_layer_obj(
+            data, self.isLightOn, pop_last=True
+        )
+
+    def _encode_is_light_on(
+        self, chunk: Chunk, data: ChunkDataType, floor_cy: int, height_cy: int
+    ):
+        is_light_on = bool(chunk.misc.pop("isLightOn", None))
+        self.set_layer_obj(data, self.isLightOn, ByteTag(is_light_on))
+
+
+export = Anvil1934Interface

{amulet_core-1.9.22 → amulet_core-1.9.23}/amulet/level/interfaces/chunk/anvil/anvil_2844.py

@@ -57,7 +57,7 @@ class Anvil2844Interface(ParentInterface):
     OldLevel: ChunkPathType = ("region", [("Level", CompoundTag)], CompoundTag)
     Level: ChunkPathType = ("region", [], CompoundTag)
     Sections: ChunkPathType = ("region", [("sections", ListTag)], ListTag)
-
+    isLightOn: ChunkPathType = ("region", [("isLightOn", ByteTag)], ByteTag)
     Entities: ChunkPathType = ("region", [("entities", ListTag)], ListTag)
     BlockEntities: ChunkPathType = ("region", [("block_entities", ListTag)], ListTag)
     BlockTicks: ChunkPathType = ("region", [("block_ticks", ListTag)], ListTag)

{amulet_core-1.9.22 → amulet_core-1.9.23}/amulet/level/interfaces/chunk/anvil/anvil_na.py

@@ -537,7 +537,7 @@ class AnvilNAInterface(BaseAnvilInterface):
                                 "t": IntTag(t),
                                 "x": IntTag(x),
                                 "y": IntTag(y),
-                                "z": IntTag(x),
+                                "z": IntTag(z),
                             }
                         )
                     )

{amulet_core-1.9.22 → amulet_core-1.9.23}/amulet_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 1.9.22
+Version: 1.9.23
 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.

amulet_core-1.9.22/amulet/level/interfaces/chunk/anvil/anvil_1934.py

@@ -1,20 +0,0 @@
-from __future__ import annotations
-
-from .anvil_1912 import Anvil1912Interface as ParentInterface
-
-
-class Anvil1934Interface(ParentInterface):
-    """
-    Made lighting optional
-    """
-
-    def __init__(self):
-        super().__init__()
-        self._set_feature("light_optional", "true")
-
-    @staticmethod
-    def minor_is_valid(key: int):
-        return 1934 <= key < 2203
-
-
-export = Anvil1934Interface