diff --git a/mods/CORE/CraftSystem/src/CraftSystem.lua b/mods/CORE/CraftSystem/src/CraftSystem.lua index 56a654e..b1d13ea 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem.lua @@ -1,117 +1,25 @@ -local HASH_SPLITTER = '&' - local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require ----@alias CraftSystem.shapelessCraftsList table> ----@alias CraftSystem.processualCraftsList table> +---@type CraftSystem.PrimitiveCraftHandler +local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler') + +---@alias CraftSystem.CraftGroup string +---@alias CraftSystem.CraftRecipe string[] +---@alias CraftSystem.CraftType 'primitive' ---@class CraftSystem ----@field shapelessCraftsList CraftSystem.shapelessCraftsList ----@field processualCraftsList CraftSystem.processualCraftsList -local CraftSystem = { - shapelessCraftsList = {}, - processualCraftsList = {}, -} +local CraftSystem = {} ----@alias CraftSystem.Craft.Type ----|'shapeless' ----|'processual' ----@alias CraftSystem.Craft.Group string ----@alias CraftSystem.Craft.Recipe string[] - ----@alias shapelessCraftFunc fun(self:CraftSystem.ShapelessCraft, input:ItemStack[], workbenchMeta:NodeMetaRef?):boolean ----@alias processualCraftFunc fun(self:CraftSystem.ProcessualCraft, input:ItemStack[], workbenchMeta:NodeMetaRef?, processTime:number):boolean - ----@class CraftSystem.BaseCraft ----@field type CraftSystem.Craft.Type ----@field group CraftSystem.Craft.Group ----@field output string ----@field recipe CraftSystem.Craft.Recipe ----@field return table? TODO: доделать тут тип ----@field craftFunc (fun(self, ...):boolean)? - ----@class CraftSystem.ShapelessCraft : CraftSystem.BaseCraft ----@field craftFunc shapelessCraftFunc? - ----@class CraftSystem.ProcessualCraft : CraftSystem.BaseCraft ----@field processTime number ----@field craftFunc processualCraftFunc? - ----@param type CraftSystem.Craft.Type ----@return CraftSystem.shapelessCraftsList|CraftSystem.processualCraftsList -local function getCraftList(type) - local craftList - - if type == 'shapeless' then - craftList = CraftSystem.shapelessCraftsList - elseif type == 'processual' then - craftList = CraftSystem.processualCraftsList +---@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(string.format('Craft type `%s` does not exist.', type)) + error(('Craft type `%s` does not exist'):format(craftType)) end - - return craftList -end - ----@param type CraftSystem.Craft.Type ----@param group CraftSystem.Craft.Group ----@return table -local function getCraftGroup(type, group) - local craftList = getCraftList(type) - - ---@type table? - local craftGroup = craftList[group] - - assert(craftGroup ~= nil, string.format('Craft group `%s` does not exist.', type)) - - return craftGroup -end - ----@param type CraftSystem.Craft.Type ----@param group CraftSystem.Craft.Group -function CraftSystem.registerCraftGroup(type, group) - local craftList = getCraftList(type) - - assert(craftList[group] == nil, string.format('Craft group `%s` is already registered.', type)) - - craftList[group] = {} -end - ----@param recipe CraftSystem.Craft.Recipe ----@return string -function CraftSystem.getCraftHash(recipe) - table.sort(recipe) - - local hash = '' - - for i = 0, #recipe-1 do - hash = hash..recipe[i]..HASH_SPLITTER - end - - return hash..recipe[#recipe] -end - ----@param craftDef CraftSystem.ShapelessCraft|CraftSystem.ProcessualCraft -function CraftSystem.registerCraft(craftDef) - local craftGroup = getCraftGroup(craftDef.type, craftDef.group) - - local hash = CraftSystem.getCraftHash(craftDef.recipe) - - table.insert(craftGroup[hash], craftDef) -end - ----@param type CraftSystem.Craft.Type ----@param group CraftSystem.Craft.Group ----@return CraftSystem.ShapelessCraft[] | ---- CraftSystem.processualCraftsList[] | ---- nil -function CraftSystem.getCraftResults(type, group, recipe) - local craftGroup = getCraftGroup(type, group) - - local hash = CraftSystem.getCraftHash(recipe) - - return craftGroup[hash] end return CraftSystem \ No newline at end of file diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua new file mode 100644 index 0000000..0b25367 --- /dev/null +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua @@ -0,0 +1,35 @@ +local getInstance = Class.getInstance + +---@class CraftSystem.PrimitiveCraft +---@field name string +---@field group CraftSystem.CraftGroup +---@field output string +---@field recipe CraftSystem.CraftRecipe +---@field returnItems table? TODO: доделать тут тип +local PrimitiveCraft = {} + +---Definition table for the `CraftSystem.PrimitiveCraft`. +--- +---**Only for EmmyLua.** +---@class CraftSystem.PrimitiveCraftDef +---@field group CraftSystem.CraftGroup +---@field output string +---@field recipe CraftSystem.CraftRecipe +---@field returnItems table? TODO: доделать тут тип + +---@param name string +---@param def CraftSystem.PrimitiveCraftDef +---@return CraftSystem.PrimitiveCraft +function PrimitiveCraft:new(name, def) + local instance = getInstance(self, { + name = name, + group = def.group, + output = def.output, + recipe = def.recipe, + returnItems = def.returnItems or {} + }) + + return instance +end + +return PrimitiveCraft \ No newline at end of file diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua new file mode 100644 index 0000000..c829200 --- /dev/null +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua @@ -0,0 +1,71 @@ +local tableInsert = table.insert + +local modInfo = Mod.getInfo('smc__core__craft_system') +local require = modInfo.require + +---@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 = {}, +} + +---@param craftName string +---@param def CraftSystem.PrimitiveCraftDef +function PrimitiveCraftHandler:addCraft(craftName, def) + assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format( + craftName)) + + local craft = PrimitiveCraft:new(craftName, def) + + if self.craftsByGroup[craftName] == nil then + self.craftsByGroup[craftName] = {} + end + + self.craftsByName[craftName] = craft + tableInsert(self.craftsByGroup[craftName], 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 \ No newline at end of file