amulet-core 2.0.3a2__tar.gz → 2.0.4a0__tar.gz

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/CMakeLists.txt

@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.13)
 
 project(amulet_core LANGUAGES CXX)
 
+set(amulet_core_DIR ${CMAKE_CURRENT_LIST_DIR}/src/amulet/core CACHE PATH "")
+
 # Set C++20
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -22,10 +24,18 @@ if (MSVC)
 endif()
 
 # Find libraries
-find_package(pybind11 CONFIG REQUIRED)
-find_package(amulet_pybind11_extensions CONFIG REQUIRED)
-find_package(amulet_io CONFIG REQUIRED)
-find_package(amulet_nbt CONFIG REQUIRED)
+if (NOT TARGET pybind11::module)
+    find_package(pybind11 CONFIG REQUIRED)
+endif()
+if (NOT TARGET amulet_pybind11_extensions)
+    find_package(amulet_pybind11_extensions CONFIG REQUIRED)
+endif()
+if (NOT TARGET amulet_io)
+    find_package(amulet_io CONFIG REQUIRED)
+endif()
+if (NOT TARGET amulet_nbt)
+    find_package(amulet_nbt CONFIG REQUIRED)
+endif()
 
 # Find C++ files
 file(REAL_PATH src SOURCE_PATH)

{amulet_core-2.0.3a2/src/amulet_core.egg-info → amulet_core-2.0.4a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.3a2
+Version: 2.0.4a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -12,11 +12,11 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: amulet-compiler-target==2.0
 Requires-Dist: amulet-compiler-version==3.0.0
-Requires-Dist: pybind11==2.13.6
+Requires-Dist: pybind11==3.0.0
 Requires-Dist: amulet-pybind11-extensions~=1.1.0.0a0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-zlib~=1.0.0.0a7
-Requires-Dist: amulet-nbt~=5.0.0.0a7
+Requires-Dist: amulet-zlib~=1.0.1.0a0
+Requires-Dist: amulet-nbt~=5.0.1.0a0
 Requires-Dist: numpy~=2.0
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/requirements.py

@@ -4,11 +4,11 @@ from packaging.version import Version
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
 AMULET_COMPILER_VERSION_REQUIREMENT = "==3.0.0"
 
-PYBIND11_REQUIREMENT = "==2.13.6"
+PYBIND11_REQUIREMENT = "==3.0.0"
 AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.1.0.0a0"
 AMULET_IO_REQUIREMENT = "~=1.0"
-AMULET_ZLIB_REQUIREMENT = "~=1.0.0.0a7"
-AMULET_NBT_REQUIREMENT = "~=5.0.0.0a7"
+AMULET_ZLIB_REQUIREMENT = "~=1.0.1.0a0"
+AMULET_NBT_REQUIREMENT = "~=5.0.1.0a0"
 NUMPY_REQUIREMENT = "~=2.0"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):

amulet_core-2.0.4a0/src/amulet/core/__init__.pyi

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from . import (
+    _amulet_core,
+    _version,
+    biome,
+    block,
+    block_entity,
+    chunk,
+    entity,
+    palette,
+    selection,
+    version,
+)
+
+__all__ = [
+    "biome",
+    "block",
+    "block_entity",
+    "chunk",
+    "compiler_config",
+    "entity",
+    "palette",
+    "selection",
+    "version",
+]
+
+def _init() -> None: ...
+
+__version__: str
+compiler_config: dict

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-27T16:04:02+0100",
+ "date": "2025-07-28T11:25:11+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "e066fffa9dd7f65769e62a638a8b55659eae70d0",
- "version": "2.0.3a2"
+ "full-revisionid": "dc592d63267cf51ecdff3972fd21b2fa4711de47",
+ "version": "2.0.4a0"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/biome/biome.cpp

@@ -34,7 +34,7 @@ Biome Biome::deserialise(BinaryReader& reader)
         return { platform, version, namespace_, base_name };
     }
     default:
-        throw std::invalid_argument("Unsupported version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported Biome version " + std::to_string(version_number));
     }
 }
 

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/block/__init__.pyi

@@ -89,7 +89,7 @@ class Block(amulet.core.version.PlatformVersionContainer):
         version: amulet.core.version.VersionNumber,
         namespace: str,
         base_name: str,
