diff --git a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua index 71284c4..db4939d 100644 --- a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua +++ b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI.lua @@ -199,15 +199,14 @@ end --- 'left_tab_is_block'| --- 'right_tab_is_block'| --- +--- 'left_tab_craft_search_field_value'| +--- 'right_tab_craft_search_field_value'| --- 'left_tab_craft_selected_craft'| --- 'right_tab_craft_selected_craft'| --- 'left_tab_craft_selected_group'| --- 'right_tab_craft_selected_group'| ---- 'group_image_number'| --- 'left_tab_craft_page_number'| ---- 'right_tab_craft_page_number'| ---- 'left_tab_craft_scroll'| ---- 'right_tab_craft_scroll' +--- 'right_tab_craft_page_number' ---@class PlayerInventoryUI : BaseUI ---@field getFormSpecString fun(self:PlayerInventoryUI,playerName:string):string @@ -268,6 +267,17 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('select_right_%S+', function(pl PlayerInventoryUI:showForm(playerName) end) +-- Hadling input in the crafting search bar. +PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::craft_search_field', function(player, fieldName, fieldValue) + local tabType = stringMatch(fieldName, '(%S+)::craft_search_field') + assert(tabType == 'left' or tabType == 'right') + + local playerName = player:get_player_name() + + PlayerInventoryUI:setContex(playerName, tabType..'_tab_craft_search_field_value', fieldValue) + PlayerInventoryUI:showForm(playerName) +end) + -- Handling the click of the button to turning back through the crafting menu pages. PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::page_back', function(player, fieldName, fieldValue) local tabType = stringMatch(fieldName, '(%S+)::page_back') diff --git a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftTab.lua b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftTab.lua index ffc5161..32b6056 100644 --- a/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftTab.lua +++ b/mods/UI/PlayerInventoryUI/src/PlayerInventoryUI/getCraftTab.lua @@ -1,7 +1,7 @@ local mathFloor = math.floor ---Number of crafting recipes on one menu page. -local PAGE_NUMBER_ITEMS = 24 +local PAGE_NUMBER_ITEMS = 20 local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler() @@ -21,11 +21,15 @@ local function getCraftTab(self, playerName, tabType) ---@type string local selectedCraft = self:getContex(playerName, tabType..'_tab_craft_selected_craft') or '' ---@type CraftSystem.CraftGroup? - local selectedGroup = self:getContex(playerName, tabType..'_tab_craft_selected_group') - local pageNumber = self:getContex(playerName, tabType..'_tab_craft_page_number') or 1 + local selectedGroup = self:getContex(playerName, tabType..'_tab_craft_selected_group') + local searchFieldValue = self:getContex(playerName, tabType..'_tab_craft_search_field_value') + local pageNumber = self:getContex(playerName, tabType..'_tab_craft_page_number') or 1 local crafts - if selectedGroup == nil then + if searchFieldValue ~= '' and searchFieldValue ~= nil then + ---@type CraftSystem.PrimitiveCraft[] + crafts = PrimitiveCraftHandler:getLearnedCraftsMatch(playerName, searchFieldValue) + elseif selectedGroup == nil then ---@type (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[] crafts = PrimitiveCraftHandler:getLearnedCrafts(playerName) else @@ -39,6 +43,10 @@ local function getCraftTab(self, playerName, tabType) ---@type integer local pagesMax = math.ceil(#crafts/PAGE_NUMBER_ITEMS) + if pagesMax == 0 then + pagesMax = 1 + end + if pageNumber > pagesMax then pageNumber = pagesMax self:setContex(playerName, tabType..'_tab_craft_page_number', pageNumber) @@ -91,7 +99,9 @@ local function getCraftTab(self, playerName, tabType) CraftTab :background(0, 0, 11, 9, 'player_inventory_craft_tab_background.png') - :container(craftsListForm, 0.5, 0.5) + :field(0.25, 0.5, 5, 0.75, tabType..'::craft_search_field', nil, searchFieldValue) + :fieldCloseOnEnter(tabType..'::craft_search_field', false) + :container(craftsListForm, 0.5, 1.5) :button(1.75, 7.75, 1, 0.5, tabType..'::page_back', '<') :button(2.75, 7.75, 1, 0.5, tabType..'::page_forward', '>') :label(2.5,8.5, ('%s/%s'):format(pageNumber, pagesMax)) diff --git a/mods/UI/PlayerInventoryUI/textures/player_inventory_craft_tab_background.png b/mods/UI/PlayerInventoryUI/textures/player_inventory_craft_tab_background.png index efd01cc..5292170 100644 Binary files a/mods/UI/PlayerInventoryUI/textures/player_inventory_craft_tab_background.png and b/mods/UI/PlayerInventoryUI/textures/player_inventory_craft_tab_background.png differ