fix: update data structure StringByteInput for CompoundTag::fromBinar…

…yNBT (#1166)
LiteLDev · Mar 26, 2023 · 40034d9 · 40034d9
1 parent ef432bf
commit 40034d9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/LiteLoader/include/llapi/mc/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp
@@ -82,6 +82,8 @@ class CompoundTag : public Tag {
     LIAPI std::string toBinaryNBT(bool isLittleEndian = true);
     LIAPI static std::string nbtListToBinary(std::vector<std::unique_ptr<CompoundTag>> tags, bool isLittleEndian = true);
     LIAPI static std::unique_ptr<CompoundTag> fromSNBT(const std::string& snbt);
+
+    LIAPI static std::unique_ptr<CompoundTag> fromBinaryNBT(std::string_view dataView, size_t& offset, bool isLittleEndian = true);
     LIAPI static std::unique_ptr<CompoundTag> fromBinaryNBT(void* data, size_t len, bool isLittleEndian = true);
     LIAPI static std::unique_ptr<CompoundTag> fromBinaryNBT(void* data, size_t len, size_t& offset, bool isLittleEndian = true);
     LIAPI static std::unique_ptr<CompoundTag> fromBinaryNBT(std::string const& data, size_t& offset, bool isLittleEndian = true);

diff --git a/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp b/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp
@@ -292,20 +292,30 @@ std::string CompoundTag::nbtListToBinary(std::vector<std::unique_ptr<CompoundTag
 
 #pragma region From Binary
 //////////////////// From Binary ////////////////////
-std::unique_ptr<CompoundTag> CompoundTag::fromBinaryNBT(void* data, size_t len, size_t& offset, bool isLittleEndian) {
-    void* vtbl;
-    if (isLittleEndian)
-        vtbl = dlsym("??_7StringByteInput@@6B@");
-    else
-        vtbl = dlsym("??_7BigEndianStringByteInput@@6B@");
-
-    uintptr_t iDataInput[4] = {(uintptr_t)vtbl, offset, len, (uintptr_t)data};
-    auto rtn = NbtIo::read((IDataInput&)iDataInput);
 
-    offset = iDataInput[1];
+std::unique_ptr<CompoundTag> CompoundTag::fromBinaryNBT(std::string_view dataView, size_t& offset, bool isLittleEndian) {
+    struct {
+        __int64* mVtbl;
+        size_t mOffset;
+        std::string_view mBuffer;
+    } tStringByteInput;
+
+    if (isLittleEndian) tStringByteInput.mVtbl = (__int64*)dlsym("??_7StringByteInput@@6B@");
+    else tStringByteInput.mVtbl = (__int64*)dlsym("??_7BigEndianStringByteInput@@6B@");
+
+    tStringByteInput.mOffset = offset;
+    tStringByteInput.mBuffer = dataView;
+    auto rtn = NbtIo::read(*reinterpret_cast<IDataInput*>(&tStringByteInput));
+
+    //update currentOffset
+    offset = tStringByteInput.mOffset;
     return rtn;
 }
 
+std::unique_ptr<CompoundTag> CompoundTag::fromBinaryNBT(void* data, size_t len, size_t& offset, bool isLittleEndian) {
+    return fromBinaryNBT(std::string_view((char*)data, len), offset, isLittleEndian);
+}
+
 std::unique_ptr<CompoundTag> CompoundTag::fromBinaryNBT(void* data, size_t len, bool isLittleEndian) {
     size_t endOffset = 0;
     return fromBinaryNBT(data, len, endOffset, isLittleEndian);