-        properties: dict[
+        properties: collections.abc.Mapping[
             str,
             amulet.nbt.ByteTag
             | amulet.nbt.ShortTag
@@ -223,7 +223,7 @@ class BlockStack:
     def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
     def __ge__(self, arg0: BlockStack) -> bool: ...
     @typing.overload
-    def __getitem__(self, arg0: int) -> Block: ...
+    def __getitem__(self, arg0: typing.SupportsInt) -> Block: ...
     @typing.overload
     def __getitem__(self, arg0: slice) -> list: ...
     def __gt__(self, arg0: BlockStack) -> bool: ...
@@ -237,7 +237,10 @@ class BlockStack:
     def __reversed__(self) -> collections.abc.Iterator[Block]: ...
     def count(self, value: typing.Any) -> int: ...
     def index(
-        self, value: typing.Any, start: int = 0, stop: int = 9223372036854775807
+        self,
+        value: typing.Any,
+        start: typing.SupportsInt = 0,
+        stop: typing.SupportsInt = 9223372036854775807,
     ) -> int: ...
     @property
     def base_block(self) -> Block:

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/block/block.py.cpp

@@ -291,6 +291,15 @@ void init_block(py::module m_parent)
                 py::tuple(py::cast(self.get_blocks())));
         });
 
+    BlockStack.def(
+        py::pickle(
+            [](const Amulet::BlockStack& self) -> py::bytes {
+                return py::bytes(Amulet::serialise(self));
+            },
+            [](py::bytes state) {
+                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);

amulet_core-2.0.4a0/src/amulet/core/block_entity/block_entity.cpp

@@ -0,0 +1,51 @@
+#include <amulet/nbt/nbt_encoding/binary.hpp>
+
+#include <amulet/core/dll.hpp>
+
+#include "block_entity.hpp"
+
+namespace Amulet {
+
+void BlockEntity::serialise(BinaryWriter& writer) const
+{
+    writer.write_numeric<std::uint8_t>(1);
+    writer.write_size_and_bytes(get_platform());
+    get_version().serialise(writer);
+    writer.write_size_and_bytes(_namespace);
+    writer.write_size_and_bytes(_base_name);
+    Amulet::NBT::encode_nbt(writer, *_nbt);
+}
+
+BlockEntity BlockEntity::deserialise(BinaryReader& reader)
+{
+    auto version_number = reader.read_numeric<std::uint8_t>();
+    switch (version_number) {
+    case 1: {
+        std::string platform { reader.read_size_and_bytes() };
+        VersionNumber version = VersionNumber::deserialise(reader);
+        std::string namespace_ { reader.read_size_and_bytes() };
+        std::string base_name { reader.read_size_and_bytes() };
+        auto named_tag = std::make_shared<Amulet::NBT::NamedTag>(Amulet::NBT::decode_nbt(reader));
+        return BlockEntity {
+            std::move(platform),
+            std::move(version),
+            std::move(namespace_),
+            std::move(base_name),
+            std::move(named_tag)
+        };
+    }
+    default:
+        throw std::invalid_argument("Unsupported BlockEntity version " + std::to_string(version_number));
+    }
+}
+
+bool BlockEntity::operator==(const BlockEntity& other) const
+{
+    return (
+        PlatformVersionContainer::operator==(other)
+        && _namespace == other._namespace
+        && _base_name == other._base_name
+        && Amulet::NBT::NBTTag_eq(*_nbt, *other._nbt));
+}
+
+}

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/chunk/component/biome_3d_component.cpp

@@ -6,14 +6,42 @@ namespace Amulet {
 
 // Biome3DComponent
 
+void Biome3DComponentData::serialise(BinaryWriter& writer) const
+{
+    writer.write_numeric<std::uint8_t>(1);
+    _palette->serialise(writer);
+    _sections->serialise(writer);
+}
+Biome3DComponentData Biome3DComponentData::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) };
+    }
+    default:
+        throw std::invalid_argument("Unsupported Biome3DComponentData version " + std::to_string(version_number));
+    }
+}
+
 std::optional<std::string> Biome3DComponent::serialise() const
 {
-    throw std::runtime_error("NotImplementedError");
+    if (_value) {
+        return Amulet::serialise(**_value);
+    } else {
+        return std::nullopt;
+    }
 }
 // Deserialise the component
