Remove core dependency (#10)

gentlegiantJGC · web-flow · commit b56629c991df · 2025-10-16T16:30:56.000+01:00
* Remove core dependency

* Remove core dependency

Add RegionEntryDoesNotExist to replace ChunkDoesNotExist
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,9 +58,6 @@ endif()
 if (NOT TARGET amulet_nbt)
     find_package(amulet_nbt CONFIG REQUIRED)
 endif()
-if (NOT TARGET amulet_core)
-    find_package(amulet_core CONFIG REQUIRED)
-endif()
 
 # Find C++ files
 file(REAL_PATH src SOURCE_PATH)
@@ -81,7 +78,6 @@ target_link_libraries(amulet_anvil PUBLIC amulet_io)
 target_link_libraries(amulet_anvil PUBLIC amulet_utils)
 target_link_libraries(amulet_anvil PRIVATE amulet_zlib)
 target_link_libraries(amulet_anvil PUBLIC amulet_nbt)
-target_link_libraries(amulet_anvil PUBLIC amulet_core)
 target_include_directories(amulet_anvil PUBLIC ${SOURCE_PATH})
 target_sources(amulet_anvil PRIVATE ${SOURCES} ${HEADERS})
 foreach(FILE ${SOURCES} ${HEADERS})
diff --git a/requirements.py b/requirements.py
@@ -10,7 +10,6 @@
 AMULET_UTILS_REQUIREMENT = "~=1.1.3.0a0"
 AMULET_ZLIB_REQUIREMENT = "~=1.0.8.0a0"
 AMULET_NBT_REQUIREMENT = "~=5.0.2.0a0"
-AMULET_CORE_REQUIREMENT = "~=2.0.6.0a0"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
     AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = f"{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT},{os.environ['AMULET_PYBIND11_EXTENSIONS_REQUIREMENT']}"
@@ -35,11 +34,6 @@
         f"{AMULET_NBT_REQUIREMENT},{os.environ['AMULET_NBT_REQUIREMENT']}"
     )
 
