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

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/CMakeLists.txt

@@ -3,6 +3,7 @@ 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(BUILD_AMULET_CORE_TESTS OFF CACHE BOOL "Should tests be built?")
 
 # Set C++20
 set(CMAKE_CXX_STANDARD 20)
@@ -15,8 +16,10 @@ if (WIN32)
 	add_definitions(-D_WIN32_WINNT=0x0601)
 elseif(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
-else()
+elseif(UNIX)
     set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+else()
+    message( FATAL_ERROR "Unsupported platform. Please submit a pull request to support this platform." )
 endif()
 
 if (MSVC)
@@ -33,6 +36,9 @@ endif()
 if (NOT TARGET amulet_io)
     find_package(amulet_io CONFIG REQUIRED)
 endif()
+if (NOT TARGET amulet_utils)
+    find_package(amulet_utils CONFIG REQUIRED)
+endif()
 if (NOT TARGET amulet_nbt)
     find_package(amulet_nbt CONFIG REQUIRED)
 endif()
@@ -49,7 +55,10 @@ list(REMOVE_ITEM HEADERS ${EXTENSION_HEADERS})
 # Add implementation
 add_library(amulet_core SHARED)
 target_compile_definitions(amulet_core PRIVATE ExportAmuletCore)
+target_link_libraries(amulet_core PUBLIC pybind11::module)
+target_link_libraries(amulet_core PUBLIC amulet_pybind11_extensions)
 target_link_libraries(amulet_core PUBLIC amulet_io)
+target_link_libraries(amulet_core PUBLIC amulet_utils)
 target_link_libraries(amulet_core PUBLIC amulet_nbt)
 target_include_directories(amulet_core PUBLIC ${SOURCE_PATH})
 target_sources(amulet_core PRIVATE ${SOURCES} ${HEADERS})
@@ -84,6 +93,6 @@ endif()
 install(TARGETS amulet_core DESTINATION ${amulet_core_DIR})
 install(TARGETS _amulet_core DESTINATION ${AMULET_CORE_EXT_DIR})
 
-if (DEFINED BUILD_AMULET_CORE_TESTS)
+if (BUILD_AMULET_CORE_TESTS)
     add_subdirectory(tests)
 endif()

{amulet_core-2.0.4a1/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.4a1
+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
@@ -11,12 +11,13 @@ Classifier: Operating System :: OS Independent
 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: 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-zlib~=1.0.1.0a0
-Requires-Dist: amulet-nbt~=5.0.1.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
 Provides-Extra: docs
 Requires-Dist: Sphinx>=1.7.4; extra == "docs"
@@ -27,14 +28,13 @@ 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"
 Requires-Dist: autoflake; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: types-pyinstaller; extra == "dev"
-Requires-Dist: amulet-test-utils~=1.1; extra == "dev"
+Requires-Dist: amulet-test-utils~=1.3; extra == "dev"
 Dynamic: requires-dist
 
 # Amulet Core

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.4a1 → amulet_core-2.0.5a1}/pyproject.toml

@@ -32,14 +32,13 @@ dev = [
     "versioneer",
     "packaging",
     "wheel",
-    "amulet_pybind11_extensions~=1.0",
     "pybind11_stubgen>=2.5.4",
     "black>=22.3",
     "isort",
     "autoflake",
     "mypy",
     "types-pyinstaller",
-    "amulet-test-utils~=1.1",
+    "amulet-test-utils~=1.3",
 ]
 
 [project.urls]

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/requirements.py

@@ -1,14 +1,15 @@
 import os
 from packaging.version import Version
+import get_compiler
 
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
-AMULET_COMPILER_VERSION_REQUIREMENT = "==3.0.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_ZLIB_REQUIREMENT = "~=1.0.1.0a0"
-AMULET_NBT_REQUIREMENT = "~=5.0.1.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"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
@@ -19,6 +20,11 @@ if os.environ.get("AMULET_IO_REQUIREMENT", None):
         f"{AMULET_IO_REQUIREMENT},{os.environ['AMULET_IO_REQUIREMENT']}"
     )
 