-void Biome3DComponent::deserialise(std::optional<std::string>)
+void Biome3DComponent::deserialise(std::optional<std::string> data)
 {
-    throw std::runtime_error("NotImplementedError");
+    if (data) {
+        _value = std::make_shared<Biome3DComponentData>(Amulet::deserialise<Biome3DComponentData>(*data));
+    } else {
+        _value = std::nullopt;
+    }
 }
 
 const std::string Biome3DComponent::ComponentID = "Amulet::Biome3DComponent";

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/chunk/component/biome_3d_component.hpp

@@ -59,6 +59,9 @@ public:
     std::shared_ptr<BiomePalette> get_palette_ptr() { return _palette; }
     SectionArrayMap& get_sections() { return *_sections; }
     std::shared_ptr<SectionArrayMap> get_sections_ptr() { return _sections; }
+
+    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT static Biome3DComponentData deserialise(BinaryReader&);
 };
 
 class Biome3DComponent {

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/chunk/component/block_component.pyi

@@ -17,7 +17,7 @@ class BlockComponentData:
     def __init__(
         self,
         version_range: amulet.core.version.VersionRange,
-        array_shape: tuple[int, int, int],
+        array_shape: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt],
         default_block: amulet.core.block.BlockStack,
     ) -> None: ...
     @property

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/chunk/component/block_entity_component.cpp

@@ -6,13 +6,47 @@ namespace Amulet {
 
 // BlockEntityComponentData
 
-void BlockEntityComponentData::serialise(BinaryWriter&) const
+void BlockEntityComponentData::serialise(BinaryWriter& writer) const
 {
-    throw std::runtime_error("NotImplementedError");
+    writer.write_numeric<std::uint8_t>(1);
+    get_version_range().serialise(writer);
+    writer.write_numeric<std::uint16_t>(get_x_size());
+    writer.write_numeric<std::uint16_t>(get_z_size());
+
+    writer.write_numeric<std::uint64_t>(get_block_entities().size());
+    for (const auto& [coord, block_entity] : get_block_entities()) {
+        writer.write_numeric<std::uint16_t>(std::get<0>(coord));
+        writer.write_numeric<std::int64_t>(std::get<1>(coord));
+        writer.write_numeric<std::uint16_t>(std::get<2>(coord));
+        block_entity->serialise(writer);
+    }
 }
-BlockEntityComponentData BlockEntityComponentData::deserialise(BinaryReader&)
+BlockEntityComponentData BlockEntityComponentData::deserialise(BinaryReader& reader)
 {
-    throw std::runtime_error("NotImplementedError");
+    auto version_number = reader.read_numeric<std::uint8_t>();
+    switch (version_number) {
+    case 1: {
+        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 {
+            std::move(version_range),
+            x_size,
+            z_size
+        };
+        auto block_entity_count = reader.read_numeric<std::uint64_t>();
+        for (std::uint16_t i = 0; i < block_entity_count; i++) {
+            auto dx = reader.read_numeric<std::uint16_t>();
+            auto y = reader.read_numeric<std::int64_t>();
+            auto dz = reader.read_numeric<std::uint16_t>();
+            auto block_entity = std::make_shared<BlockEntity>(BlockEntity::deserialise(reader));
+            block_entities.set({ dx, y, dz }, std::move(block_entity));
+        }
+        return block_entities;
+    }
+    default:
+        throw std::invalid_argument("Unsupported BlockEntityComponentData version " + std::to_string(version_number));
+    }
 }
 
 // BlockEntityComponent

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/chunk/component/section_array_map.py.cpp

@@ -233,5 +233,14 @@ py::module init_section_array_map(py::module m_parent)
     pyext::collections::def_MutableMapping_setdefault<std::int64_t, pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
     pyext::collections::register_MutableMapping(SectionArrayMap);
 
+    SectionArrayMap.def(
+        py::pickle(
+            [](const Amulet::SectionArrayMap& self) -> py::bytes {
+                return py::bytes(Amulet::serialise(self));
+            },
+            [](py::bytes state) {
+                return Amulet::deserialise<Amulet::SectionArrayMap>(state.cast<std::string>());
+            }));
+
     return m;
 }

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/chunk/component/section_array_map.pyi

@@ -6,7 +6,6 @@ import typing
 
 import numpy
 import numpy.typing
-import typing_extensions
 
 __all__ = ["IndexArray3D", "SectionArrayMap"]
 
