amulet-core 1.9.22__py3-none-any.whl → 1.9.23__py3-none-any.whl

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/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/level/interfaces/chunk/anvil/anvil_1934.py

@@ -1,5 +1,14 @@
 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
 
 
@@ -8,13 +17,34 @@ 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/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/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.dist-info → amulet_core-1.9.23.dist-info}/METADATA

@@ -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.dist-info → amulet_core-1.9.23.dist-info}/RECORD

@@ -1,5 +1,5 @@
 amulet/__init__.py,sha256=sWKAqhofjzTINMJB22nXeBTITznt4H9rM3ZaaAn2SB4,866
-amulet/_version.py,sha256=twBWv29M0ARlZrctWSYbZAh4QkCPN47RVvdbf3-7MD8,498
+amulet/_version.py,sha256=z0-nRVfOEgkeixLvzIVxq4gKndY0aTQx4OGJfbB91VQ,498
 amulet/__pyinstaller/__init__.py,sha256=JJOm9J0BoU_vwoYyoHgd8vwSdiO5SGlHHWH6EQK6sc4,41
 amulet/__pyinstaller/hook-amulet.py,sha256=5s6LZxxd47zNsrsJi-PORR7Q6QC079D7pcTkSn1uzCs,158
 amulet/api/__init__.py,sha256=HJ88KU13JNYES9sptkz0la0OsoRvBGUavuOanaZ_RyM,46
@@ -80,7 +80,7 @@ amulet/level/formats/anvil_forge_world.py,sha256=oktfFzj7YYzCdpHJeRKPp-XAR6EzGIp
 amulet/level/formats/anvil_world/__init__.py,sha256=QlLF_96Ub9ceibhR8J1CVfkSaAqXl8dUQWWxFjDJkW0,54
 amulet/level/formats/anvil_world/_sector_manager.py,sha256=QK-M9C4j_QfcpBxd_GwmUeQbwpnTgc6TC6egqtB4ZP8,11080
 amulet/level/formats/anvil_world/dimension.py,sha256=Ft38XWSjJ7mRjHqF-XjEIR7uJFTB_oBaWQIPNaMrsgQ,6069
-amulet/level/formats/anvil_world/format.py,sha256=wBP2yesGNwNL5Xl-WmYWoWV2aMJTL6Vs2ky13EzCzro,27515
+amulet/level/formats/anvil_world/format.py,sha256=hioBjb9x_Abo4Ffr3VrwnBhgJe4CygtHXK0jOydVxj0,27566
 amulet/level/formats/anvil_world/region.py,sha256=KzwvmQHbxYMQdps43Iwy6ruOufQst4GmyF2P3GLzuHc,15995
 amulet/level/formats/anvil_world/data_pack/__init__.py,sha256=L-He67mqDNWp0boI1VDyIz92BfBZqSKLnBcR0bYxQUA,79
 amulet/level/formats/anvil_world/data_pack/data_pack.py,sha256=N7WwzdQuqmIsjInIqhk-I0UGV67wCFc_ysQMYh0UXYU,6161
@@ -168,14 +168,14 @@ amulet/level/interfaces/chunk/anvil/anvil_1519.py,sha256=IBBGYF2to_zuKwE6Iij4IvJ
 amulet/level/interfaces/chunk/anvil/anvil_1901.py,sha256=JHR35Nfe9d7BV7KRzJuEcAeabBPP7Vg88VK5w4vhC1s,434
 amulet/level/interfaces/chunk/anvil/anvil_1908.py,sha256=KVeajPPgn__K1QFm1xlXHaqEkHMSNVJQE3QA5MTHZwA,412
 amulet/level/interfaces/chunk/anvil/anvil_1912.py,sha256=T4fiKT4Qzc57zhY9eMQpG5P2WoT4EmTf8rGY9aWjdpc,461
