PlayerInventoryUI: add admin list tab, some changes, rename textures and minor refactoring

This commit is contained in:
Van
2026-11-05 20:59:04 +03:00
parent 9566e0edde
commit f995397f28
12 changed files with 344 additions and 299 deletions

View File

@@ -1,4 +0,0 @@
local modInfo = Mod.getInfo('smc__ui__admin_list')
local require = modInfo.require
return require('AdminListUI')

View File

@@ -1,2 +0,0 @@
name = smc__ui__admin_list
depends = smc__core__formspec

View File

@@ -1,85 +0,0 @@
local BaseUI, Formspec = Smc.requireBaseUI(), Smc.requireFormspec()
---@param self BaseUI
---@param playerName string
---@param isSelect boolean?
---@return string
local function getFormSpecString(self, playerName, isSelect)
if isSelect == nil and self:getContex(playerName, 'select_item') ~= nil then
isSelect = true
else
isSelect = false
end
local items = {}
for name, def in pairs(core.registered_items) do
if def.groups and not def.groups.not_in_creative_inventory then
table.insert(items, name)
end
end
table.sort(items)
local listFormItems = Formspec:new()
local w, h = 0, 0
---@param name string
for _, name in ipairs(items) do
listFormItems:itemImageButton(w, h, 1, 1, name, name..'::item_button')
w = w + 1
if w >= 9 then
w = 0
h = h + 1
end
end
local listForm = Formspec:new({
size = {x=21, y=12},
})
listForm
:list('current_player', 'main', 10.5, 6.5, 8, 4)
:scrollContainer(listFormItems, 0.5, 0.5, 9, 11, 'admin_commands:list_items', 'vertical')
:scrollbar(10, 0.5, 0.25, 10, 'vertical', 'admin_commands:list_items', self:getContex(playerName, 'scroll'))
if isSelect then
---@type ItemStackString
local item = self:getContex(playerName, 'select_item')
local itemDefinition = Smc.getItemDefinitionOrNil(item)
local itemSettings
if itemDefinition == nil then
itemSettings = core.registered_items[item]
else
itemSettings = itemDefinition.settings
end
listForm
:itemImage(11, 0.5, 2, 2, item)
:areaLabel(11, 4.5, 4, 1, 'Add to inventory:')
:button(11, 5, 3, 1, 'admin_commands:list_add_item', '1')
:button(14, 5,3, 1, 'admin_commands:list_add_item', ''..tostring(itemSettings.stack_max))
:areaLabel(14.5, 0.5, 6, 4,
item..'\n\n'..
(itemSettings._title or itemSettings.description)..'\n'..
(itemSettings._description or ''))
end
return listForm:toString()
end
---@class AdminListUI : BaseUI
---@field getFormSpecString fun(self:BaseUI,playerName:string,isSelect:boolean?):string
---@field showForm fun(self:BaseUI,playerName:string,isSelect:boolean?):string
local AdminListUI = BaseUI:new('admin_commands:list_form', getFormSpecString, false)
AdminListUI:registerOnFormFieldAction('admin_commands:list_items', function(player, fieldName, fieldValue)
local scrollValue = string.match(fieldValue, 'CHG:(%S+)')
if scrollValue then
AdminListUI:setContex(player, 'scroll', scrollValue)
end
end)
return AdminListUI

View File