@@ -16,13 +15,19 @@ class IndexArray3D:
     """
 
     @typing.overload
-    def __init__(self, shape: tuple[int, int, int]) -> None: ...
+    def __init__(
+        self, shape: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt]
+    ) -> None: ...
     @typing.overload
-    def __init__(self, shape: tuple[int, int, int], value: int) -> None: ...
+    def __init__(
+        self,
+        shape: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt],
+        value: typing.SupportsInt,
+    ) -> None: ...
     @typing.overload
     def __init__(self, other: IndexArray3D) -> None: ...
     @typing.overload
-    def __init__(self, arg0: typing_extensions.Buffer) -> None: ...
+    def __init__(self, arg0: collections.abc.Buffer) -> None: ...
     @property
     def shape(self) -> tuple[int, int, int]: ...
     @property
@@ -33,35 +38,48 @@ class SectionArrayMap:
     A container of sub-chunk arrays.
     """
 
-    def __contains__(self, arg0: int) -> bool: ...
-    def __delitem__(self, arg0: int) -> None: ...
+    def __contains__(self, arg0: typing.SupportsInt) -> bool: ...
+    def __delitem__(self, arg0: typing.SupportsInt) -> None: ...
     def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
-    def __getitem__(self, arg0: int) -> numpy.typing.NDArray[numpy.uint32]: ...
+    def __getitem__(
+        self, arg0: typing.SupportsInt
+    ) -> numpy.typing.NDArray[numpy.uint32]: ...
     def __hash__(self) -> int: ...
     def __init__(
         self,
-        array_shape: tuple[int, int, int],
-        default_array: int | IndexArray3D | typing_extensions.Buffer,
+        array_shape: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt],
+        default_array: (
+            typing.SupportsInt
+            | amulet.core.chunk.component.section_array_map.IndexArray3D
+            | collections.abc.Buffer
+        ),
     ) -> None: ...
     def __iter__(self) -> collections.abc.Iterator[int]: ...
     def __len__(self) -> int: ...
     def __setitem__(
-        self, arg0: int, arg1: IndexArray3D | typing_extensions.Buffer
+        self,
+        arg0: typing.SupportsInt,
+        arg1: (
+            amulet.core.chunk.component.section_array_map.IndexArray3D
+            | collections.abc.Buffer
+        ),
     ) -> None: ...
     def get(
-        self, key: int, default: numpy.typing.NDArray[numpy.uint32] | None = None
+        self,
+        key: typing.SupportsInt,
+        default: numpy.typing.NDArray[numpy.uint32] | None = None,
     ) -> numpy.typing.NDArray[numpy.uint32] | None: ...
     def items(
         self,
     ) -> collections.abc.ItemsView[int, numpy.typing.NDArray[numpy.uint32]]: ...
     def keys(self) -> collections.abc.KeysView[int]: ...
     def pop(
-        self, key: int, default: numpy.typing.NDArray[numpy.uint32] = ...
+        self, key: typing.SupportsInt, default: numpy.typing.NDArray[numpy.uint32] = ...
     ) -> numpy.typing.NDArray[numpy.uint32]: ...
     def popitem(self) -> tuple[int, numpy.typing.NDArray[numpy.uint32]]: ...
-    def populate(self, arg0: int) -> None: ...
+    def populate(self, arg0: typing.SupportsInt) -> None: ...
     def setdefault(
-        self, arg0: int, arg1: numpy.typing.NDArray[numpy.uint32] | None
+        self, arg0: typing.SupportsInt, arg1: numpy.typing.NDArray[numpy.uint32] | None
     ) -> numpy.typing.NDArray[numpy.uint32] | None: ...
     def update(self, other: typing.Any = (), **kwargs: typing.Any) -> None: ...
     def values(
@@ -73,5 +91,10 @@ class SectionArrayMap:
     def default_array(self) -> int | numpy.ndarray: ...
     @default_array.setter
     def default_array(
-        self, arg1: int | IndexArray3D | typing_extensions.Buffer
+        self,
+        arg1: (
+            typing.SupportsInt
+            | amulet.core.chunk.component.section_array_map.IndexArray3D
+            | collections.abc.Buffer
+        ),
     ) -> None: ...

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/entity/__init__.pyi

@@ -24,9 +24,9 @@ class Entity(amulet.core.version.PlatformVersionContainer):
         version: amulet.core.version.VersionNumber,
         namespace: str,
         base_name: str,
-        x: float,
-        y: float,
-        z: float,
+        x: typing.SupportsFloat,
+        y: typing.SupportsFloat,
+        z: typing.SupportsFloat,
         nbt: amulet.nbt.NamedTag,
     ) -> None: ...
     def __repr__(self) -> str: ...
