From 8a0b5785ab324fed5f4ca2ff26cc7ac95d0f3ed0 Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 30 Mar 2026 20:59:34 +0300 Subject: [PATCH] Added the ability to specify the number of items in primitive crafting recipes and results --- .../src/CraftSystem/ImmersiveCraft.lua | 6 +-- .../src/CraftSystem/PrimitiveCraft.lua | 4 +- mods/GAME/ITEMS/wood/init.lua | 52 +------------------ .../src/PlayerInventoryUI/getCraftPane.lua | 11 ++-- 4 files changed, 14 insertions(+), 59 deletions(-) diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua index d59bad5..eb9f47b 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua @@ -18,7 +18,7 @@ local stageTypes = { ---Immersive crafting aimed at a more logical process of crafting items. ---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft ---@field startStageName string ----@field triggerItem string +---@field triggerItem ItemStackString ---@field output ItemStackString ---@field stagesByName table local ImmersiveCraft = extend(BaseCraft, {}) @@ -28,8 +28,8 @@ local ImmersiveCraft = extend(BaseCraft, {}) ---**Only for EmmyLua.** ---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef ---@field startStageName string ----@field triggerItem string ----@field output string +---@field triggerItem ItemStackString +---@field output ItemStackString ---@field stages CraftSystem.ImmersiveCraftStageDef[] ---@param name string diff --git a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua index effd041..75b81c7 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/PrimitiveCraft.lua @@ -7,7 +7,7 @@ local require = modInfo.require local BaseCraft = require('CraftSystem.BaseCraft') ---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft ----@field output string +---@field output ItemStackString ---@field recipe CraftSystem.CraftRecipe ---@field returnItems ItemStackString[] local PrimitiveCraft = extend(BaseCraft, {}) @@ -16,7 +16,7 @@ local PrimitiveCraft = extend(BaseCraft, {}) --- ---**Only for EmmyLua.** ---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef ----@field output string +---@field output ItemStackString ---@field recipe CraftSystem.CraftRecipe ---@field returnItems ItemStackString[]? diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index 59d5f09..f79f5d5 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -202,61 +202,13 @@ local function registerWood(name, x, def) recipe = { 'wood:'..name..'_log' }, - output = 'wood:'..name..'_planks', + output = 'wood:'..name..'_planks 4', group = 'test' }) PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped', { recipe = { - 'wood:'..name..'_log' - }, - output = 'wood:'..name..'_log_stripped', - group = 'test' - }) - - PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped_1', { - recipe = { - 'wood:'..name..'_log' - }, - output = 'wood:'..name..'_log_stripped', - group = 'test' - }) - - PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped_2', { - recipe = { - 'wood:'..name..'_log' - }, - output = 'wood:'..name..'_log_stripped', - group = 'test' - }) - - PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped_3', { - recipe = { - 'wood:'..name..'_log' - }, - output = 'wood:'..name..'_log_stripped', - group = 'test' - }) - - PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped_11', { - recipe = { - 'wood:'..name..'_log' - }, - output = 'wood:'..name..'_log_stripped', - group = 'test' - }) - - PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped_22', { - recipe = { - 'wood:'..name..'_log' - }, - output = 'wood:'..name..'_log_stripped', - group = 'test' - }) - - PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped_33', { - recipe = { - 'wood:'..name..'_log' + 'wood:'..name..'_log 2' }, output = 'wood:'..name..'_log_stripped', group = 'test' diff --git a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftPane.lua b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftPane.lua index 9a36d1a..6cf457c 100644 --- a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftPane.lua +++ b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftPane.lua @@ -79,14 +79,17 @@ local function getCraftPane(self, playerName, paneType) if selectedCraft ~= nil then local craft = PrimitiveCraftHandler:getCraftByName(selectedCraft) - local itemName = craft.output + local item = ItemStack(craft.output) + local itemDef = item:get_definition() + local recipe = '' for _, itemName in ipairs(craft.recipe) do - recipe = recipe..'- '..core.registered_items[itemName]._title..'\n' + local recipeItem = ItemStack(itemName) + recipe = recipe..'- '..core.strip_colors(recipeItem:get_definition()._title)..' x'..recipeItem:get_count()..'\n' end - local itemDef = core.registered_items[itemName] + CraftPane: - itemImage(5.5, 0.5, 2, 2, itemName): + itemImage(5.5, 0.5, 2, 2, craft.output): areaLabel(5.5, 3, 4, 4, itemDef._title..'\n'.. itemDef._description..'\n\n'..