-if os.environ.get("AMULET_CORE_REQUIREMENT", None):
-    AMULET_CORE_REQUIREMENT = (
-        f"{AMULET_CORE_REQUIREMENT},{os.environ['AMULET_CORE_REQUIREMENT']}"
-    )
-
 
 def get_specifier_set(version_str: str) -> str:
     """
@@ -92,13 +86,6 @@ def get_specifier_set(version_str: str) -> str:
 else:
     AMULET_NBT_REQUIREMENT = get_specifier_set(amulet.nbt.__version__)
 
-try:
-    import amulet.core
-except ImportError:
-    pass
-else:
-    AMULET_CORE_REQUIREMENT = get_specifier_set(amulet.core.__version__)
-
 
 def get_build_dependencies() -> list:
     return [
@@ -109,7 +96,6 @@ def get_build_dependencies() -> list:
         f"amulet-utils{AMULET_UTILS_REQUIREMENT}",
         f"amulet-zlib{AMULET_ZLIB_REQUIREMENT}",
         f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
-        f"amulet-core{AMULET_CORE_REQUIREMENT}",
     ] * (not os.environ.get("AMULET_SKIP_COMPILE", None))
 
 
@@ -123,5 +109,4 @@ def get_runtime_dependencies() -> list[str]:
         f"amulet-utils{AMULET_UTILS_REQUIREMENT}",
         f"amulet-zlib{AMULET_ZLIB_REQUIREMENT}",
         f"amulet-nbt{AMULET_NBT_REQUIREMENT}",
-        f"amulet-core{AMULET_CORE_REQUIREMENT}",
     ]
diff --git a/setup.py b/setup.py
@@ -28,7 +28,6 @@ def build_extension(self, ext):
         import amulet.utils
         import amulet.zlib
         import amulet.nbt
-        import amulet.core
 
         ext_dir = (
             (Path.cwd() / self.get_ext_fullpath("")).parent.resolve()
@@ -65,7 +64,6 @@ def build_extension(self, ext):
                     f"-Damulet_utils_DIR={fix_path(amulet.utils.__path__[0])}",
                     f"-Damulet_zlib_DIR={fix_path(amulet.zlib.__path__[0])}",
                     f"-Damulet_nbt_DIR={fix_path(amulet.nbt.__path__[0])}",
-                    f"-Damulet_core_DIR={fix_path(amulet.core.__path__[0])}",
                     f"-Damulet_anvil_DIR={fix_path(anvil_src_dir)}",
                     f"-DAMULET_ANVIL_EXT_DIR={fix_path(ext_dir)}",
                     f"-DCMAKE_INSTALL_PREFIX=install",
diff --git a/src/amulet/anvil/__init__.py b/src/amulet/anvil/__init__.py
@@ -26,7 +26,6 @@ def _init() -> None:
     import amulet.utils
     import amulet.zlib
     import amulet.nbt
-    import amulet.core
 
     # Load the shared library
     ctypes.cdll.LoadLibrary(lib_path)
diff --git a/src/amulet/anvil/__init__.pyi b/src/amulet/anvil/__init__.pyi
@@ -4,7 +4,7 @@ import typing
 
 import amulet.nbt
 from amulet.anvil.dimension import AnvilDimension, AnvilDimensionLayer
-from amulet.anvil.region import AnvilRegion, RegionDoesNotExist
+from amulet.anvil.region import AnvilRegion, RegionDoesNotExist, RegionEntryDoesNotExist
 
 from . import _amulet_anvil, _version, dimension, region
 
@@ -14,6 +14,7 @@ __all__: list[str] = [
     "AnvilRegion",
     "RawChunkType",
     "RegionDoesNotExist",
+    "RegionEntryDoesNotExist",
     "compiler_config",
     "dimension",
     "region",
diff --git a/src/amulet/anvil/_amulet_anvil.py.cpp b/src/amulet/anvil/_amulet_anvil.py.cpp
@@ -14,13 +14,13 @@ void init_module(py::module 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);
-    pyext::check_compatibility(py::module::import("amulet.core"), m);
 
     auto region = init_anvil_region(m);
     auto dimension = init_anvil_dimension(m);
 
     m.attr("AnvilRegion") = region.attr("AnvilRegion");
     m.attr("RegionDoesNotExist") = region.attr("RegionDoesNotExist");
+    m.attr("RegionEntryDoesNotExist") = region.attr("RegionEntryDoesNotExist");
     m.attr("AnvilDimensionLayer") = dimension.attr("AnvilDimensionLayer");
     m.attr("AnvilDimension") = dimension.attr("AnvilDimension");
     m.attr("RawChunkType") = dimension.attr("RawChunkType");
diff --git a/src/amulet/anvil/amulet_anvilConfig.cmake b/src/amulet/anvil/amulet_anvilConfig.cmake
@@ -3,7 +3,6 @@ if (NOT TARGET amulet_anvil)
 
     find_package(amulet_io CONFIG REQUIRED)
     find_package(amulet_nbt CONFIG REQUIRED)
-    find_package(amulet_core CONFIG REQUIRED)
     find_package(amulet_utils CONFIG REQUIRED)
 
     set(amulet_anvil_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")
@@ -18,7 +17,6 @@ if (NOT TARGET amulet_anvil)
     add_library(amulet_anvil INTERFACE)
     target_link_libraries(amulet_anvil INTERFACE amulet_io)
     target_link_libraries(amulet_anvil INTERFACE amulet_nbt)
-    target_link_libraries(amulet_anvil INTERFACE amulet_core)
     target_link_libraries(amulet_anvil INTERFACE amulet_utils)
     target_link_libraries(amulet_anvil INTERFACE amulet_anvil_bin)
     target_include_directories(amulet_anvil INTERFACE ${amulet_anvil_INCLUDE_DIR})
diff --git a/src/amulet/anvil/dimension.cpp b/src/amulet/anvil/dimension.cpp
@@ -1,8 +1,6 @@
 #include <algorithm>
 #include <mutex>
 
-#include <amulet/core/chunk/chunk.hpp>
-
 #include "dimension.hpp"
 #include "region.hpp"
 
@@ -236,7 +234,7 @@ Amulet::NBT::NamedTag AnvilDimensionLayer::get_chunk_data(std::int64_t cx, std::
     try {
         region = get_region(cx >> 5, cz >> 5);
     } catch (RegionDoesNotExist) {
-        throw ChunkDoesNotExist("Chunk " + std::to_string(cx) + ", " + std::to_string(cz) + " does not exist.");
+        throw RegionEntryDoesNotExist("Chunk " + std::to_string(cx) + ", " + std::to_string(cz) + " does not exist.");
     }
     auto& region_mutex = region->get_mutex();
     region_mutex.lock<ThreadAccessMode::Read, ThreadShareMode::SharedReadWrite>();
@@ -369,14 +367,14 @@ JavaRawChunk AnvilDimension::get_chunk_data(std::int64_t cx, std::int64_t cz)
         std::lock_guard region_lock(layer_mutex, std::adopt_lock);
         try {
             chunk_data.emplace(layer_name, layer.get_chunk_data(cx, cz));
-        } catch (ChunkDoesNotExist) {
+        } catch (RegionEntryDoesNotExist) {
         }
     }
     if (chunk_data.empty()) {
         if (destroyed) {
             throw std::runtime_error("This AnvilDimensionLayer instance has been destroyed.");
         }
-        throw ChunkDoesNotExist();
+        throw RegionEntryDoesNotExist();
     }
     return chunk_data;
 }
diff --git a/src/amulet/anvil/dimension.hpp b/src/amulet/anvil/dimension.hpp
@@ -165,7 +165,7 @@ class AnvilDimensionLayer {
     AMULET_ANVIL_EXPORT bool has_chunk(std::int64_t cx, std::int64_t cz);
 
     // Get the chunk data for this layer.
-    // Will throw ChunkDoesNotExist if the chunk does not exist.
+    // Will throw RegionEntryDoesNotExist if the chunk does not exist.
     // External Read::SharedReadWrite lock required.
     AMULET_ANVIL_EXPORT Amulet::NBT::NamedTag get_chunk_data(std::int64_t cx, std::int64_t cz);
 
diff --git a/src/amulet/anvil/dimension.py.cpp b/src/amulet/anvil/dimension.py.cpp
@@ -114,7 +114,7 @@ py::module init_anvil_dimension(py::module m_parent)
         py::arg("cz"),
         py::doc(
             "Get a NamedTag of a chunk from the database.\n"
-            "Will raise ChunkDoesNotExist if the region or chunk does not exist\n"
+            "Will raise RegionEntryDoesNotExist if the region or chunk does not exist\n"
             "External Read::SharedReadWrite lock required."));
     AnvilDimensionLayer.def(
         "set_chunk_data",
diff --git a/src/amulet/anvil/dimension.pyi b/src/amulet/anvil/dimension.pyi
@@ -170,7 +170,7 @@ class AnvilDimensionLayer:
     ) -> amulet.nbt.NamedTag:
         """
         Get a NamedTag of a chunk from the database.
