amulet-core 2.0.5a0__tar.gz → 2.0.6a0__tar.gz

{amulet_core-2.0.5a0/src/amulet_core.egg-info → amulet_core-2.0.6a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.5a0
+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
@@ -13,9 +13,9 @@ Description-Content-Type: text/markdown
 Requires-Dist: amulet-compiler-target==2.0
 Requires-Dist: amulet-compiler-version==4.309027957683952396889703.17
 Requires-Dist: pybind11==3.0.0
-Requires-Dist: amulet-pybind11-extensions~=1.1.0.0a0
+Requires-Dist: amulet-pybind11-extensions~=1.2.0.0a0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-utils~=1.1.3.0a0
+Requires-Dist: amulet-utils~=1.1.3.0a1
 Requires-Dist: amulet-zlib~=1.0.8.0a0
 Requires-Dist: amulet-nbt~=5.0.2.0a0
 Requires-Dist: numpy~=2.0
@@ -28,7 +28,6 @@ Requires-Dist: setuptools>=42; extra == "dev"
 Requires-Dist: versioneer; extra == "dev"
 Requires-Dist: packaging; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
-Requires-Dist: amulet_pybind11_extensions~=1.0; extra == "dev"
 Requires-Dist: pybind11_stubgen>=2.5.4; extra == "dev"
 Requires-Dist: black>=22.3; extra == "dev"
 Requires-Dist: isort; extra == "dev"

amulet_core-2.0.6a0/get_compiler/__init__.py

@@ -0,0 +1,32 @@
+import os
+import subprocess
+from tempfile import TemporaryDirectory
+
+
+def main() -> str:
+    if subprocess.run(["cmake", "--version"]).returncode:
+        raise RuntimeError("Could not find cmake")
+
+    with TemporaryDirectory() as build_dir:
+        # get the compiler id and version
+        if subprocess.run(
+            ["cmake", "-S", os.path.dirname(__file__), "-B", build_dir]
+        ).returncode:
+            raise RuntimeError(
+                "Could not find a C++ 20 compiler. Do you have a C++ 20 compiler installed?"
+            )
+
+        # Get the compiler variables generated by the cmake file
+        with open(os.path.join(build_dir, "compiler_id.txt")) as f:
+            compiler_id_str = f.read().strip()
+        with open(os.path.join(build_dir, "compiler_version.txt")) as f:
+            compiler_version = f.read().strip().split(".", 1)[0]
+
+    # convert the compiler id to an int so it can be used in a version number
+    compiler_id_int = 0
+    for b in compiler_id_str.encode("utf-8"):
+        compiler_id_int <<= 8
+        compiler_id_int += b
+
+    # combine the compiler id and compiler version into a version number
+    return f"==4.{compiler_id_int}.{compiler_version}"

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/pyproject.toml

@@ -32,7 +32,6 @@ dev = [
     "versioneer",
     "packaging",
     "wheel",
-    "amulet_pybind11_extensions~=1.0",
     "pybind11_stubgen>=2.5.4",
     "black>=22.3",
     "isort",

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/requirements.py

@@ -5,9 +5,9 @@ import get_compiler
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
 
 PYBIND11_REQUIREMENT = "==3.0.0"
-AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.1.0.0a0"
+AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.2.0.0a0"
 AMULET_IO_REQUIREMENT = "~=1.0"
-AMULET_UTILS_REQUIREMENT = "~=1.1.3.0a0"
+AMULET_UTILS_REQUIREMENT = "~=1.1.3.0a1"
 AMULET_ZLIB_REQUIREMENT = "~=1.0.8.0a0"
 AMULET_NBT_REQUIREMENT = "~=5.0.2.0a0"
 NUMPY_REQUIREMENT = "~=2.0"

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-01T13:18:18+0100",
+ "date": "2025-10-16T14:53:07+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "d46ea97b2c67f05ece822c4af0819fa94db55cf3",
- "version": "2.0.5a0"
+ "full-revisionid": "c3e4c826d97d6d0ca38d45bbd0595499626b71df",
+ "version": "2.0.6a0"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/biome/__init__.pyi

@@ -25,9 +25,9 @@ class Biome(amulet.core.version.PlatformVersionContainer):
     """
 
     @typing.overload
-    def __eq__(self, arg0: Biome) -> bool: ...
+    def __eq__(self, other: Biome) -> bool: ...
     @typing.overload
-    def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
+    def __eq__(self, other: typing.Any) -> bool | types.NotImplementedType: ...
     def __ge__(self, arg0: Biome) -> bool: ...
     def __gt__(self, arg0: Biome) -> bool: ...
     def __hash__(self) -> int: ...

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/block/__init__.pyi

@@ -77,9 +77,9 @@ class Block(amulet.core.version.PlatformVersionContainer):
         """
 
     @typing.overload
-    def __eq__(self, arg0: Block) -> bool: ...
+    def __eq__(self, other: Block) -> bool: ...
     @typing.overload
-    def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
+    def __eq__(self, other: typing.Any) -> bool | types.NotImplementedType: ...
     def __ge__(self, arg0: Block) -> bool: ...
     def __gt__(self, arg0: Block) -> bool: ...
     def __hash__(self) -> int: ...
@@ -216,16 +216,16 @@ class BlockStack:
     >>> blocks = list(waterlogged_stone)
     """
 
-    def __contains__(self, arg0: typing.Any) -> bool: ...
+    def __contains__(self, item: typing.Any) -> bool: ...
     @typing.overload
-    def __eq__(self, arg0: BlockStack) -> bool: ...
+    def __eq__(self, other: BlockStack) -> bool: ...
     @typing.overload
-    def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
+    def __eq__(self, other: typing.Any) -> bool | types.NotImplementedType: ...
     def __ge__(self, arg0: BlockStack) -> bool: ...
     @typing.overload
     def __getitem__(self, arg0: typing.SupportsInt) -> Block: ...
     @typing.overload
-    def __getitem__(self, arg0: slice) -> list: ...
+    def __getitem__(self, item: slice) -> list[Block]: ...
     def __gt__(self, arg0: BlockStack) -> bool: ...
     def __hash__(self) -> int: ...
     def __init__(self, block: Block, *extra_blocks: Block) -> None: ...
@@ -235,10 +235,10 @@ class BlockStack:
     def __lt__(self, arg0: BlockStack) -> bool: ...
     def __repr__(self) -> str: ...
     def __reversed__(self) -> collections.abc.Iterator[Block]: ...
-    def count(self, value: typing.Any) -> int: ...
+    def count(self, value: Block) -> int: ...
     def index(
         self,
-        value: typing.Any,
+        value: Block,
         start: typing.SupportsInt = 0,
         stop: typing.SupportsInt = 9223372036854775807,
     ) -> int: ...

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/block/block.py.cpp

@@ -6,8 +6,8 @@
 #include <memory>
 #include <span>
 
-#include <amulet/pybind11_extensions/types.hpp>
 #include <amulet/pybind11_extensions/py_module.hpp>
+#include <amulet/pybind11_extensions/types.hpp>
 
 #include <amulet/pybind11_extensions/sequence.hpp>
 
@@ -278,8 +278,7 @@ void init_block(py::module m_parent)
                 if (index < 0) {
                     throw py::index_error("");
                 }
-            }
-            if (index >= self.size()) {
+            } else if (index >= self.size()) {
                 throw py::index_error("");
             }
             return self.at(index);
@@ -300,13 +299,14 @@ void init_block(py::module m_parent)
                 return Amulet::deserialise<Amulet::BlockStack>(state.cast<std::string>());
             }));
 
-    pyext::collections::def_Sequence_getitem_slice(BlockStack);
-    pyext::collections::def_Sequence_contains(BlockStack);
-    pyext::collections::def_Sequence_iter<Amulet::Block>(BlockStack);
-    pyext::collections::def_Sequence_reversed<Amulet::Block>(BlockStack);
-    pyext::collections::def_Sequence_index(BlockStack);
-    pyext::collections::def_Sequence_count(BlockStack);
-    pyext::collections::register_Sequence(BlockStack);
+    using BlockSequence = pyext::collections::Sequence<Amulet::Block>;
+    BlockSequence::def_getitem_slice(BlockStack);
+    BlockSequence::def_contains(BlockStack);
+    BlockSequence::def_iter(BlockStack);
+    BlockSequence::def_reversed(BlockStack);
+    BlockSequence::def_index(BlockStack);
+    BlockSequence::def_count(BlockStack);
+    BlockSequence::register_cls(BlockStack);
 
     BlockStack.def(py::self == py::self);
     BlockStack.def(py::self > py::self);

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/block_entity/__init__.pyi

@@ -14,9 +14,9 @@ class BlockEntity(amulet.core.version.PlatformVersionContainer):
     """
 
     @typing.overload
-    def __eq__(self, arg0: BlockEntity) -> bool: ...
+    def __eq__(self, other: BlockEntity) -> bool: ...
     @typing.overload
-    def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
+    def __eq__(self, other: typing.Any) -> bool | types.NotImplementedType: ...
     def __hash__(self) -> int: ...
     def __init__(
         self,

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/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-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/chunk/component/__init_chunk_components.py.cpp

@@ -17,6 +17,6 @@ void init_chunk_components(py::module m_parent)
     m.attr("SectionArrayMap") = m_section_array_map.attr("SectionArrayMap");
 
     auto m_block_component = init_block_component(m);
-    m.attr("BlockComponentData") = m_block_component.attr("BlockComponentData");
+    m.attr("BlockStorage") = m_block_component.attr("BlockStorage");
     m.attr("BlockComponent") = m_block_component.attr("BlockComponent");
 }

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/chunk/component/biome_3d_component.cpp

@@ -6,23 +6,23 @@ namespace Amulet {
 
 // Biome3DComponent
 
-void Biome3DComponentData::serialise(BinaryWriter& writer) const
+void Biome3DStorage::serialise(BinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     _palette->serialise(writer);
     _sections->serialise(writer);
 }
-Biome3DComponentData Biome3DComponentData::deserialise(BinaryReader& reader)
+Biome3DStorage Biome3DStorage::deserialise(BinaryReader& reader)
 {
     auto version_number = reader.read_numeric<std::uint8_t>();
     switch (version_number) {
     case 1: {
         auto palette = std::make_shared<BiomePalette>(BiomePalette::deserialise(reader));
         auto sections = std::make_shared<SectionArrayMap>(SectionArrayMap::deserialise(reader));
-        return Biome3DComponentData { std::move(palette), std::move(sections) };
+        return Biome3DStorage { std::move(palette), std::move(sections) };
     }
     default:
-        throw std::invalid_argument("Unsupported Biome3DComponentData version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported Biome3DStorage version " + std::to_string(version_number));
     }
 }
 
@@ -38,7 +38,7 @@ std::optional<std::string> Biome3DComponent::serialise() const
 void Biome3DComponent::deserialise(std::optional<std::string> data)
 {
     if (data) {
-        _value = std::make_shared<Biome3DComponentData>(Amulet::deserialise<Biome3DComponentData>(*data));
+        _value = std::make_shared<Biome3DStorage>(Amulet::deserialise<Biome3DStorage>(*data));
     } else {
         _value = std::nullopt;
     }
@@ -46,7 +46,7 @@ void Biome3DComponent::deserialise(std::optional<std::string> data)
 
 const std::string Biome3DComponent::ComponentID = "Amulet::Biome3DComponent";
 
-std::shared_ptr<Biome3DComponentData> Biome3DComponent::get_biome()
+std::shared_ptr<Biome3DStorage> Biome3DComponent::get_biome_storage()
 {
     if (_value) {
         return *_value;
@@ -54,7 +54,7 @@ std::shared_ptr<Biome3DComponentData> Biome3DComponent::get_biome()
     throw std::runtime_error("BiomeComponent has not been loaded.");
 }
 
-void Biome3DComponent::set_biome(std::shared_ptr<Biome3DComponentData> component)
+void Biome3DComponent::set_biome_storage(std::shared_ptr<Biome3DStorage> component)
 {
     if (_value) {
         auto& old_data = **_value;

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/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-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/chunk/component/block_component.cpp

@@ -4,15 +4,15 @@
 
 namespace Amulet {
 
-// BlockComponentData
-void BlockComponentData::serialise(BinaryWriter& writer) const
+// BlockStorage
+void BlockStorage::serialise(BinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     get_palette().serialise(writer);
     get_sections().serialise(writer);
 }
 
-BlockComponentData BlockComponentData::deserialise(BinaryReader& reader)
+BlockStorage BlockStorage::deserialise(BinaryReader& reader)
 {
     auto version = reader.read_numeric<std::uint8_t>();
     switch (version) {
@@ -22,7 +22,7 @@ BlockComponentData BlockComponentData::deserialise(BinaryReader& reader)
         return { palette, sections };
     }
     default:
-        throw std::invalid_argument("Unsupported BlockComponentData version " + std::to_string(version));
+        throw std::invalid_argument("Unsupported BlockStorage version " + std::to_string(version));
     }
 }
 
@@ -39,7 +39,7 @@ std::optional<std::string> BlockComponent::serialise() const
 void BlockComponent::deserialise(std::optional<std::string> data)
 {
     if (data) {
-        _value = std::make_shared<BlockComponentData>(Amulet::deserialise<BlockComponentData>(*data));
+        _value = std::make_shared<BlockStorage>(Amulet::deserialise<BlockStorage>(*data));
     } else {
         _value = std::nullopt;
     }
@@ -47,7 +47,7 @@ void BlockComponent::deserialise(std::optional<std::string> data)
 
 const std::string BlockComponent::ComponentID = "Amulet::BlockComponent";
 
-std::shared_ptr<BlockComponentData> BlockComponent::get_block()
+std::shared_ptr<BlockStorage> BlockComponent::get_block_storage()
 {
     if (_value) {
         return *_value;
@@ -55,7 +55,7 @@ std::shared_ptr<BlockComponentData> BlockComponent::get_block()
     throw std::runtime_error("BlockComponent has not been loaded.");
 }
 
-void BlockComponent::set_block(std::shared_ptr<BlockComponentData> component)
+void BlockComponent::set_block_storage(std::shared_ptr<BlockStorage> component)
 {
     if (_value) {
         auto& old_data = **_value;

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/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-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/chunk/component/block_component.py.cpp

@@ -16,9 +16,9 @@ py::module init_block_component(py::module m_parent)
 {
     auto m = m_parent.def_submodule("block_component");
 
-    py::class_<Amulet::BlockComponentData, std::shared_ptr<Amulet::BlockComponentData>>
-        BlockComponentData(m, "BlockComponentData");
-    BlockComponentData.def(
+    py::class_<Amulet::BlockStorage, std::shared_ptr<Amulet::BlockStorage>>
+        BlockStorage(m, "BlockStorage");
+    BlockStorage.def(
         py::init<
             const Amulet::VersionRange&,
             const Amulet::SectionShape&,
@@ -26,12 +26,12 @@ py::module init_block_component(py::module m_parent)
         py::arg("version_range"),
         py::arg("array_shape"),
         py::arg("default_block"));
-    BlockComponentData.def_property_readonly(
+    BlockStorage.def_property_readonly(
         "palette",
-        &Amulet::BlockComponentData::get_palette_ptr);
-    BlockComponentData.def_property_readonly(
+        &Amulet::BlockStorage::get_palette_ptr);
+    BlockStorage.def_property_readonly(
         "sections",
-        &Amulet::BlockComponentData::get_sections_ptr);
+        &Amulet::BlockStorage::get_sections_ptr);
 
     py::class_<Amulet::BlockComponent, std::shared_ptr<Amulet::BlockComponent>>
         BlockComponent(m, "BlockComponent");
@@ -39,9 +39,9 @@ py::module init_block_component(py::module m_parent)
         "ComponentID",
         &Amulet::BlockComponent::ComponentID);
     BlockComponent.def_property(
-        "block",
-        &Amulet::BlockComponent::get_block,
-        &Amulet::BlockComponent::set_block);
+        "block_storage",
+        &Amulet::BlockComponent::get_block_storage,
+        &Amulet::BlockComponent::set_block_storage);
 
     return m;
 }

{amulet_core-2.0.5a0 → amulet_core-2.0.6a0}/src/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-2.0.5a0 → amulet_core-2.0.6a0}/src/amulet/core/chunk/component/block_entity_component.cpp

@@ -4,9 +4,9 @@
 
 namespace Amulet {
 
-// BlockEntityComponentData
+// BlockEntityStorage
 
-void BlockEntityComponentData::serialise(BinaryWriter& writer) const
+void BlockEntityStorage::serialise(BinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     get_version_range().serialise(writer);
@@ -21,7 +21,7 @@ void BlockEntityComponentData::serialise(BinaryWriter& writer) const
         block_entity->serialise(writer);
     }
 }
-BlockEntityComponentData BlockEntityComponentData::deserialise(BinaryReader& reader)
+BlockEntityStorage BlockEntityStorage::deserialise(BinaryReader& reader)
 {
     auto version_number = reader.read_numeric<std::uint8_t>();
     switch (version_number) {
@@ -29,7 +29,7 @@ BlockEntityComponentData BlockEntityComponentData::deserialise(BinaryReader& rea
         auto version_range = VersionRange::deserialise(reader);
         auto x_size = reader.read_numeric<std::uint16_t>();
         auto z_size = reader.read_numeric<std::uint16_t>();
-        BlockEntityComponentData block_entities {
+        BlockEntityStorage block_entities {
             std::move(version_range),
             x_size,
             z_size
@@ -45,7 +45,7 @@ BlockEntityComponentData BlockEntityComponentData::deserialise(BinaryReader& rea
         return block_entities;
     }
     default:
-        throw std::invalid_argument("Unsupported BlockEntityComponentData version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported BlockEntityStorage version " + std::to_string(version_number));
     }
 }
 
@@ -55,7 +55,7 @@ AMULET_CORE_EXPORT void BlockEntityComponent::init(
     std::uint16_t x_size,
     std::uint16_t z_size)
 {
-    _value = std::make_shared<BlockEntityComponentData>(version_range, x_size, z_size);
+    _value = std::make_shared<BlockEntityStorage>(version_range, x_size, z_size);
 }
 
 std::optional<std::string> BlockEntityComponent::serialise() const
@@ -70,7 +70,7 @@ std::optional<std::string> BlockEntityComponent::serialise() const
 void BlockEntityComponent::deserialise(std::optional<std::string> data)
 {
     if (data) {
-        _value = std::make_shared<BlockEntityComponentData>(Amulet::deserialise<BlockEntityComponentData>(*data));
+        _value = std::make_shared<BlockEntityStorage>(Amulet::deserialise<BlockEntityStorage>(*data));
     } else {
         _value = std::nullopt;
     }
@@ -78,7 +78,7 @@ void BlockEntityComponent::deserialise(std::optional<std::string> data)
 
 const std::string BlockEntityComponent::ComponentID = "Amulet::BlockEntityComponent";
 
-AMULET_CORE_EXPORT std::shared_ptr<BlockEntityComponentData> BlockEntityComponent::get_block_entity()
+AMULET_CORE_EXPORT std::shared_ptr<BlockEntityStorage> BlockEntityComponent::get_block_entities()
 {
     if (_value) {
         return *_value;
@@ -86,7 +86,7 @@ AMULET_CORE_EXPORT std::shared_ptr<BlockEntityComponentData> BlockEntityComponen
     throw std::runtime_error("BlockEntityComponent has not been loaded.");
 }
 
-AMULET_CORE_EXPORT void BlockEntityComponent::set_block_entity(std::shared_ptr<BlockEntityComponentData> component)
+AMULET_CORE_EXPORT void BlockEntityComponent::set_block_entities(std::shared_ptr<BlockEntityStorage> component)
 {
     if (_value) {
         auto& old_data = **_value;