Fixed binary compatibility (#90)

Made named parameter optional
Amulet-Team · Oct 14, 2024 · fd4f246 · fd4f246
1 parent 0d921f5
commit fd4f246
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/src/amulet_nbt/cpp/nbt_encoding/binary/read_binary.cpp b/src/amulet_nbt/cpp/nbt_encoding/binary/read_binary.cpp
@@ -171,24 +171,19 @@ namespace AmuletNBT {
     }
 
     // Read one (un)named tag from the string at position offset.
-    AmuletNBT::NamedTag read_nbt(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, bool named, size_t& offset){
+    AmuletNBT::NamedTag read_nbt(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, size_t& offset, bool named){
         AmuletNBT::BinaryReader reader(raw, offset, endianness, string_decode);
         return read_nbt(reader, named);
     }
 
     // Read one (un)named tag from the string.
     AmuletNBT::NamedTag read_nbt(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, bool named){
         size_t offset = 0;
-        return read_nbt(raw, endianness, string_decode, named, offset);
-    }
-
-    // Read one named tag from the string.
-    AmuletNBT::NamedTag read_nbt(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode){
-        return read_nbt(raw, endianness, string_decode, true);
+        return read_nbt(raw, endianness, string_decode, offset, named);
     }
 
     // Read count (un)named tags from the string at position offset.
-    std::vector<AmuletNBT::NamedTag> read_nbt_array(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, bool named, size_t& offset, size_t count){
+    std::vector<AmuletNBT::NamedTag> read_nbt_array(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, size_t& offset, size_t count, bool named){
         AmuletNBT::BinaryReader reader(raw, offset, endianness, string_decode);
         std::vector<AmuletNBT::NamedTag> out;
         for (size_t i = 0; i < count; i++){
@@ -198,7 +193,7 @@ namespace AmuletNBT {
     }
 
     // Read all (un)named tags from the string at position offset.
-    std::vector<AmuletNBT::NamedTag> read_nbt_array(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, bool named, size_t& offset){
+    std::vector<AmuletNBT::NamedTag> read_nbt_array(const std::string& raw, std::endian endianness, AmuletNBT::StringDecode string_decode, size_t& offset, bool named){
         AmuletNBT::BinaryReader reader(raw, offset, endianness, string_decode);
         std::vector<AmuletNBT::NamedTag> out;
         while (reader.has_more_data()){

diff --git a/src/amulet_nbt/include/amulet_nbt/nbt_encoding/binary.hpp b/src/amulet_nbt/include/amulet_nbt/nbt_encoding/binary.hpp
@@ -17,12 +17,11 @@
 #include <amulet_nbt/string_encoding.hpp>
 
 namespace AmuletNBT {
-    NamedTag read_nbt(BinaryReader& reader, bool named);
-    NamedTag read_nbt(const std::string&, std::endian, StringDecode, bool named, size_t& offset);
-    NamedTag read_nbt(const std::string&, std::endian, StringDecode, bool named);
-    NamedTag read_nbt(const std::string&, std::endian, StringDecode);
-    std::vector<NamedTag> read_nbt_array(const std::string&, std::endian, StringDecode, bool named, size_t& offset);
-    std::vector<NamedTag> read_nbt_array(const std::string&, std::endian, StringDecode, bool named, size_t& offset, size_t count);
+    NamedTag read_nbt(BinaryReader& reader, bool named = true);
+    NamedTag read_nbt(const std::string&, std::endian, StringDecode, size_t& offset, bool named = true);
+    NamedTag read_nbt(const std::string&, std::endian, StringDecode, bool named = true);
+    std::vector<NamedTag> read_nbt_array(const std::string&, std::endian, StringDecode, size_t& offset, bool named = true);
+    std::vector<NamedTag> read_nbt_array(const std::string&, std::endian, StringDecode, size_t& offset, size_t count, bool named);
 
     void write_nbt(BinaryWriter&, const std::optional<std::string>& name, const ByteTag&);
     void write_nbt(BinaryWriter&, const std::optional<std::string>& name, const ShortTag&);

diff --git a/src/amulet_nbt/pybind/bnbt.cpp b/src/amulet_nbt/pybind/bnbt.cpp
@@ -97,8 +97,8 @@ void init_bnbt(py::module& m) {
                 buffer,
                 endianness,
                 string_decoder,
-                named,
-                read_offset.offset
+                read_offset.offset,
+                named
             );
         } else if (read_offset_py.is(py::none())){
             return AmuletNBT::read_nbt(
@@ -203,17 +203,17 @@ void init_bnbt(py::module& m) {
                     buffer,
                     endianness,
                     string_decoder,
-                    named,
-                    read_offset.offset
+                    read_offset.offset,
+                    named
                 );
             } else {
                 return AmuletNBT::read_nbt_array(
                     buffer,
                     endianness,
                     string_decoder,
-                    named,
                     read_offset.offset,
-                    count
+                    count,
+                    named
                 );
             }
         } else if (read_offset_py.is(py::none())){
@@ -223,17 +223,17 @@ void init_bnbt(py::module& m) {
                     buffer,
                     endianness,
                     string_decoder,
-                    named,
-                    offset
+                    offset,
+                    named
                 );
             } else {
                 return AmuletNBT::read_nbt_array(
                     buffer,
                     endianness,
                     string_decoder,
-                    named,
                     offset,
-                    count
+                    count,
+                    named
                 );
             }
         } else {