-        Will raise ChunkDoesNotExist if the region or chunk does not exist
+        Will raise RegionEntryDoesNotExist if the region or chunk does not exist
         External Read::SharedReadWrite lock required.
         """
 
diff --git a/src/amulet/anvil/region.cpp b/src/amulet/anvil/region.cpp
@@ -15,8 +15,6 @@
 
 #include <amulet/nbt/nbt_encoding/binary.hpp>
 
-#include <amulet/core/chunk/chunk.hpp>
-
 #include <amulet/utils/logging.hpp>
 
 #include <amulet/zlib/zlib.hpp>
@@ -368,7 +366,7 @@ NamedTag AnvilRegion::get_value(std::int64_t cx, std::int64_t cz)
     read_file_header();
     auto it = _chunk_locations.find(std::make_pair(cx, cz));
     if (it == _chunk_locations.end()) {
-        throw ChunkDoesNotExist("Chunk " + std::to_string(cx) + ", " + std::to_string(cz) + " does not exist.");
+        throw RegionEntryDoesNotExist("Chunk " + std::to_string(cx) + ", " + std::to_string(cz) + " does not exist.");
     }
     create_open_region_file_if_closed();
     auto& regionf = _shared->regionf;
diff --git a/src/amulet/anvil/region.hpp b/src/amulet/anvil/region.hpp
@@ -297,4 +297,13 @@ class AMULET_ANVIL_EXPORT_EXCEPTION RegionDoesNotExist : public std::runtime_err
     }
 };
 
+class AMULET_ANVIL_EXPORT_EXCEPTION RegionEntryDoesNotExist : public std::runtime_error {
+public:
+    using std::runtime_error::runtime_error;
+    RegionEntryDoesNotExist()
+        : RegionEntryDoesNotExist("RegionDoesNotExist")
+    {
+    }
+};
+
 } // namespace Amulet
diff --git a/src/amulet/anvil/region.py.cpp b/src/amulet/anvil/region.py.cpp
@@ -183,6 +183,7 @@ py::module init_anvil_region(py::module m_parent)
                 "Thread safe."));
 
     py::register_exception<Amulet::RegionDoesNotExist>(m, "RegionDoesNotExist", PyExc_RuntimeError);
+    py::register_exception<Amulet::RegionEntryDoesNotExist>(m, "RegionEntryDoesNotExist", PyExc_RuntimeError);
 
     return m;
 }
diff --git a/src/amulet/anvil/region.pyi b/src/amulet/anvil/region.pyi
@@ -6,7 +6,7 @@ import typing
 import amulet.nbt
 import amulet.utils.lock
 
-__all__: list[str] = ["AnvilRegion", "RegionDoesNotExist"]
+__all__: list[str] = ["AnvilRegion", "RegionDoesNotExist", "RegionEntryDoesNotExist"]
 
 class AnvilRegion:
     """
