TheRandomLegoBrick
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mcl_inventory: Don't store inv. size globally

This commit is contained in:
Wuzzy 2017-06-02 22:46:39 +02:00
parent f8bb3bd2ca
commit 4b5fce18ad
2 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
mods/HUD/mcl_inventory/creative.lua
View File

@ -1,5 +1,3 @@
mcl_inventory.creative_inventory_size = 0
-- Prepare player info table -- Prepare player info table
local players = {} local players = {}
@ -82,7 +80,9 @@ local function set_inv_search(filter, player)
inv:set_size("main", #creative_list) inv:set_size("main", #creative_list)
inv:set_list("main", creative_list) inv:set_list("main", creative_list)
mcl_inventory.creative_inventory_size = #creative_list
-- Return number of items
return #creative_list
end end
local function set_inv_page(page, player) local function set_inv_page(page, player)
@ -95,7 +95,9 @@ local function set_inv_page(page, player)
end end
inv:set_size("main", #creative_list) inv:set_size("main", #creative_list)
inv:set_list("main", creative_list) inv:set_list("main", creative_list)
mcl_inventory.creative_inventory_size = #creative_list
-- Return number of items
return #creative_list
end end
local function init(player) local function init(player)
@ -194,10 +196,23 @@ local function reset_menu_item_bg()
end end
mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, show, page, filter) mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_size, show, page, filter)
reset_menu_item_bg() reset_menu_item_bg()
pagenum = math.floor(pagenum) or 1 pagenum = math.floor(pagenum) or 1
local pagemax = math.floor((mcl_inventory.creative_inventory_size-1) / (9*5) + 1)
local playername = player:get_player_name()
if not inv_size then
if page == "nix" then
local inv = minetest.get_inventory({type="detached", name="creative_"..playername})
inv_size = inv:get_size("main")
elseif page ~= nil and page ~= "inv" then
inv_size = #(inventory_lists[page])
else
inv_size = 0
end
end
local pagemax = math.floor((inv_size-1) / (9*5) + 1)
local slider_height local slider_height
if pagemax == 1 then if pagemax == 1 then
slider_height = 4.525 slider_height = 4.525
@ -208,7 +223,6 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, show, p
local name = "nix" local name = "nix"
local formspec = "" local formspec = ""
local main_list local main_list
local playername = player:get_player_name()
local listrings = "listring[detached:creative_"..playername..";main]".. local listrings = "listring[detached:creative_"..playername..";main]"..
"listring[current_player;main]".. "listring[current_player;main]"..
"listring[detached:trash;main]" "listring[detached:trash;main]"
@ -354,7 +368,7 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, show, p
end end
if pagenum ~= nil then formspec = formspec .. "p"..tostring(pagenum) end if pagenum ~= nil then formspec = formspec .. "p"..tostring(pagenum) end
player:set_inventory_formspec(formspec) player:set_inventory_formspec(formspec)
end end
@ -370,21 +384,22 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name() local name = player:get_player_name()
local size = 0
if fields.blocks then if fields.blocks then
if players[name].page == "blocks" then return end if players[name].page == "blocks" then return end
set_inv_page("blocks",player) size = set_inv_page("blocks",player)
page = "blocks" page = "blocks"
elseif fields.deco then elseif fields.deco then
if players[name].page == "deco" then return end if players[name].page == "deco" then return end
set_inv_page("deco",player) size = set_inv_page("deco",player)
page = "deco" page = "deco"
elseif fields.redstone then elseif fields.redstone then
if players[name].page == "redstone" then return end if players[name].page == "redstone" then return end
set_inv_page("redstone",player) size = set_inv_page("redstone",player)
page = "redstone" page = "redstone"
elseif fields.rail then elseif fields.rail then
if players[name].page == "rail" then return end if players[name].page == "rail" then return end
set_inv_page("rail",player) size = set_inv_page("rail",player)
page = "rail" page = "rail"
elseif fields.misc then elseif fields.misc then
if players[name].page == "misc" then return end if players[name].page == "misc" then return end
@ -396,32 +411,32 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
page = "nix" page = "nix"
elseif fields.food then elseif fields.food then
if players[name].page == "food" then return end if players[name].page == "food" then return end
set_inv_page("food",player) size = set_inv_page("food",player)
page = "food" page = "food"
elseif fields.tools then elseif fields.tools then
if players[name].page == "tools" then return end if players[name].page == "tools" then return end
set_inv_page("tools",player) size = set_inv_page("tools",player)
page = "tools" page = "tools"
elseif fields.combat then elseif fields.combat then
if players[name].page == "combat" then return end if players[name].page == "combat" then return end
set_inv_page("combat",player) size = set_inv_page("combat",player)
page = "combat" page = "combat"
elseif fields.brew then elseif fields.brew then
if players[name].page == "brew" then return end if players[name].page == "brew" then return end
set_inv_page("brew",player) size = set_inv_page("brew",player)
page = "brew" page = "brew"
elseif fields.matr then elseif fields.matr then
if players[name].page == "matr" then return end if players[name].page == "matr" then return end
set_inv_page("matr",player) size = set_inv_page("matr",player)
page = "matr" page = "matr"
elseif fields.inv then elseif fields.inv then
if players[name].page == "inv" then return end if players[name].page == "inv" then return end
page = "inv" page = "inv"
elseif fields.suche == "" and not fields.creative_next and not fields.creative_prev then elseif fields.suche == "" and not fields.creative_next and not fields.creative_prev then
set_inv_page("all", player) size = set_inv_page("all", player)
page = "nix" page = "nix"
elseif fields.suche ~= nil and not fields.creative_next and not fields.creative_prev then elseif fields.suche ~= nil and not fields.creative_next and not fields.creative_prev then
set_inv_search(string.lower(fields.suche),player) size = set_inv_search(string.lower(fields.suche),player)
page = "nix" page = "nix"
end end
@ -432,11 +447,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
page = players[name].page page = players[name].page
end end
-- Figure out current page from formspec -- Figure out current scroll bar from formspec
local formspec = player:get_inventory_formspec() local formspec = player:get_inventory_formspec()
local size = string.len(formspec)
local start_i = players[name].start_i local start_i = players[name].start_i
if fields.creative_prev then if fields.creative_prev then
start_i = start_i - 9*5 start_i = start_i - 9*5
end end
@ -446,10 +461,21 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
if start_i < 0 then if start_i < 0 then
start_i = start_i + 9*5 start_i = start_i + 9*5
end end
if start_i >= mcl_inventory.creative_inventory_size then
local inv_size
if page == "nix" then
local inv = minetest.get_inventory({type="detached", name="creative_"..name})
inv_size = inv:get_size("main")
elseif page ~= nil and page ~= "inv" then
inv_size = #(inventory_lists[page])
else
inv_size = 0
end
if start_i >= inv_size then
start_i = start_i - 9*5 start_i = start_i - 9*5
end end
if start_i < 0 or start_i >= mcl_inventory.creative_inventory_size then if start_i < 0 or start_i >= inv_size then
start_i = 0 start_i = 0
end end
players[name].start_i = start_i players[name].start_i = start_i
@ -460,7 +486,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
players[name].filter = filter players[name].filter = filter
end end
mcl_inventory.set_creative_formspec(player, start_i, start_i / (9*5) + 1, false, page, filter) mcl_inventory.set_creative_formspec(player, start_i, start_i / (9*5) + 1, inv_size, false, page, filter)
end) end)
@ -470,7 +496,7 @@ if minetest.setting_getbool("creative_mode") then
local group = minetest.get_item_group(itemstack:get_name(), "shulker_box") local group = minetest.get_item_group(itemstack:get_name(), "shulker_box")
return group == 0 or group == nil return group == 0 or group == nil
end) end)
function minetest.handle_node_drops(pos, drops, digger) function minetest.handle_node_drops(pos, drops, digger)
if not digger or not digger:is_player() then if not digger or not digger:is_player() then
return return
@ -485,7 +511,7 @@ if minetest.setting_getbool("creative_mode") then
end end
end end
end end
end end
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)

2
mods/HUD/mcl_inventory/init.lua
View File

@ -40,7 +40,7 @@ local function set_inventory(player, armor_change_only)
if minetest.setting_getbool("creative_mode") then if minetest.setting_getbool("creative_mode") then
if armor_change_only then if armor_change_only then
-- Stay on survival inventory plage if only the armor has been changed -- Stay on survival inventory plage if only the armor has been changed
mcl_inventory.set_creative_formspec(player, 0, 0, nil, "inv") mcl_inventory.set_creative_formspec(player, 0, 0, nil, nil, "inv")
else else
mcl_inventory.set_creative_formspec(player, 0, 1) mcl_inventory.set_creative_formspec(player, 0, 1)
end end