Autocomplete mod name prefix for items

This commit is contained in:
Van
2026-01-02 21:32:54 +03:00
parent 275f54c7b7
commit 6db2e9f77a
5 changed files with 28 additions and 33 deletions

View File

@@ -61,12 +61,23 @@ local defMerge = function(...)
return table.merge(...) return table.merge(...)
end end
---@param itemDef Item.ItemDefinition|Node.NodeDefinition ---@param itemDef Item.ItemDefinition|Node.NodeDefinition
---@return Item ---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true`
function Item:new(itemDef) ---@return Item
function Item:new(itemDef, addModName)
if addModName == nil then
addModName = true
end
---Adding default parameters ---Adding default parameters
itemDef = defMerge(itemDef, self.defaultDef, true) itemDef = defMerge(itemDef, self.defaultDef, true)
local modName = Mod.getInfo().shortName
if addModName then
itemDef.settings.name = modName .. ':' .. itemDef.settings.name
end
---@type Item ---@type Item
local instance = setmetatable({}, {__index = self}) local instance = setmetatable({}, {__index = self})

View File

@@ -25,21 +25,11 @@ end
---@param itemDefs Item.ItemDefinition[]|Node.NodeDefinition[] List of nodes with parameters unique to them. ---@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` ---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true`
function ItemFactory:registerItems(itemDefs, addModName) function ItemFactory:registerItems(itemDefs, addModName)
if addModName == nil then
addModName = true
end
local modName = Mod.getInfo().shortName
---@param nodeDef Item.ItemDefinition | Node.NodeDefinition ---@param nodeDef Item.ItemDefinition | Node.NodeDefinition
for _, itemDef in ipairs(itemDefs) do for _, itemDef in ipairs(itemDefs) do
itemDef = defMerge(itemDef, self.defaultDef, true) itemDef = defMerge(itemDef, self.defaultDef, true)
if addModName then self.itemClass:new(itemDef, addModName)
itemDef.settings.name = modName .. ':' .. itemDef.settings.name
end
self.itemClass:new(itemDef)
end end
end end
@@ -50,15 +40,9 @@ local defMerge = function(...)
return table.merge(...) return table.merge(...)
end 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` ---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true`
function ItemFactory:registerNodesByShortDef(shortNodeDefs, addModName) function ItemFactory:registerNodesByShortDef(shortNodeDefs, addModName)
if addModName == nil then
addModName = true
end
local modName = Mod.getInfo().shortName
for _, shortNodeDef in ipairs(shortNodeDefs) do for _, shortNodeDef in ipairs(shortNodeDefs) do
---@type Node.NodeDefinition ---@type Node.NodeDefinition
local nodeDef = { local nodeDef = {
@@ -72,11 +56,7 @@ function ItemFactory:registerNodesByShortDef(shortNodeDefs, addModName)
nodeDef = defMerge(nodeDef, self.defaultDef, true) nodeDef = defMerge(nodeDef, self.defaultDef, true)
if addModName then self.itemClass:new(nodeDef, addModName)
nodeDef.settings.name = modName .. ':' .. nodeDef.settings.name
end
self.itemClass:new(nodeDef)
end end
end end

View File

@@ -16,16 +16,17 @@ local defMerge = function(...)
return table.merge(...) return table.merge(...)
end end
---@param nodeDef Node.NodeDefinition ---@param nodeDef Node.NodeDefinition
---@return Node ---@param addModName boolean? Whether to add the mod name to the settings.name. Default: `true`
function Node:new(nodeDef) ---@return Node
function Node:new(nodeDef, addModName)
---Adding default parameters ---Adding default parameters
nodeDef = defMerge(nodeDef, self.defaultDef, true) nodeDef = defMerge(nodeDef, self.defaultDef, true)
nodeDef.settings.visual = 'item_3d' nodeDef.settings.visual = 'item_3d'
---@type Node ---@type Node
local instance = Item:new(nodeDef) local instance = Item:new(nodeDef, addModName)
return instance return instance
end end

View File

@@ -8,7 +8,7 @@ local Plant = modInfo.require('Plant')
Plant:new({ Plant:new({
settings = { settings = {
name = 'plants:plants', name = 'plants',
description = 'Plant', description = 'Plant',
tiles = { "test_plant.png" }, tiles = { "test_plant.png" },
place_param2 = 3, place_param2 = 3,
@@ -21,10 +21,13 @@ local ts = TileSheet:new('plants_test_sheet.png', 16, 16)
for i=0, 3 do for i=0, 3 do
Plant:new({ Plant:new({
settings = { settings = {
name = 'plants:plant'..tostring(i), name = 'plant'..tostring(i),
description = 'Plant', description = 'Plant',
tiles = { ts:t(i,0) }, tiles = { ts:t(i,0) },
place_param2 = 3, place_param2 = 3,
}, },
}) })
end end
core.log(dump(core.registered_nodes))

View File

@@ -243,7 +243,7 @@ local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16)
Node:new({ Node:new({
settings = { 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)}, tiles = {tsT:t(0,0), ts:t(6, 0), ts:t(6,0)..'^'..tsT:t(0,1)},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,