@@ -86,7 +86,7 @@ class Entity(amulet.core.version.PlatformVersionContainer):
         """
 
     @x.setter
-    def x(self, arg1: float) -> None: ...
+    def x(self, arg1: typing.SupportsFloat) -> None: ...
     @property
     def y(self) -> float:
         """
@@ -94,7 +94,7 @@ class Entity(amulet.core.version.PlatformVersionContainer):
         """
 
     @y.setter
-    def y(self, arg1: float) -> None: ...
+    def y(self, arg1: typing.SupportsFloat) -> None: ...
     @property
     def z(self) -> float:
         """
@@ -102,4 +102,4 @@ class Entity(amulet.core.version.PlatformVersionContainer):
         """
 
     @z.setter
-    def z(self, arg1: float) -> None: ...
+    def z(self, arg1: typing.SupportsFloat) -> None: ...

amulet_core-2.0.4a0/src/amulet/core/entity/entity.cpp

@@ -0,0 +1,64 @@
+#include <amulet/nbt/nbt_encoding/binary.hpp>
+
+#include <amulet/core/dll.hpp>
+#include <amulet/core/version/version.hpp>
+
+#include "entity.hpp"
+
+namespace Amulet {
+
+void Entity::serialise(BinaryWriter& writer) const
+{
+    writer.write_numeric<std::uint8_t>(1);
+    writer.write_size_and_bytes(get_platform());
+    get_version().serialise(writer);
+    writer.write_size_and_bytes(_namespace);
+    writer.write_size_and_bytes(_base_name);
+    writer.write_numeric<double>(_x);
+    writer.write_numeric<double>(_y);
+    writer.write_numeric<double>(_z);
+    Amulet::NBT::encode_nbt(writer, *_nbt);
+}
+
+Entity Entity::deserialise(BinaryReader& reader)
+{
+    auto version_number = reader.read_numeric<std::uint8_t>();
+    switch (version_number) {
+    case 1: {
+        std::string platform { reader.read_size_and_bytes() };
+        VersionNumber version = VersionNumber::deserialise(reader);
+        std::string namespace_ { reader.read_size_and_bytes() };
+        std::string base_name { reader.read_size_and_bytes() };
+        double x = reader.read_numeric<double>();
+        double y = reader.read_numeric<double>();
+        double z = reader.read_numeric<double>();
+        auto named_tag = std::make_shared<Amulet::NBT::NamedTag>(Amulet::NBT::decode_nbt(reader));
+        return Entity {
+            std::move(platform),
+            std::move(version),
+            std::move(namespace_),
+            std::move(base_name),
+            x,
+            y,
+            z,
+            std::move(named_tag)
+        };
+    }
+    default:
+        throw std::invalid_argument("Unsupported BlockEntity version " + std::to_string(version_number));
+    }
+}
+
+bool Entity::operator==(const Entity& other) const
+{
+    return (
+        PlatformVersionContainer::operator==(other)
+        && _namespace == other._namespace
+        && _base_name == other._base_name
+        && _x == other._x
+        && _y == other._y
+        && _z == other._z
+        && Amulet::NBT::NBTTag_eq(*_nbt, *other._nbt));
+}
+
+} // namespace Amulet

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/palette/biome_palette.pyi

@@ -10,11 +10,11 @@ __all__ = ["BiomePalette"]
 
 class BiomePalette(amulet.core.version.VersionRangeContainer):
     @typing.overload
-    def __contains__(self, arg0: int) -> bool: ...
+    def __contains__(self, arg0: typing.SupportsInt) -> bool: ...
     @typing.overload
     def __contains__(self, arg0: amulet.core.biome.Biome) -> bool: ...
     @typing.overload
-    def __getitem__(self, arg0: int) -> amulet.core.biome.Biome: ...
+    def __getitem__(self, arg0: typing.SupportsInt) -> amulet.core.biome.Biome: ...
     @typing.overload
     def __getitem__(self, arg0: slice) -> list: ...
     def __init__(self, arg0: amulet.core.version.VersionRange) -> None: ...
@@ -33,9 +33,12 @@ class BiomePalette(amulet.core.version.VersionRangeContainer):
 
     def count(self, value: typing.Any) -> int: ...
     def index(
-        self, value: typing.Any, start: int = 0, stop: int = 9223372036854775807
+        self,
+        value: typing.Any,
+        start: typing.SupportsInt = 0,
+        stop: typing.SupportsInt = 9223372036854775807,
     ) -> int: ...
-    def index_to_biome(self, arg0: int) -> amulet.core.biome.Biome:
+    def index_to_biome(self, arg0: typing.SupportsInt) -> amulet.core.biome.Biome:
         """
         Get the biome at the specified palette index.
 

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/palette/block_palette.pyi

