mirror of
https://github.com/minetest-mods/craftguide.git
synced 2024-11-23 03:13:44 +01:00
More optimizations
This commit is contained in:
parent
6705549a31
commit
01a846d2a3
53
init.lua
53
init.lua
@ -145,6 +145,8 @@ end
|
|||||||
|
|
||||||
function craftguide:get_formspec(player_name, is_fuel)
|
function craftguide:get_formspec(player_name, is_fuel)
|
||||||
local data = datas[player_name]
|
local data = datas[player_name]
|
||||||
|
local pagemax = max(1, ceil(#data.items / ipp))
|
||||||
|
|
||||||
local formspec = "size["..iX..","..(iY+3)..".6;]"..[[
|
local formspec = "size["..iX..","..(iY+3)..".6;]"..[[
|
||||||
background[1,1;1,1;craftguide_bg.png;true]
|
background[1,1;1,1;craftguide_bg.png;true]
|
||||||
button[2.5,0.2;0.8,0.5;search;?]
|
button[2.5,0.2;0.8,0.5;search;?]
|
||||||
@ -154,7 +156,7 @@ function craftguide:get_formspec(player_name, is_fuel)
|
|||||||
field_close_on_enter[craftguide_filter, false] ]]..
|
field_close_on_enter[craftguide_filter, false] ]]..
|
||||||
"button["..(iX-3)..".4,0;0.8,0.95;prev;<]"..
|
"button["..(iX-3)..".4,0;0.8,0.95;prev;<]"..
|
||||||
"label["..(iX-2)..".1,0.18;"..colorize(data.pagenum)..
|
"label["..(iX-2)..".1,0.18;"..colorize(data.pagenum)..
|
||||||
" / "..data.pagemax.."]"..
|
" / "..pagemax.."]"..
|
||||||
"button["..(iX-1)..".2,0;0.8,0.95;next;>]"..
|
"button["..(iX-1)..".2,0;0.8,0.95;next;>]"..
|
||||||
"field[0.3,0.32;2.6,1;craftguide_filter;;"..
|
"field[0.3,0.32;2.6,1;craftguide_filter;;"..
|
||||||
minetest.formspec_escape(data.filter).."]"
|
minetest.formspec_escape(data.filter).."]"
|
||||||
@ -250,7 +252,9 @@ function craftguide:recipe_in_inv(inv, item_name, recipes_f)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function craftguide:get_init_items(player_name)
|
function craftguide:get_init_items(player_name)
|
||||||
local items_list, data, list_size = {}, datas[player_name], 0
|
local data = datas[player_name]
|
||||||
|
local items_list, counter = {}, 0
|
||||||
|
|
||||||
for name, def in pairs(minetest.registered_items) do
|
for name, def in pairs(minetest.registered_items) do
|
||||||
local is_fuel = minetest.get_craft_result({
|
local is_fuel = minetest.get_craft_result({
|
||||||
method="fuel", width=1, items={name}}).time > 0
|
method="fuel", width=1, items={name}}).time > 0
|
||||||
@ -258,39 +262,35 @@ function craftguide:get_init_items(player_name)
|
|||||||
(minetest.get_craft_recipe(name).items or is_fuel) and
|
(minetest.get_craft_recipe(name).items or is_fuel) and
|
||||||
def.description and def.description ~= "" then
|
def.description and def.description ~= "" then
|
||||||
|
|
||||||
list_size = list_size + 1
|
counter = counter + 1
|
||||||
items_list[list_size] = name
|
items_list[counter] = name
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
sort(items_list)
|
sort(items_list)
|
||||||
|
data.init_items = items_list
|
||||||
data.items = items_list
|
data.items = items_list
|
||||||
data.pagemax = max(1, ceil(list_size / ipp))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function craftguide:get_filter_items(player_name)
|
function craftguide:get_filter_items(player_name)
|
||||||
local data = datas[player_name]
|
local data = datas[player_name]
|
||||||
local items_list, list_size = data.items, #data.items
|
local items_list = progressive_mode and data.items or data.init_items
|
||||||
local player = minetest.get_player_by_name(player_name)
|
local player = minetest.get_player_by_name(player_name)
|
||||||
local inv = player:get_inventory()
|
local inv = player:get_inventory()
|
||||||
|
local filtered_list, counter = {}, 0
|
||||||
|
|
||||||
for i=list_size, 1, -1 do
|
for i=1, #items_list do
|
||||||
if not items_list[i]:find(data.filter, 1, true) then
|
local item = items_list[i]
|
||||||
remove(items_list, i)
|
local _, has_item = self:recipe_in_inv(inv, item)
|
||||||
list_size = list_size - 1
|
|
||||||
end
|
|
||||||
if progressive_mode then
|
|
||||||
local _, has_item =
|
|
||||||
self:recipe_in_inv(inv, items_list[i] or "")
|
|
||||||
if not has_item then
|
|
||||||
remove(items_list, i)
|
|
||||||
list_size = list_size - 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
data.items = items_list
|
if (data.filter ~= "" and item:find(data.filter, 1, true)) or
|
||||||
data.pagemax = max(1, ceil(list_size / ipp))
|
(data.filter == "" and progressive_mode and
|
||||||
|
has_item) then
|
||||||
|
counter = counter + 1
|
||||||
|
filtered_list[counter] = item
|
||||||
|
end
|
||||||
|
end
|
||||||
|
data.items = filtered_list
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
@ -301,7 +301,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||||||
if fields.clear then
|
if fields.clear then
|
||||||
data.filter, data.item, data.pagenum, data.recipe_num =
|
data.filter, data.item, data.pagenum, data.recipe_num =
|
||||||
"", nil, 1, 1
|
"", nil, 1, 1
|
||||||
craftguide:get_init_items(player_name)
|
data.items = data.init_items
|
||||||
if progressive_mode then
|
if progressive_mode then
|
||||||
craftguide:get_filter_items(player_name)
|
craftguide:get_filter_items(player_name)
|
||||||
end
|
end
|
||||||
@ -314,15 +314,16 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||||||
fields.key_enter_field == "craftguide_filter" then
|
fields.key_enter_field == "craftguide_filter" then
|
||||||
data.filter = fields.craftguide_filter:lower()
|
data.filter = fields.craftguide_filter:lower()
|
||||||
data.pagenum = 1
|
data.pagenum = 1
|
||||||
craftguide:get_init_items(player_name)
|
|
||||||
craftguide:get_filter_items(player_name)
|
craftguide:get_filter_items(player_name)
|
||||||
craftguide:get_formspec(player_name)
|
craftguide:get_formspec(player_name)
|
||||||
elseif fields.prev or fields.next then
|
elseif fields.prev or fields.next then
|
||||||
data.pagenum = data.pagenum - (fields.prev and 1 or -1)
|
data.pagenum = data.pagenum - (fields.prev and 1 or -1)
|
||||||
if data.pagenum > data.pagemax then
|
local pagemax = max(1, ceil(#data.items / ipp))
|
||||||
|
|
||||||
|
if data.pagenum > pagemax then
|
||||||
data.pagenum = 1
|
data.pagenum = 1
|
||||||
elseif data.pagenum == 0 then
|
elseif data.pagenum == 0 then
|
||||||
data.pagenum = data.pagemax
|
data.pagenum = pagemax
|
||||||
end
|
end
|
||||||
craftguide:get_formspec(player_name)
|
craftguide:get_formspec(player_name)
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user