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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amulet-core
-Version: 2.0.5a0
+Version: 2.0.5a1
 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.5a1/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.5a1}/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.5a1}/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.5a1}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-01T13:18:18+0100",
+ "date": "2025-09-17T11:29:24+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "d46ea97b2c67f05ece822c4af0819fa94db55cf3",
- "version": "2.0.5a0"
+ "full-revisionid": "7ed2b2b5421e7cb0691779cf4861faf812f8cee3",
+ "version": "2.0.5a1"
 }
 '''  # END VERSION_JSON
 

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

@@ -221,17 +221,18 @@ py::module init_section_array_map(py::module m_parent)
     SectionArrayMap.def(
         "__contains__",
         &Amulet::SectionArrayMap::contains_section);
-    pyext::collections::def_Mapping_keys<std::int64_t>(SectionArrayMap);
-    pyext::collections::def_Mapping_values<pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
-    pyext::collections::def_Mapping_items<std::int64_t, pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
-    pyext::collections::def_Mapping_get<std::int64_t, pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
-    pyext::collections::def_Mapping_eq(SectionArrayMap);
-    pyext::collections::def_Mapping_hash(SectionArrayMap);
-    pyext::collections::def_MutableMapping_pop<std::int64_t, pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
-    pyext::collections::def_MutableMapping_popitem<std::int64_t, pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
-    pyext::collections::def_MutableMapping_update(SectionArrayMap);
-    pyext::collections::def_MutableMapping_setdefault<std::int64_t, pyext::numpy::array_t<std::uint32_t>>(SectionArrayMap);
-    pyext::collections::register_MutableMapping(SectionArrayMap);
+    using SectionMap = pyext::collections::MutableMapping<std::int64_t, pyext::numpy::array_t<std::uint32_t>>;
+    SectionMap::def_keys(SectionArrayMap);
+    SectionMap::def_values(SectionArrayMap);
+    SectionMap::def_items(SectionArrayMap);
+    SectionMap::def_get(SectionArrayMap);
+    SectionMap::def_eq(SectionArrayMap);
+    SectionMap::def_hash(SectionArrayMap);
+    SectionMap::def_pop(SectionArrayMap);
+    SectionMap::def_popitem(SectionArrayMap);
+    SectionMap::def_update(SectionArrayMap);
+    SectionMap::def_setdefault(SectionArrayMap);
+    SectionMap::register_cls(SectionArrayMap);
 
     SectionArrayMap.def(
         py::pickle(

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/chunk/component/section_array_map.pyi

@@ -40,7 +40,7 @@ class SectionArrayMap:
 
     def __contains__(self, arg0: typing.SupportsInt) -> bool: ...
     def __delitem__(self, arg0: typing.SupportsInt) -> None: ...
-    def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
+    def __eq__(self, other: typing.Any) -> bool | types.NotImplementedType: ...
     def __getitem__(
         self, arg0: typing.SupportsInt
     ) -> numpy.typing.NDArray[numpy.uint32]: ...
@@ -48,40 +48,61 @@ class SectionArrayMap:
     def __init__(
         self,
         array_shape: tuple[typing.SupportsInt, typing.SupportsInt, typing.SupportsInt],
-        default_array: (
-            typing.SupportsInt
-            | amulet.core.chunk.component.section_array_map.IndexArray3D
-            | collections.abc.Buffer
-        ),
+        default_array: typing.SupportsInt | IndexArray3D | collections.abc.Buffer,
     ) -> None: ...
     def __iter__(self) -> collections.abc.Iterator[int]: ...
     def __len__(self) -> int: ...
     def __setitem__(
-        self,
-        arg0: typing.SupportsInt,
-        arg1: (
-            amulet.core.chunk.component.section_array_map.IndexArray3D
-            | collections.abc.Buffer
-        ),
+        self, arg0: typing.SupportsInt, arg1: IndexArray3D | collections.abc.Buffer
     ) -> None: ...
+    @typing.overload
     def get(
-        self,
-        key: typing.SupportsInt,
-        default: numpy.typing.NDArray[numpy.uint32] | None = None,
+        self, key: typing.SupportsInt
     ) -> numpy.typing.NDArray[numpy.uint32] | None: ...
+    @typing.overload
+    def get(
+        self, key: typing.SupportsInt, default: numpy.typing.NDArray[numpy.uint32]
+    ) -> numpy.typing.NDArray[numpy.uint32]: ...
+    @typing.overload
+    def get[T](
+        self, key: typing.SupportsInt, default: T
+    ) -> numpy.typing.NDArray[numpy.uint32] | T: ...
     def items(
         self,
     ) -> collections.abc.ItemsView[int, numpy.typing.NDArray[numpy.uint32]]: ...
     def keys(self) -> collections.abc.KeysView[int]: ...
+    @typing.overload
+    def pop(self, key: typing.SupportsInt) -> numpy.typing.NDArray[numpy.uint32]: ...
+    @typing.overload
     def pop(
-        self, key: typing.SupportsInt, default: numpy.typing.NDArray[numpy.uint32] = ...
+        self, key: typing.SupportsInt, default: numpy.typing.NDArray[numpy.uint32]
     ) -> numpy.typing.NDArray[numpy.uint32]: ...
+    @typing.overload
+    def pop[T](
+        self, key: typing.SupportsInt, default: T
+    ) -> numpy.typing.NDArray[numpy.uint32] | T: ...
     def popitem(self) -> tuple[int, numpy.typing.NDArray[numpy.uint32]]: ...
     def populate(self, arg0: typing.SupportsInt) -> None: ...
+    @typing.overload
     def setdefault(
-        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: ...
+        self, key: typing.SupportsInt
+    ) -> numpy.typing.NDArray[numpy.uint32]: ...
+    @typing.overload
+    def setdefault(
+        self, key: typing.SupportsInt, default: numpy.typing.NDArray[numpy.uint32]
+    ) -> numpy.typing.NDArray[numpy.uint32]: ...
+    def update(
+        self,
+        other: (
+            collections.abc.Mapping[
+                typing.SupportsInt, numpy.typing.NDArray[numpy.uint32]
+            ]
+            | collections.abc.Iterable[
+                tuple[typing.SupportsInt, numpy.typing.NDArray[numpy.uint32]]
+            ]
+        ) = (),
+        **kwargs: numpy.typing.NDArray[numpy.uint32],
+    ) -> None: ...
     def values(
         self,
     ) -> collections.abc.ValuesView[numpy.typing.NDArray[numpy.uint32]]: ...
@@ -91,10 +112,5 @@ class SectionArrayMap:
     def default_array(self) -> int | numpy.ndarray: ...
     @default_array.setter
     def default_array(
-        self,
-        arg1: (
-            typing.SupportsInt
-            | amulet.core.chunk.component.section_array_map.IndexArray3D
-            | collections.abc.Buffer
-        ),
+        self, arg1: typing.SupportsInt | IndexArray3D | collections.abc.Buffer
     ) -> None: ...

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/entity/__init__.pyi

@@ -14,9 +14,9 @@ class Entity(amulet.core.version.PlatformVersionContainer):
     """
 
     @typing.overload
-    def __eq__(self, arg0: Entity) -> bool: ...
+    def __eq__(self, other: Entity) -> 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.5a1}/src/amulet/core/palette/biome_palette.py.cpp

@@ -48,7 +48,7 @@ void init_biome_palette(py::module biome_palette_module)
             bounds_check(self.size(), index);
             return self.index_to_biome(index);
         });
-    pyext::collections::def_Sequence_getitem_slice(BiomePalette);
+    
     BiomePalette.def(
         "__contains__",
         [](const Amulet::BiomePalette& self, Py_ssize_t index) {
@@ -57,11 +57,13 @@ void init_biome_palette(py::module biome_palette_module)
     BiomePalette.def(
         "__contains__",
         &Amulet::BiomePalette::contains_biome);
-    pyext::collections::def_Sequence_iter(BiomePalette);
-    pyext::collections::def_Sequence_reversed(BiomePalette);
-    pyext::collections::def_Sequence_index(BiomePalette);
-    pyext::collections::def_Sequence_count(BiomePalette);
-    pyext::collections::register_Sequence(BiomePalette);
+    using BiomeSequence = pyext::collections::Sequence<Amulet::Biome>;
+    BiomeSequence::def_getitem_slice(BiomePalette);
+    BiomeSequence::def_iter(BiomePalette);
+    BiomeSequence::def_reversed(BiomePalette);
+    BiomeSequence::def_index(BiomePalette);
+    BiomeSequence::def_count(BiomePalette);
+    BiomeSequence::register_cls(BiomePalette);
 
     BiomePalette.def(
         "index_to_biome",

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/palette/biome_palette.pyi

@@ -16,12 +16,12 @@ class BiomePalette(amulet.core.version.VersionRangeContainer):
     @typing.overload
     def __getitem__(self, arg0: typing.SupportsInt) -> amulet.core.biome.Biome: ...
     @typing.overload
-    def __getitem__(self, arg0: slice) -> list: ...
+    def __getitem__(self, item: slice) -> list[amulet.core.biome.Biome]: ...
     def __init__(self, arg0: amulet.core.version.VersionRange) -> None: ...
-    def __iter__(self) -> collections.abc.Iterator[typing.Any]: ...
+    def __iter__(self) -> collections.abc.Iterator[amulet.core.biome.Biome]: ...
     def __len__(self) -> int: ...
     def __repr__(self) -> str: ...
-    def __reversed__(self) -> collections.abc.Iterator[typing.Any]: ...
+    def __reversed__(self) -> collections.abc.Iterator[amulet.core.biome.Biome]: ...
     def biome_to_index(self, arg0: amulet.core.biome.Biome) -> int:
         """
         Get the index of the biome in the palette.
@@ -31,10 +31,10 @@ class BiomePalette(amulet.core.version.VersionRangeContainer):
         :return: The index of the biome in the palette.
         """
 
-    def count(self, value: typing.Any) -> int: ...
+    def count(self, value: amulet.core.biome.Biome) -> int: ...
     def index(
         self,
-        value: typing.Any,
+        value: amulet.core.biome.Biome,
         start: typing.SupportsInt = 0,
         stop: typing.SupportsInt = 9223372036854775807,
     ) -> int: ...

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/palette/block_palette.py.cpp

@@ -48,7 +48,7 @@ void init_block_palette(py::module block_palette_module)
             bounds_check(self.size(), index);
             return self.index_to_block_stack(index);
         });
-    pyext::collections::def_Sequence_getitem_slice(BlockPalette);
+    
     BlockPalette.def(
         "__contains__",
         [](const Amulet::BlockPalette& self, Py_ssize_t index) {
@@ -57,11 +57,13 @@ void init_block_palette(py::module block_palette_module)
     BlockPalette.def(
         "__contains__",
         &Amulet::BlockPalette::contains_block);
-    pyext::collections::def_Sequence_iter<Amulet::BlockStack>(BlockPalette);
-    pyext::collections::def_Sequence_reversed<Amulet::BlockStack>(BlockPalette);
-    pyext::collections::def_Sequence_index(BlockPalette);
-    pyext::collections::def_Sequence_count(BlockPalette);
-    pyext::collections::register_Sequence(BlockPalette);
+    using BlockSequence = pyext::collections::Sequence<Amulet::BlockStack>;
+    BlockSequence::def_getitem_slice(BlockPalette);
+    BlockSequence::def_iter(BlockPalette);
+    BlockSequence::def_reversed(BlockPalette);
+    BlockSequence::def_index(BlockPalette);
+    BlockSequence::def_count(BlockPalette);
+    BlockSequence::register_cls(BlockPalette);
 
     BlockPalette.def(
         "index_to_block_stack",

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/palette/block_palette.pyi

@@ -16,7 +16,7 @@ class BlockPalette(amulet.core.version.VersionRangeContainer):
     @typing.overload
     def __getitem__(self, arg0: typing.SupportsInt) -> amulet.core.block.BlockStack: ...
     @typing.overload
-    def __getitem__(self, arg0: slice) -> list: ...
+    def __getitem__(self, item: slice) -> list[amulet.core.block.BlockStack]: ...
     def __init__(self, arg0: amulet.core.version.VersionRange) -> None: ...
     def __iter__(self) -> collections.abc.Iterator[amulet.core.block.BlockStack]: ...
     def __len__(self) -> int: ...
@@ -33,10 +33,10 @@ class BlockPalette(amulet.core.version.VersionRangeContainer):
         :return: The index of the block stack in the palette.
         """
 
-    def count(self, value: typing.Any) -> int: ...
+    def count(self, value: amulet.core.block.BlockStack) -> int: ...
     def index(
         self,
-        value: typing.Any,
+        value: amulet.core.block.BlockStack,
         start: typing.SupportsInt = 0,
         stop: typing.SupportsInt = 9223372036854775807,
     ) -> int: ...

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/selection/__init_selection.py.cpp

@@ -4,6 +4,7 @@
 
 #include "box.hpp"
 #include "box_group.hpp"
+#include "shape_group.hpp"
 
 namespace py = pybind11;
 namespace pyext = Amulet::pybind11_extensions;
@@ -11,7 +12,7 @@ namespace pyext = Amulet::pybind11_extensions;
 void init_selection_box(py::classh<Amulet::SelectionBox>);
 void init_selection_box_group(py::classh<Amulet::SelectionBoxGroup>);
 py::object init_selection_shape(py::module);
-py::object init_selection_shape_group(py::module);
+void init_selection_shape_group(py::module, py::classh<Amulet::SelectionShapeGroup>);
 py::object init_selection_cuboid(py::module m_parent);
 py::object init_selection_ellipsoid(py::module m_parent);
 
@@ -21,6 +22,7 @@ void init_selection(py::module m_parent)
 
     auto selection_box_module = m.def_submodule("box");
     auto selection_box_group_module = m.def_submodule("box_group");
+    auto selection_shape_group_module = m.def_submodule("shape_group");
 
     // Low level selection
     // These classes must be defined before methods can be added
@@ -32,6 +34,8 @@ void init_selection(py::module m_parent)
         "A container for zero or more :class:`SelectionBox` instances.\n"
         "\n"
         "This allows for non-rectangular and non-contiguous selections.");
+    py::classh<Amulet::SelectionShapeGroup> SelectionShapeGroup(selection_shape_group_module, "SelectionShapeGroup",
+        "A group of selection shapes.");
 
     // Shape base class
     m.attr("SelectionShape") = init_selection_shape(m);
@@ -42,9 +46,10 @@ void init_selection(py::module m_parent)
 
     m.attr("SelectionBox") = SelectionBox;
     m.attr("SelectionBoxGroup") = SelectionBoxGroup;
+    m.attr("SelectionShapeGroup") = SelectionShapeGroup;
 
     // Init shape classes
-    m.attr("SelectionShapeGroup") = init_selection_shape_group(m);
+    init_selection_shape_group(selection_shape_group_module, SelectionShapeGroup);
     m.attr("SelectionCuboid") = init_selection_cuboid(m);
     m.attr("SelectionEllipsoid") = init_selection_ellipsoid(m);
 }

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/selection/box.pyi

@@ -16,9 +16,9 @@ class SelectionBox:
     """
 
     @typing.overload
-    def __eq__(self, arg0: SelectionBox) -> bool: ...
+    def __eq__(self, other: SelectionBox) -> 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: SelectionBox) -> bool: ...
     def __gt__(self, arg0: SelectionBox) -> bool: ...
     def __hash__(self) -> int: ...

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/selection/box_group.py.cpp

@@ -39,6 +39,12 @@ void init_selection_box_group(py::classh<Amulet::SelectionBoxGroup> SelectionBox
             "Create an empty SelectionBoxGroup.\n"
             "\n"
             ">>> SelectionBoxGroup()"));
+    SelectionBoxGroup.def(
+        py::init(
+            [](const Amulet::SelectionShapeGroup& shapes) {
+                return shapes.voxelise();
+            }),
+        py::arg("shape_group"));
     SelectionBoxGroup.def(
         py::init(
             [](pyext::collections::Iterable<const Amulet::SelectionBox&> boxes) {

{amulet_core-2.0.5a0 → amulet_core-2.0.5a1}/src/amulet/core/selection/box_group.pyi

@@ -5,6 +5,7 @@ import types
 import typing
 
 import amulet.core.selection.box
+import amulet.core.selection.shape_group
 import amulet.utils.matrix
 
 __all__: list[str] = ["SelectionBoxGroup"]
@@ -23,7 +24,7 @@ class SelectionBoxGroup:
         """
 
     @typing.overload
-    def __eq__(self, arg0: SelectionBoxGroup) -> bool:
+    def __eq__(self, other: SelectionBoxGroup) -> bool:
         """
         Does the contents of this :class:`SelectionBoxGroup` match the other :class:`SelectionBoxGroup`.
 
@@ -34,7 +35,7 @@ class SelectionBoxGroup:
         """
 
     @typing.overload
-    def __eq__(self, arg0: typing.Any) -> bool | types.NotImplementedType: ...
+    def __eq__(self, other: typing.Any) -> bool | types.NotImplementedType: ...
     @typing.overload
     def __init__(self) -> None:
         """
@@ -43,6 +44,10 @@ class SelectionBoxGroup:
         >>> SelectionBoxGroup()
         """
 
+    @typing.overload
+    def __init__(
+        self, shape_group: amulet.core.selection.shape_group.SelectionShapeGroup
+    ) -> None: ...
     @typing.overload
     def __init__(
         self, boxes: collections.abc.Iterable[amulet.core.selection.box.SelectionBox]