sixam/minetest
Template
2
0
Fork 0
mirror of https://github.com/luanti-org/minetest_game.git synced 2025-05-21 14:53:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Creative: Skip redundant refreshes

Browse source 
Fixes the 'Reset' button not showing up everything
This commit is contained in:
SmallJoker 2020-03-01 10:22:48 +01:00
parent 8d9aa07752
commit fc03602966
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mods/creative/inventory.lua
View file

@ -25,7 +25,9 @@ function creative.init_creative_inventory(player)
player_inventory[player_name] = { player_inventory[player_name] = {
size = 0, size = 0,
filter = "", filter = "",
start_i = 0 start_i = 0,
_old_filter = nil,
_old_content = nil
} }
minetest.create_detached_inventory("creative_" .. player_name, { minetest.create_detached_inventory("creative_" .. player_name, {
@ -74,6 +76,12 @@ function creative.update_creative_inventory(player_name, tab_content)
creative.init_creative_inventory(minetest.get_player_by_name(player_name)) creative.init_creative_inventory(minetest.get_player_by_name(player_name))
local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name}) local player_inv = minetest.get_inventory({type = "detached", name = "creative_" .. player_name})
if inv.filter == inv._old_filter and tab_content == inv._old_content then
return
end
inv._old_filter = inv.filter
inv._old_content = tab_content
local items = inventory_cache[tab_content] or init_creative_cache(tab_content) local items = inventory_cache[tab_content] or init_creative_cache(tab_content)
local creative_list = {} local creative_list = {}
@ -92,6 +100,7 @@ function creative.update_creative_inventory(player_name, tab_content)
player_inv:set_size("main", #creative_list) player_inv:set_size("main", #creative_list)
player_inv:set_list("main", creative_list) player_inv:set_list("main", creative_list)
inv.size = #creative_list inv.size = #creative_list
print("update", inv.size)
end end
-- Create the trash field -- Create the trash field
@ -119,8 +128,7 @@ function creative.register_tab(name, title, items)
local player_name = player:get_player_name() local player_name = player:get_player_name()
creative.update_creative_inventory(player_name, items) creative.update_creative_inventory(player_name, items)
local inv = player_inventory[player_name] local inv = player_inventory[player_name]
local start_i = inv.start_i or 0 local pagenum = math.floor(inv.start_i / (4*8) + 1)
local pagenum = math.floor(start_i / (4*8) + 1)
local pagemax = math.ceil(inv.size / (4*8)) local pagemax = math.ceil(inv.size / (4*8))
local esc = minetest.formspec_escape local esc = minetest.formspec_escape
return sfinv.make_formspec(player, context, return sfinv.make_formspec(player, context,
@ -143,7 +151,7 @@ function creative.register_tab(name, title, items)
"field_close_on_enter[creative_filter;false]" .. "field_close_on_enter[creative_filter;false]" ..
"field[0.3,4.2;2.8,1.2;creative_filter;;" .. esc(inv.filter) .. "]" .. "field[0.3,4.2;2.8,1.2;creative_filter;;" .. esc(inv.filter) .. "]" ..
"listring[detached:creative_" .. player_name .. ";main]" .. "listring[detached:creative_" .. player_name .. ";main]" ..
"list[detached:creative_" .. player_name .. ";main;0,0;8,4;" .. tostring(start_i) .. "]" .. "list[detached:creative_" .. player_name .. ";main;0,0;8,4;" .. tostring(inv.start_i) .. "]" ..
creative.formspec_add, true) creative.formspec_add, true)
end, end,
on_enter = function(self, player, context) on_enter = function(self, player, context)
@ -161,13 +169,11 @@ function creative.register_tab(name, title, items)
if fields.creative_clear then if fields.creative_clear then
inv.start_i = 0 inv.start_i = 0
inv.filter = "" inv.filter = ""
creative.update_creative_inventory(player_name, items)
sfinv.set_player_inventory_formspec(player, context) sfinv.set_player_inventory_formspec(player, context)
elseif fields.creative_search or elseif fields.creative_search or
fields.key_enter_field == "creative_filter" then fields.key_enter_field == "creative_filter" then
inv.start_i = 0 inv.start_i = 0
inv.filter = fields.creative_filter:lower() inv.filter = fields.creative_filter:lower()
creative.update_creative_inventory(player_name, items)
sfinv.set_player_inventory_formspec(player, context) sfinv.set_player_inventory_formspec(player, context)
elseif not fields.quit then elseif not fields.quit then
local start_i = inv.start_i or 0 local start_i = inv.start_i or 0