-amulet/level/interfaces/chunk/anvil/anvil_1934.py,sha256=sfLWB0zqAPTlTP7QVU8Dirf1cqB1giFGJcknQXCg8do,407
+amulet/level/interfaces/chunk/anvil/anvil_1934.py,sha256=2uBQcRjhWJZj1LEOFYvdQVTNT0gvXMLJ30KqRPEKpjQ,1332
 amulet/level/interfaces/chunk/anvil/anvil_2203.py,sha256=t2lOVgKI_j-3GTZcyTACAqQS3z8R1OKD8ytWZrpiUDE,2114
 amulet/level/interfaces/chunk/anvil/anvil_2529.py,sha256=UTtQkxcM3jUdSWpy02gehEhqenzNW_JitQLFW2PQBLg,478
 amulet/level/interfaces/chunk/anvil/anvil_2681.py,sha256=w9lz9014E3yNFdsLUFvF4UP1IE_OzdwFp8lZ0Zl5tCg,2319
 amulet/level/interfaces/chunk/anvil/anvil_2709.py,sha256=qRvOb67bjyh-HcSEUiqlf1YKMqPfZjeW98Aid92YQy8,417
-amulet/level/interfaces/chunk/anvil/anvil_2844.py,sha256=0jqoRhw5kRgDUfmm6dF18lxpIsDvm0eSL2rckVFhCCY,10216
+amulet/level/interfaces/chunk/anvil/anvil_2844.py,sha256=wyl97xOVr2tARqEgNGe0yH9fZNVyeNocH_5ScOX-gD0,10292
 amulet/level/interfaces/chunk/anvil/anvil_3463.py,sha256=DXduuopYNspAjxmHuQkPzeJo7_ZGPQkV6IxEWktJLEM,423
-amulet/level/interfaces/chunk/anvil/anvil_na.py,sha256=9E9Jd9sQQqG_osfYmIg50hbMpZ0c9Dhi1N1ZDurC2VI,22007
+amulet/level/interfaces/chunk/anvil/anvil_na.py,sha256=UcSd3LWjGdDmTvTfKF02UsAtnjLdQc1l_ZN3GpP3LHg,22007
 amulet/level/interfaces/chunk/anvil/base_anvil_interface.py,sha256=fG3nEkRxY9O-yvlBPFJW1abTb8Vw6Lhh7rjMJf7c1SA,11979
 amulet/level/translators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amulet/level/translators/chunk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -201,8 +201,8 @@ amulet/utils/generator.py,sha256=2pKToghl8irYozX5hBJYtjTQVzhljznPCi42hQKRGDQ,364
 amulet/utils/matrix.py,sha256=KSqluO0H6oHUfe0pU4Esv67pOmHFurK2BDOrZAeNxg8,7665
 amulet/utils/numpy_helpers.py,sha256=fM0rjZxbUqoTMTrFooZEVVhHfsqv0j_7KPGsjVq4ReM,1232
 amulet/utils/world_utils.py,sha256=xb6JPrrbwDF0_y4ZYjTJ1ieydL3COzzLosTgcxDDyRc,12559
-amulet_core-1.9.22.dist-info/METADATA,sha256=sGrR7pkSs401NZnBcdzVggpTqxkKLta95d0O-7ojTjM,4287
-amulet_core-1.9.22.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-amulet_core-1.9.22.dist-info/entry_points.txt,sha256=53zFNThTPzI8f9ertsyU2DoUpxdWU8rjOA_Cu4YH5Vk,63
-amulet_core-1.9.22.dist-info/top_level.txt,sha256=3ZqHzNDiIb9kV8TwSeeXxK_9haSrsu631Qe4ndDo0rc,7
-amulet_core-1.9.22.dist-info/RECORD,,
+amulet_core-1.9.23.dist-info/METADATA,sha256=X3nL24CVINctasQph4z3YdvjaOE6ZZUzYJ7VBw4G-zE,4287
+amulet_core-1.9.23.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+amulet_core-1.9.23.dist-info/entry_points.txt,sha256=53zFNThTPzI8f9ertsyU2DoUpxdWU8rjOA_Cu4YH5Vk,63
+amulet_core-1.9.23.dist-info/top_level.txt,sha256=3ZqHzNDiIb9kV8TwSeeXxK_9haSrsu631Qe4ndDo0rc,7
+amulet_core-1.9.23.dist-info/RECORD,,