From 362d626f9b547247c1e0c41cfa6d03fbb6a6eeba Mon Sep 17 00:00:00 2001 From: Vanic Date: Fri, 3 Apr 2026 18:42:18 +0300 Subject: [PATCH] `CraftSystem`: add `groupedCrafts` --- .../CraftSystem/src/CraftSystem/BaseCraft.lua | 2 +- .../src/CraftSystem/BaseCraftHandler.lua | 9 +++-- .../src/CraftSystem/ImmersiveCraftHandler.lua | 7 ++-- .../src/CraftSystem/PrimitiveCraftHandler.lua | 37 +++++++++++++++++-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua index 848bf4f..a2ec1c1 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua @@ -8,6 +8,6 @@ local BaseCraft = {} --- ---**Only for EmmyLua.** ---@class CraftSystem.BaseCraftDef ----@field group CraftSystem.CraftGroup +---@field group CraftSystem.CraftGroup? return BaseCraft diff --git a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua index b54bc78..baa8434 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua @@ -5,11 +5,13 @@ local PLAYERS_KNOW_ALL_RECIPES = true ---@field craftsByName table ---@field craftsByGroup table ---@field craftsList CraftSystem.BaseCraft[] ----@field learnedCrafts table> +---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[] +---@field learnedCrafts table local BaseCraftHandler = { craftsByName = {}, craftsByGroup = {}, craftsList = {}, + groupedCrafts = {}, learnedCrafts = {}, } @@ -36,14 +38,13 @@ function BaseCraftHandler:getCraftsByGroup(craftGroup) end ---@param playerName string ----@return table +---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[] function BaseCraftHandler:getLearnedCrafts(playerName) if PLAYERS_KNOW_ALL_RECIPES then - return self.craftsByName + return self.groupedCrafts end local crafts = self.learnedCrafts[playerName] - print(playerName) if crafts == nil then crafts = {} diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua index dafa271..df043f9 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftHandler.lua @@ -29,12 +29,13 @@ function ImmersiveCraftHandler:registerCraft(craftName, def) assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format( craftName)) + -- The craft group to which the craft belongs. + local group = 'craft_group:' .. (def.group or 'UNDEFINED') + def.group = group + -- We obtain a crafting instance according to the given parameters. local craft = ImmersiveCraft:new(craftName, def) - -- The craft group to which the craft belongs. - local group = def.group - -- If no craft with this group has been registered before... if self.craftsByGroup[group] == nil then -- ...then we create a list for this group. diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua index 084d2c4..da337cf 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua @@ -1,6 +1,6 @@ local extend = Class.extend -local tableInsert = table.insert +local tableInsert, tableSort, tableMerge = table.insert, table.sort, table.merge local modInfo = Mod.getInfo('smc__core__craft_system') local require = modInfo.require @@ -14,9 +14,11 @@ local PrimitiveCraft = require('CraftSystem.PrimitiveCraft') ---A primitive crafting processor that doesn't require much interaction and provides ---simple crafting based on a recipe-result scheme. ---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler +---@field craftsByGroup table +---@field groupedCrafts (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[] ---@field getCraftByName fun(self, craftName:string):CraftSystem.PrimitiveCraft ---@field getCraftsByGroup fun(self, craftGroup:string):CraftSystem.PrimitiveCraft[] ----@field getLearnedCrafts fun(self, playerName:string):table +---@field getLearnedCrafts fun(self, playerName:string):(CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[] local PrimitiveCraftHandler = extend(BaseCraftHandler, {}) ---Register a primitive craft that does not require special interaction. @@ -26,9 +28,10 @@ function PrimitiveCraftHandler:registerCraft(craftName, def) assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format( craftName)) - local craft = PrimitiveCraft:new(craftName, def) + local group = 'craft_group:' .. (def.group or 'UNDEFINED') + def.group = group - local group = def.group + local craft = PrimitiveCraft:new(craftName, def) if self.craftsByGroup[group] == nil then self.craftsByGroup[group] = {} @@ -39,4 +42,30 @@ function PrimitiveCraftHandler:registerCraft(craftName, def) tableInsert(self.craftsList, craft) end +core.register_on_mods_loaded(function() + for groupName, crafts in pairs(PrimitiveCraftHandler.craftsByGroup) do + tableSort(crafts, function(a, b) + if a.output < b.output then + return true + end + end) + + if groupName ~= 'craft_group:UNDEFINED' then + tableInsert(PrimitiveCraftHandler.groupedCrafts, crafts) + else + -- TODO: поменять Merge на Join + PrimitiveCraftHandler.groupedCrafts = tableMerge(PrimitiveCraftHandler.groupedCrafts, crafts, false) + end + end + + tableSort(PrimitiveCraftHandler.groupedCrafts, function(a, b) + local outputA = (a[1] and a[1].output) or a.output + local outputB = (b[1] and b[1].output) or b.output + + if outputA < outputB then + return true + end + end) +end) + return PrimitiveCraftHandler