amulet-core 2.0.5a1__cp311-cp311-win_amd64.whl → 2.0.6a0__cp311-cp311-win_amd64.whl

amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-17T11:29:24+0100",
+ "date": "2025-10-16T14:53:07+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "7ed2b2b5421e7cb0691779cf4861faf812f8cee3",
- "version": "2.0.5a1"
+ "full-revisionid": "c3e4c826d97d6d0ca38d45bbd0595499626b71df",
+ "version": "2.0.6a0"
 }
 '''  # END VERSION_JSON
 

amulet/core/chunk/component/__init__.pyi

@@ -1,16 +1,13 @@
 from __future__ import annotations
 
-from amulet.core.chunk.component.block_component import (
-    BlockComponent,
-    BlockComponentData,
-)
+from amulet.core.chunk.component.block_component import BlockComponent, BlockStorage
 from amulet.core.chunk.component.section_array_map import IndexArray3D, SectionArrayMap
 
 from . import block_component, section_array_map
 
 __all__: list[str] = [
     "BlockComponent",
-    "BlockComponentData",
+    "BlockStorage",
     "IndexArray3D",
     "SectionArrayMap",
     "block_component",

amulet/core/chunk/component/biome_3d_component.hpp

@@ -14,14 +14,14 @@
 
 namespace Amulet {
 
-class Biome3DComponentData {
+class Biome3DStorage {
 private:
     std::shared_ptr<BiomePalette> _palette;
     std::shared_ptr<SectionArrayMap> _sections;
 
 public:
     template <typename PaletteT, typename SectionsT>
-    Biome3DComponentData(
+    Biome3DStorage(
         PaletteT&& palette,
         SectionsT&& sections)
         : _palette(
@@ -44,11 +44,11 @@ public:
     }
 
     template <typename VersionRangeT>
-    Biome3DComponentData(
+    Biome3DStorage(
         VersionRangeT&& version_range,
         const SectionShape& array_shape,
         const Biome& default_biome)
-        : Biome3DComponentData(
+        : Biome3DStorage(
               std::make_shared<BiomePalette>(std::forward<VersionRangeT>(version_range)),
               std::make_shared<SectionArrayMap>(array_shape, static_cast<std::uint32_t>(0)))
     {
@@ -61,12 +61,12 @@ public:
     std::shared_ptr<SectionArrayMap> get_sections_ptr() { return _sections; }
 
     AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
-    AMULET_CORE_EXPORT static Biome3DComponentData deserialise(BinaryReader&);
+    AMULET_CORE_EXPORT static Biome3DStorage deserialise(BinaryReader&);
 };
 
 class Biome3DComponent {
 private:
-    std::optional<std::shared_ptr<Biome3DComponentData>> _value;
+    std::optional<std::shared_ptr<Biome3DStorage>> _value;
 
 protected:
     // Null constructor
@@ -79,7 +79,7 @@ protected:
         const SectionShape& array_shape,
         const Biome& default_biome)
     {
-        _value = std::make_shared<Biome3DComponentData>(
+        _value = std::make_shared<Biome3DStorage>(
             std::forward<VersionRangeT>(version_range),
             array_shape,
             default_biome);
@@ -92,8 +92,8 @@ protected:
 
 public:
     AMULET_CORE_EXPORT static const std::string ComponentID;
-    AMULET_CORE_EXPORT std::shared_ptr<Biome3DComponentData> get_biome();
-    AMULET_CORE_EXPORT void set_biome(std::shared_ptr<Biome3DComponentData> component);
+    AMULET_CORE_EXPORT std::shared_ptr<Biome3DStorage> get_biome_storage();
+    AMULET_CORE_EXPORT void set_biome_storage(std::shared_ptr<Biome3DStorage> component);
 };
 
 } // namespace Amulet

amulet/core/chunk/component/block_component.hpp

@@ -16,14 +16,14 @@
 
 namespace Amulet {
 
-class BlockComponentData {
+class BlockStorage {
 private:
     std::shared_ptr<BlockPalette> _palette;
     std::shared_ptr<SectionArrayMap> _sections;
 
 public:
     template <typename PaletteT, typename SectionsT>
-    BlockComponentData(
+    BlockStorage(
         PaletteT&& palette,
         SectionsT&& sections)
         : _palette(
@@ -46,11 +46,11 @@ public:
     }
 
     template <typename VersionRangeT>
-    BlockComponentData(
+    BlockStorage(
         VersionRangeT&& version_range,
         const SectionShape& array_shape,
         const BlockStack& default_block)
-        : BlockComponentData(
+        : BlockStorage(
               std::make_shared<BlockPalette>(std::forward<VersionRangeT>(version_range)),
               std::make_shared<SectionArrayMap>(array_shape, static_cast<std::uint32_t>(0)))
     {
@@ -58,7 +58,7 @@ public:
     }
 
     AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
-    AMULET_CORE_EXPORT static BlockComponentData deserialise(BinaryReader&);
+    AMULET_CORE_EXPORT static BlockStorage deserialise(BinaryReader&);
 
     BlockPalette& get_palette() const { return *_palette; }
     std::shared_ptr<BlockPalette> get_palette_ptr() const { return _palette; }
@@ -68,7 +68,7 @@ public:
 
 class BlockComponent {
 private:
-    std::optional<std::shared_ptr<BlockComponentData>> _value;
+    std::optional<std::shared_ptr<BlockStorage>> _value;
 
 protected:
     // Null constructor
@@ -81,7 +81,7 @@ protected:
         const SectionShape& array_shape,
         const BlockStack& default_block)
     {
-        _value = std::make_shared<BlockComponentData>(
+        _value = std::make_shared<BlockStorage>(
             std::forward<VersionRangeT>(version_range),
             array_shape,
             default_block);
@@ -94,8 +94,8 @@ protected:
 
 public:
     AMULET_CORE_EXPORT static const std::string ComponentID;
-    AMULET_CORE_EXPORT std::shared_ptr<BlockComponentData> get_block();
-    AMULET_CORE_EXPORT void set_block(std::shared_ptr<BlockComponentData> component);
+    AMULET_CORE_EXPORT std::shared_ptr<BlockStorage> get_block_storage();
+    AMULET_CORE_EXPORT void set_block_storage(std::shared_ptr<BlockStorage> component);
 };
 
 } // namespace Amulet

amulet/core/chunk/component/block_component.pyi

@@ -7,13 +7,13 @@ import amulet.core.chunk.component.section_array_map
 import amulet.core.palette.block_palette
 import amulet.core.version
 
-__all__: list[str] = ["BlockComponent", "BlockComponentData"]
+__all__: list[str] = ["BlockComponent", "BlockStorage"]
 
 class BlockComponent:
     ComponentID: typing.ClassVar[str] = "Amulet::BlockComponent"
-    block: BlockComponentData
+    block_storage: BlockStorage
 
-class BlockComponentData:
+class BlockStorage:
     def __init__(
         self,
         version_range: amulet.core.version.VersionRange,

amulet/core/chunk/component/block_entity_component.hpp

@@ -12,7 +12,7 @@
 
 namespace Amulet {
 typedef std::tuple<std::uint16_t, std::int64_t, std::uint16_t> BlockEntityChunkCoord;
-class BlockEntityComponentData : public VersionRangeContainer {
+class BlockEntityStorage : public VersionRangeContainer {
 private:
     std::uint16_t _x_size;
     std::uint16_t _z_size;
@@ -23,7 +23,7 @@ private:
 
 public:
     template <typename VersionRangeT>
-    BlockEntityComponentData(
+    BlockEntityStorage(
         VersionRangeT&& version_range,
         std::uint16_t x_size,
         std::uint16_t z_size)
@@ -35,7 +35,7 @@ public:
     }
 
     AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
-    AMULET_CORE_EXPORT static BlockEntityComponentData deserialise(BinaryReader&);
+    AMULET_CORE_EXPORT static BlockEntityStorage deserialise(BinaryReader&);
 
     std::uint16_t get_x_size() const { return _x_size; }
     std::uint16_t get_z_size() const { return _z_size; }
@@ -79,12 +79,12 @@ public:
         }
         if (!(
                 get_version_range().contains(
-                    block_entity->get_platform(),
-                    block_entity->get_version()))) {
+                    block_entity_ptr->get_platform(),
+                    block_entity_ptr->get_version()))) {
             throw std::invalid_argument(
                 "BlockEntity is incompatible with VersionRange.");
         }
-        _block_entities.insert_or_assign(coord, std::move(block_entity));
+        _block_entities.insert_or_assign(coord, std::move(block_entity_ptr));
     }
 
     void del(const BlockEntityChunkCoord& coord)
@@ -95,7 +95,7 @@ public:
 
 class BlockEntityComponent {
 private:
-    std::optional<std::shared_ptr<BlockEntityComponentData>> _value;
+    std::optional<std::shared_ptr<BlockEntityStorage>> _value;
 
 protected:
     // Null constructor
@@ -113,7 +113,7 @@ protected:
 
 public:
     AMULET_CORE_EXPORT static const std::string ComponentID;
-    AMULET_CORE_EXPORT std::shared_ptr<BlockEntityComponentData> get_block_entity();
-    AMULET_CORE_EXPORT void set_block_entity(std::shared_ptr<BlockEntityComponentData> component);
+    AMULET_CORE_EXPORT std::shared_ptr<BlockEntityStorage> get_block_entities();
+    AMULET_CORE_EXPORT void set_block_entities(std::shared_ptr<BlockEntityStorage> component);
 };
 }

{amulet_core-2.0.5a1.dist-info → amulet_core-2.0.6a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.5a1
+Version: 2.0.6a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -15,7 +15,7 @@ Requires-Dist: amulet-compiler-version==4.1297307203.19
 Requires-Dist: pybind11==3.0.0
 Requires-Dist: amulet-pybind11-extensions~=1.2.0.0a0
 Requires-Dist: amulet-io~=1.0.0.0
-Requires-Dist: amulet-utils~=1.1.3.0a1
+Requires-Dist: amulet-utils~=1.1.3.0a2
 Requires-Dist: amulet-zlib~=1.0.8.0a2
 Requires-Dist: amulet-nbt~=5.0.2.0a1
 Requires-Dist: numpy~=2.0

{amulet_core-2.0.5a1.dist-info → amulet_core-2.0.6a0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 amulet/core/__init__.py,sha256=3OSfdYsczg_YNIY2Vv_Rit2Ob61sNt3Bo9mE1Ixx8Sg,978
 amulet/core/__init__.pyi,sha256=qhxaM6yfnVWokiy9uzRktnKtWJYc2zy_gH3_rh4SxKI,456
-amulet/core/_amulet_core.cp311-win_amd64.pyd,sha256=jPBl81_vfx17zN8CmNhpRepxFlymNDv0aghOJEu9VUU,763904
+amulet/core/_amulet_core.cp311-win_amd64.pyd,sha256=0pta-Gdx7StJ5K47goE-7wkjk1roIzbqsdSUQEU_yG0,763904
 amulet/core/_amulet_core.pyi,sha256=ysIiVDNTMxy3kdBKGkDXr0EDyhZqMITrH_ywsm0HAwM,134
-amulet/core/_version.py,sha256=mETEQ4ANIIYXuyFSMhjSZwGmU0K2PsT92z1OcojPoxE,520
-amulet/core/amulet_core.dll,sha256=Wt1g99mdXKzAcJzd6exF2XyB9FeTzG1fJ841zyY5hlM,221696
-amulet/core/amulet_core.lib,sha256=oiaTgzWvQtrPfiFcz6zG6rH1Nz2kCjkpQAu71dbmoN0,98444
+amulet/core/_version.py,sha256=4VlcR3MwixePIWVdPcYWPOYVcGnykFOQRgcrIx3c4i8,520
+amulet/core/amulet_core.dll,sha256=1wrfimRSTka-fCVvReX63oKuhoUem5Iwp_6PyO2irtk,221696
+amulet/core/amulet_core.lib,sha256=NepODRQicyGo15YPJbsVLLhpvUgJBSUr3XJO7Nx48VA,98264
 amulet/core/amulet_coreConfig.cmake,sha256=iwFn1KmAr-rFh3jafs52FAnTArYjPEd2eVs0w2gidEA,987
 amulet/core/dll.hpp,sha256=pyhd9lh570R1Qi7TPPnKoiB-fAFmQan8Vnk-oZmuK70,586
 amulet/core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,11 +18,11 @@ amulet/core/block_entity/__init__.pyi,sha256=QQ-3_RywLfvpEbN7SGgmTdVNwHb9xZxo56D
 amulet/core/block_entity/block_entity.hpp,sha256=q_8rzz4JCQ-L4q025G-ooQ2G47Hf6hyn3Wou4GZZ1Dc,2277
 amulet/core/chunk/__init__.pyi,sha256=35RyNsGhktLv6LfJkQRJ-OONR947y1HHac6D4NjaOGo,1957
 amulet/core/chunk/chunk.hpp,sha256=r3s5nPd60XwTyulG8xA7VdPH72OwDFwD-32faKp75ds,3915
-amulet/core/chunk/component/__init__.pyi,sha256=U_-nIa6YXnTMnrj2BQCt-sU2mSu8klfvf9-m9722Xj0,461
-amulet/core/chunk/component/biome_3d_component.hpp,sha256=qtBGznXfxGh44GMrm5QwjyooCLhIXySuozyRWuBo1cA,3281
-amulet/core/chunk/component/block_component.hpp,sha256=JFk1O1IBWWX9-blvQN0Kv1xNUuWYWpMxkPB6jzIoG2w,3361
-amulet/core/chunk/component/block_component.pyi,sha256=Yc2ACyeHLOacLqdpA9WyoWkgelLoJNhZa88d2rKSD60,895
-amulet/core/chunk/component/block_entity_component.hpp,sha256=wCv7Im03GqPoTLmtt0bmvxrS12kJN_qjzqONuRZ2YmE,3918
+amulet/core/chunk/component/__init__.pyi,sha256=v98Vp36DdTOMPFeJOiFTezD0yMT9iZlMLGvG-zvt9kc,433
+amulet/core/chunk/component/biome_3d_component.hpp,sha256=cqhXF2hnj6y0FRtpaBjcH4UqS--ivCbT5r89eTBIai8,3243
+amulet/core/chunk/component/block_component.hpp,sha256=LLOezLLDF-TZGfLx9fkb4-Xzlswo1WE_R_U-nKhlLHI,3323
+amulet/core/chunk/component/block_component.pyi,sha256=iOnFtHMAUKC9orzh7JFnnbhuQ4WHFsk0Y9iaUrsdg20,885
+amulet/core/chunk/component/block_entity_component.hpp,sha256=0gWLkqrBYSugXY_Ilu-xL5gz5d42po7e7ELrwcpM0us,3898
 amulet/core/chunk/component/section_array_map.hpp,sha256=V_WAG56rz3SAUWMMLgoPAhY3faH3t4Egg9_PsSERueE,3855
 amulet/core/chunk/component/section_array_map.pyi,sha256=H2pNAew6qkqKlWPvHW70jMHVIic9wqDT6GcsBuNpW-4,4072
 amulet/core/entity/__init__.pyi,sha256=KGtjf-QjJijeutbvkhK7S4bwwjrelaUdrR2DqVaA6NI,2676
@@ -47,8 +47,8 @@ amulet/core/selection/shape_group.hpp,sha256=Cn1Wo4bHLjcVcqo9IF8jdMaH9LSCx4Jv6SR
 amulet/core/selection/shape_group.pyi,sha256=Ik1sWCC0vJ8MHGJmvPiXtQEZkU2HVCFeb_7Q4lGycTE,3927
 amulet/core/version/__init__.pyi,sha256=yBPn3RivWayjrFGm9WhuIgjt0Aro6ubWAUBcb-ZUwZ0,4279
 amulet/core/version/version.hpp,sha256=yVc_uhBgmHQ0Evo73rXXoRwSQMHakUQxSYR3_fu2KH4,6506
-amulet_core-2.0.5a1.dist-info/METADATA,sha256=2YgrjPzDCZRNuATe0fEXZuJ0O2ZJIf4OUXyRSRszOgw,5025
-amulet_core-2.0.5a1.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
-amulet_core-2.0.5a1.dist-info/entry_points.txt,sha256=a64mqk_dgbzVyk-pz0WKpK6kNAhIGdVT9DO2VqDIAc8,68
-amulet_core-2.0.5a1.dist-info/top_level.txt,sha256=3ZqHzNDiIb9kV8TwSeeXxK_9haSrsu631Qe4ndDo0rc,7
-amulet_core-2.0.5a1.dist-info/RECORD,,
+amulet_core-2.0.6a0.dist-info/METADATA,sha256=cLDiiVnhw_dvqLBy3FgldGTOwX0RPqa64IqHYrnyOE0,5025
+amulet_core-2.0.6a0.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
+amulet_core-2.0.6a0.dist-info/entry_points.txt,sha256=a64mqk_dgbzVyk-pz0WKpK6kNAhIGdVT9DO2VqDIAc8,68
+amulet_core-2.0.6a0.dist-info/top_level.txt,sha256=3ZqHzNDiIb9kV8TwSeeXxK_9haSrsu631Qe4ndDo0rc,7
+amulet_core-2.0.6a0.dist-info/RECORD,,