diff --git a/res/scripts/post_content.lua b/res/scripts/post_content.lua index 97b2e93b6..cc056f5d4 100644 --- a/res/scripts/post_content.lua +++ b/res/scripts/post_content.lua @@ -2,7 +2,7 @@ local app = __vc_app local internals = __vc_internals local user_props = file.read_combined_object("config/user-props.toml") -local names = { +local core_names = { "parent", "caption", "texture", "texture-faces", "model", "model-name", "model-primitives", "material", "rotation", "hitboxes", "hitbox", "emission", "size", "obstacle", "replaceable", "light-passing", "sky-light-passing", @@ -10,35 +10,61 @@ local names = { "hidden", "draw-group", "picking-item", "surface-replacement", "script-name", "ui-layout", "inventory-size", "tick-interval", "overlay-texture", "translucent", "fields", "particles", "icon-type", "icon", "placing-block", - "stack-size", "name", "script-file", "culling", "solid" + "stack-size", "name", "script-file", "culling", "solid", + "components", "sensors", "body-type", "save", "save-skeleton-pose", + "save-skeleton-textures", "save-body-velocity", "save-body-settings", + "skeleton-name", "lighting-mode", "mass", "elasticity", "step-height", + "blocking", "material", "translucent" } for name, _ in pairs(user_props) do - table.insert(names, name) + table.insert(core_names, name) +end + +local function get_parent_props(lib, props) + if not props.parent then + return {} + end + if lib == entities then + local parent_id = entities.def_index(props.parent) + if parent_id == nil then + return {} + end + return entities.properties[parent_id] or {} + end + if lib.index == nil then + return {} + end + local parent_id = lib.index(props.parent) + if parent_id == nil then + return {} + end + return lib.properties[parent_id] or {} end -- remove undefined properties and build tags set local function process_properties(lib) for id, props in pairs(lib.properties) do - if props.parent then - local parent_props = lib.properties[block.index(props.parent)] or {} - for propname, value in pairs(parent_props) do - if not props[propname] then - props[propname] = value - end + local parent_props = get_parent_props(lib, props) + for propname, value in pairs(parent_props) do + if not props[propname] then + props[propname] = value end end for propname, _ in pairs(props) do - if not table.has(names, propname) then + if not table.has(core_names, propname) then props[propname] = nil end end - props.tags_set = lib.__get_tags(id) + if lib.__get_tags then + props.tags_set = lib.__get_tags(id) + end end end process_properties(block) process_properties(item) +process_properties(entities) local function make_read_only(t) setmetatable(t, { @@ -53,6 +79,16 @@ for k,v in pairs(block.properties) do make_read_only(v) end +make_read_only(item.properties) +for k,v in pairs(item.properties) do + make_read_only(v) +end + +make_read_only(entities.properties) +for k,v in pairs(entities.properties) do + make_read_only(v) +end + local function cache_names(library) local indices = {} local names = {} @@ -87,6 +123,26 @@ end cache_names(block) cache_names(item) +local function cache_entity_names() + local indices = {} + local names = {} + for id=0, entities.defs_count() - 1 do + local name = entities.properties[id].name + indices[name] = id + names[id] = name + end + + function entities.name(id) + return names[id] + end + + function entities.index(name) + return indices[name] + end +end + +cache_entity_names() + __vc_scripts_registry.build_registry() local packs = app.get_content() diff --git a/src/content/ContentBuilder.cpp b/src/content/ContentBuilder.cpp index 83836dfe3..e0caac381 100644 --- a/src/content/ContentBuilder.cpp +++ b/src/content/ContentBuilder.cpp @@ -123,6 +123,13 @@ std::unique_ptr ContentBuilder::build() { def->properties["script-file"] = def->scriptFile; } + for (EntityDef* def : entityDefsIndices) { + if (def->properties == nullptr) { + def->properties = dv::object(); + } + def->properties["name"] = def->name; + } + for (auto& [name, def] : content->generators.getDefs()) { def->prepare(content.get()); } diff --git a/src/content/loading/EntityLoader.cpp b/src/content/loading/EntityLoader.cpp index fbc29bddf..91f571c95 100644 --- a/src/content/loading/EntityLoader.cpp +++ b/src/content/loading/EntityLoader.cpp @@ -1,5 +1,6 @@ #define VC_ENABLE_REFLECTION #include "ContentUnitLoader.hpp" +#include "ContentLoadingCommons.hpp" #include "../ContentBuilder.hpp" #include "coders/json.hpp" @@ -16,6 +17,7 @@ template<> void ContentUnitLoader::loadUnit( EntityDef& def, const std::string& name, const io::path& file ) { auto root = io::read_json(file); + process_properties(def, name, root); if (root.has("parent")) { const auto& parentName = root["parent"].asString(); diff --git a/src/logic/scripting/scripting.cpp b/src/logic/scripting/scripting.cpp index 4ccdd7b31..6bca06cfa 100644 --- a/src/logic/scripting/scripting.cpp +++ b/src/logic/scripting/scripting.cpp @@ -24,6 +24,7 @@ #include "world/Level.hpp" #include "world/World.hpp" #include "interfaces/Process.hpp" +#include "objects/EntityDef.hpp" #include #include @@ -298,6 +299,11 @@ void scripting::on_content_load(Content* content) { lua::setfield(L, "properties"); lua::pop(L); } + if (lua::getglobal(L, "entities")) { + push_properties_tables(L, indices.entities); + lua::setfield(L, "properties"); + lua::pop(L); + } lua::getregistry(L, "app"); lua::setglobal(L, "__vc_app"); diff --git a/src/objects/EntityDef.hpp b/src/objects/EntityDef.hpp index c50834671..57b88f113 100644 --- a/src/objects/EntityDef.hpp +++ b/src/objects/EntityDef.hpp @@ -19,6 +19,8 @@ struct EntityDef { /// @brief Entity string id (with prefix included) std::string const name; + dv::value properties = nullptr; + /// @brief Component instances std::vector components;