mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-22 18:39:46 +00:00
fix content inheritance issues
This commit is contained in:
parent
8124b550df
commit
c9cc301e46
10 changed files with 55 additions and 22 deletions
|
|
@ -1,5 +1,8 @@
|
||||||
#include "ContentBuilder.hpp"
|
#include "ContentBuilder.hpp"
|
||||||
|
|
||||||
|
#include "core_defs.hpp"
|
||||||
|
#include "util/stringutil.hpp"
|
||||||
|
|
||||||
ContentBuilder::~ContentBuilder() = default;
|
ContentBuilder::~ContentBuilder() = default;
|
||||||
|
|
||||||
void ContentBuilder::add(std::unique_ptr<ContentPackRuntime> pack) {
|
void ContentBuilder::add(std::unique_ptr<ContentPackRuntime> pack) {
|
||||||
|
|
@ -19,6 +22,11 @@ std::unique_ptr<Content> ContentBuilder::build() {
|
||||||
for (const std::string& name : blocks.names) {
|
for (const std::string& name : blocks.names) {
|
||||||
Block& def = *blocks.defs[name];
|
Block& def = *blocks.defs[name];
|
||||||
|
|
||||||
|
// Filling auto fields
|
||||||
|
if (def.caption.empty()) {
|
||||||
|
def.caption = util::id_to_caption(def.name);
|
||||||
|
}
|
||||||
|
|
||||||
// Generating runtime info
|
// Generating runtime info
|
||||||
def.rt.id = blockDefsIndices.size();
|
def.rt.id = blockDefsIndices.size();
|
||||||
def.rt.emissive = *reinterpret_cast<uint32_t*>(def.emission);
|
def.rt.emissive = *reinterpret_cast<uint32_t*>(def.emission);
|
||||||
|
|
@ -83,6 +91,11 @@ std::unique_ptr<Content> ContentBuilder::build() {
|
||||||
for (const std::string& name : items.names) {
|
for (const std::string& name : items.names) {
|
||||||
ItemDef& def = *items.defs[name];
|
ItemDef& def = *items.defs[name];
|
||||||
|
|
||||||
|
// Filling auto fields
|
||||||
|
if (def.caption.empty()) {
|
||||||
|
def.caption = util::id_to_caption(def.name);
|
||||||
|
}
|
||||||
|
|
||||||
// Generating runtime info
|
// Generating runtime info
|
||||||
def.rt.id = itemDefsIndices.size();
|
def.rt.id = itemDefsIndices.size();
|
||||||
def.rt.emissive = *reinterpret_cast<uint32_t*>(def.emission);
|
def.rt.emissive = *reinterpret_cast<uint32_t*>(def.emission);
|
||||||
|
|
@ -116,8 +129,17 @@ std::unique_ptr<Content> ContentBuilder::build() {
|
||||||
|
|
||||||
// Now, it's time to resolve foreign keys
|
// Now, it's time to resolve foreign keys
|
||||||
for (Block* def : blockDefsIndices) {
|
for (Block* def : blockDefsIndices) {
|
||||||
def->rt.pickingItem = content->items.require(def->pickingItem).rt.id;
|
def->rt.pickingItem =
|
||||||
def->rt.surfaceReplacement = content->blocks.require(def->surfaceReplacement).rt.id;
|
content->items
|
||||||
|
.require(
|
||||||
|
def->pickingItem.empty()
|
||||||
|
? (def->hidden ? CORE_EMPTY
|
||||||
|
: def->name + BLOCK_ITEM_SUFFIX)
|
||||||
|
: def->pickingItem
|
||||||
|
)
|
||||||
|
.rt.id;
|
||||||
|
def->rt.surfaceReplacement =
|
||||||
|
content->blocks.require(def->surfaceReplacement).rt.id;
|
||||||
if (def->properties == nullptr) {
|
if (def->properties == nullptr) {
|
||||||
def->properties = dv::object();
|
def->properties = dv::object();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -38,16 +38,21 @@ public:
|
||||||
T& create(const std::string& id, bool* created = nullptr) {
|
T& create(const std::string& id, bool* created = nullptr) {
|
||||||
auto found = defs.find(id);
|
auto found = defs.find(id);
|
||||||
if (found != defs.end()) {
|
if (found != defs.end()) {
|
||||||
if (created) *created = false;
|
if (created) {
|
||||||
|
*created = false;
|
||||||
|
}
|
||||||
return *found->second;
|
return *found->second;
|
||||||
}
|
}
|
||||||
if (created) *created = true;
|
if (created) {
|
||||||
|
*created = true;
|
||||||
|
}
|
||||||
checkIdentifier(id);
|
checkIdentifier(id);
|
||||||
allNames[id] = type;
|
allNames[id] = type;
|
||||||
names.push_back(id);
|
names.push_back(id);
|
||||||
defs[id] = std::make_unique<T>(id);
|
defs[id] = std::make_unique<T>(id);
|
||||||
return *defs[id];
|
return *defs[id];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only fetch existing definition, return null otherwise.
|
// Only fetch existing definition, return null otherwise.
|
||||||
T* get(const std::string& id) {
|
T* get(const std::string& id) {
|
||||||
auto found = defs.find(id);
|
auto found = defs.find(id);
|
||||||
|
|
|
||||||
|
|
@ -180,7 +180,8 @@ void ContentUnitLoader<DefT>::loadUnit(
|
||||||
auto configFile = folder / (defsDir + "/" + name + ".json");
|
auto configFile = folder / (defsDir + "/" + name + ".json");
|
||||||
if (io::exists(configFile)) {
|
if (io::exists(configFile)) {
|
||||||
try {
|
try {
|
||||||
loadUnit(def, full, configFile);
|
dv::value root = io::read_json(configFile);
|
||||||
|
loadUnit(def, full, std::move(root));
|
||||||
} catch (const std::runtime_error& err) {
|
} catch (const std::runtime_error& err) {
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"file " + util::quote(configFile.string()) + ": " +
|
"file " + util::quote(configFile.string()) + ": " +
|
||||||
|
|
@ -286,12 +287,15 @@ void ContentLoader::loadContent(const dv::value& root) {
|
||||||
};
|
};
|
||||||
|
|
||||||
ContentUnitLoader<Block>(*pack, builder.blocks, "blocks",
|
ContentUnitLoader<Block>(*pack, builder.blocks, "blocks",
|
||||||
[this](Block& def) {
|
[this](const Block& def) {
|
||||||
if (!def.hidden) {
|
if (!def.hidden) {
|
||||||
bool created;
|
bool created;
|
||||||
auto& item = builder.items.create(def.name + BLOCK_ITEM_SUFFIX, &created);
|
auto& item = builder.items.create(
|
||||||
|
def.name + BLOCK_ITEM_SUFFIX, &created
|
||||||
|
);
|
||||||
item.generated = true;
|
item.generated = true;
|
||||||
item.caption = def.caption;
|
item.caption = def.caption.empty() ? util::id_to_caption(def.name)
|
||||||
|
: def.caption;
|
||||||
item.iconType = ItemIconType::BLOCK;
|
item.iconType = ItemIconType::BLOCK;
|
||||||
item.icon = def.name;
|
item.icon = def.name;
|
||||||
item.placingBlock = def.name;
|
item.placingBlock = def.name;
|
||||||
|
|
|
||||||
|
|
@ -115,9 +115,8 @@ static void load_variant(
|
||||||
}
|
}
|
||||||
|
|
||||||
template<> void ContentUnitLoader<Block>::loadUnit(
|
template<> void ContentUnitLoader<Block>::loadUnit(
|
||||||
Block& def, const std::string& name, const io::path& file
|
Block& def, const std::string& name, dv::value root
|
||||||
) {
|
) {
|
||||||
auto root = io::read_json(file);
|
|
||||||
process_properties(def, name, root);
|
process_properties(def, name, root);
|
||||||
process_tags(def, root);
|
process_tags(def, root);
|
||||||
|
|
||||||
|
|
@ -126,7 +125,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
|
||||||
auto parentDef = builder.get(parentName);
|
auto parentDef = builder.get(parentName);
|
||||||
if (parentDef == nullptr) {
|
if (parentDef == nullptr) {
|
||||||
throw std::runtime_error(
|
throw std::runtime_error(
|
||||||
"Failed to find parent(" + parentName + ") for " + name
|
"failed to find parent(" + parentName + ") for " + name
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
parentDef->cloneTo(def);
|
parentDef->cloneTo(def);
|
||||||
|
|
@ -146,7 +145,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
|
||||||
stateBased.at("offset").get(offset);
|
stateBased.at("offset").get(offset);
|
||||||
stateBased.at("bits").get(bitsCount);
|
stateBased.at("bits").get(bitsCount);
|
||||||
if (offset < 0 || bitsCount <= 0 || offset + bitsCount > 8) {
|
if (offset < 0 || bitsCount <= 0 || offset + bitsCount > 8) {
|
||||||
throw std::runtime_error("Invalid state-based bits configuration");
|
throw std::runtime_error("invalid state-based bits configuration");
|
||||||
}
|
}
|
||||||
|
|
||||||
def.variants = std::make_unique<Variants>();
|
def.variants = std::make_unique<Variants>();
|
||||||
|
|
@ -162,6 +161,13 @@ template<> void ContentUnitLoader<Block>::loadUnit(
|
||||||
def.variants->variants.push_back(def.defaults);
|
def.variants->variants.push_back(def.defaults);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (def.variants) {
|
||||||
|
auto& variants = def.variants->variants;
|
||||||
|
variants.at(0) = def.defaults;
|
||||||
|
|
||||||
|
for (int i = 1; i < variants.size(); i++) {
|
||||||
|
load_variant(variants.at(i), root, name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
root.at("material").get(def.material);
|
root.at("material").get(def.material);
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ public:
|
||||||
postFunc(std::move(postFunc)) {
|
postFunc(std::move(postFunc)) {
|
||||||
}
|
}
|
||||||
void loadUnit(DefT& def, const std::string& full, const std::string& name);
|
void loadUnit(DefT& def, const std::string& full, const std::string& name);
|
||||||
void loadUnit(DefT& def, const std::string& name, const io::path& file);
|
void loadUnit(DefT& def, const std::string& name, dv::value root);
|
||||||
void loadDefs(const dv::value& root);
|
void loadDefs(const dv::value& root);
|
||||||
private:
|
private:
|
||||||
const ContentPack& pack;
|
const ContentPack& pack;
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,8 @@
|
||||||
static debug::Logger logger("entity-content-loader");
|
static debug::Logger logger("entity-content-loader");
|
||||||
|
|
||||||
template<> void ContentUnitLoader<EntityDef>::loadUnit(
|
template<> void ContentUnitLoader<EntityDef>::loadUnit(
|
||||||
EntityDef& def, const std::string& name, const io::path& file
|
EntityDef& def, const std::string& name, dv::value root
|
||||||
) {
|
) {
|
||||||
auto root = io::read_json(file);
|
|
||||||
process_properties(def, name, root);
|
process_properties(def, name, root);
|
||||||
|
|
||||||
if (root.has("parent")) {
|
if (root.has("parent")) {
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,8 @@ static debug::Logger logger("item-content-loader");
|
||||||
|
|
||||||
|
|
||||||
template<> void ContentUnitLoader<ItemDef>::loadUnit(
|
template<> void ContentUnitLoader<ItemDef>::loadUnit(
|
||||||
ItemDef& def, const std::string& name, const io::path& file
|
ItemDef& def, const std::string& name, dv::value root
|
||||||
) {
|
) {
|
||||||
auto root = io::read_json(file);
|
|
||||||
process_properties(def, name, root);
|
process_properties(def, name, root);
|
||||||
process_tags(def, root);
|
process_tags(def, root);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
#include "util/stringutil.hpp"
|
#include "util/stringutil.hpp"
|
||||||
|
|
||||||
ItemDef::ItemDef(const std::string& name)
|
ItemDef::ItemDef(const std::string& name)
|
||||||
: name(name),
|
: name(name),
|
||||||
caption(util::id_to_caption(name)),
|
|
||||||
scriptName(name.substr(name.find(':') + 1)) {
|
scriptName(name.substr(name.find(':') + 1)) {
|
||||||
}
|
}
|
||||||
void ItemDef::cloneTo(ItemDef& dst) {
|
void ItemDef::cloneTo(ItemDef& dst) {
|
||||||
|
|
|
||||||
|
|
@ -120,8 +120,7 @@ const BlockRotProfile BlockRotProfile::LADDER {
|
||||||
4
|
4
|
||||||
};
|
};
|
||||||
|
|
||||||
Block::Block(const std::string& name)
|
Block::Block(const std::string& name) : name(name) {
|
||||||
: name(name), caption(util::id_to_caption(name)) {
|
|
||||||
for (int i = 0; i < defaults.textureFaces.size(); i++) {
|
for (int i = 0; i < defaults.textureFaces.size(); i++) {
|
||||||
defaults.textureFaces[i] = TEXTURE_NOTFOUND;
|
defaults.textureFaces[i] = TEXTURE_NOTFOUND;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -274,7 +274,7 @@ public:
|
||||||
BlockRotProfile rotations = BlockRotProfile::NONE;
|
BlockRotProfile rotations = BlockRotProfile::NONE;
|
||||||
|
|
||||||
/// @brief Item will be picked on MMB click on the block
|
/// @brief Item will be picked on MMB click on the block
|
||||||
std::string pickingItem = name + BLOCK_ITEM_SUFFIX;
|
std::string pickingItem;
|
||||||
|
|
||||||
/// @brief Block script name in blocks/ without extension
|
/// @brief Block script name in blocks/ without extension
|
||||||
std::string scriptName = name.substr(name.find(':') + 1);
|
std::string scriptName = name.substr(name.find(':') + 1);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue