amulet-core 2.0a4__tar.gz → 2.0a5__tar.gz

{amulet_core-2.0a4/src/amulet_core.egg-info → amulet_core-2.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 2.0a4
+Version: 2.0a5
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Home-page: https://www.amuletmc.com
 Author: James Clare, Ben Gothard et al.

{amulet_core-2.0a4 → amulet_core-2.0a5}/setup.py

@@ -16,7 +16,7 @@ else:
     CompileArgs = ["-std=c++20"]
 
 if sys.platform == "darwin":
-    CompileArgs.append("-mmacosx-version-min=10.13")
+    CompileArgs.append("-mmacosx-version-min=10.15")
 
 
 # TODO: Would it be better to compile a shared library and link against that?

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-17T13:23:40+0100",
+ "date": "2024-09-17T14:48:15+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "2ad030d26c5fc9301849a2024c384f9d7ada0bf4",
- "version": "2.0a4"
+ "full-revisionid": "44627ded044dfa5a4f63fc941b36dd5e84be0a54",
+ "version": "2.0a5"
 }
 '''  # END VERSION_JSON
 

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/chunk_components/block_entity_component.hpp

@@ -12,19 +12,20 @@
 
 
 namespace Amulet {
+	typedef std::tuple<std::uint16_t, std::int64_t, std::uint16_t> BlockEntityChunkCoord;
 	class BlockEntityComponentData: public VersionRangeContainer {
 	private:
-		size_t _x_size;
-		size_t _z_size;
+		std::uint16_t _x_size;
+		std::uint16_t _z_size;
 		std::map<
-			std::tuple<std::int64_t, std::int64_t, std::int64_t>, 
+			BlockEntityChunkCoord,
 			std::shared_ptr<BlockEntity>
 		> _block_entities;
 	public:
 		BlockEntityComponentData(
 			std::shared_ptr<VersionRange> version_range,
-			const size_t& x_size,
-			const size_t& z_size
+			const std::uint16_t& x_size,
+			const std::uint16_t& z_size
 		) :
 			VersionRangeContainer(version_range),
 			_x_size(x_size),
@@ -32,11 +33,11 @@ namespace Amulet {
 			_block_entities()
 		{}
 
-		size_t get_x_size() const { return _x_size; }
-		size_t get_z_size() const { return _z_size; }
+		std::uint16_t get_x_size() const { return _x_size; }
+		std::uint16_t get_z_size() const { return _z_size; }
 
 		const std::map<
-			std::tuple<std::int64_t, std::int64_t, std::int64_t>,
+			BlockEntityChunkCoord,
 			std::shared_ptr<BlockEntity>
 		>& get_block_entities() const {
 			return _block_entities;
@@ -45,19 +46,19 @@ namespace Amulet {
 		size_t get_size() const { return _block_entities.size(); }
 		
 		bool contains(
-			const std::tuple<std::int64_t, std::int64_t, std::int64_t>& coord
+			const BlockEntityChunkCoord& coord
 		) const {
 			return _block_entities.contains(coord);
 		}
 
 		std::shared_ptr<BlockEntity> get(
-			const std::tuple<std::int64_t, std::int64_t, std::int64_t>& coord
+			const BlockEntityChunkCoord& coord
 		) const {
 			return _block_entities.at(coord);
 		}
 
 		void set(
-			const std::tuple<std::int64_t, std::int64_t, std::int64_t>& coord,
+			const BlockEntityChunkCoord& coord,
 			std::shared_ptr<BlockEntity> block_entity
 		) {
 			if (
@@ -91,7 +92,7 @@ namespace Amulet {
 		}
 
 		void del(
-			const std::tuple<std::int64_t, std::int64_t, std::int64_t>& coord
+			const BlockEntityChunkCoord& coord
 		) {
 			_block_entities.erase(coord);
 		}
@@ -107,8 +108,8 @@ namespace Amulet {
 		// Default constructor
 		void init(
 			std::shared_ptr<VersionRange> version_range,
-			const size_t& x_size,
-			const size_t& z_size
+			const std::uint16_t& x_size,
+			const std::uint16_t& z_size
 		) {
 			_value = std::make_shared<BlockEntityComponentData>(version_range, x_size, z_size);
 		}

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/chunk_components/section_array_map.py.cpp

@@ -41,10 +41,7 @@ void init_section_array_map(py::module section_array_map_module) {
     );
     auto index_array_from_buffer = [](py::buffer other) {
         py::buffer_info info = other.request();
-        if (!(
-            (sizeof(unsigned int) == 4 && info.format != "I") ||
-            (sizeof(unsigned long) == 4 && info.format != "L")
-            )) {
+        if (!info.item_type_is_equivalent_to<std::uint32_t>()) {
             throw std::invalid_argument("Array must be a std::uint32_t array.");
         }
         if (info.ndim != 3) {

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/collections/iterator.py.hpp

@@ -42,9 +42,9 @@ namespace collections {
 	private:
 		py::object owner;
 		const mapT& map;
-		mapT::const_iterator begin;
-		mapT::const_iterator end;
-		mapT::const_iterator pos;
+		typename mapT::const_iterator begin;
+		typename mapT::const_iterator end;
+		typename mapT::const_iterator pos;
 		size_t size;
 
 	public:

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/collections/mapping.py.hpp

@@ -166,7 +166,7 @@ namespace collections {
 		) : _owner(owner), _map(map) {}
 
 		py::object getitem(py::object py_key) const override {
-			return py::cast(_map.at(py_key.cast<mapT::key_type>()));
+			return py::cast(_map.at(py_key.cast<typename mapT::key_type>()));
 		}
 		std::shared_ptr<Iterator> iter() const override {
 			return std::make_shared<MapIterator<mapT>>(_map, _owner);
@@ -175,7 +175,7 @@ namespace collections {
 			return _map.size();
 		}
 		bool contains(py::object py_key) const override {
-			return _map.contains(py_key.cast<mapT::key_type>());
+			return _map.contains(py_key.cast<typename mapT::key_type>());
 		}
 	};
 

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/collections/mutable_mapping.py.hpp

@@ -178,7 +178,7 @@ namespace collections {
 		) : _owner(owner), _map(map) {}
 
 		py::object getitem(py::object py_key) const override {
-			return py::cast(_map.at(py_key.cast<mapT::key_type>()));
+			return py::cast(_map.at(py_key.cast<typename mapT::key_type>()));
 		}
 		std::shared_ptr<Iterator> iter() const override {
 			return std::make_shared<MapIterator<mapT>>(_map, _owner);
@@ -187,16 +187,16 @@ namespace collections {
 			return _map.size();
 		}
 		bool contains(py::object py_key) const override {
-			return _map.contains(py_key.cast<mapT::key_type>());
+			return _map.contains(py_key.cast<typename mapT::key_type>());
 		}
 		void setitem(py::object py_key, py::object py_value) override {
 			_map.insert_or_assign(
-				py_key.cast<mapT::key_type>(),
-				py_value.cast<mapT::mapped_type>()
+				py_key.cast<typename mapT::key_type>(),
+				py_value.cast<typename mapT::mapped_type>()
 			);
 		}
 		void delitem(py::object py_key) override {
-			_map.erase(py_key.cast<mapT::key_type>());
+			_map.erase(py_key.cast<typename mapT::key_type>());
 		}
 		void clear() override {
 			_map.clear();

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/collections/sequence.py.hpp

@@ -7,6 +7,7 @@
 #include <pybind11/pybind11.h>
 #include "iterator.py.hpp"
 #include <amulet/pybind11/collections.hpp>
+#include <amulet/pybind11/python.hpp>
 
 namespace py = pybind11;
 
@@ -40,7 +41,7 @@ namespace Amulet {
 				[](py::object self, py::object value) {
 					py::iterator it = py::iter(self);
 					while (it != py::iterator::sentinel()) {
-						if (*it == value) {
+						if (py::equals(*it, value)) {
 							return true;
 						}
 						++it;
@@ -113,7 +114,7 @@ namespace Amulet {
 							}
 						}
 
-						if (value == obj) {
+						if (py::equals(value, obj)) {
 							return start;
 						}
 
@@ -134,7 +135,7 @@ namespace Amulet {
 					size_t size = py::len(self);
 					py::object getitem = self.attr("__getitem__");
 					for (size_t i = 0; i < size; ++i) {
-						if (value == getitem(i)) {
+						if (py::equals(value, getitem(i))) {
 							count++;
 						}
 					}

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/io/binary_reader.hpp

@@ -7,6 +7,7 @@
 #include <bit>
 #include <functional>
 #include <stdexcept>
+#include <memory>
 
 #include <amulet_nbt/io/binary_reader.hpp>
 

amulet_core-2.0a5/src/amulet/pybind11/python.hpp

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <pybind11/pybind11.h>
+
+namespace py = pybind11;
+
+namespace pybind11 {
+	inline bool equals(
+	    const py::handle l,
+	    const py::handle r
+	){
+		return PyObject_RichCompare(l.ptr(), r.ptr(), Py_EQ);
+	}
+}

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet/utils/numpy.py.cpp

@@ -16,10 +16,7 @@ void init_utils_numpy(py::module m_parent) {
         [](py::buffer arr_buffer){
             py::buffer_info arr_info = arr_buffer.request();
             // validate the input
-            if (!(
-                arr_info.format == py::format_descriptor<std::uint32_t>::format() ||
-                (arr_info.format == "L" && arr_info.itemsize == 4)
-            )) {
+            if (!arr_info.item_type_is_equivalent_to<std::uint32_t>()) {
                 throw std::invalid_argument("dtype must be uint32.");
             }
             if (arr_info.ndim != 1){

{amulet_core-2.0a4 → amulet_core-2.0a5/src/amulet_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amulet-core
-Version: 2.0a4
+Version: 2.0a5
 Summary: A Python library for reading/writing Minecraft's various save formats.
 Home-page: https://www.amuletmc.com
 Author: James Clare, Ben Gothard et al.

{amulet_core-2.0a4 → amulet_core-2.0a5}/src/amulet_core.egg-info/SOURCES.txt

@@ -3,14 +3,14 @@ README.md
 pyproject.toml
 setup.cfg
 setup.py
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/binary/read_binary.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/binary/write_binary.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/string/read_string.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/string/write_string.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/string_encoding/mutf8.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/string_encoding/utf8.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/tag/copy.cpp
-C:/Users/runneradmin/AppData/Local/Temp/build-env-e8smhi83/Lib/site-packages/amulet_nbt/cpp/tag/eq.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/binary/read_binary.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/binary/write_binary.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/string/read_string.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/nbt_encoding/string/write_string.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/string_encoding/mutf8.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/string_encoding/utf8.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/tag/copy.cpp
+C:/Users/runneradmin/AppData/Local/Temp/build-env-4fr287_y/Lib/site-packages/amulet_nbt/cpp/tag/eq.cpp
 src/amulet/__init__.py.cpp
 src/amulet/__init__.pyi
 src/amulet/_init.py

amulet_core-2.0a4/src/amulet/pybind11/python.hpp

@@ -1,25 +0,0 @@
-#pragma once
-
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-
-namespace pybind11 {
-	inline bool equals(
-	    py::object l,
-	    py::object r
-	){
-		py::object l_result = l.attr("__eq__")(r);
-		py::object NotImplemented = py::module::import("builtins").attr("NotImplemented");
-		if (l_result.is(NotImplemented)){
-		    py::object r_result = r.attr("__eq__")(l);
-		    if (r_result.is(NotImplemented)){
-                return false;
-            } else {
-                return r_result.cast<bool>();
-            }
-		} else {
-		    return l_result.cast<bool>();
-		}
-	}
-}