@@ -10,11 +10,11 @@ __all__ = ["BlockPalette"]
 
 class BlockPalette(amulet.core.version.VersionRangeContainer):
     @typing.overload
-    def __contains__(self, arg0: int) -> bool: ...
+    def __contains__(self, arg0: typing.SupportsInt) -> bool: ...
     @typing.overload
     def __contains__(self, arg0: amulet.core.block.BlockStack) -> bool: ...
     @typing.overload
-    def __getitem__(self, arg0: int) -> amulet.core.block.BlockStack: ...
+    def __getitem__(self, arg0: typing.SupportsInt) -> amulet.core.block.BlockStack: ...
     @typing.overload
     def __getitem__(self, arg0: slice) -> list: ...
     def __init__(self, arg0: amulet.core.version.VersionRange) -> None: ...
@@ -35,9 +35,14 @@ class BlockPalette(amulet.core.version.VersionRangeContainer):
 
     def count(self, value: typing.Any) -> int: ...
     def index(
-        self, value: typing.Any, start: int = 0, stop: int = 9223372036854775807
+        self,
+        value: typing.Any,
+        start: typing.SupportsInt = 0,
+        stop: typing.SupportsInt = 9223372036854775807,
     ) -> int: ...
-    def index_to_block_stack(self, arg0: int) -> amulet.core.block.BlockStack:
+    def index_to_block_stack(
+        self, arg0: typing.SupportsInt
+    ) -> amulet.core.block.BlockStack:
         """
         Get the block stack at the specified palette index.
 

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/selection/box.pyi

@@ -23,7 +23,13 @@ class SelectionBox:
     def __hash__(self) -> int: ...
     @typing.overload
     def __init__(
-        self, min_x: int, min_y: int, min_z: int, size_x: int, size_y: int, size_z: int
+        self,
+        min_x: typing.SupportsInt,
+        min_y: typing.SupportsInt,
+        min_z: typing.SupportsInt,
+        size_x: typing.SupportsInt,
+        size_y: typing.SupportsInt,
+        size_z: typing.SupportsInt,
     ) -> None:
         """
         Construct a new SelectionBox instance.
@@ -41,7 +47,9 @@ class SelectionBox:
 
     @typing.overload
     def __init__(
-        self, point_1: tuple[int, int, int], point_2: tuple[int, int, int]
+        self,
+        point_1: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt],
+        point_2: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt],
     ) -> None:
         """
         Construct a new SelectionBox instance.
@@ -57,7 +65,9 @@ class SelectionBox:
     def __lt__(self, arg0: SelectionBox) -> bool: ...
     def __repr__(self) -> str: ...
     def __str__(self) -> str: ...
-    def contains_block(self, x: int, y: int, z: int) -> bool:
+    def contains_block(
+        self, x: typing.SupportsInt, y: typing.SupportsInt, z: typing.SupportsInt
+    ) -> bool:
         """
         Is the block contained within the selection.
 
@@ -79,7 +89,9 @@ class SelectionBox:
         :return: True if other fits in self, False otherwise.
         """
 
-    def contains_point(self, x: float, y: float, z: float) -> bool:
+    def contains_point(
+        self, x: typing.SupportsFloat, y: typing.SupportsFloat, z: typing.SupportsFloat
+    ) -> bool:
         """
         Is the point contained within the selection.
 
@@ -120,7 +132,9 @@ class SelectionBox:
         :return: True if the two :class:`SelectionBox` instances touch or intersect, False otherwise.
         """
 
-    def translate(self, x: int, y: int, z: int) -> SelectionBox:
+    def translate(
+        self, x: typing.SupportsInt, y: typing.SupportsInt, z: typing.SupportsInt
+    ) -> SelectionBox:
         """
         Create a new :class:`SelectionBox` based on this one with the coordinates moved by the given offset.
 

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/selection/group.pyi