+if os.environ.get("AMULET_UTILS_REQUIREMENT", None):
+    AMULET_UTILS_REQUIREMENT = (
+        f"{AMULET_UTILS_REQUIREMENT},{os.environ['AMULET_UTILS_REQUIREMENT']}"
+    )
+
 if os.environ.get("AMULET_ZLIB_REQUIREMENT", None):
     AMULET_ZLIB_REQUIREMENT = (
         f"{AMULET_ZLIB_REQUIREMENT},{os.environ['AMULET_ZLIB_REQUIREMENT']}"
@@ -41,40 +47,45 @@ def get_specifier_set(version_str: str) -> str:
     return f"~={version.major}.{version.minor}.{version.micro}.0{''.join(map(str, version.pre or ()))}"
 
 
-if os.environ.get("AMULET_FREEZE_COMPILER", None):
-    import get_compiler
-
-    AMULET_COMPILER_VERSION_REQUIREMENT = get_compiler.main()
+AMULET_COMPILER_VERSION_REQUIREMENT = get_compiler.main()
 
-    try:
-        import amulet.pybind11_extensions
-    except ImportError:
-        pass
-    else:
-        AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = get_specifier_set(
-            amulet.pybind11_extensions.__version__
-        )
 
-    try:
-        import amulet.io
-    except ImportError:
-        pass
-    else:
-        AMULET_IO_REQUIREMENT = get_specifier_set(amulet.io.__version__)
-
-    try:
-        import amulet.zlib
-    except ImportError:
-        pass
-    else:
-        AMULET_ZLIB_REQUIREMENT = get_specifier_set(amulet.zlib.__version__)
+try:
+    import amulet.pybind11_extensions
+except ImportError:
+    pass
+else:
+    AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = get_specifier_set(
+        amulet.pybind11_extensions.__version__
+    )
 
-    try:
-        import amulet.nbt
-    except ImportError:
-        pass
-    else:
-        AMULET_NBT_REQUIREMENT = get_specifier_set(amulet.nbt.__version__)
+try:
+    import amulet.io
+except ImportError:
+    pass
+else:
+    AMULET_IO_REQUIREMENT = get_specifier_set(amulet.io.__version__)
+
+try:
+    import amulet.utils
+except ImportError:
+    pass
+else:
+    AMULET_UTILS_REQUIREMENT = get_specifier_set(amulet.utils.__version__)
+
+try:
+    import amulet.zlib
+except ImportError:
+    pass
+else:
+    AMULET_ZLIB_REQUIREMENT = get_specifier_set(amulet.zlib.__version__)
+
+try:
+    import amulet.nbt
+except ImportError:
+    pass
+else:
+    AMULET_NBT_REQUIREMENT = get_specifier_set(amulet.nbt.__version__)
 
 
 def get_build_dependencies() -> list:
@@ -83,6 +94,7 @@ def get_build_dependencies() -> list:
         f"pybind11{PYBIND11_REQUIREMENT}",
         f"amulet-pybind11-extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
         f"amulet-io{AMULET_IO_REQUIREMENT}",
+        f"amulet-utils{AMULET_UTILS_REQUIREMENT}",
         f"amulet-zlib{AMULET_ZLIB_REQUIREMENT}",
         f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
     ] * (not os.environ.get("AMULET_SKIP_COMPILE", None))
@@ -95,6 +107,7 @@ def get_runtime_dependencies() -> list[str]:
         f"pybind11{PYBIND11_REQUIREMENT}",
         f"amulet-pybind11-extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
         f"amulet-io{AMULET_IO_REQUIREMENT}",
+        f"amulet-utils{AMULET_UTILS_REQUIREMENT}",
         f"amulet-zlib{AMULET_ZLIB_REQUIREMENT}",
         f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
         f"numpy{NUMPY_REQUIREMENT}",

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/setup.py