@@ -6,13 +6,11 @@ local tableInsert, tableRemoveValue = table.insert, table.remove_value
local BaseUI, Formspec = Smc.requireBaseUI(), Smc.requireFormspec()
local CraftSystem = Smc.requireCraftSystem()
local InventoryCraftHandler = CraftSystem:getPrimitiveCraftHandler('inside_player_inventory')
local require = Mod.getInfo('smc__ui__player_inventory').require
---@alias PlayerInventoryUI.TabType 'left'|'right'
---@alias PlayerInventoryUI.getTabFunc fun(self:PlayerInventoryUI,playerName:string,tabType:PlayerInventoryUI.TabType):Formspec
---@alias PlayerInventoryUI.TabName 'bag_tab'|'craft_tab'|'equip_tab'|'ref_tab'|'node_tab'
---@alias PlayerInventoryUI.TabType 'left'|'right'
---@alias PlayerInventoryUI.getTabFunc fun(self:PlayerInventoryUI,playerName:string,tabType:PlayerInventoryUI.TabType):Formspec
---@alias PlayerInventoryUI.TabName 'bag_tab'|'craft_tab'|'equip_tab'|'ref_tab'|'node_tab'|'admin_list_tab'
---@type PlayerInventoryUI.getTabFunc
local getBagTab = require('PlayerInventoryUI.getBagTab')
@@ -22,53 +20,33 @@ local getCraftTab = require('PlayerInventoryUI.getCraftTab')
local getEquipTab = require('PlayerInventoryUI.getEquipTab')
---@type PlayerInventoryUI.getTabFunc
local getRefTab = require('PlayerInventoryUI.getRefTab')
---@type PlayerInventoryUI.getTabFunc
local getAdminListTab = require('PlayerInventoryUI.getAdminListTab')
---@type table<PlayerInventoryUI.TabName, PlayerInventoryUI.getTabFunc>
local tabs = {
['bag_tab'] = getBagTab,
['craft_tab'] = getCraftTab,
['equip_tab'] = getEquipTab,
['ref_tab'] = getRefTab,
['craft_tab'] = getCraftTab,
['equip_tab'] = getEquipTab,
['ref_tab'] = getRefTab,
['admin_list_tab'] = getAdminListTab
}
local selectTabButtonTexture, unselectTabButtonTexture = 'player_inventory_select_tab_button.png', 'player_inventory_select_tab_button_unselected.png'
local tabButtonTextures = {
['craft_tab'] = {
selectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture
},
['equip_tab'] = {
unselectTabButtonTexture,
selectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture
},
['bag_tab'] = {
unselectTabButtonTexture,
unselectTabButtonTexture,
selectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture
},
['ref_tab'] = {
unselectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture,
selectTabButtonTexture,
unselectTabButtonTexture
},
['node_tab'] = {
unselectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture,
unselectTabButtonTexture,
selectTabButtonTexture
}
}
--TODO Эту таблицу надо превратить в более краткую функцию
local SELECT_TAB_BUTTON_TEXTURE, UNSELECT_TAB_BUTTON_TEXTURE = 'player_inventory_select_tab_button.png', 'player_inventory_select_tab_button_unselected.png'
---Returns the texture name for a tab button,
---corresponding to its status (active or inactive)
---@param activeTabName string
---@param tabName PlayerInventoryUI.TabName
---@return string
local function getTabTexture(activeTabName, tabName)
if activeTabName == tabName then
return SELECT_TAB_BUTTON_TEXTURE
else
return UNSELECT_TAB_BUTTON_TEXTURE
end
end
---Returns the formspec definition for the compact (single tab)
---version of the player's inventory.
@@ -87,6 +65,7 @@ local function getCompactForm(self, playerName)
if leftTabName == 'node_tab' then
leftTab = self:getContex(playerName, 'node_tab')
else
print(leftTabName)
leftTab = tabs[leftTabName]
end
@@ -96,11 +75,6 @@ local function getCompactForm(self, playerName)
noPrepend = true,
})
-- We get a table for textures for tab selection buttons according to the active tab.
-- The active button should be lighter than the others.
-- This is achieved by using a different texture on the button.
local leftTabButtonTextures = tabButtonTextures[leftTabName]
InventoryForm
-- Removing the inventory background color:
:bgcolor('#00000000', 'neither')
@@ -116,14 +90,18 @@ local function getCompactForm(self, playerName)
-- Selection buttons for the (left) panel
local leftTabs = {
{ leftTabButtonTextures[1], 'select_left_craft_tab', core.colorize('#e1b691','craft') },
{ leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip') },
{ leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags') },
{ leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs') }
{ getTabTexture(leftTabName, 'craft_tab'), 'select_left_craft_tab', core.colorize('#e1b691','craft') },
{ getTabTexture(leftTabName, 'equip_tab'), 'select_left_equip_tab', core.colorize('#e1b691','equip') },
{ getTabTexture(leftTabName, 'bag_tab'), 'select_left_bag_tab', core.colorize('#e1b691','bags') },
{ getTabTexture(leftTabName, 'ref_tab'), 'select_left_ref_tab', core.colorize('#e1b691','refs') },
}
if self:getContex(playerName, 'node_tab') ~= nil then
tableInsert(leftTabs, { leftTabButtonTextures[5], 'select_left_node_tab', core.colorize('#e1b691','node') })
tableInsert(leftTabs, { getTabTexture(leftTabName, 'node_tab'), 'select_left_node_tab', core.colorize('#e1b691','node') })
end
if core.check_player_privs(playerName, 'give') then
tableInsert(leftTabs, { getTabTexture(leftTabName, 'admin_list_tab'), 'select_left_admin_list_tab', core.colorize('#e1b691','admin list') })
end
InventoryForm:imageButtonRow(0, 0, 2, 0.5, leftTabs)
@@ -169,12 +147,6 @@ local function getFullForm(self, playerName)
noPrepend = true,
})
-- We get texture tables for the tab selection buttons depending on the active tabs.
-- The active button should be lighter than the others.
-- This is achieved by using a different texture on the button.
local leftTabButtonTextures = tabButtonTextures[leftTabName]
local rightTabButtonTextures = tabButtonTextures[rightTabName]
InventoryForm
-- Removing the inventory background color:
:bgcolor('#00000000', 'neither')
@@ -192,23 +164,28 @@ local function getFullForm(self, playerName)
-- Selection buttons for the (left) panel
local leftTabs = {
{ leftTabButtonTextures[1], 'select_left_craft_tab', core.colorize('#e1b691','craft') },
{ leftTabButtonTextures[2], 'select_left_equip_tab', core.colorize('#e1b691','equip') },
{ leftTabButtonTextures[3], 'select_left_bag_tab', core.colorize('#e1b691','bags') },
{ leftTabButtonTextures[4], 'select_left_ref_tab', core.colorize('#e1b691','refs') }
{ getTabTexture(leftTabName, 'craft_tab'), 'select_left_craft_tab', core.colorize('#e1b691','craft') },
{ getTabTexture(leftTabName, 'equip_tab'), 'select_left_equip_tab', core.colorize('#e1b691','equip') },
{ getTabTexture(leftTabName, 'bag_tab'), 'select_left_bag_tab', core.colorize('#e1b691','bags') },
{ getTabTexture(leftTabName, 'ref_tab'), 'select_left_ref_tab', core.colorize('#e1b691','refs') }
}
-- Selection buttons for the (right) panel
local rightTabs = {
{ rightTabButtonTextures[1], 'select_right_craft_tab', core.colorize('#e1b691','craft') },
{ rightTabButtonTextures[2], 'select_right_equip_tab', core.colorize('#e1b691','equip') },
{ rightTabButtonTextures[3], 'select_right_bag_tab', core.colorize('#e1b691','bags') },
{ rightTabButtonTextures[4], 'select_right_ref_tab', core.colorize('#e1b691','refs') }
{ getTabTexture(rightTabName, 'craft_tab'), 'select_right_craft_tab', core.colorize('#e1b691','craft') },
{ getTabTexture(rightTabName, 'equip_tab'), 'select_right_equip_tab', core.colorize('#e1b691','equip') },
{ getTabTexture(rightTabName, 'bag_tab'), 'select_right_bag_tab', core.colorize('#e1b691','bags') },
{ getTabTexture(rightTabName, 'ref_tab'), 'select_right_ref_tab', core.colorize('#e1b691','refs') }
}
if self:getContex(playerName, 'node_tab') ~= nil then
tableInsert(leftTabs, { leftTabButtonTextures[5], 'select_left_node_tab', core.colorize('#e1b691','node') })
tableInsert(rightTabs, { rightTabButtonTextures[5], 'select_right_node_tab', core.colorize('#e1b691','node') })
tableInsert(leftTabs, { getTabTexture(leftTabName, 'node_tab'), 'select_left_node_tab', core.colorize('#e1b691','node') })
tableInsert(rightTabs, { getTabTexture(rightTabName, 'node_tab'), 'select_right_node_tab', core.colorize('#e1b691','node') })
end
if core.check_player_privs(playerName, 'give') then
tableInsert(leftTabs, { getTabTexture(leftTabName, 'admin_list_tab'), 'select_left_admin_list_tab', core.colorize('#e1b691','admin list') })
tableInsert(rightTabs, { getTabTexture(rightTabName, 'admin_list_tab'), 'select_right_admin_list_tab', core.colorize('#e1b691','admin list') })
end
InventoryForm:imageButtonRow(0, 0, 2, 0.5, leftTabs)
@@ -243,26 +220,31 @@ local function getFormSpecString(self, playerName)
end
end
---@class PlayerInventoryUI.CraftTabData
---@field search_field_value string?
---@field selected_craft string?
---@field selected_recipe_index integer?
---@field selected_group CraftSystem.CraftGroup?
---@field page_number integer?
---@class PlayerInventoryUI.CraftListTabData
---@field searchFieldValue string?
---@field selectedCraft string?
---@field selectedRecipeIndex integer?
---@field selectedGroup CraftSystem.CraftGroup?
---@field pageNumber integer?
---@field handler CraftSystem.BaseCraftHandler
---@class PlayerInventoryUI.AdminListTabData
---@field selectedItem string?
---@field searchFieldValue string?
---@field pageNumber integer?
---Context keys for the `PlayerInventoryUI` class.
---@alias PlayerInventoryUI.ContexKey
---|'compact_mode'
---|'node_tab_pos'
---|'node_tab'
---
---|'left_tab_name'|
---|'right_tab_name'|
---|'left_tab_name'
---|'right_tab_name'
---
---|'left_craft_tab_craft_data'|
---|'right_craft_tab_craft_data'|
---|'left_node_tab_craft_data'|
---|'left_craft_tab_craft_data'
---|'right_craft_tab_craft_data'
---|'left_node_tab_craft_data'
---|'right_node_tab_craft_data'
@@ -276,22 +258,39 @@ local PlayerInventoryUI = BaseUI:new('', getFormSpecString, false)
---@param playerName string
---@param tabType PlayerInventoryUI.TabType
---@param tabName 'craft_tab'|'node_tab'
---@return PlayerInventoryUI.CraftTabData
---@return PlayerInventoryUI.CraftListTabData
function PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
---@type PlayerInventoryUI.CraftTabData
local craftTabData = self:getContex(playerName, tabType..'_'..tabName..'_craft_data')
---@type PlayerInventoryUI.CraftListTabData
local craftListTabData = self:getContex(playerName, tabType..'_'..tabName..'_craft_data')
return craftTabData
return craftListTabData
end
---@param playerName string
---@param tabType PlayerInventoryUI.TabType
---@param tabName 'craft_tab'|'node_tab'
---@param data PlayerInventoryUI.CraftTabData
---@param data PlayerInventoryUI.CraftListTabData
function PlayerInventoryUI:setTabCraftData(playerName, tabType, tabName, data)
self:setContex(playerName, tabType..'_'..tabName..'_craft_data', data)
end
---@param playerName string
---@param tabType PlayerInventoryUI.TabType
---@return PlayerInventoryUI.AdminListTabData
function PlayerInventoryUI:getAdminListTabData(playerName, tabType)
---@type PlayerInventoryUI.AdminListTabData
local listTabData = self:getContex(playerName, tabType..'_admin_list_data')
return listTabData
end
---@param playerName string
---@param tabType PlayerInventoryUI.TabType
---@param data PlayerInventoryUI.AdminListTabData
function PlayerInventoryUI:setAdminListTabData(playerName, tabType, data)
self:setContex(playerName, tabType..'_admin_list_data', data)
end
---@type table<string, string[]>
PlayerInventoryUI.ActiveNodeForms = {}
@@ -421,92 +420,108 @@ PlayerInventoryUI:registerOnFormFieldAction('change_compact_mode', function(play
PlayerInventoryUI:showForm(playerName)
end)
-- Handling the left inventory tab selection button press.
PlayerInventoryUI:registerOnFormFieldActionMatch('select_left_%S+', function(player, fieldName, fieldValue)
local tabName = stringMatch(fieldName, 'select_%S+_(%S+_%S+)')
-- Handling the inventory tab selection button press.
PlayerInventoryUI:registerOnFormFieldActionMatch('select_[%a]+_%S+', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, 'select_([%a]+)_(%S+)')
assert(tabType == 'right' or tabType == 'left')
assert(tabName ~= nil)
local playerName = player:get_player_name()
PlayerInventoryUI:setContex(playerName, 'left_tab_name', tabName)
PlayerInventoryUI:setContex(playerName, tabType..'_tab_name', tabName)
PlayerInventoryUI:showForm(playerName)
end)
-- Handling the right inventory tab selection button press.
PlayerInventoryUI:registerOnFormFieldActionMatch('select_right_%S+', function(player, fieldName, fieldValue)
local tabName = stringMatch(fieldName, 'select_%S+_(%S+_%S+)')
assert(tabName ~= nil)
local playerName = player:get_player_name()
PlayerInventoryUI:setContex(playerName, 'right_tab_name', tabName)
PlayerInventoryUI:showForm(playerName)
end)
-- Hadling input in the crafting search bar.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::craft_search_field', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, '(%S+)::(%S+)::craft_search_field')
-- Hadling input in the items list search bar.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::items_list_search_field', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, '(%S+)::(%S+)::items_list_search_field')
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
assert(tabName == 'craft_tab' or tabName == 'node_tab' or tabName == 'admin_list_tab')
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
if craftTabData.search_field_value == fieldValue then
---@type PlayerInventoryUI.CraftListTabData|PlayerInventoryUI.AdminListTabData
local tabData
if tabName == 'craft_tab' or tabName == 'node_tab' then
tabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
elseif tabName == 'admin_list_tab' then
tabData = PlayerInventoryUI:getAdminListTabData(playerName, tabType)
else
error('Invalid tabName: '..tabName)
end
if tabData.searchFieldValue == fieldValue then
return
end
craftTabData.search_field_value = fieldValue
tabData.searchFieldValue = fieldValue
PlayerInventoryUI:showForm(playerName)
end)
-- Handling the click of the button to turning back through the crafting menu pages.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::page_back', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, '(%S+)::(%S+)::page_back')
-- Handling the button press for flipping through the pages of an item list.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::items_list_page_[%a]+', function(player, fieldName, fieldValue)
local tabType, tabName, pageFlip = stringMatch(fieldName, '(%S+)::(%S+)::items_list_page_([%a]+)')
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
assert(tabName == 'craft_tab' or tabName == 'node_tab' or tabName == 'admin_list_tab')
assert(pageFlip == 'back' or pageFlip == 'forward')
---A factor that determines whether the page moves backward or forward
---@type integer
local pageFactor
if pageFlip == 'back' then
pageFactor = -1
else
pageFactor = 1
end
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local pageNumber = craftTabData.page_number or 1
pageNumber = pageNumber - 1
---@type PlayerInventoryUI.CraftListTabData|PlayerInventoryUI.AdminListTabData
local tabData
if tabName == 'craft_tab' or tabName == 'node_tab' then
tabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
elseif tabName == 'admin_list_tab' then
tabData = PlayerInventoryUI:getAdminListTabData(playerName, tabType)
else
error('Invalid tabName: '..tabName)
end
local pageNumber = tabData.pageNumber or 1
pageNumber = pageNumber + pageFactor
if pageNumber <= 0 then
pageNumber = 1
end
craftTabData.page_number = pageNumber
PlayerInventoryUI:showForm(playerName)
end)
tabData.pageNumber = pageNumber
-- Handling the click of the button to turning forward through the crafting menu pages.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::page_forward', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, '(%S+)::(%S+)::page_forward')
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local pageNumber = craftTabData.page_number or 1
pageNumber = pageNumber + 1
craftTabData.page_number = pageNumber
PlayerInventoryUI:showForm(playerName)
end)
-- Handlings the click of the button to move back in the list of alternative recipes.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::alt_recipe_back', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, '(%S+)::(%S+)::alt_recipe_back')
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::alt_recipe_[%a]+', function(player, fieldName, fieldValue)
local tabType, tabName, pageFlip = stringMatch(fieldName, '(%S+)::(%S+)::alt_recipe_([%a]+)')
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
assert(pageFlip == 'back' or pageFlip == 'forward')
---A factor that determines whether the page moves backward or forward
---@type integer
local pageFactor
if pageFlip == 'back' then
pageFactor = -1
else
pageFactor = 1
end
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local recipeIndex = craftTabData.selected_recipe_index or 1
recipeIndex = recipeIndex - 1
local craftListTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local recipeIndex = craftListTabData.selectedRecipeIndex or 1
recipeIndex = recipeIndex + pageFactor
local handler = craftTabData.handler
local craft = handler:getCraftByName(craftTabData.selected_craft)
local handler = craftListTabData.handler
local craft = handler:getCraftByName(craftListTabData.selectedCraft)
local crafts = handler:getLearnedCraftsByOutput(playerName, craft.output)
assert(crafts ~= nil)
@@ -514,31 +529,11 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::alt_recipe_back', fu
recipeIndex = 1
end
craftTabData.selected_recipe_index = recipeIndex
PlayerInventoryUI:showForm(playerName)
end)
-- Handlings the click of the button to move forward in the list of alternative recipes.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::alt_recipe_forward', function(player, fieldName, fieldValue)
local tabType, tabName = stringMatch(fieldName, '(%S+)::(%S+)::alt_recipe_forward')
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local recipeIndex = craftTabData.selected_recipe_index or 1
recipeIndex = recipeIndex + 1
local handler = craftTabData.handler
local craft = handler:getCraftByName(craftTabData.selected_craft)
local crafts = handler:getLearnedCraftsByOutput(playerName, craft.output)
assert(crafts ~= nil)
if recipeIndex > #crafts then
recipeIndex = #crafts
end
craftTabData.selected_recipe_index = recipeIndex
craftListTabData.selectedRecipeIndex = recipeIndex
PlayerInventoryUI:showForm(playerName)
end)
@@ -549,23 +544,31 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::close_group', functi
assert(tabName == 'craft_tab' or tabName == 'node_tab')
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
craftTabData.selected_group = nil
local craftListTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
craftListTabData.selectedGroup = nil
PlayerInventoryUI:showForm(playerName)
end)
-- Handling the button click for selecting an item for crafting.
-- Opens the item description and allows you to craft the selected item.
PlayerInventoryUI:registerOnFormFieldActionMatch('.+::%S+::%S+::item_button',function(player, fieldName, fieldValue)
local craftName, tabType, tabName = string.match(fieldName, '(.+)::(%S+)::(%S+)::item_button')
assert(craftName ~= nil)
PlayerInventoryUI:registerOnFormFieldActionMatch('.+::%S+::%S+::items_list_button',function(player, fieldName, fieldValue)
local name, tabType, tabName = string.match(fieldName, '(.+)::(%S+)::(%S+)::items_list_button')
assert(name ~= nil)
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
assert(tabName == 'craft_tab' or tabName == 'node_tab' or tabName == 'admin_list_tab')
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
craftTabData.selected_recipe_index = 1
craftTabData.selected_craft = craftName
if tabName == 'craft_tab' or tabName == 'node_tab' then
local craftListTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
craftListTabData.selectedRecipeIndex = 1
craftListTabData.selectedCraft = name
elseif tabName == 'admin_list_tab' then
local craftListTabData = PlayerInventoryUI:getAdminListTabData(playerName, tabType)
craftListTabData.selectedItem = name
else
error('Invalid tabName: '..tabName)
end
PlayerInventoryUI:showForm(playerName)
end)
@@ -578,8 +581,8 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('.+::%S+::%S+::group_button',fu
assert(tabName == 'craft_tab' or tabName == 'node_tab')
local playerName = player:get_player_name()
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
craftTabData.selected_group = groupName
local craftListTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
craftListTabData.selectedGroup = groupName
PlayerInventoryUI:showForm(playerName)
end)
@@ -588,17 +591,18 @@ end)
--
-- Note: Materials are only searched in the player's main inventory.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::craft_item', function(player, fieldName, fieldValue)
local playerName = player:get_player_name()
local tabType, tabName = string.match(fieldName, '(%S+)::(%S+)::craft_item')
assert(tabType == 'left' or tabType == 'right')
assert(tabName == 'craft_tab' or tabName == 'node_tab')
local playerName = player:get_player_name()
-- We get the recipe selected in the crafting menu.
local craftTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local handler = craftTabData.handler
local craftName = craftTabData.selected_craft
local craftListTabData = PlayerInventoryUI:getTabCraftData(playerName, tabType, tabName)
local handler = craftListTabData.handler
local craftName = craftListTabData.selectedCraft
assert(craftName ~= nil)
local recipeIndex = craftTabData.selected_recipe_index
local recipeIndex = craftListTabData.selectedRecipeIndex
assert(recipeIndex ~= nil)
local craft = handler:getCraftByName(craftName)
@@ -638,6 +642,31 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::%S+::craft_item', functio
end
end)
-- Handling the addition of an item from the admin list.
-- If the player does not have the 'give' privilege, nothing will happen.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::add_item', function(player, fieldName, fieldValue)
local tabType = string.match(fieldName, '(%S+)::add_item')
assert(tabType == 'left' or tabType == 'right')
local playerName = player:get_player_name()
if not core.check_player_privs(playerName, 'give') then
core.chat_send_player(player:get_player_name(), 'Your attempt to retrieve the item has been reported to the administrators.')
return
end
local craftListTabData = PlayerInventoryUI:getAdminListTabData(playerName, tabType)
local stack = ItemStack(craftListTabData.selectedItem)
stack:set_count(fieldValue)
---@type InvRef
local inv = player:get_inventory()
-- TODO выделить это в функцию Smc.playerTakeOrDrop
if inv:room_for_item('main', stack) then
inv:add_item('main', stack)
end
end)
---Automatically places equipment items into their corresponding slots.
---@param player Player
---@param inventory InvRef

