PlayerInventory & PlayerInventoryUI: Adding minimal functionality to the crafting pane. #34

This commit is contained in:
Van
2026-03-28 17:03:04 +03:00
parent d6cc39a0b2
commit 9ed2319b14
5 changed files with 180 additions and 7 deletions

View File

@@ -20,4 +20,8 @@ core.register_chatcommand('show_inv',
} }
) )
local require = Mod.getInfo('smc__core__player').require
require('Player.inventory')
return Player return Player

View File

@@ -1,4 +0,0 @@
---@class Player.GUI
local GUI = {}
return GUI

View File

@@ -0,0 +1,54 @@
local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler()
---@type PlayerInventoryUI
local PlayerInventoryUI = Mod.getInfo('smc__ui__player_inventory').require('PlayerInventoryUI')
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::item_button',function(player, fieldName, fieldValue)
local craftName, paneType = string.match(fieldName, '(%S+)::(%S+)::item_button')
assert(craftName ~= nil)
assert(paneType == 'left' or paneType == 'right')
local playerName = player:get_player_name()
PlayerInventoryUI:setContex(playerName, paneType..'_pane_craft_selected_craft', craftName)
PlayerInventoryUI:showForm(playerName)
end)
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::craft_item', function(player, fieldName, fieldValue)
---@type InvRef
local inv = player:get_inventory()
local playerName = player:get_player_name()
local paneType = string.match(fieldName, '(%S+)::craft_item')
assert(paneType == 'left' or paneType == 'right')
local craftName = PlayerInventoryUI:getContex(playerName, paneType..'_pane_craft_selected_craft')
local craft = PrimitiveCraftHandler:getCraftByName(craftName)
local OutputStack = ItemStack(craft.output)
OutputStack:set_count(OutputStack:get_count() * fieldValue)
local recipeStacks = {}
for _, itemName in ipairs(craft.recipe) do
local item = ItemStack(itemName)
item:set_count(item:get_count() * fieldValue)
table.insert(recipeStacks, item)
end
for _, item in ipairs(recipeStacks) do
if not inv:contains_item('main', item) then
core.chat_send_player(playerName, 'Not enough materials for crafting!')
return
end
end
if inv:room_for_item('main', OutputStack) then
for _, item in ipairs(recipeStacks) do
inv:remove_item('main', item)
end
inv:add_item('main', OutputStack)
else
core.chat_send_player(playerName, 'There is no space in the inventory!')
end
end)

View File

@@ -62,7 +62,7 @@ local function getFormSpecString(self, playerName)
InventoryForm: InventoryForm:
bgcolor('#00000000'): bgcolor('#00000000', 'neither'):
listColors('#00000000', '#e1b69150'): listColors('#00000000', '#e1b69150'):
list('current_player', 'main', 5.5,9.25, 9,1): list('current_player', 'main', 5.5,9.25, 9,1):
list('current_player', 'main', 5.5,10.75, 9,1, 9): list('current_player', 'main', 5.5,10.75, 9,1, 9):
@@ -75,12 +75,24 @@ local function getFormSpecString(self, playerName)
return InventoryForm:toString() return InventoryForm:toString()
end end
---@alias PlayerInventoryUI.ContexKey 'left_pane_name'|'right_pane_name'|'left_pane_is_block'|'right_pane_is_block' ---@alias PlayerInventoryUI.ContexKey
--- 'left_pane_name'|
--- 'right_pane_name'|
--- 'left_pane_is_block'|
--- 'right_pane_is_block'|
---
--- 'left_pane_craft_selected_craft'|
--- 'right_pane_craft_selected_craft'|
--- 'left_pane_craft_page_number'|
--- 'right_pane_craft_page_number'|
--- 'left_pane_craft_scroll'|
--- 'right_pane_craft_scroll'
---@class PlayerInventoryUI : BaseUI ---@class PlayerInventoryUI : BaseUI
---@field getFormSpecString fun(self:PlayerInventoryUI,playerName:string):string ---@field getFormSpecString fun(self:PlayerInventoryUI,playerName:string):string
---@field showForm fun(self:PlayerInventoryUI,playerName:string):string ---@field showForm fun(self:PlayerInventoryUI,playerName:string):string
---@field getContex fun(self:PlayerInventoryUI,player:string|Player,key:PlayerInventoryUI.ContexKey):any ---@field getContex fun(self:PlayerInventoryUI,player:string|Player,key:PlayerInventoryUI.ContexKey):any
---@field setContex fun(self:PlayerInventoryUI,player:string|Player,key:PlayerInventoryUI.ContexKey,value:any)
local PlayerInventoryUI = BaseUI:new('', getFormSpecString, false) local PlayerInventoryUI = BaseUI:new('', getFormSpecString, false)
PlayerInventoryUI:registerOnFormFieldAction('close_left_pane', function(player, fieldName, fieldValue) PlayerInventoryUI:registerOnFormFieldAction('close_left_pane', function(player, fieldName, fieldValue)
@@ -120,4 +132,38 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('select_right_%S+', function(pl
player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(playerName)) player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(playerName))
end) end)
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::page_back', function(player, fieldName, fieldValue)
local paneType = stringMatch(fieldName, '(%S+)::page_back')
assert(paneType == 'left' or paneType == 'right')
local playerName = player:get_player_name()
local pageNumber = PlayerInventoryUI:getContex(playerName, paneType..'_pane_craft_page_number') or 1
pageNumber = pageNumber - 1
if pageNumber <= 0 then
pageNumber = 1
end
PlayerInventoryUI:setContex(playerName, paneType..'_pane_craft_page_number', pageNumber)
PlayerInventoryUI:showForm(playerName)
player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(playerName))
end)
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::page_forward', function(player, fieldName, fieldValue)
local paneType = stringMatch(fieldName, '(%S+)::page_forward')
assert(paneType == 'left' or paneType == 'right')
local playerName = player:get_player_name()
local pageNumber = PlayerInventoryUI:getContex(playerName, paneType..'_pane_craft_page_number') or 1
pageNumber = pageNumber + 1
if pageNumber <= 0 then
pageNumber = 1
end
PlayerInventoryUI:setContex(playerName, paneType..'_pane_craft_page_number', pageNumber)
PlayerInventoryUI:showForm(playerName)
player:set_inventory_formspec(PlayerInventoryUI:getFormSpecString(playerName))
end)
return PlayerInventoryUI return PlayerInventoryUI

