diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 6f87d14..01b30c0 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -91,10 +91,6 @@ local function itemDefToLuantiDef(itemDef) local s = itemDef.settings local c = itemDef.callbacks - if s._add_mod_name then - s.name = modName .. ':' .. s.name - end - local title = s._title local description = s._description @@ -146,28 +142,33 @@ local defMerge = function(...) return tableMerge(...) end ----@param def Item.ItemDefinition|Node.NodeDefinition ----@return Item -function Item:new(def) - assert(def.settings.description == nil, +---@param itemDef Item.ItemDefinition|Node.NodeDefinition +---@return Item +function Item:new(itemDef) + assert(itemDef.settings.description == nil, 'The item description was specified using `description`, not `_description`. '.. 'Please note that the `description` field should not be used when registering an item. '.. 'Use `_title` and `_description` instead.') - ---Adding default parameters - def = defMerge(def, self.defaultDef, true) + -- Adding default parameters + itemDef = defMerge(itemDef, self.defaultDef, true) + local s = itemDef.settings + + if s._add_mod_name then + s.name = Mod.getInfo().shortName .. ':' .. s.name + end ---@type Item local instance = getInstance(self, {}) - local luantiDef = itemDefToLuantiDef(def) - local visual = def.settings._visual + local luantiDef = itemDefToLuantiDef(itemDef) + local visual = itemDef.settings._visual if visual == nil then visual = 'item_2d' end - def.settings._visual = nil + itemDef.settings._visual = nil if visual == 'item_3d' then register3dItem(luantiDef) @@ -180,7 +181,7 @@ function Item:new(def) return visual end - instance.itemDef = def + instance.itemDef = itemDef instance.luantiDef = luantiDef return instance