3 Commits

8 changed files with 115 additions and 24 deletions

View File

@@ -1,2 +1,2 @@
name = smc__core__craft_system name = smc__core__craft_system
depends = smc__system__system_loader depends = smc__system__system_loader, smc__core__creature

View File

@@ -5,6 +5,8 @@ local require = modInfo.require
local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler') local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler')
---@type CraftSystem.ImmersiveCraftHandler ---@type CraftSystem.ImmersiveCraftHandler
local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler') local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler')
---@type CraftSystem.ImmersiveCraftNode
local ImmersiveCraftNode= require('CraftSystem.ImmersiveCraftNode')
---@alias CraftSystem.CraftGroup string ---@alias CraftSystem.CraftGroup string
---@alias CraftSystem.CraftRecipe string[] ---@alias CraftSystem.CraftRecipe string[]

View File

@@ -0,0 +1,12 @@
local extend = Class.extend
local modInfo = Mod.getInfo('smc__core__craft_system')
local require = modInfo.require
---@type CraftSystem.ImmersiveCraftNode
local ImmersiveCraftNode = require('CraftSystem.ImmersiveCraftNode')
---@class CraftSystem.ImmersiveCraftNode.TapperNode : CraftSystem.ImmersiveCraftNode
local TapperNode = extend(ImmersiveCraftNode, {})
return TapperNode

View File

@@ -7,7 +7,6 @@ local getInstance = Class.getInstance
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
---@field data table
---@field returnItems table? TODO: доделать тут тип ---@field returnItems table? TODO: доделать тут тип
local ImmersiveCraftStage = { local ImmersiveCraftStage = {
data = {} data = {}

View File

@@ -0,0 +1,38 @@
local getInstance, extend = Class.getInstance, Class.extend
---@type CraftSystem.ImmersiveCraftStage
local ImmersiveCraftStage = Mod.getInfo('smc__core__craft_system').require('ImmersiveCraftStage')
---@class CraftSystem.ImmersiveCraftStage.Tapping : CraftSystem.ImmersiveCraftStage
---@field targetItem string
---@field startHandler fun(self:CraftSystem.ImmersiveCraftStage.Tapping, pos:Position, Player:Player)
---@field processHandler fun(self:CraftSystem.ImmersiveCraftStage.Tapping, pos:Position, Player:Player)
---@field endHabdler fun(self:CraftSystem.ImmersiveCraftStage.Tapping, pos:Position, Player:Player)
---@field entity Entity
local Tapping = extend(ImmersiveCraftStage, {})
---@class CraftSystem.ImmersiveCraftStage.TappingDef
---@field targetItem string
---@param def CraftSystem.ImmersiveCraftStage.TappingDef
function Tapping:new(def)
local instance = getInstance(self, {})
instance.targetItem = def.targetItem
instance.startHandler = function(self, pos, Player)
end
instance.processHandler = function(self, pos, Player)
end
instance.endHabdler = function(self, pos, Player)
end
return instance
end
return Tapping

View File

@@ -0,0 +1,15 @@
---@type Creature
local Creature = Mod.getInfo('smc__core__entity').require('Creature')
---@class CraftSystem.ImmersiveCraftNode : Creature
local ImmersiveCraftNode = Creature:getExtended({
settings = {
_name = 'craft_system:immersive_craft_node',
_add_mod_name = false,
initial_properties = {
}
}
})
return ImmersiveCraftNode

View File

@@ -17,41 +17,64 @@ local Creature = {
} }
} }
---The alias `table.merge` for EmmyLua
---@type fun(...):(EntityDefinition)
local defMerge = function(...)
return tableMerge(...)
end
---@param entityDef Creature.CreatureDefinition ---@param entityDef Creature.CreatureDefinition
---@return EntityDefinition ---@return EntityDefinition
local function entityDefToLuantiDef(entityDef) local function entityDefToLuantiDef(entityDef)
entityDef = tableCopy(entityDef) entityDef = tableCopy(entityDef)
local s = entityDef.settings local s = entityDef.settings
local c = entityDef.callbacks local c = entityDef.callbacks or {}
local luantiDef = defMerge(s, c) ---@type EntityDefinition
local luantiDef = tableMerge(s, c)
return luantiDef return luantiDef
end end
---The alias `table.merge` for EmmyLua
---@type fun(...):(Creature.CreatureDefinition)
local defMerge = function(...)
return tableMerge(...)
end
---@param entityDef Creature.CreatureDefinition ---@param entityDef Creature.CreatureDefinition
---@return Creature ---@return Creature
function Creature:new(entityDef) function Creature:new(entityDef)
-- Adding default parameters -- Adding default parameters.
entityDef = defMerge(entityDef, self.defaultDef, true) ---@type Creature.CreatureDefinition
local s = entityDef.settings entityDef = tableMerge(entityDef, self.defaultDef, true)
-- The callback table may not be specified.
if entityDef.callbacks == nil then
---@type Creature.Callbacks
entityDef.callbacks = {}
end
local s = entityDef.settings
local c = entityDef.callbacks
-- Add the short mod name prefix to the entity name.
if s._add_mod_name then if s._add_mod_name then
s._name = Mod.getInfo().shortName .. ':' .. s._name s._name = Mod.getInfo().shortName .. ':' .. s._name
end end
local onActivate = c.on_activate or function() end
-- We rewrite the entity initialization function so that custom fields
-- can be passed to it directly via `core.add_entity(pos, name, [staticdata])`.
c.on_activate = function(self, staticdata, dtime)
local initCustomFields = {}
if staticdata and staticdata ~= '' then
initCustomFields = core.deserialize(staticdata) or {}
end
-- We reset the fields that should not be overwritten.
initCustomFields.name = nil
initCustomFields.object = nil
---@type LuaEntity
self = tableMerge(self, initCustomFields)
-- If an initialization callback was specified for the entity, then we call it.
if c.on_activate ~= nil then
onActivate(self, staticdata, dtime)
end
end
---@type Creature ---@type Creature
local instance = getInstance(self, {}) local instance = getInstance(self, {})
@@ -71,7 +94,9 @@ end
---@param defaultDef Creature.CreatureDefinition ---@param defaultDef Creature.CreatureDefinition
---@return Creature ---@return Creature
function Creature:getExtended(defaultDef) function Creature:getExtended(defaultDef)
defaultDef = defMerge(self.defaultDef, defaultDef) -- Adding default parameters.
---@type Creature.CreatureDefinition
defaultDef = tableMerge(self.defaultDef, defaultDef)
---@type Creature ---@type Creature
local ChildClass = extend(self, { local ChildClass = extend(self, {

View File

@@ -156,10 +156,10 @@ 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.
--- @param t1 table<string, any> | any[] Target table to merge into --- @param t1 table Target table to merge into
--- @param t2 table<string, any> | any[] 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 table<string, any> | any[] --- @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')