@@ -3,25 +3,15 @@ import subprocess
 import sys
 from pathlib import Path
 import platform
-import datetime
 from tempfile import TemporaryDirectory
 
 from setuptools import setup, Extension, Command
 from setuptools.command.build_ext import build_ext
 
-from packaging.version import Version
-
 import versioneer
 
 import requirements
 
-if (
-    os.environ.get("AMULET_FREEZE_COMPILER", None)
-    and sys.platform == "darwin"
-    and platform.machine() != "arm64"
-):
-    raise Exception("The MacOS frozen build must be created on arm64")
-
 
 def fix_path(path: str) -> str:
     return os.path.realpath(path).replace(os.sep, "/")
@@ -35,6 +25,7 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
         import pybind11
         import amulet.pybind11_extensions
         import amulet.io
+        import amulet.utils
         import amulet.nbt
 
         ext_dir = (
@@ -69,6 +60,7 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
                     f"-Dpybind11_DIR={fix_path(pybind11.get_cmake_dir())}",
                     f"-Damulet_pybind11_extensions_DIR={fix_path(amulet.pybind11_extensions.__path__[0])}",
                     f"-Damulet_io_DIR={fix_path(amulet.io.__path__[0])}",
+                    f"-Damulet_utils_DIR={fix_path(amulet.utils.__path__[0])}",
                     f"-Damulet_nbt_DIR={fix_path(amulet.nbt.__path__[0])}",
                     f"-Damulet_core_DIR={fix_path(core_src_dir)}",
                     f"-DAMULET_CORE_EXT_DIR={fix_path(ext_dir)}",
@@ -91,35 +83,8 @@ class CMakeBuild(cmdclass.get("build_ext", build_ext)):
 cmdclass["build_ext"] = CMakeBuild
 
 
-def _get_version() -> str:
-    version_str: str = versioneer.get_version()
-
-    if os.environ.get("AMULET_FREEZE_COMPILER", None):
-        date_format = "%y%m%d%H%M%S"
-        try:
-            with open("build/timestamp.txt", "r") as f:
-                timestamp = datetime.datetime.strptime(f.read(), date_format)
-        except Exception:
-            timestamp = datetime.datetime(1, 1, 1)
-        if datetime.timedelta(minutes=10) < datetime.datetime.now() - timestamp:
-            timestamp = datetime.datetime.now()
-            os.makedirs("build", exist_ok=True)
-            with open("build/timestamp.txt", "w") as f:
-                f.write(timestamp.strftime(date_format))
-
-        version = Version(version_str)
-        epoch = f"{version.epoch}!" if version.epoch else ""
-        release = ".".join(map(str, version.release))
-        pre = "".join(map(str, version.pre)) if version.is_prerelease else ""
-        post = f".post{timestamp.strftime(date_format)}"
-        local = f"+{version.local}" if version.local else ""
-        version_str = f"{epoch}{release}{pre}{post}{local}"
-
-    return version_str
-
-
 setup(
-    version=_get_version(),
+    version=versioneer.get_version(),
     cmdclass=cmdclass,
     ext_modules=[Extension("amulet.core._amulet_core", [])]
     * (not os.environ.get("AMULET_SKIP_COMPILE", None)),

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/__init__.py

@@ -23,6 +23,7 @@ def _init() -> None:
         raise RuntimeError(f"Unsupported platform {sys.platform}")
 
     # Import dependencies
+    import amulet.utils
     import amulet.zlib
     import amulet.nbt
 

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

@@ -13,7 +13,7 @@ from . import (
     version,
 )
 
-__all__ = [
+__all__: list[str] = [
     "biome",
     "block",
     "block_entity",

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/_amulet_core.py.cpp

@@ -17,6 +17,7 @@ void init_chunk(py::module);
 void init_module(py::module m)
 {
     pyext::init_compiler_config(m);
+    pyext::check_compatibility(py::module::import("amulet.utils"), m);
     pyext::check_compatibility(py::module::import("amulet.zlib"), m);
     pyext::check_compatibility(py::module::import("amulet.nbt"), m);
 

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/_amulet_core.pyi

@@ -2,6 +2,6 @@ from __future__ import annotations
 
 import types
 
-__all__ = ["init"]
+__all__: list[str] = ["init"]
 
 def init(arg0: types.ModuleType) -> None: ...

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-28T13:06:55+0100",
+ "date": "2025-09-17T11:29:24+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "9f6478cecb25ca0c0779bb4bf851c1a4ee0771cf",
- "version": "2.0.4a1"
+ "full-revisionid": "7ed2b2b5421e7cb0691779cf4861faf812f8cee3",
+ "version": "2.0.5a1"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/amulet_coreConfig.cmake

@@ -3,6 +3,7 @@ if (NOT TARGET amulet_core)
 
     find_package(amulet_io CONFIG REQUIRED)
     find_package(amulet_nbt CONFIG REQUIRED)
+    find_package(amulet_utils CONFIG REQUIRED)
 
     set(amulet_core_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
     find_library(amulet_core_LIBRARY NAMES amulet_core PATHS "${CMAKE_CURRENT_LIST_DIR}")
@@ -16,6 +17,7 @@ if (NOT TARGET amulet_core)
     add_library(amulet_core INTERFACE)
     target_link_libraries(amulet_core INTERFACE amulet_io)
     target_link_libraries(amulet_core INTERFACE amulet_nbt)
+    target_link_libraries(amulet_core INTERFACE amulet_utils)
     target_link_libraries(amulet_core INTERFACE amulet_core_bin)
     target_include_directories(amulet_core INTERFACE ${amulet_core_INCLUDE_DIR})
 endif()

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/biome/__init__.pyi

@@ -5,7 +5,7 @@ import typing
 
 import amulet.core.version
 
-__all__ = ["Biome"]
+__all__: list[str] = ["Biome"]
 
 class Biome(amulet.core.version.PlatformVersionContainer):
     """
@@ -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.4a1 → amulet_core-2.0.5a1}/src/amulet/core/block/__init__.pyi

@@ -7,7 +7,7 @@ import typing
 import amulet.core.version
 import amulet.nbt
 
-__all__ = ["Block", "BlockStack"]
+__all__: list[str] = ["Block", "BlockStack"]
 
 class Block(amulet.core.version.PlatformVersionContainer):
     """
@@ -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.4a1 → 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.4a1 → amulet_core-2.0.5a1}/src/amulet/core/block_entity/__init__.pyi

@@ -6,7 +6,7 @@ import typing
 import amulet.core.version
 import amulet.nbt
 
-__all__ = ["BlockEntity"]
+__all__: list[str] = ["BlockEntity"]
 
 class BlockEntity(amulet.core.version.PlatformVersionContainer):
     """
@@ -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.4a1 → amulet_core-2.0.5a1}/src/amulet/core/chunk/__init__.pyi

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from . import component
 
-__all__ = [
+__all__: list[str] = [
     "Chunk",
     "ChunkDoesNotExist",
     "ChunkLoadError",

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/chunk/component/__init__.pyi

@@ -8,7 +8,7 @@ from amulet.core.chunk.component.section_array_map import IndexArray3D, SectionA
 
 from . import block_component, section_array_map
 
-__all__ = [
+__all__: list[str] = [
     "BlockComponent",
     "BlockComponentData",
     "IndexArray3D",

{amulet_core-2.0.4a1 → amulet_core-2.0.5a1}/src/amulet/core/chunk/component/block_component.pyi

@@ -7,7 +7,7 @@ import amulet.core.chunk.component.section_array_map
 import amulet.core.palette.block_palette
 import amulet.core.version
 
-__all__ = ["BlockComponent", "BlockComponentData"]
+__all__: list[str] = ["BlockComponent", "BlockComponentData"]
 
 class BlockComponent:
     ComponentID: typing.ClassVar[str] = "Amulet::BlockComponent"

{amulet_core-2.0.4a1 → 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(