From c3cde1fc63c985c743df0d783966004fdefa5783 Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 22 Sep 2025 18:30:13 +0000 Subject: [PATCH] Item, Node, Factory: minor fixes for launch game --- mods/CORE/Factory/mod.conf | 1 + mods/CORE/Factory/src/Factory.lua | 4 ++-- mods/CORE/Item/mod.conf | 2 +- mods/CORE/Item/src/Item.lua | 11 +++++++---- mods/CORE/Node/mod.conf | 2 +- mods/CORE/Node/src/Node.lua | 3 ++- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/mods/CORE/Factory/mod.conf b/mods/CORE/Factory/mod.conf index 3362c6d..fd30277 100644 --- a/mods/CORE/Factory/mod.conf +++ b/mods/CORE/Factory/mod.conf @@ -1 +1,2 @@ name = smc__core__factory +depends = smc__api__system diff --git a/mods/CORE/Factory/src/Factory.lua b/mods/CORE/Factory/src/Factory.lua index 4028c7f..f701ff9 100644 --- a/mods/CORE/Factory/src/Factory.lua +++ b/mods/CORE/Factory/src/Factory.lua @@ -19,7 +19,7 @@ end ---The aleas `table.merge` for EmmyLua ---@type fun(...):(Item.ItemDefinition) local defMerge = function(...) - return table.merge(..., true) + return table.merge(...) end ---@param itemDefs Item.ItemDefinition[] | Node.NodeDefinition[] List of nodes with parameters unique to them. @@ -28,7 +28,7 @@ function Factory:registerItems(itemDefs) for _, nodeDef in ipairs(itemDefs) do ---@type Item.ItemDefinition - local nodeDef = defMerge(nodeDef, self.defaultDef) + local nodeDef = defMerge(nodeDef, self.defaultDef, true) self.itemClass:new(nodeDef) diff --git a/mods/CORE/Item/mod.conf b/mods/CORE/Item/mod.conf index 1a124eb..4411d6b 100644 --- a/mods/CORE/Item/mod.conf +++ b/mods/CORE/Item/mod.conf @@ -1,2 +1,2 @@ name = smc__core__item -depends = smc__api__system, smc__core__enum +depends = smc__api__system, smc__core__enum, smc__core__factory diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 697dbd9..4d512ea 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -11,8 +11,11 @@ local VisualEnum = require('Item.VisualEnum') local Item = { defaultDef = { settings = { - name = "" - } + name = "", + title = "", + description = "", + }, + callbacks = {} } } @@ -48,14 +51,14 @@ end ---The aleas `table.merge` for EmmyLua ---@type fun(...):(Item.ItemDefinition) local defMerge = function(...) - return table.merge(..., true) + return table.merge(...) end ---@param itemDef Item.ItemDefinition ---@return Item function Item:new(itemDef) ---Adding default parameters - itemDef = defMerge(itemDef, self.defaultDef) + itemDef = defMerge(itemDef, self.defaultDef, true) ---@type Item local instance = setmetatable({}, {__index = self}) diff --git a/mods/CORE/Node/mod.conf b/mods/CORE/Node/mod.conf index bb0010e..e0a682f 100644 --- a/mods/CORE/Node/mod.conf +++ b/mods/CORE/Node/mod.conf @@ -1,2 +1,2 @@ name = smc__core__node -depends = smc__core__item +depends = smc__core__item, smc__core__factory diff --git a/mods/CORE/Node/src/Node.lua b/mods/CORE/Node/src/Node.lua index 23d9766..b83d281 100644 --- a/mods/CORE/Node/src/Node.lua +++ b/mods/CORE/Node/src/Node.lua @@ -38,7 +38,8 @@ function Node:getFactory(defaultDef) defaultDef = self.defaultDef end - local instance = Core.Factory():new(self, defaultDef) + ---@type Factory + local instance = Core.Factory:getModClassInstance(self, defaultDef) return instance end