PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: error if indices.json has no 'blocks-data' element

Browse Source
This commit is contained in:
MihailRis 2024-10-02 00:29:00 +03:00
parent bc7be5ecc8
commit c79b65a432
1 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/content/ContentReport.cpp
View File

@ -31,6 +31,42 @@ static constexpr size_t get_entries_count(
: indices.count(); : indices.count();
} }
static void process_blocks_data(
const Content* content,
ContentReport& report,
const dv::value& root
) {
for (const auto& [name, map] : root.asObject()) {
data::StructLayout layout;
layout.deserialize(map);
auto def = content->blocks.find(name);
if (def == nullptr) {
continue;
}
if (def->dataStruct == nullptr) {
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE};
report.issues.push_back(issue);
report.dataLoss.push_back(name+": discard data");
continue;
}
auto incapatibility = layout.checkCompatibility(*def->dataStruct);
if (!incapatibility.empty()) {
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE};
report.issues.push_back(issue);
for (const auto& error : incapatibility) {
report.dataLoss.push_back(
"[" + name + "] field " + error.name + " - " +
data::to_string(error.type)
);
}
}
if (layout != *def->dataStruct) {
report.dataLayoutsUpdated = true;
}
report.blocksDataLayouts[name] = std::move(layout);
}
}
std::shared_ptr<ContentReport> ContentReport::create( std::shared_ptr<ContentReport> ContentReport::create(
const std::shared_ptr<WorldFiles>& worldFiles, const std::shared_ptr<WorldFiles>& worldFiles,
const fs::path& filename, const fs::path& filename,
@ -57,34 +93,8 @@ std::shared_ptr<ContentReport> ContentReport::create(
report->blocks.setup(blocklist, content->blocks); report->blocks.setup(blocklist, content->blocks);
report->items.setup(itemlist, content->items); report->items.setup(itemlist, content->items);
for (const auto& [name, map] : root["blocks-data"].asObject()) { if (root.has("blocks-data")) {
data::StructLayout layout; process_blocks_data(content, *report, root["blocks-data"]);
layout.deserialize(map);
auto def = content->blocks.find(name);
if (def == nullptr) {
continue;
}
if (def->dataStruct == nullptr) {
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE};
report->issues.push_back(issue);
report->dataLoss.push_back(name+": discard data");
continue;
}
auto incapatibility = layout.checkCompatibility(*def->dataStruct);
if (!incapatibility.empty()) {
ContentIssue issue {ContentIssueType::BLOCK_DATA_LAYOUTS_UPDATE};
report->issues.push_back(issue);
for (const auto& error : incapatibility) {
report->dataLoss.push_back(
"[" + name + "] field " + error.name + " - " +
data::to_string(error.type)
);
}
}
if (layout != *def->dataStruct) {
report->dataLayoutsUpdated = true;
}
report->blocksDataLayouts[name] = std::move(layout);
} }
report->buildIssues(); report->buildIssues();