Minor cleanup

This commit is contained in:
JPG 2016-12-24 03:27:41 +01:00
parent 4df8a53d45
commit d2f49eb589
2 changed files with 10 additions and 11 deletions

@ -1 +1,2 @@
A simple, flexible and efficient Crafting Guide. The most comprehensive Crafting Guide
on Minetest.

@ -151,7 +151,7 @@ function craftguide:get_formspec(player_name, is_fuel)
tooltip[clear;Reset] tooltip[clear;Reset]
tooltip[size_inc;Increase window size] tooltip[size_inc;Increase window size]
tooltip[size_dec;Decrease window size] tooltip[size_dec;Decrease window size]
field_close_on_enter[craftguide_filter, false] ]].. field_close_on_enter[filter, false] ]]..
"button["..(data.iX/2)..",-0.02;0.7,1;size_inc;+]".. "button["..(data.iX/2)..",-0.02;0.7,1;size_inc;+]"..
"button["..((data.iX/2) + 0.5).. "button["..((data.iX/2) + 0.5)..
",-0.02;0.7,1;size_dec;-]".. ",-0.02;0.7,1;size_dec;-]"..
@ -159,7 +159,7 @@ function craftguide:get_formspec(player_name, is_fuel)
"label["..(data.iX-2)..".1,0.18;".. "label["..(data.iX-2)..".1,0.18;"..
colorize(data.pagenum).." / "..data.pagemax.."]".. colorize(data.pagenum).." / "..data.pagemax.."]"..
"button["..(data.iX-1)..".2,0;0.8,0.95;next;>]".. "button["..(data.iX-1)..".2,0;0.8,0.95;next;>]"..
"field[0.3,0.32;2.5,1;craftguide_filter;;".. "field[0.3,0.32;2.5,1;filter;;"..
minetest.formspec_escape(data.filter).."]" minetest.formspec_escape(data.filter).."]"
local xoffset = data.iX / 2 + (data.iX % 2 == 0 and 0.5 or 0) local xoffset = data.iX / 2 + (data.iX % 2 == 0 and 0.5 or 0)
@ -318,13 +318,12 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end end
craftguide:get_formspec(player_name) craftguide:get_formspec(player_name)
elseif fields.alternate then elseif fields.alternate then
local recipe = data.recipes_item[data.recipe_num+1] local recipe = data.recipes_item[data.recipe_num + 1]
data.recipe_num = recipe and data.recipe_num + 1 or 1 data.recipe_num = recipe and data.recipe_num + 1 or 1
craftguide:get_formspec(player_name) craftguide:get_formspec(player_name)
elseif fields.search or elseif (fields.key_enter_field == "filter" or fields.search) and
fields.key_enter_field == "craftguide_filter" then fields.filter ~= "" then
if fields.craftguide_filter == "" then return end data.filter = fields.filter:lower()
data.filter = fields.craftguide_filter:lower()
data.pagenum = 1 data.pagenum = 1
craftguide:get_filter_items(player_name) craftguide:get_filter_items(player_name)
craftguide:get_formspec(player_name) craftguide:get_formspec(player_name)
@ -336,9 +335,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
data.pagenum = data.pagemax data.pagenum = data.pagemax
end end
craftguide:get_formspec(player_name) craftguide:get_formspec(player_name)
elseif fields.size_inc or fields.size_dec then elseif (fields.size_inc and data.iX < 12) or
if (fields.size_dec and data.iX == 8) or (fields.size_dec and data.iX > 8) then
(fields.size_inc and data.iX == 12) then return end
data.pagenum = 1 data.pagenum = 1
data.iX = data.iX - (fields.size_dec and 1 or -1) data.iX = data.iX - (fields.size_dec and 1 or -1)
craftguide:get_formspec(player_name) craftguide:get_formspec(player_name)