From 2935c4d10b33bb1f4521f0d40951e51ef7dae06b Mon Sep 17 00:00:00 2001 From: Vanic Date: Sat, 28 Mar 2026 17:00:54 +0300 Subject: [PATCH] `CraftSystem`: minor fixes --- .../src/CraftSystem/BaseCraftHandler.lua | 15 ++++++++++++--- .../src/CraftSystem/PrimitiveCraft.lua | 2 +- .../src/CraftSystem/PrimitiveCraftHandler.lua | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua index 4b27431..b54bc78 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua @@ -1,3 +1,5 @@ +local PLAYERS_KNOW_ALL_RECIPES = true + ---Abstract class for handling crafting. ---@class CraftSystem.BaseCraftHandler ---@field craftsByName table @@ -36,10 +38,17 @@ end ---@param playerName string ---@return table function BaseCraftHandler:getLearnedCrafts(playerName) - local crafts = self.learnedCrafts[playerName] + if PLAYERS_KNOW_ALL_RECIPES then + return self.craftsByName + end - assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format( - playerName)) + local crafts = self.learnedCrafts[playerName] + print(playerName) + + if crafts == nil then + crafts = {} + self.learnedCrafts[playerName] = crafts + end return crafts end diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua index 48c64cd..effd041 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua @@ -18,7 +18,7 @@ local PrimitiveCraft = extend(BaseCraft, {}) ---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef ---@field output string ---@field recipe CraftSystem.CraftRecipe ----@field returnItems ItemStackString[] +---@field returnItems ItemStackString[]? ---@param name string ---@param def CraftSystem.PrimitiveCraftDef diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua index 6694a36..084d2c4 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraftHandler.lua @@ -15,8 +15,8 @@ local PrimitiveCraft = require('CraftSystem.PrimitiveCraft') ---simple crafting based on a recipe-result scheme. ---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler ---@field getCraftByName fun(self, craftName:string):CraftSystem.PrimitiveCraft ----@field getCraftsByGroup fun(self, craftGroup):CraftSystem.PrimitiveCraft[] ----@field getLearnedCrafts fun(self, playerName):table +---@field getCraftsByGroup fun(self, craftGroup:string):CraftSystem.PrimitiveCraft[] +---@field getLearnedCrafts fun(self, playerName:string):table local PrimitiveCraftHandler = extend(BaseCraftHandler, {}) ---Register a primitive craft that does not require special interaction.