Update IO library (#441)

gentlegiantJGC · web-flow · commit f125540ce005 · 2025-11-27T16:12:08.000Z
diff --git a/requirements.py b/requirements.py
@@ -6,10 +6,10 @@
 
 PYBIND11_REQUIREMENT = "==3.0.1"
 AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.2.0.0a2"
-AMULET_IO_REQUIREMENT = "~=1.0"
+AMULET_IO_REQUIREMENT = "~=2.0.0.0a0"
 AMULET_UTILS_REQUIREMENT = "~=1.1.3.0a6"
 AMULET_ZLIB_REQUIREMENT = "~=1.0.8.0a0"
-AMULET_NBT_REQUIREMENT = "~=5.0.2.0a2"
+AMULET_NBT_REQUIREMENT = "~=5.0.3.0a0"
 NUMPY_REQUIREMENT = "~=2.0"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
diff --git a/src/amulet/core/biome/biome.cpp b/src/amulet/core/biome/biome.cpp
@@ -13,7 +13,7 @@
 
 namespace Amulet {
 
-void Biome::serialise(BinaryWriter& writer) const
+void Biome::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_size_and_bytes(get_platform());
diff --git a/src/amulet/core/biome/biome.hpp b/src/amulet/core/biome/biome.hpp
@@ -30,7 +30,7 @@ class Biome : public PlatformVersionContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static Biome deserialise(BinaryReader&);
 
     auto operator<=>(const Biome& other) const
diff --git a/src/amulet/core/block/block.cpp b/src/amulet/core/block/block.cpp
@@ -13,7 +13,7 @@
 
 namespace Amulet {
 
-void Block::serialise(BinaryWriter& writer) const
+void Block::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_size_and_bytes(get_platform());
@@ -393,7 +393,7 @@ Block Block::from_bedrock_blockstate(const PlatformType& platform, const Version
         blockstate);
 }
 
-void BlockStack::serialise(BinaryWriter& writer) const
+void BlockStack::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_numeric<std::uint64_t>(get_blocks().size());
diff --git a/src/amulet/core/block/block.hpp b/src/amulet/core/block/block.hpp
@@ -72,7 +72,7 @@ class Block : public PlatformVersionContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static Block deserialise(BinaryReader&);
 
     auto operator<=>(const Block& other) const
@@ -127,7 +127,7 @@ class BlockStack {
         }
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static BlockStack deserialise(BinaryReader&);
 
     auto operator<=>(const BlockStack& other) const
diff --git a/src/amulet/core/block_entity/block_entity.cpp b/src/amulet/core/block_entity/block_entity.cpp
@@ -6,7 +6,7 @@
 
 namespace Amulet {
 
-void BlockEntity::serialise(BinaryWriter& writer) const
+void BlockEntity::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_size_and_bytes(get_platform());
diff --git a/src/amulet/core/block_entity/block_entity.hpp b/src/amulet/core/block_entity/block_entity.hpp
@@ -76,7 +76,7 @@ class BlockEntity : public PlatformVersionContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static BlockEntity deserialise(BinaryReader&);
 
     AMULET_CORE_EXPORT bool operator==(const BlockEntity& other) const;
diff --git a/src/amulet/core/chunk/component/biome_3d_component.cpp b/src/amulet/core/chunk/component/biome_3d_component.cpp
@@ -6,7 +6,7 @@ namespace Amulet {
 
 // Biome3DComponent
 
-void Biome3DStorage::serialise(BinaryWriter& writer) const
+void Biome3DStorage::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     _palette->serialise(writer);
diff --git a/src/amulet/core/chunk/component/biome_3d_component.hpp b/src/amulet/core/chunk/component/biome_3d_component.hpp
@@ -60,7 +60,7 @@ class Biome3DStorage {
     SectionArrayMap& get_sections() { return *_sections; }
     std::shared_ptr<SectionArrayMap> get_sections_ptr() { return _sections; }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static Biome3DStorage deserialise(BinaryReader&);
 };
 
diff --git a/src/amulet/core/chunk/component/block_component.cpp b/src/amulet/core/chunk/component/block_component.cpp
@@ -5,7 +5,7 @@
 namespace Amulet {
 
 // BlockStorage
-void BlockStorage::serialise(BinaryWriter& writer) const
+void BlockStorage::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     get_palette().serialise(writer);
diff --git a/src/amulet/core/chunk/component/block_component.hpp b/src/amulet/core/chunk/component/block_component.hpp
@@ -57,7 +57,7 @@ class BlockStorage {
         _palette->block_stack_to_index(default_block);
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static BlockStorage deserialise(BinaryReader&);
 
     const BlockPalette& get_palette() const { return *_palette; }
diff --git a/src/amulet/core/chunk/component/block_entity_component.cpp b/src/amulet/core/chunk/component/block_entity_component.cpp
@@ -6,7 +6,7 @@ namespace Amulet {
 
 // BlockEntityStorage
 
-void BlockEntityStorage::serialise(BinaryWriter& writer) const
+void BlockEntityStorage::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     get_version_range().serialise(writer);
diff --git a/src/amulet/core/chunk/component/block_entity_component.hpp b/src/amulet/core/chunk/component/block_entity_component.hpp
@@ -34,7 +34,7 @@ class BlockEntityStorage : public VersionRangeContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static BlockEntityStorage deserialise(BinaryReader&);
 
     std::uint16_t get_x_size() const { return _x_size; }
diff --git a/src/amulet/core/chunk/component/section_array_map.cpp b/src/amulet/core/chunk/component/section_array_map.cpp
@@ -82,7 +82,7 @@ IndexArray3D::~IndexArray3D()
     }
 }
 
-void IndexArray3D::serialise(BinaryWriter& writer) const
+void IndexArray3D::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
 
@@ -128,7 +128,7 @@ IndexArray3D IndexArray3D::deserialise(BinaryReader& reader)
 }
 
 // SectionArrayMap
-void SectionArrayMap::serialise(BinaryWriter& writer) const
+void SectionArrayMap::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
 
diff --git a/src/amulet/core/chunk/component/section_array_map.hpp b/src/amulet/core/chunk/component/section_array_map.hpp
@@ -39,7 +39,7 @@ class IndexArray3D {
 
     AMULET_CORE_EXPORT ~IndexArray3D();
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static IndexArray3D deserialise(BinaryReader&);
 
     const SectionShape& get_shape() const { return _shape; }
@@ -85,7 +85,7 @@ class SectionArrayMap {
         validate_array_shape(_default_array);
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static SectionArrayMap deserialise(BinaryReader&);
 
     const SectionShape& get_array_shape() const { return _array_shape; }
diff --git a/src/amulet/core/entity/entity.cpp b/src/amulet/core/entity/entity.cpp
@@ -7,7 +7,7 @@
 
 namespace Amulet {
 
-void Entity::serialise(BinaryWriter& writer) const
+void Entity::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_size_and_bytes(get_platform());
diff --git a/src/amulet/core/entity/entity.hpp b/src/amulet/core/entity/entity.hpp
@@ -91,7 +91,7 @@ class Entity : public PlatformVersionContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static Entity deserialise(BinaryReader&);
 
     AMULET_CORE_EXPORT bool operator==(const Entity& other) const;
diff --git a/src/amulet/core/palette/biome_palette.cpp b/src/amulet/core/palette/biome_palette.cpp
@@ -1,7 +1,7 @@
 #include "biome_palette.hpp"
 
 namespace Amulet {
-void BiomePalette::serialise(BinaryWriter& writer) const
+void BiomePalette::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     get_version_range().serialise(writer);
diff --git a/src/amulet/core/palette/biome_palette.hpp b/src/amulet/core/palette/biome_palette.hpp
@@ -24,7 +24,7 @@ class BiomePalette : public VersionRangeContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static BiomePalette deserialise(BinaryReader&);
 
     bool operator==(const BiomePalette& other) const
diff --git a/src/amulet/core/palette/block_palette.cpp b/src/amulet/core/palette/block_palette.cpp
@@ -1,7 +1,7 @@
 #include "block_palette.hpp"
 
 namespace Amulet {
-void BlockPalette::serialise(BinaryWriter& writer) const
+void BlockPalette::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     get_version_range().serialise(writer);
diff --git a/src/amulet/core/palette/block_palette.hpp b/src/amulet/core/palette/block_palette.hpp
@@ -28,7 +28,7 @@ class BlockPalette : public VersionRangeContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static BlockPalette deserialise(BinaryReader&);
 
     bool operator==(const BlockPalette& other) const
diff --git a/src/amulet/core/version/version.cpp b/src/amulet/core/version/version.cpp
@@ -8,7 +8,7 @@
 
 namespace Amulet {
 
-void VersionNumber::serialise(BinaryWriter& writer) const
+void VersionNumber::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_numeric<std::uint64_t>(_vec.size());
@@ -72,7 +72,7 @@ std::vector<std::int64_t> VersionNumber::padded_version(size_t len) const
     return out;
 }
 
-void PlatformVersionContainer::serialise(BinaryWriter& writer) const
+void PlatformVersionContainer::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_size_and_bytes(_platform);
@@ -93,7 +93,7 @@ PlatformVersionContainer PlatformVersionContainer::deserialise(BinaryReader& rea
     }
 }
 
-void VersionRange::serialise(BinaryWriter& writer) const
+void VersionRange::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     writer.write_size_and_bytes(_platform);
@@ -126,7 +126,7 @@ bool VersionRange::operator==(const VersionRange& other) const
     return _platform == other._platform && _min_version == other._min_version && _max_version == other._max_version;
 }
 
-void VersionRangeContainer::serialise(BinaryWriter& writer) const
+void VersionRangeContainer::serialise(BaseBinaryWriter& writer) const
 {
     writer.write_numeric<std::uint8_t>(1);
     _version_range.serialise(writer);
diff --git a/src/amulet/core/version/version.hpp b/src/amulet/core/version/version.hpp
@@ -61,7 +61,7 @@ class VersionNumber {
         return *this;
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static VersionNumber deserialise(BinaryReader&);
 
     // Iterators
@@ -141,7 +141,7 @@ class PlatformVersionContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static PlatformVersionContainer deserialise(BinaryReader&);
 
     // Comparison operators
@@ -191,7 +191,7 @@ class VersionRange {
         }
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static VersionRange deserialise(BinaryReader&);
 
     // Check if the platform is equal and the version number is within the range.
@@ -217,7 +217,7 @@ class VersionRangeContainer {
     {
     }
 
-    AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;
+    AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;
     AMULET_CORE_EXPORT static VersionRangeContainer deserialise(BinaryReader&);
 };
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Amulet {`
`15`	`15`
`16`		`-void Biome::serialise(BinaryWriter& writer) const`
	`16`	`+void Biome::serialise(BaseBinaryWriter& writer) const`
`17`	`17`	`{`
`18`	`18`	`writer.write_numeric<std::uint8_t>(1);`
`19`	`19`	`writer.write_size_and_bytes(get_platform());`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class Biome : public PlatformVersionContainer {`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
`33`		`- AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;`
	`33`	`+ AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;`
`34`	`34`	`AMULET_CORE_EXPORT static Biome deserialise(BinaryReader&);`
`35`	`35`
`36`	`36`	`auto operator<=>(const Biome& other) const`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class Block : public PlatformVersionContainer {`
`72`	`72`	`{`
`73`	`73`	`}`
`74`	`74`
`75`		`- AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;`
	`75`	`+ AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;`
`76`	`76`	`AMULET_CORE_EXPORT static Block deserialise(BinaryReader&);`
`77`	`77`
`78`	`78`	`auto operator<=>(const Block& other) const`
`@@ -127,7 +127,7 @@ class BlockStack {`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
`130`		`- AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;`
	`130`	`+ AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;`
`131`	`131`	`AMULET_CORE_EXPORT static BlockStack deserialise(BinaryReader&);`
`132`	`132`
`133`	`133`	`auto operator<=>(const BlockStack& other) const`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Amulet {`
`8`	`8`
`9`		`-void BlockEntity::serialise(BinaryWriter& writer) const`
	`9`	`+void BlockEntity::serialise(BaseBinaryWriter& writer) const`
`10`	`10`	`{`
`11`	`11`	`writer.write_numeric<std::uint8_t>(1);`
`12`	`12`	`writer.write_size_and_bytes(get_platform());`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ class BlockEntity : public PlatformVersionContainer {`
`76`	`76`	`{`
`77`	`77`	`}`
`78`	`78`
`79`		`- AMULET_CORE_EXPORT void serialise(BinaryWriter&) const;`
	`79`	`+ AMULET_CORE_EXPORT void serialise(BaseBinaryWriter&) const;`
`80`	`80`	`AMULET_CORE_EXPORT static BlockEntity deserialise(BinaryReader&);`
`81`	`81`
`82`	`82`	`AMULET_CORE_EXPORT bool operator==(const BlockEntity& other) const;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Amulet {`
`6`	`6`
`7`	`7`	`// Biome3DComponent`
`8`	`8`
`9`		`-void Biome3DStorage::serialise(BinaryWriter& writer) const`
	`9`	`+void Biome3DStorage::serialise(BaseBinaryWriter& writer) const`
`10`	`10`	`{`
`11`	`11`	`writer.write_numeric<std::uint8_t>(1);`
`12`	`12`	`_palette->serialise(writer);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace Amulet {`
`6`	`6`
`7`	`7`	`// BlockStorage`
`8`		`-void BlockStorage::serialise(BinaryWriter& writer) const`
	`8`	`+void BlockStorage::serialise(BaseBinaryWriter& writer) const`
`9`	`9`	`{`
`10`	`10`	`writer.write_numeric<std::uint8_t>(1);`
`11`	`11`	`get_palette().serialise(writer);`