diff --git a/mods/CORE/CraftSystem/src/CraftSystem.lua b/mods/CORE/CraftSystem/src/CraftSystem.lua index a386d5a..b4a99a1 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem.lua @@ -3,23 +3,26 @@ local require = modInfo.require ---@type CraftSystem.PrimitiveCraftHandler local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler') +---@type CraftSystem.ImmersiveCraftHandler +local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler') ---@alias CraftSystem.CraftGroup string ---@alias CraftSystem.CraftRecipe string[] ----@alias CraftSystem.CraftType 'primitive' +---@alias CraftSystem.CraftType 'primitive'|'immersive' ---@class CraftSystem local CraftSystem = {} ----@param craftType CraftSystem.CraftType ---@param craftName string ---@param def CraftSystem.PrimitiveCraftDef -function CraftSystem.registerCraft(craftType, craftName, def) - if craftType == 'primitive' then - PrimitiveCraftHandler:addCraft(craftName, def) - else - error(('Craft type `%s` does not exist'):format(craftType)) - end +function CraftSystem.registerPrimitiveCraft(craftName, def) + PrimitiveCraftHandler:addCraft(craftName, def) +end + +---@param craftName string +---@param def CraftSystem.ImmersiveCraftDef +function CraftSystem.registerImmersiveCraft(craftName, def) + ImmersiveCraftHandler:addCraft(craftName, def) end return CraftSystem diff --git a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua new file mode 100644 index 0000000..848bf4f --- /dev/null +++ b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua @@ -0,0 +1,13 @@ +---Abstract class for craft. +---@class CraftSystem.BaseCraft +---@field name string +---@field group CraftSystem.CraftGroup +local BaseCraft = {} + +---Definition table for the `CraftSystem.BaseCraft`. +--- +---**Only for EmmyLua.** +---@class CraftSystem.BaseCraftDef +---@field group CraftSystem.CraftGroup + +return BaseCraft diff --git a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua new file mode 100644 index 0000000..4b27431 --- /dev/null +++ b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua @@ -0,0 +1,47 @@ +---Abstract class for handling crafting. +---@class CraftSystem.BaseCraftHandler +---@field craftsByName table +---@field craftsByGroup table +---@field craftsList CraftSystem.BaseCraft[] +---@field learnedCrafts table> +local BaseCraftHandler = { + craftsByName = {}, + craftsByGroup = {}, + craftsList = {}, + learnedCrafts = {}, +} + +---@param craftName string +---@return CraftSystem.BaseCraft +function BaseCraftHandler:getCraftByName(craftName) + local craft = self.craftsByName[craftName] + + assert(craft ~= nil, ('There is no primitive craft named `%s`.'):format( + craftName)) + + return craft +end + +---@param craftGroup CraftSystem.CraftGroup +---@return CraftSystem.BaseCraft[] +function BaseCraftHandler:getCraftsByGroup(craftGroup) + local crafts = self.craftsByGroup[craftGroup] + + assert(crafts ~= nil, ('There are no primitive crafts with `%s` group'):format( + craftGroup)) + + return crafts +end + +---@param playerName string +---@return table +function BaseCraftHandler:getLearnedCrafts(playerName) + local crafts = self.learnedCrafts[playerName] + + assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format( + playerName)) + + return crafts +end + +return BaseCraftHandler diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua index 49abe6a..fc9eba2 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua @@ -1,26 +1,23 @@ -local getInstance = Class.getInstance - -local tableInsert = table.insert +local getInstance, extend = Class.getInstance, Class.extend local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require +---@type CraftSystem.BaseCraft +local BaseCraft = require('CraftSystem.BaseCraft') ---@type CraftSystem.ImmersiveCraftStage -local ImmersiveCraftStage = require('CraftSystem.CraftSystem.ImmersiveCraftStage') +local ImmersiveCraftStage = require('CraftSystem.ImmersiveCraftStage') ----@class CraftSystem.ImmersiveCraft ----@field name string ----@field group CraftSystem.CraftGroup +---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft ---@field startStageName string ---@field triggerItem string ---@field stagesByName table -local ImmersiveCraft = {} +local ImmersiveCraft = extend(BaseCraft, {}) ---Definition table for the `CraftSystem.ImmersiveCraft`. --- ---**Only for EmmyLua.** ----@class CraftSystem.ImmersiveCraftDef ----@field group CraftSystem.CraftGroup +---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef ---@field startStageName string ---@field triggerItem string ---@field stages CraftSystem.ImmersiveCraftStageDef[] @@ -38,11 +35,11 @@ function ImmersiveCraft:new(name, def) end local instance = getInstance(self, { - name = name, - group = def.group, - startStageName = def.startStageName, - triggerItem = def.triggerItem, - stagesByName = stagesByName, + name = name, + group = def.group, + startStageName = def.startStageName, + triggerItem = def.triggerItem, + stagesByName = stagesByName, }) return instance diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua index 40e065e..98534a8 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua @@ -1,12 +1,56 @@ +local extend = Class.extend + local tableInsert = table.insert local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require +---@type CraftSystem.BaseCraftHandler +local BaseCraftHandler = require('CraftSystem.BaseCraftHandler') ---@type CraftSystem.ImmersiveCraft local ImmersiveCraft = require('CraftSystem.ImmersiveCraft') ----@class CraftSystem.ImmersiveCraftHandler -local ImmersiveCraftHandler = {} +---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler +---@field craftsByTriggerItem table +---@field getCraftByName fun(craftName:string):CraftSystem.ImmersiveCraft +---@field getCraftsByGroup fun(craftGroup):CraftSystem.ImmersiveCraft[] +---@field getLearnedCrafts fun(playerName):table +local ImmersiveCraftHandler = extend(BaseCraftHandler, { + craftsByTriggerItem = {}, +}) + +---@param craftName string +---@param def CraftSystem.ImmersiveCraftDef +function ImmersiveCraftHandler:addCraft(craftName, def) + assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format( + craftName)) + + local craft = ImmersiveCraft:new(craftName, def) + + local group = def.group + + if self.craftsByGroup[group] == nil then + self.craftsByGroup[group] = {} + end + + local triggerItem = def.triggerItem + + if self.craftsByTriggerItem[triggerItem] == nil then + self.craftsByTriggerItem[triggerItem] = {} + end + + self.craftsByName[craftName] = craft + tableInsert(self.craftsByGroup[group], craft) + tableInsert(self.craftsByTriggerItem[triggerItem], craft) + tableInsert(self.craftsList, craft) +end + +---@param triggerItem string +---@return CraftSystem.ImmersiveCraft[]? +function ImmersiveCraftHandler:getCraftsByTriggerItem(triggerItem) + local crafts = self.craftsByTriggerItem[triggerItem] + + return crafts +end return ImmersiveCraftHandler diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua index 7145a65..92be662 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua @@ -8,6 +8,7 @@ local getInstance = Class.getInstance ---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field data table +---@field returnItems table? TODO: доделать тут тип local ImmersiveCraftStage = { data = {} } @@ -20,6 +21,7 @@ local ImmersiveCraftStage = { ---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc +---@field returnItems table? TODO: доделать тут тип ---@param def CraftSystem.ImmersiveCraftStageDef ---@return CraftSystem.ImmersiveCraftStage diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua index d2f11ae..d954c77 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua @@ -1,18 +1,21 @@ -local getInstance = Class.getInstance +local getInstance, extend = Class.getInstance, Class.extend ----@class CraftSystem.PrimitiveCraft ----@field name string ----@field group CraftSystem.CraftGroup +local modInfo = Mod.getInfo('smc__core__craft_system') +local require = modInfo.require + +---@type CraftSystem.BaseCraft +local BaseCraft = require('CraftSystem.BaseCraft') + +---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft ---@field output string ---@field recipe CraftSystem.CraftRecipe ---@field returnItems table? TODO: доделать тут тип -local PrimitiveCraft = {} +local PrimitiveCraft = extend(BaseCraft, {}) ---Definition table for the `CraftSystem.PrimitiveCraft`. --- ---**Only for EmmyLua.** ----@class CraftSystem.PrimitiveCraftDef ----@field group CraftSystem.CraftGroup +---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef ---@field output string ---@field recipe CraftSystem.CraftRecipe ---@field returnItems table? TODO: доделать тут тип diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua index 163f9c2..cc1316f 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua @@ -1,22 +1,21 @@ +local extend = Class.extend + local tableInsert = table.insert local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require +---@type CraftSystem.BaseCraftHandler +local BaseCraftHandler = require('CraftSystem.BaseCraftHandler') + ---@type CraftSystem.PrimitiveCraft local PrimitiveCraft = require('CraftSystem.PrimitiveCraft') ----@class CraftSystem.PrimitiveCraftHandler ----@field craftsByName table ----@field craftsByGroup table ----@field craftsList CraftSystem.PrimitiveCraft[] ----@field learnedCrafts table> -local PrimitiveCraftHandler = { - craftsByName = {}, - craftsByGroup = {}, - craftsList = {}, - learnedCrafts = {}, -} +---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler +---@field getCraftByName fun(craftName:string):CraftSystem.PrimitiveCraft +---@field getCraftsByGroup fun(craftGroup):CraftSystem.PrimitiveCraft[] +---@field getLearnedCrafts fun(playerName):table +local PrimitiveCraftHandler = extend(BaseCraftHandler, {}) ---@param craftName string ---@param def CraftSystem.PrimitiveCraftDef @@ -26,46 +25,15 @@ function PrimitiveCraftHandler:addCraft(craftName, def) local craft = PrimitiveCraft:new(craftName, def) - if self.craftsByGroup[craftName] == nil then - self.craftsByGroup[craftName] = {} + local group = def.group + + if self.craftsByGroup[group] == nil then + self.craftsByGroup[group] = {} end self.craftsByName[craftName] = craft - tableInsert(self.craftsByGroup[craftName], craft) + tableInsert(self.craftsByGroup[group], craft) tableInsert(self.craftsList, craft) end ----@param craftName string ----@return CraftSystem.PrimitiveCraft -function PrimitiveCraftHandler:getCraftByName(craftName) - local craft = self.craftsByName[craftName] - - assert(craft ~= nil, ('There is no primitive craft named `%s`.'):format( - craftName)) - - return craft -end - ----@param craftGroup CraftSystem.CraftGroup ----@return CraftSystem.PrimitiveCraft[] -function PrimitiveCraftHandler:getCraftsByGroup(craftGroup) - local crafts = self.craftsByGroup[craftGroup] - - assert(crafts ~= nil, ('There are no primitive crafts with `%s` group'):format( - craftGroup)) - - return crafts -end - ----@param playerName string ----@return table -function PrimitiveCraftHandler:getLearnedCrafts(playerName) - local crafts = self.learnedCrafts[playerName] - - assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format( - playerName)) - - return crafts -end - return PrimitiveCraftHandler