feat: scripts classification

res/layouts/console.xml.lua

@@ -11,6 +11,7 @@ local error_id = 0
 
 local writeables = {}
 local filenames = {}
+local scripts_classification = {}
 
 local current_file = {
     filename = "",
@@ -92,7 +93,7 @@ function build_files_list(filenames, selected)
             filename = filename:gsub(selected, "**"..selected.."**")
         end
         local parent = file.parent(filename)
-        local script_type = "file"
+        local script_type = scripts_classification[actual_filename] or "file"
         files_list:add(gui.template("script_file", {
             path = parent .. (parent[#parent] == ':' and '' or '/'), 
             name = file.name(filename),
@@ -319,6 +320,31 @@ local function collect_scripts(dirname, dest)
     end
 end
 
+local function build_scripts_classification()
+    for id, props in pairs(block.properties) do
+        scripts_classification[props["script-file"]] = "block"
+    end
+    for id, props in pairs(item.properties) do
+        scripts_classification[props["script-file"]] = "item"
+    end
+end
+
+local function load_scripts_list()
+    local packs = pack.get_installed()
+    for _, packid in ipairs(packs) do
+        collect_scripts(packid..":modules", filenames)
+    end
+
+    for _, filename in ipairs(filenames) do
+        scripts_classification[filename] = "module"
+    end
+
+    for _, packid in ipairs(packs) do
+        collect_scripts(packid..":scripts", filenames)
+    end
+
+end
+
 function on_open(mode)
     if modes == nil then
         modes = RadioGroup({
@@ -330,12 +356,10 @@ function on_open(mode)
         end, mode or "console")
 
         local files_list = document.filesList
-        local packs = pack.get_installed()
 
-        for _, packid in ipairs(packs) do
-            collect_scripts(packid..":modules", filenames)
-            collect_scripts(packid..":scripts", filenames)
-        end
+        load_scripts_list()
+        build_scripts_classification()
+
         table.sort(filenames)
         build_files_list(filenames)
 

res/preload.json

@@ -29,7 +29,8 @@
         "gui/save",
         "gui/block",
         "gui/item",
-        "gui/file"
+        "gui/file",
+        "gui/module"
     ],
     "fonts": [
         {

res/scripts/post_content.lua

@@ -7,7 +7,7 @@ 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"
+    "stack-size", "name", "script-file"
 }
 for name, _ in pairs(user_props) do
     table.insert(names, name)

src/content/ContentBuilder.cpp

@@ -94,8 +94,9 @@ std::unique_ptr<Content> ContentBuilder::build() {
         def->rt.surfaceReplacement = content->blocks.require(def->surfaceReplacement).rt.id;
         if (def->properties == nullptr) {
             def->properties = dv::object();
-            def->properties["name"] = def->name;
         }
+        def->properties["name"] = def->name;
+        def->properties["script-file"] = def->scriptFile;
     }
 
     for (ItemDef* def : itemDefsIndices) {
@@ -104,6 +105,7 @@ std::unique_ptr<Content> ContentBuilder::build() {
             def->properties = dv::object();
         }
         def->properties["name"] = def->name;
+        def->properties["script-file"] = def->scriptFile;
     }
 
     for (auto& [name, def] : content->generators.getDefs()) {

src/content/ContentLoader.cpp

@@ -394,6 +394,7 @@ void ContentLoader::loadBlock(
     if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) {
         def.pickingItem = CORE_EMPTY;
     }
+    def.scriptFile = pack->id + ":scripts/" + def.scriptName + ".lua";
 }
 
 void ContentLoader::loadItem(
@@ -452,6 +453,8 @@ void ContentLoader::loadItem(
         def.emission[1] = emissionarr[1].asNumber();
         def.emission[2] = emissionarr[2].asNumber();
     }
+
+    def.scriptFile = pack->id + ":scripts/" + def.scriptName + ".lua";
 }
 
 void ContentLoader::loadEntity(
@@ -865,7 +868,7 @@ static void load_scripts(Content& content, ContentUnitDefs<T>& units) {
                 runtime->getEnvironment(),
                 name,
                 scriptfile,
-                pack.id + ":scripts/" + def->scriptName + ".lua",
+                def->scriptFile,
                 def->rt.funcsset
             );
         }

src/items/ItemDef.hpp

@@ -59,6 +59,8 @@ struct ItemDef {
 
     std::string modelName = name + ".model";
 
+    std::string scriptFile;
+
     struct {
         itemid_t id;
         blockid_t placingBlock;

src/voxels/Block.hpp

@@ -204,6 +204,8 @@ public:
     /// @brief Block script name in blocks/ without extension
     std::string scriptName = name.substr(name.find(':') + 1);
 
+    std::string scriptFile;
+
     /// @brief Block will be used instead of this if generated on surface
     std::string surfaceReplacement = name;