View File

@@ -1,3 +1,6 @@
---Number of crafting recipes on one menu page.
local PAGE_NUMBER_ITEMS = 28
local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler() local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler()
local Formspec = Smc.requireFormspec() local Formspec = Smc.requireFormspec()
@@ -9,9 +12,79 @@ local CraftPane = Formspec:new()
---@param paneType PlayerInventoryUI.PaneType ---@param paneType PlayerInventoryUI.PaneType
---@return Formspec ---@return Formspec
local function getCraftPane(self, playerName, paneType) local function getCraftPane(self, playerName, paneType)
if paneType ~= 'left' and paneType ~= 'right' then
error('Incorrect argument `paneType`: '..paneType)
end
local selectedCraft = self:getContex(playerName, paneType..'_pane_craft_selected_craft')
local pageNumber = self:getContex(playerName, paneType..'_pane_craft_page_number') or 1
local learnedCrafts = PrimitiveCraftHandler:getLearnedCrafts(playerName)
---@type CraftSystem.PrimitiveCraft[]
local crafts = {}
local craftsListForm = Formspec:new()
for _, craft in pairs(learnedCrafts) do
table.insert(crafts, craft)
end
table.sort(crafts, function(a, b)
if a.output < b.output then
return true
end
end)
---Maximum number of crafting recipe pages
---@type integer
local pagesMax = math.ceil(#crafts/PAGE_NUMBER_ITEMS)
if pageNumber > pagesMax then
pageNumber = pagesMax
self:setContex(playerName, paneType..'_pane_craft_page_number', pageNumber)
end
local w, h = 0, 0
for i = PAGE_NUMBER_ITEMS*pageNumber-PAGE_NUMBER_ITEMS+1, PAGE_NUMBER_ITEMS*pageNumber do
local craft = crafts[i]
if craft == nil then
break
end
craftsListForm:itemImageButton(w, h, 1, 1, craft.output, craft.name..'::'..paneType..'::item_button')
w = w + 1
if w >= 4 then
w = 0
h = h + 1
end
end
CraftPane: CraftPane:
image(0, 0, 11, 9, 'player_inventory_pane_background.png'): image(0, 0, 11, 9, 'player_inventory_pane_background.png'):
label(2,2, 'CRAFTING PANE') container(craftsListForm, 0.5, 0.5):
button(1.5, 7.5, 1, 0.5, paneType..'::page_back', '<'):
button(2.5, 7.5, 1, 0.5, paneType..'::page_forward', '>'):
label(2.25,8.25, ('%s/%s'):format(pageNumber, pagesMax))
if selectedCraft ~= nil then
local craft = PrimitiveCraftHandler:getCraftByName(selectedCraft)
local itemName = craft.output
local recipe = ''
for _, itemName in ipairs(craft.recipe) do
recipe = recipe..'- '..core.registered_items[itemName]._title..'\n'
end
local itemDef = core.registered_items[itemName]
CraftPane:
itemImage(5, 0.5, 2, 2, itemName):
areaLabel(5, 3, 6, 4,
itemDef._title..'\n'..
itemDef._description..'\n\n'..
'Needed:\n'..recipe):
areaLabel(5, 7, 4, 1, 'Craft:'):
button(5, 7.5, 2, 1, paneType..'::craft_item', '1'):
button(7, 7.5,2, 1, paneType..'::craft_item', ''..tostring(itemDef.stack_max))
end
return CraftPane return CraftPane
end end