@@ -185,3 +185,6 @@ class AnvilRegion:
 
 class RegionDoesNotExist(RuntimeError):
     pass
+
+class RegionEntryDoesNotExist(RuntimeError):
+    pass
diff --git a/tests/test_amulet_anvil/test_dimension.py b/tests/test_amulet_anvil/test_dimension.py
@@ -3,10 +3,10 @@
 
 from amulet.nbt import NamedTag, CompoundTag, StringTag
 
-from amulet.core.chunk import ChunkDoesNotExist
 from amulet.anvil import (
     AnvilRegion,
     RegionDoesNotExist,
+    RegionEntryDoesNotExist,
     AnvilDimension,
     AnvilDimensionLayer,
 )
@@ -56,9 +56,9 @@ def test_methods(self) -> None:
 
             # Get chunk
             self.assertIsInstance(layer.get_chunk_data(0, 0), NamedTag)
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 layer.get_chunk_data(20, 0)
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 layer.get_chunk_data(50, 50)
 
             # Set chunk
@@ -74,7 +74,7 @@ def test_methods(self) -> None:
             # Delete chunk
             layer.delete_chunk(50, 50)
             self.assertFalse(layer.has_chunk(50, 50))
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 layer.get_chunk_data(50, 50)
             self.assertEqual(
                 {(0, 0), (0, -1), (-1, 0), (-1, -1), (1, 1)},
@@ -144,7 +144,7 @@ def test_methods(self) -> None:
             for k, v in chunk_data.items():
                 self.assertIsInstance(k, str)
                 self.assertIsInstance(v, NamedTag)
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 dimension.get_chunk_data(50, 50)
 
             # Set chunk
@@ -155,7 +155,7 @@ def test_methods(self) -> None:
 
             # Delete chunk
             dimension.delete_chunk(50, 50)
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 dimension.get_chunk_data(50, 50)
             self.assertTrue(region_layer.has_region(1, 1))
 
diff --git a/tests/test_amulet_anvil/test_region.py b/tests/test_amulet_anvil/test_region.py
@@ -10,8 +10,7 @@
 
 from amulet.nbt import NamedTag, CompoundTag, StringTag, ListTag
 
-from amulet.core.chunk import ChunkDoesNotExist
-from amulet.anvil import AnvilRegion, RegionDoesNotExist
+from amulet.anvil import AnvilRegion, RegionDoesNotExist, RegionEntryDoesNotExist
 import amulet.minecraft_worlds
 import test_amulet_anvil.region
 from test_amulet_anvil.test_region_ import (
@@ -275,14 +274,14 @@ def test_exceptions(self) -> None:
         with TemporaryDirectory() as tmpdir:
             region = AnvilRegion(tmpdir, 0, 0)
 
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 region.get_value(0, 0)
 
             with self.assertRaises(ValueError):
                 region.has_value(-1, -1)
             with self.assertRaises(ValueError):
                 region.has_value(32, 0)
-            with self.assertRaises(ChunkDoesNotExist):
+            with self.assertRaises(RegionEntryDoesNotExist):
                 region.get_value(0, 0)
 
             value = NamedTag(CompoundTag(test=StringTag("test")), "test")
diff --git a/tools/cmake_generate.py b/tools/cmake_generate.py
@@ -10,7 +10,6 @@
 import amulet.utils
 import amulet.zlib
 import amulet.nbt
-import amulet.core
 
 
 def fix_path(path: str) -> str:
@@ -47,7 +46,6 @@ def main():
             f"-Damulet_utils_DIR={fix_path(amulet.utils.__path__[0])}",
             f"-Damulet_zlib_DIR={fix_path(amulet.zlib.__path__[0])}",
             f"-Damulet_nbt_DIR={fix_path(amulet.nbt.__path__[0])}",
-            f"-Damulet_core_DIR={fix_path(amulet.core.__path__[0])}",
             f"-Damulet_anvil_DIR={fix_path(os.path.join(RootDir, 'src', 'amulet', 'anvil'))}",
             f"-DCMAKE_INSTALL_PREFIX=install",
             f"-DBUILD_AMULET_ANVIL_TESTS=ON",
diff --git a/tools/compile_tests.py b/tools/compile_tests.py
@@ -9,7 +9,6 @@
 import amulet.test_utils
 import amulet.utils
 import amulet.nbt
-import amulet.core
 import amulet.anvil
 
 
@@ -47,7 +46,6 @@ def main() -> None:
             f"-Damulet_test_utils_DIR={fix_path(amulet.test_utils.__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(amulet.core.__path__[0])}",
             f"-Damulet_anvil_DIR={fix_path(amulet.anvil.__path__[0])}",
             f"-DCMAKE_INSTALL_PREFIX=install",
             "-B",
diff --git a/tools/generate_pybind_stubs.py b/tools/generate_pybind_stubs.py
@@ -244,7 +244,7 @@ def main() -> None:
         pyi = EqPattern.sub(eq_sub_func, pyi)
         pyi = pyi.replace("**kwargs)", "**kwargs: typing.Any)")
         pyi_split = [l.rstrip("\r") for l in pyi.split("\n")]
-        for hidden_import in ["typing", "types"]:
+        for hidden_import in ["amulet.nbt", "typing", "types"]:
             if hidden_import in pyi and f"import {hidden_import}" not in pyi_split:
                 pyi_split.insert(
                     pyi_split.index("from __future__ import annotations") + 1,

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`#include <algorithm>`
`2`	`2`	`#include <mutex>`
`3`	`3`
`4`		`-#include <amulet/core/chunk/chunk.hpp>`
`5`		`-`
`6`	`4`	`#include "dimension.hpp"`
`7`	`5`	`#include "region.hpp"`
`8`	`6`
`@@ -236,7 +234,7 @@ Amulet::NBT::NamedTag AnvilDimensionLayer::get_chunk_data(std::int64_t cx, std::`
`236`	`234`	`try {`
`237`	`235`	`region = get_region(cx >> 5, cz >> 5);`
`238`	`236`	`} catch (RegionDoesNotExist) {`
`239`		`- throw ChunkDoesNotExist("Chunk " + std::to_string(cx) + ", " + std::to_string(cz) + " does not exist.");`
	`237`	`+ throw RegionEntryDoesNotExist("Chunk " + std::to_string(cx) + ", " + std::to_string(cz) + " does not exist.");`
`240`	`238`	`}`
`241`	`239`	`auto& region_mutex = region->get_mutex();`
`242`	`240`	`region_mutex.lock<ThreadAccessMode::Read, ThreadShareMode::SharedReadWrite>();`
`@@ -369,14 +367,14 @@ JavaRawChunk AnvilDimension::get_chunk_data(std::int64_t cx, std::int64_t cz)`
`369`	`367`	`std::lock_guard region_lock(layer_mutex, std::adopt_lock);`
`370`	`368`	`try {`
`371`	`369`	`chunk_data.emplace(layer_name, layer.get_chunk_data(cx, cz));`
`372`		`- } catch (ChunkDoesNotExist) {`
	`370`	`+ } catch (RegionEntryDoesNotExist) {`
`373`	`371`	`}`
`374`	`372`	`}`
`375`	`373`	`if (chunk_data.empty()) {`
`376`	`374`	`if (destroyed) {`
`377`	`375`	`throw std::runtime_error("This AnvilDimensionLayer instance has been destroyed.");`
`378`	`376`	`}`
`379`		`- throw ChunkDoesNotExist();`
	`377`	`+ throw RegionEntryDoesNotExist();`
`380`	`378`	`}`
`381`	`379`	`return chunk_data;`
`382`	`380`	`}`