mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-09 04:51:49 +00:00
Merge branch 'main' into blocks-metadata
This commit is contained in:
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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue