Merge branch 'main' into blocks-metadata

2024-09-19 14:51:47 +03:00
parent 44753904dc cf77da3bd1
commit 28b6ec2a0e
73 changed files with 1866 additions and 1730 deletions
@@ -7,10 +7,6 @@
 #include "typedefs.hpp"
 #include "ItemStack.hpp"

-namespace dynamic {
-    class Map;
-}
-
 class ContentReport;
 class ContentIndices;

@@ -37,13 +33,12 @@ public:
        size_t end = -1
    );

-    /* deserializing inventory */
-    void deserialize(dynamic::Map* src) override;
-    /* serializing inventory */
-    std::unique_ptr<dynamic::Map> serialize() const override;
+    void deserialize(const dv::value& src) override;
+
+    dv::value serialize() const override;

    void convert(const ContentReport* report);
-    static void convert(dynamic::Map* data, const ContentReport* report);
+    static void convert(dv::value& data, const ContentReport* report);

    inline void setId(int64_t id) {
        this->id = id;