diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 166f52a..69a1f8b 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -61,12 +61,23 @@ local defMerge = function(...) return table.merge(...) end ----@param itemDef Item.ItemDefinition|Node.NodeDefinition ----@return Item -function Item:new(itemDef) +---@param itemDef Item.ItemDefinition|Node.NodeDefinition +---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true` +---@return Item +function Item:new(itemDef, addModName) + if addModName == nil then + addModName = true + end + ---Adding default parameters itemDef = defMerge(itemDef, self.defaultDef, true) + local modName = Mod.getInfo().shortName + + if addModName then + itemDef.settings.name = modName .. ':' .. itemDef.settings.name + end + ---@type Item local instance = setmetatable({}, {__index = self}) diff --git a/mods/CORE/ItemFactory/src/ItemFactory.lua b/mods/CORE/ItemFactory/src/ItemFactory.lua index 3bbc8ae..b51efe1 100644 --- a/mods/CORE/ItemFactory/src/ItemFactory.lua +++ b/mods/CORE/ItemFactory/src/ItemFactory.lua @@ -25,21 +25,11 @@ end ---@param itemDefs Item.ItemDefinition[]|Node.NodeDefinition[] List of nodes with parameters unique to them. ---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true` function ItemFactory:registerItems(itemDefs, addModName) - if addModName == nil then - addModName = true - end - - local modName = Mod.getInfo().shortName - ---@param nodeDef Item.ItemDefinition | Node.NodeDefinition for _, itemDef in ipairs(itemDefs) do itemDef = defMerge(itemDef, self.defaultDef, true) - if addModName then - itemDef.settings.name = modName .. ':' .. itemDef.settings.name - end - - self.itemClass:new(itemDef) + self.itemClass:new(itemDef, addModName) end end @@ -50,15 +40,9 @@ local defMerge = function(...) return table.merge(...) end ----@param shortNodeDefs table Table of the form `{ {name, title, description, tiles}, {name, title, description, tiles}, ...}` +---@param shortNodeDefs table Table of the form `{ {name, title, description, tiles}, {name, title, description, tiles}, ...}` ---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true` function ItemFactory:registerNodesByShortDef(shortNodeDefs, addModName) - if addModName == nil then - addModName = true - end - - local modName = Mod.getInfo().shortName - for _, shortNodeDef in ipairs(shortNodeDefs) do ---@type Node.NodeDefinition local nodeDef = { @@ -72,11 +56,7 @@ function ItemFactory:registerNodesByShortDef(shortNodeDefs, addModName) nodeDef = defMerge(nodeDef, self.defaultDef, true) - if addModName then - nodeDef.settings.name = modName .. ':' .. nodeDef.settings.name - end - - self.itemClass:new(nodeDef) + self.itemClass:new(nodeDef, addModName) end end diff --git a/mods/CORE/Node/src/Node.lua b/mods/CORE/Node/src/Node.lua index eac0de9..a89c313 100644 --- a/mods/CORE/Node/src/Node.lua +++ b/mods/CORE/Node/src/Node.lua @@ -16,16 +16,17 @@ local defMerge = function(...) return table.merge(...) end ----@param nodeDef Node.NodeDefinition ----@return Node -function Node:new(nodeDef) +---@param nodeDef Node.NodeDefinition +---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true` +---@return Node +function Node:new(nodeDef, addModName) ---Adding default parameters nodeDef = defMerge(nodeDef, self.defaultDef, true) nodeDef.settings.visual = 'item_3d' ---@type Node - local instance = Item:new(nodeDef) + local instance = Item:new(nodeDef, addModName) return instance end diff --git a/mods/GAME/ITEMS/plants/init.lua b/mods/GAME/ITEMS/plants/init.lua index 4572d43..36ccd68 100644 --- a/mods/GAME/ITEMS/plants/init.lua +++ b/mods/GAME/ITEMS/plants/init.lua @@ -8,7 +8,7 @@ local Plant = modInfo.require('Plant') Plant:new({ settings = { - name = 'plants:plants', + name = 'plants', description = 'Plant', tiles = { "test_plant.png" }, place_param2 = 3, @@ -21,10 +21,13 @@ local ts = TileSheet:new('plants_test_sheet.png', 16, 16) for i=0, 3 do Plant:new({ settings = { - name = 'plants:plant'..tostring(i), + name = 'plant'..tostring(i), description = 'Plant', tiles = { ts:t(i,0) }, place_param2 = 3, }, }) end + + +core.log(dump(core.registered_nodes)) diff --git a/mods/GAME/ITEMS/soils/init.lua b/mods/GAME/ITEMS/soils/init.lua index f60920d..3bf47b3 100644 --- a/mods/GAME/ITEMS/soils/init.lua +++ b/mods/GAME/ITEMS/soils/init.lua @@ -243,7 +243,7 @@ local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16) Node:new({ settings = { - name = 'soils:turf_swamp', + name = 'turf_swamp', tiles = {tsT:t(0,0), ts:t(6, 0), ts:t(6,0)..'^'..tsT:t(0,1)}, groups = { dig_immediate = 2,