Item & Node: update settings & callbacks: inheritance from ide-helper

This commit is contained in:
Van
2026-06-20 22:36:12 +03:00
parent 45a1e79bc6
commit f39a696653
9 changed files with 25 additions and 761 deletions

View File

@@ -83,14 +83,8 @@ local function addRarityToDesc(rarity, desc)
return desc..'\n'..colorize(color, rarityString)
end
---The alias `table.merge` for EmmyLua
---@type fun(...):(NodeDefinition|ItemDefinition)
local defMerge = function(...)
return tableMerge(...)
end
---@param itemDef Item.ItemDefinition
---@return NodeDefinition|ItemDefinition
---@return ItemDefinition
local function itemDefToLuantiDef(itemDef)
local modName = Mod.getInfo().shortName
local S = core.get_translator(modName)
@@ -127,7 +121,7 @@ local function itemDefToLuantiDef(itemDef)
s._description = description
s.description = luantiDescription..core.get_background_escape_sequence('#110F13')
local luantiDef = defMerge(s, c, true)
local luantiDef = tableMerge(s, c, true) --[[@as ItemDefinition]]
return luantiDef
end
@@ -167,8 +161,7 @@ function Item:new(itemDef)
itemDef = tableCopy(itemDef)
-- Adding default parameterss
---@type Item.ItemDefinition
itemDef = tableMerge(itemDef, self.defaultDef, true)
itemDef = tableMerge(itemDef, self.defaultDef, true) --[[@as Item.ItemDefinition]]
local s = itemDef.settings
local shortModName = Mod.getInfo().shortName
@@ -190,7 +183,7 @@ function Item:new(itemDef)
itemDef.settings._type = nil
if type == 'node' then
registerNode(luantiDef)
registerNode(luantiDef --[[@as NodeDefinition]])
elseif type == 'craftitem' then
registerCraftitem(luantiDef)
elseif type == 'tool' then