Table: fix annotations, remove defMerge alias from Item, Node, and Tool

This commit is contained in:
Van
2026-05-19 17:14:56 +03:00
parent bd1059f9d7
commit 85aaf470f7
4 changed files with 21 additions and 33 deletions

View File

@@ -158,12 +158,6 @@ local function registerTool(luantiDef)
core.register_tool(':'..name, luantiDef)
end
---The alias `table.merge` for EmmyLua
---@type fun(...):(Item.ItemDefinition)
local defMerge = function(...)
return tableMerge(...)
end
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
---@return Item
function Item:new(itemDef)
@@ -174,8 +168,9 @@ function Item:new(itemDef)
itemDef = tableCopy(itemDef)
-- Adding default parameters
itemDef = defMerge(itemDef, self.defaultDef, true)
-- Adding default parameterss
---@type Item.ItemDefinition
itemDef = tableMerge(itemDef, self.defaultDef, true)
local s = itemDef.settings
local shortModName = Mod.getInfo().shortName
@@ -223,7 +218,7 @@ end
---@param defaultDef Item.ItemDefinition
---@return Item
function Item:getExtended(defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef, true)
defaultDef = tableMerge(defaultDef, self.defaultDef, true)
---@type Item
local ChildClass = extend(self, {
@@ -240,7 +235,7 @@ function Item:getFactory(defaultDef)
if defaultDef == nil then
defaultDef = self.defaultDef
else
defaultDef = defMerge(self.defaultDef, defaultDef, true)
defaultDef = tableMerge(self.defaultDef, defaultDef, true)
end
---@type ItemFactory