Table: fix annotations, remove defMerge alias from Item, Node, and Tool
This commit is contained in:
@@ -158,12 +158,6 @@ local function registerTool(luantiDef)
|
|||||||
core.register_tool(':'..name, luantiDef)
|
core.register_tool(':'..name, luantiDef)
|
||||||
end
|
end
|
||||||
|
|
||||||
---The alias `table.merge` for EmmyLua
|
|
||||||
---@type fun(...):(Item.ItemDefinition)
|
|
||||||
local defMerge = function(...)
|
|
||||||
return tableMerge(...)
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
|
---@param itemDef Item.ItemDefinition|Node.NodeDefinition
|
||||||
---@return Item
|
---@return Item
|
||||||
function Item:new(itemDef)
|
function Item:new(itemDef)
|
||||||
@@ -174,8 +168,9 @@ function Item:new(itemDef)
|
|||||||
|
|
||||||
itemDef = tableCopy(itemDef)
|
itemDef = tableCopy(itemDef)
|
||||||
|
|
||||||
-- Adding default parameters
|
-- Adding default parameterss
|
||||||
itemDef = defMerge(itemDef, self.defaultDef, true)
|
---@type Item.ItemDefinition
|
||||||
|
itemDef = tableMerge(itemDef, self.defaultDef, true)
|
||||||
local s = itemDef.settings
|
local s = itemDef.settings
|
||||||
|
|
||||||
local shortModName = Mod.getInfo().shortName
|
local shortModName = Mod.getInfo().shortName
|
||||||
@@ -223,7 +218,7 @@ end
|
|||||||
---@param defaultDef Item.ItemDefinition
|
---@param defaultDef Item.ItemDefinition
|
||||||
---@return Item
|
---@return Item
|
||||||
function Item:getExtended(defaultDef)
|
function Item:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(defaultDef, self.defaultDef, true)
|
defaultDef = tableMerge(defaultDef, self.defaultDef, true)
|
||||||
|
|
||||||
---@type Item
|
---@type Item
|
||||||
local ChildClass = extend(self, {
|
local ChildClass = extend(self, {
|
||||||
@@ -240,7 +235,7 @@ function Item:getFactory(defaultDef)
|
|||||||
if defaultDef == nil then
|
if defaultDef == nil then
|
||||||
defaultDef = self.defaultDef
|
defaultDef = self.defaultDef
|
||||||
else
|
else
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef, true)
|
defaultDef = tableMerge(self.defaultDef, defaultDef, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@type ItemFactory
|
---@type ItemFactory
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
|
local tableMerge = table.merge
|
||||||
|
|
||||||
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
|
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
|
||||||
|
|
||||||
---@class Node : Item
|
---@class Node : Item
|
||||||
---@field defaultDef Node.NodeDefinition
|
---@field defaultDef Node.NodeDefinition
|
||||||
local Node = Class.extend(Item, {})
|
local Node = Class.extend(Item, {})
|
||||||
|
|
||||||
---The alias `table.merge` for EmmyLua
|
|
||||||
---@type fun(...):(Node.NodeDefinition)
|
|
||||||
local defMerge = function(...)
|
|
||||||
return table.merge(...)
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param nodeDef Node.NodeDefinition
|
---@param nodeDef Node.NodeDefinition
|
||||||
local function registerSlab(nodeDef)
|
local function registerSlab(nodeDef)
|
||||||
nodeDef = table.copy_with_metatables(nodeDef)
|
nodeDef = table.copy_with_metatables(nodeDef)
|
||||||
@@ -71,7 +67,7 @@ end
|
|||||||
---@return Node
|
---@return Node
|
||||||
function Node:new(nodeDef)
|
function Node:new(nodeDef)
|
||||||
-- Adding default parameters.
|
-- Adding default parameters.
|
||||||
nodeDef = defMerge(nodeDef, self.defaultDef, true)
|
nodeDef = tableMerge(nodeDef, self.defaultDef, true)
|
||||||
|
|
||||||
local settings = nodeDef.settings
|
local settings = nodeDef.settings
|
||||||
settings._type = 'node'
|
settings._type = 'node'
|
||||||
@@ -103,7 +99,7 @@ end
|
|||||||
---@param defaultDef Node.NodeDefinition
|
---@param defaultDef Node.NodeDefinition
|
||||||
---@return Node
|
---@return Node
|
||||||
function Node:getExtended(defaultDef)
|
function Node:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(defaultDef, self.defaultDef, true)
|
defaultDef = tableMerge(defaultDef, self.defaultDef, true)
|
||||||
|
|
||||||
---@type Node
|
---@type Node
|
||||||
local ChildClass = Class.extend(self, {
|
local ChildClass = Class.extend(self, {
|
||||||
@@ -120,7 +116,7 @@ function Node:getFactory(defaultDef)
|
|||||||
if defaultDef == nil then
|
if defaultDef == nil then
|
||||||
defaultDef = self.defaultDef
|
defaultDef = self.defaultDef
|
||||||
else
|
else
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef, true)
|
defaultDef = tableMerge(self.defaultDef, defaultDef, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@type ItemFactory
|
---@type ItemFactory
|
||||||
|
|||||||
@@ -1,20 +1,16 @@
|
|||||||
|
local tableMerge = table.merge
|
||||||
|
|
||||||
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
|
local Item, ItemFactory = Smc.requireItem(), Smc.requireItemFactory()
|
||||||
|
|
||||||
---@class Tool : Item
|
---@class Tool : Item
|
||||||
---@field defaultDef Item.ItemDefinition
|
---@field defaultDef Item.ItemDefinition
|
||||||
local Tool = Class.extend(Item, {})
|
local Tool = Class.extend(Item, {})
|
||||||
|
|
||||||
---The alias `table.merge` for EmmyLua
|
|
||||||
---@type fun(...):(Item.ItemDefinition)
|
|
||||||
local defMerge = function(...)
|
|
||||||
return table.merge(...)
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param ToolDef Item.ItemDefinition
|
---@param ToolDef Item.ItemDefinition
|
||||||
---@return Tool
|
---@return Tool
|
||||||
function Tool:new(ToolDef)
|
function Tool:new(ToolDef)
|
||||||
---Adding default parameters
|
---Adding default parameters
|
||||||
ToolDef = defMerge(ToolDef, self.defaultDef, true)
|
ToolDef = tableMerge(ToolDef, self.defaultDef, true)
|
||||||
|
|
||||||
ToolDef.settings._type = 'tool'
|
ToolDef.settings._type = 'tool'
|
||||||
|
|
||||||
@@ -29,7 +25,7 @@ end
|
|||||||
---@param defaultDef Item.ItemDefinition
|
---@param defaultDef Item.ItemDefinition
|
||||||
---@return Tool
|
---@return Tool
|
||||||
function Tool:getExtended(defaultDef)
|
function Tool:getExtended(defaultDef)
|
||||||
defaultDef = defMerge(defaultDef, self.defaultDef, true)
|
defaultDef = tableMerge(defaultDef, self.defaultDef, true)
|
||||||
|
|
||||||
---@type Tool
|
---@type Tool
|
||||||
local ChildClass = Class.extend(self, {
|
local ChildClass = Class.extend(self, {
|
||||||
@@ -46,7 +42,7 @@ function Tool:getFactory(defaultDef)
|
|||||||
if defaultDef == nil then
|
if defaultDef == nil then
|
||||||
defaultDef = self.defaultDef
|
defaultDef = self.defaultDef
|
||||||
else
|
else
|
||||||
defaultDef = defMerge(self.defaultDef, defaultDef, true)
|
defaultDef = tableMerge(self.defaultDef, defaultDef, true)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@type ItemFactory
|
---@type ItemFactory
|
||||||
|
|||||||
@@ -156,11 +156,12 @@ local function mergeInPlace(target, source, recursively)
|
|||||||
end
|
end
|
||||||
|
|
||||||
--- Merges entries from `t2` into a deep copy of `t1`, skipping existing keys.
|
--- Merges entries from `t2` into a deep copy of `t1`, skipping existing keys.
|
||||||
--- @generic T
|
--- @generic T table
|
||||||
--- @param t1 T Target table to merge into
|
--- @overload fun(t1:T, t2:T, recursively:boolean?):T
|
||||||
|
--- @param t1 table Target table to merge into
|
||||||
--- @param t2 table Source table to merge from
|
--- @param t2 table Source table to merge from
|
||||||
--- @param recursively? boolean Enable recursive merging (default: false)
|
--- @param recursively boolean? Enable recursive merging (default: false)
|
||||||
--- @return T
|
--- @return table
|
||||||
function table.merge(t1, t2, recursively)
|
function table.merge(t1, t2, recursively)
|
||||||
ensureArgType(t1, 'table', 1, 'table.merge')
|
ensureArgType(t1, 'table', 1, 'table.merge')
|
||||||
ensureArgType(t2, 'table', 2, 'table.merge')
|
ensureArgType(t2, 'table', 2, 'table.merge')
|
||||||
|
|||||||
Reference in New Issue
Block a user