@@ -63,7 +63,9 @@ class SelectionGroup:
         >>> ])
         """
 
-    def __iter__(self) -> typing.Iterator[amulet.core.selection.box.SelectionBox]:
+    def __iter__(
+        self,
+    ) -> collections.abc.Iterator[amulet.core.selection.box.SelectionBox]:
         """
         An iterable of all the :class:`SelectionBox` classes in the group.
         """
@@ -75,7 +77,9 @@ class SelectionGroup:
 
     def __repr__(self) -> str: ...
     def __str__(self) -> str: ...
-    def contains_block(self, x: int, y: int, z: int) -> bool:
+    def contains_block(
+        self, x: typing.SupportsInt, y: typing.SupportsInt, z: typing.SupportsInt
+    ) -> bool:
         """
         Is the block contained within the selection.
 
@@ -89,7 +93,9 @@ class SelectionGroup:
         :return: True if the block is in the selection.
         """
 
-    def contains_point(self, x: float, y: float, z: float) -> bool:
+    def contains_point(
+        self, x: typing.SupportsFloat, y: typing.SupportsFloat, z: typing.SupportsFloat
+    ) -> bool:
         """
         Is the point contained within the selection.
 
@@ -114,7 +120,9 @@ class SelectionGroup:
 
     @typing.overload
     def intersects(self, other: SelectionGroup) -> bool: ...
-    def translate(self, x: int, y: int, z: int) -> SelectionGroup:
+    def translate(
+        self, x: typing.SupportsInt, y: typing.SupportsInt, z: typing.SupportsInt
+    ) -> SelectionGroup:
         """
         Create a new :class:`SelectionGroup` based on this one with the coordinates moved by the given offset.
 
@@ -207,7 +215,7 @@ class SelectionGroup:
     @property
     def selection_boxes(
         self,
-    ) -> typing.Iterator[amulet.core.selection.box.SelectionBox]:
+    ) -> collections.abc.Iterator[amulet.core.selection.box.SelectionBox]:
         """
         An iterator of the :class:`SelectionBox` instances stored for this group.
         """

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/version/__init__.pyi

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc
 import types
 import typing
 from builtins import str as PlatformType
@@ -48,7 +49,7 @@ class VersionNumber:
     >>> v3 = VersionNumber(3578)
     """
 
-    def __contains__(self, arg0: int) -> bool: ...
+    def __contains__(self, arg0: typing.SupportsInt) -> bool: ...
     @typing.overload
     def __eq__(self, arg0: VersionNumber) -> bool: ...
     @typing.overload
@@ -61,23 +62,26 @@ class VersionNumber:
     def __gt__(self, arg0: VersionNumber) -> bool: ...
     def __hash__(self) -> int: ...
     def __init__(self, *args: typing.SupportsInt) -> None: ...
-    def __iter__(self) -> typing.Iterator[int]: ...
+    def __iter__(self) -> collections.abc.Iterator[int]: ...
     def __le__(self, arg0: VersionNumber) -> bool: ...
     def __len__(self) -> int: ...
     def __lt__(self, arg0: VersionNumber) -> bool: ...
     def __repr__(self) -> str: ...
-    def __reversed__(self) -> typing.Iterator[int]: ...
+    def __reversed__(self) -> collections.abc.Iterator[int]: ...
     def __str__(self) -> str: ...
-    def count(self, value: int) -> int: ...
+    def count(self, value: typing.SupportsInt) -> int: ...
     def cropped_version(self) -> list[int]:
         """
         The version number with trailing zeros cut off.
         """
 
     def index(
-        self, value: int, start: int = 0, stop: int = 18446744073709551615
+        self,
+        value: typing.SupportsInt,
+        start: typing.SupportsInt = 0,
+        stop: typing.SupportsInt = 18446744073709551615,
     ) -> int: ...
-    def padded_version(self, len: int) -> list[int]:
+    def padded_version(self, len: typing.SupportsInt) -> list[int]:
         """
         Get the version number cropped or padded with zeros to the given length.
         """

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet/core/version/version.cpp

@@ -31,7 +31,7 @@ VersionNumber VersionNumber::deserialise(BinaryReader& reader)
         return vec;
     }
     default:
-        throw std::invalid_argument("Unsupported version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported VersionNumber version " + std::to_string(version_number));
     }
 }
 
@@ -89,7 +89,7 @@ PlatformVersionContainer PlatformVersionContainer::deserialise(BinaryReader& rea
         return { platform, version };
     }
     default:
