voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-10 21:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' into blocks-metadata

Browse source
This commit is contained in:
MihailRis 2024-09-19 14:51:47 +03:00
commit 28b6ec2a0e
73 changed files with 1866 additions and 1730 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/world/World.hpp
View file

@ -6,7 +6,6 @@
#include <vector>
#include "content/ContentPack.hpp"
#include "data/dynamic.hpp"
#include "interfaces/Serializable.hpp"
#include "typedefs.hpp"
#include "util/timeutil.hpp"
@ -48,8 +47,8 @@ struct WorldInfo : public Serializable {
int major = 0, minor = -1;
std::unique_ptr<dynamic::Map> serialize() const override;
void deserialize(dynamic::Map* src) override;
dv::value serialize() const override;
void deserialize(const dv::value& src) override;
};
/// @brief holds all world data except the level (chunks and objects)
@ -81,10 +80,10 @@ public:
/// @brief Write all unsaved level data to the world directory
void write(Level* level);
/// @brief Check world indices and generate ContentLUT if convert required
/// @brief Check world indices and generate ContentReport if convert required
/// @param directory world directory
/// @param content current Content instance
/// @return ContentLUT if world convert required else nullptr
/// @return ContentReport if world convert required else nullptr
static std::shared_ptr<ContentReport> checkIndices(
const std::shared_ptr<WorldFiles>& worldFiles, const Content* content
);