View File

@@ -1,7 +1,7 @@
local mathFloor = math.floor
---Number of crafting recipes on one menu page.
local PAGE_NUMBER_ITEMS = 20
local PAGE_NUMBER_ITEMS = 36
local Formspec = Smc.requireFormspec()
@@ -24,16 +24,16 @@ local function getCraftTabTemplate(self, playerName, tabType, tabName, handler)
local CraftTab = Formspec:new()
local craftTabData = self:getTabCraftData(playerName, tabType, tabName)
if craftTabData == nil then
craftTabData = {handler = handler}
self:setTabCraftData(playerName, tabType, tabName, craftTabData)
local craftListTabData = self:getTabCraftData(playerName, tabType, tabName)
if craftListTabData == nil then
craftListTabData = {handler = handler}
self:setTabCraftData(playerName, tabType, tabName, craftListTabData)
end
local selectedCraft = craftTabData.selected_craft or ''
local selectedGroup = craftTabData.selected_group
local searchFieldValue = craftTabData.search_field_value
local pageNumber = craftTabData.page_number or 1
local selectedCraft = craftListTabData.selectedCraft or ''
local selectedGroup = craftListTabData.selectedGroup
local searchFieldValue = craftListTabData.searchFieldValue
local pageNumber = craftListTabData.pageNumber or 1
local crafts
if searchFieldValue ~= '' and searchFieldValue ~= nil then
@@ -59,14 +59,14 @@ local function getCraftTabTemplate(self, playerName, tabType, tabName, handler)
if pageNumber > pagesMax then
pageNumber = pagesMax
craftTabData.page_number = pageNumber
craftListTabData.pageNumber = pageNumber
end
local w, h = 0.0, 0.0
if selectedGroup ~= nil and (searchFieldValue == nil or searchFieldValue == '') then
craftsListForm
:imageButton(0, 0, 1.125, 1.125, 'player_inventory_craft_tab_close_group_button_background.png', tabType..'::'..tabName..'::close_group')
:imageButton(0, 0, 1.125, 1.125, 'player_inventory_items_list_tab_close_group_button_background.png', tabType..'::'..tabName..'::close_group')
w = 1.125
end
@@ -82,10 +82,10 @@ local function getCraftTabTemplate(self, playerName, tabType, tabName, handler)
if output ~= nil then
if craft.name == selectedCraft then
craftsListForm
:imageButton(w, h, 1.125, 1.125, 'player_inventory_craft_tab_button_pressed_background.png', craft.name..'::'..tabType..'::'..tabName..'::item_button')
:imageButton(w, h, 1.125, 1.125, 'player_inventory_items_list_tab_button_pressed_background.png', craft.name..'::'..tabType..'::'..tabName..'::items_list_button')
else
craftsListForm
:imageButton(w, h, 1.125, 1.125, 'player_inventory_craft_tab_button_background.png', craft.name..'::'..tabType..'::'..tabName..'::item_button')
:imageButton(w, h, 1.125, 1.125, 'player_inventory_items_list_tab_button_background.png', craft.name..'::'..tabType..'::'..tabName..'::items_list_button')
end
craftsListForm
@@ -95,29 +95,29 @@ local function getCraftTabTemplate(self, playerName, tabType, tabName, handler)
assert(craft ~= nil)
craftsListForm
:imageButton(w, h, 1.125, 1.125, 'player_inventory_craft_tab_button_background.png', craft.group..'::'..tabType..'::'..tabName..'::group_button')
:imageButton(w, h, 1.125, 1.125, 'player_inventory_items_list_tab_button_background.png', craft.group..'::'..tabType..'::'..tabName..'::group_button')
:itemImage(w+0.0625, h+0.0625, 1, 1, craft.output)
:image(w, h, 1.125, 1.125, 'player_inventory_craft_tab_group_button_overlay.png')
:image(w, h, 1.125, 1.125, 'player_inventory_items_list_tab_group_button_overlay.png')
end
w = w + 1.125
if w >= 4 then
if w >= 6 then
w = 0
h = h + 1.125
end
end
CraftTab
:background(0, 0, 14, 9, 'player_inventory_craft_tab_background.png')
:field(0.25, 0.5, 5, 0.75, tabType..'::'..tabName..'::craft_search_field', nil, searchFieldValue)
:fieldCloseOnEnter(tabType..'::'..tabName..'::craft_search_field', false)
:container(craftsListForm, 0.5, 1.5)
:button(1.75, 7.75, 1, 0.5, tabType..'::'..tabName..'::page_back', '<')
:button(2.75, 7.75, 1, 0.5, tabType..'::'..tabName..'::page_forward', '>')
:background(0, 0, 14, 9, 'player_inventory_items_list_tab_background.png')
:field(7.75, 0.5, 6, 0.75, tabType..'::'..tabName..'::items_list_search_field', nil, searchFieldValue)
:fieldCloseOnEnter(tabType..'::'..tabName..'::items_search_field', false)
:container(craftsListForm, 0.5, 0.5)
:button(1.75, 7.75, 1, 0.5, tabType..'::'..tabName..'::items_list_page_back', '<')
:button(2.75, 7.75, 1, 0.5, tabType..'::'..tabName..'::items_list_page_forward', '>')
:label(2.5,8.5, ('%s/%s'):format(pageNumber, pagesMax))
if selectedCraft ~= '' then
local recipeIndex = craftTabData.selected_recipe_index or 1
local recipeIndex = craftListTabData.selectedRecipeIndex or 1
local craft = handler:getCraftByName(selectedCraft)
craft = handler:getLearnedCraftsByOutput(playerName, craft.output)[recipeIndex]
@@ -129,16 +129,16 @@ local function getCraftTabTemplate(self, playerName, tabType, tabName, handler)
local mainList = player:get_inventory():get_list('main')
local craftsByOutput = handler:getLearnedCraftsByOutput(playerName, craft.output)
local recipeIndex = craftTabData.selected_recipe_index or 1
local recipeIndex = craftListTabData.selectedRecipeIndex or 1
CraftTab
:itemImage(5.5, 0.5, 2, 2, craft.output)
:label(10, 0.5, ('%s/%s'):format(recipeIndex, #craftsByOutput))
:textArea(5.5, 3, 5, 4, nil, nil, craft:toString(mainList))
:button(5.5, 7.5, 0.5, 1, tabType..'::'..tabName..'::alt_recipe_back', '<')
:button(6, 7.5, 2, 1, tabType..'::'..tabName..'::craft_item', '1')
:button(8, 7.5,2, 1, tabType..'::'..tabName..'::craft_item', ''..tostring(itemDef.stack_max))
:button(10, 7.5, 0.5, 1, tabType..'::'..tabName..'::alt_recipe_forward', '>')
:itemImage(8, 1.5, 2, 2, craft.output)
:label(13, 1.75, ('%s/%s'):format(recipeIndex, #craftsByOutput))
:textArea(8, 4, 5, 4, nil, nil, craft:toString(mainList))
:button(8.25, 7.5, 0.5, 1, tabType..'::'..tabName..'::alt_recipe_back', '<')
:button(8.75, 7.5, 2, 1, tabType..'::'..tabName..'::craft_item', '1')
:button(10.75, 7.5,2, 1, tabType..'::'..tabName..'::craft_item', ''..tostring(itemDef.stack_max))
:button(12.75, 7.5, 0.5, 1, tabType..'::'..tabName..'::alt_recipe_forward', '>')
end
return CraftTab

View File

@@ -0,0 +1,107 @@
local Formspec = Smc.requireFormspec()
---Number of crafting recipes on one menu page.
local PAGE_NUMBER_ITEMS = 36
---@param self PlayerInventoryUI
---@param playerName string
---@param tabType PlayerInventoryUI.TabType
---@return Formspec
local function getAdminListTab(self, playerName, tabType)
if tabType ~= 'left' and tabType ~= 'right' then
error('Incorrect argument `tabType`: '..tabType)
end
local AdminListTab = Formspec:new()
local listTabData = self:getAdminListTabData(playerName, tabType)
if listTabData == nil then
listTabData = {}
self:setAdminListTabData(playerName, tabType, listTabData)
end
local selectedItem = listTabData.selectedItem or ''
local searchFieldValue = listTabData.searchFieldValue
local pageNumber = listTabData.pageNumber or 1
---@type string[]
local items = {}
for name, def in pairs(core.registered_items) do
if def.groups and not def.groups.not_in_creative_inventory then
table.insert(items, name)
end
end
table.sort(items)
if searchFieldValue ~= nil and searchFieldValue ~= '' then
items = Smc.getMathedItems(items, searchFieldValue)
end
local ItemListForm = Formspec:new()
---Maximum number of items pages
---@type integer
local pagesMax = math.ceil(#items/PAGE_NUMBER_ITEMS)
if pagesMax == 0 then
pagesMax = 1
end
if pageNumber > pagesMax then
pageNumber = pagesMax
listTabData.pageNumber = pageNumber
end
local w, h = 0.0, 0.0
for i = PAGE_NUMBER_ITEMS*pageNumber-PAGE_NUMBER_ITEMS+1, PAGE_NUMBER_ITEMS*pageNumber do
local item = items[i]
if item == nil then
break
end
if item == selectedItem then
ItemListForm
:imageButton(w, h, 1.125, 1.125, 'player_inventory_items_list_tab_button_pressed_background.png', item..'::'..tabType..'::admin_list_tab::items_list_button')
else
ItemListForm
:imageButton(w, h, 1.125, 1.125, 'player_inventory_items_list_tab_button_background.png', item..'::'..tabType..'::admin_list_tab::items_list_button')
end
ItemListForm
:itemImage(w+0.0625, h+0.0625, 1, 1, item)
w = w + 1.125
if w >= 6 then
w = 0
h = h + 1.125
end
end
AdminListTab
:background(0, 0, 14, 9, 'player_inventory_items_list_tab_background.png')
:field(7.75, 0.5, 6, 0.75, tabType..'::admin_list_tab::items_list_search_field', nil, searchFieldValue)
:fieldCloseOnEnter(tabType..'::admin_list_tab::items_list_search_field', false)
:container(ItemListForm, 0.5, 0.5)
:button(1.75, 7.75, 1, 0.5, tabType..'::admin_list_tab::items_list_page_back', '<')
:button(2.75, 7.75, 1, 0.5, tabType..'::admin_list_tab::items_list_page_forward', '>')
:label(2.5,8.5, ('%s/%s'):format(pageNumber, pagesMax))
if selectedItem ~= '' then
local item = ItemStack(selectedItem)
local itemDef = item:get_definition()
AdminListTab
:itemImage(8, 1.5, 2, 2, selectedItem)
:textArea(8, 4, 5, 4, nil, nil, selectedItem)
:button(8.75, 7.5, 2, 1, tabType..'::add_item', '1')
:button(10.75, 7.5,2, 1, tabType..'::add_item', ''..tostring(itemDef.stack_max))
end
return AdminListTab
end
return getAdminListTab

Binary file not shown.

Before

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 630 B