diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp index 4c478f4ef..1484e6e70 100644 --- a/src/content/ContentBuilder.cpp +++ b/src/content/ContentBuilder.cpp @@ -133,7 +133,7 @@ std::unique_ptr ContentBuilder::build() { content->items .require( def->pickingItem.empty() - ? (def->hidden ? CORE_EMPTY + ? ((def->abstract || def->hidden) ? CORE_EMPTY : def->name + BLOCK_ITEM_SUFFIX) : def->pickingItem ) diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index bf752531d..9ab0a379e 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -288,7 +288,7 @@ void ContentLoader::loadContent(const dv::value& root) { ContentUnitLoader(*pack, builder.blocks, "blocks", [this](const Block& def) { - if (!def.hidden) { + if (!def.abstract || !def.hidden) { bool created; auto& item = builder.items.create( def.name + BLOCK_ITEM_SUFFIX, &created diff --git a/src/content/loading/BlockLoader.cpp b/src/content/loading/BlockLoader.cpp index 1c1a1345c..85b35b348 100644 --- a/src/content/loading/BlockLoader.cpp +++ b/src/content/loading/BlockLoader.cpp @@ -260,6 +260,7 @@ template<> void ContentUnitLoader::loadUnit( root.at("selectable").get(def.selectable); root.at("grounded").get(def.grounded); root.at("hidden").get(def.hidden); + root.at("abstract").get(def.abstract); root.at("picking-item").get(def.pickingItem); root.at("surface-replacement").get(def.surfaceReplacement); root.at("script-name").get(def.scriptName); diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp index 27029f43c..732839199 100644 --- a/src/voxels/Block.hpp +++ b/src/voxels/Block.hpp @@ -258,6 +258,9 @@ public: /// below bool grounded = false; + /// @brief Makes block abstract + bool abstract = false; + /// @brief Turns off block item generation bool hidden = false;