-        throw std::invalid_argument("Unsupported version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported PlatformVersionContainer version " + std::to_string(version_number));
     }
 }
 
@@ -112,7 +112,7 @@ VersionRange VersionRange::deserialise(BinaryReader& reader)
         return { platform, min_version, max_version };
     }
     default:
-        throw std::invalid_argument("Unsupported version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported VersionRange version " + std::to_string(version_number));
     }
 }
 
@@ -140,7 +140,7 @@ VersionRangeContainer VersionRangeContainer::deserialise(BinaryReader& reader)
         return VersionRange::deserialise(reader);
     }
     default:
-        throw std::invalid_argument("Unsupported version " + std::to_string(version_number));
+        throw std::invalid_argument("Unsupported VersionRangeContainer version " + std::to_string(version_number));
     }
 }
 

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0/src/amulet_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.3a2
+Version: 2.0.4a0
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Author: James Clare, Ben Gothard
 Project-URL: Homepage, https://www.amuletmc.com
@@ -12,11 +12,11 @@ Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: amulet-compiler-target==2.0
 Requires-Dist: amulet-compiler-version==3.0.0
-Requires-Dist: pybind11==2.13.6
+Requires-Dist: pybind11==3.0.0
 Requires-Dist: amulet-pybind11-extensions~=1.1.0.0a0
 Requires-Dist: amulet-io~=1.0
-Requires-Dist: amulet-zlib~=1.0.0.0a7
-Requires-Dist: amulet-nbt~=5.0.0.0a7
+Requires-Dist: amulet-zlib~=1.0.1.0a0
+Requires-Dist: amulet-nbt~=5.0.1.0a0
 Requires-Dist: numpy~=2.0
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet_core.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ setup.py
 get_compiler/CMakeLists.txt
 get_compiler/__init__.py
 src/amulet/core/__init__.py
+src/amulet/core/__init__.pyi
 src/amulet/core/_amulet_core.py.cpp
 src/amulet/core/_amulet_core.pyi
 src/amulet/core/_version.py

{amulet_core-2.0.3a2 → amulet_core-2.0.4a0}/src/amulet_core.egg-info/requires.txt

@@ -1,10 +1,10 @@
 amulet-compiler-target==2.0
 amulet-compiler-version==3.0.0
-pybind11==2.13.6
+pybind11==3.0.0
 amulet-pybind11-extensions~=1.1.0.0a0
 amulet-io~=1.0
-amulet-zlib~=1.0.0.0a7
-amulet-nbt~=5.0.0.0a7
+amulet-zlib~=1.0.1.0a0
+amulet-nbt~=5.0.1.0a0
 numpy~=2.0
 
 [dev]

amulet_core-2.0.3a2/src/amulet/core/block_entity/block_entity.cpp

@@ -1,26 +0,0 @@
-#include <amulet/core/dll.hpp>
-
-#include "block_entity.hpp"
-
-namespace Amulet {
-
-void BlockEntity::serialise(BinaryWriter&) const
-{
-    throw std::runtime_error("NotImplementedError");
-}
-
-BlockEntity BlockEntity::deserialise(BinaryReader&)
-{
-    throw std::runtime_error("NotImplementedError");
-}
-
-bool BlockEntity::operator==(const BlockEntity& other) const
-{
-    return (
-        PlatformVersionContainer::operator==(other)
-        && _namespace == other._namespace
-        && _base_name == other._base_name
-        && Amulet::NBT::NBTTag_eq(*_nbt, *other._nbt));
-}
-
-}

amulet_core-2.0.3a2/src/amulet/core/entity/entity.cpp

@@ -1,29 +0,0 @@
-#include <amulet/core/dll.hpp>
-#include <amulet/core/version/version.hpp>
-
-#include "entity.hpp"
-
-namespace Amulet {
-
-void Entity::serialise(BinaryWriter&) const
-{
-    throw std::runtime_error("NotImplementedError");
-}
-Entity Entity::deserialise(BinaryReader&)
-{
-    throw std::runtime_error("NotImplementedError");
-}
-
-bool Entity::operator==(const Entity& other) const
-{
-    return (
-        PlatformVersionContainer::operator==(other)
-        && _namespace == other._namespace
-        && _base_name == other._base_name
-        && _x == other._x
-        && _y == other._y
-        && _z == other._z
-        && Amulet::NBT::NBTTag_eq(*_nbt, *other._nbt));
-}
-
-} // namespace Amulet