Mirrorlandia_minetest/craftguide
1
0
Fork 0
mirror of https://github.com/minetest-mods/craftguide.git synced 2024-11-23 03:13:44 +01:00
Code Issues Projects Releases Wiki Activity

Minor optimization

Browse Source
This commit is contained in:
Jean-Patrick Guerrero 2018-12-19 18:36:09 +01:00
parent f188580b8c
commit e1eedb69bb
1 changed files with 91 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
init.lua
View File

@ -21,7 +21,7 @@ craftguide.intllib = S
-- Lua 5.3 removed `table.maxn`, use this alternative in case of breakage: -- Lua 5.3 removed `table.maxn`, use this alternative in case of breakage:
-- https://github.com/kilbith/xdecor/blob/master/handlers/helpers.lua#L1 -- https://github.com/kilbith/xdecor/blob/master/handlers/helpers.lua#L1
local remove, maxn, sort = table.remove, table.maxn, table.sort local remove, maxn, sort, concat = table.remove, table.maxn, table.sort, table.concat
local vector_add, vector_mul = vector.add, vector.multiply local vector_add, vector_mul = vector.add, vector.multiply
local min, max, floor, ceil = math.min, math.max, math.floor, math.ceil local min, max, floor, ceil = math.min, math.max, math.floor, math.ceil
@ -167,10 +167,9 @@ local function get_tooltip(item, recipe_type, cooktime, groups)
end end
local function _get_recipe(iX, iY, xoffset, recipe_num, recipes, show_usage) local function _get_recipe(iX, iY, xoffset, recipe_num, recipes, show_usage)
local formspec, recipes_total = "", #recipes local fs, recipes_total = {}, #recipes
if recipes_total > 1 then if recipes_total > 1 then
formspec = formspec .. fs[#fs + 1] = "button[" .. (iX - (sfinv_only and 2.2 or 2.6)) .. "," ..
"button[" .. (iX - (sfinv_only and 2.2 or 2.6)) .. "," ..
(iY + (sfinv_only and 3.9 or 3.3)) .. ";2.2,1;alternate;" .. (iY + (sfinv_only and 3.9 or 3.3)) .. ";2.2,1;alternate;" ..
(show_usage and S("Usage") or S("Recipe")) .. " " .. (show_usage and S("Usage") or S("Recipe")) .. " " ..
S("@1 of @2", recipe_num, recipes_total) .. "]" S("@1 of @2", recipe_num, recipes_total) .. "]"
@ -191,10 +190,10 @@ local function _get_recipe(iX, iY, xoffset, recipe_num, recipes, show_usage)
local rightest, s_btn_size = 0 local rightest, s_btn_size = 0
if recipe_type ~= "cooking" and (width > GRID_LIMIT or rows > GRID_LIMIT) then if recipe_type ~= "cooking" and (width > GRID_LIMIT or rows > GRID_LIMIT) then
formspec = formspec .. fs[#fs + 1] = "label[" .. ((iX / 2) - 2) .. "," .. (iY + 2.2) .. ";" ..
"label[" .. ((iX / 2) - 2) .. "," .. (iY + 2.2) .. ";" ..
S("Recipe is too big to be displayed (@1x@2)", width, rows) .. "]" S("Recipe is too big to be displayed (@1x@2)", width, rows) .. "]"
return formspec
return concat(fs)
else else
for i, v in pairs(items) do for i, v in pairs(items) do
local X = ceil((i - 1) % width + xoffset - width) - local X = ceil((i - 1) % width + xoffset - width) -
@ -217,8 +216,7 @@ local function _get_recipe(iX, iY, xoffset, recipe_num, recipes, show_usage)
local item_r = group_to_item(v) local item_r = group_to_item(v)
local tltip = get_tooltip(item_r, recipe_type, cooktime, groups) local tltip = get_tooltip(item_r, recipe_type, cooktime, groups)
formspec = formspec .. fs[#fs + 1] = "item_image_button[" .. X .. "," ..
"item_image_button[" .. X .. "," ..
(Y + (sfinv_only and 0.7 or 0.2)) .. ";" .. (Y + (sfinv_only and 0.7 or 0.2)) .. ";" ..
BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" .. item_r .. BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" .. item_r ..
";" .. item_r:match("%S*") .. ";" .. label .. "]" .. tltip ";" .. item_r:match("%S*") .. ";" .. label .. "]" .. tltip
@ -235,11 +233,11 @@ local function _get_recipe(iX, iY, xoffset, recipe_num, recipes, show_usage)
(iY + (sfinv_only and 2.2 or 1.7)) .. (iY + (sfinv_only and 2.2 or 1.7)) ..
";0.5,0.5;" ";0.5,0.5;"
formspec = formspec .. fs[#fs + 1] = "image[" .. coords ..
"image[" .. coords ..
(custom_recipe and custom_recipe.icon or (custom_recipe and custom_recipe.icon or
"craftguide_" .. icon .. ".png^[resize:16x16") .. "]" .. "craftguide_" .. icon .. ".png^[resize:16x16") .. "]"
"tooltip[" .. coords ..
fs[#fs + 1] = "tooltip[" .. coords ..
(custom_recipe and custom_recipe.description or (custom_recipe and custom_recipe.description or
recipe_type:gsub("^%l", string.upper)) .. "]" recipe_type:gsub("^%l", string.upper)) .. "]"
end end
@ -251,30 +249,28 @@ local function _get_recipe(iX, iY, xoffset, recipe_num, recipes, show_usage)
local arrow_X = rightest + (s_btn_size or BUTTON_SIZE) local arrow_X = rightest + (s_btn_size or BUTTON_SIZE)
local output_X = arrow_X + 0.9 local output_X = arrow_X + 0.9
formspec = formspec .. fs[#fs + 1] = "image[" .. arrow_X .. "," ..
"image[" .. arrow_X .. "," ..
(iY + (sfinv_only and 2.85 or 2.35)) .. (iY + (sfinv_only and 2.85 or 2.35)) ..
";0.9,0.7;craftguide_arrow.png]" .. ";0.9,0.7;craftguide_arrow.png]"
"item_image_button[" .. output_X .. "," .. fs[#fs + 1] = "item_image_button[" .. output_X .. "," ..
(iY + (sfinv_only and 2.7 or 2.2)) .. ";" .. (iY + (sfinv_only and 2.7 or 2.2)) .. ";" ..
BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" .. BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" ..
output .. ";" .. output_s .. ";]" .. output .. ";" .. output_s .. ";]"
get_tooltip(output_s) fs[#fs + 1] = get_tooltip(output_s)
if output_is_fuel then if output_is_fuel then
formspec = formspec .. fs[#fs + 1] = "image[" .. (output_X + 1) .. "," ..
"image[" .. (output_X + 1) .. "," ..
(iY + (sfinv_only and 2.83 or 2.33)) .. (iY + (sfinv_only and 2.83 or 2.33)) ..
";0.6,0.4;craftguide_arrow.png]" .. ";0.6,0.4;craftguide_arrow.png]"
"image[" .. (output_X + 1.6) .. "," .. fs[#fs + 1] = "image[" .. (output_X + 1.6) .. "," ..
(iY + (sfinv_only and 2.68 or 2.18)) .. (iY + (sfinv_only and 2.68 or 2.18)) ..
";0.6,0.6;craftguide_fire.png]" ";0.6,0.6;craftguide_fire.png]"
end end
return formspec return concat(fs)
end end
local function get_formspec(player_name) local function get_formspec(player_name)
@ -288,42 +284,42 @@ local function get_formspec(player_name)
data.pagemax = max(1, ceil(#data.items / ipp)) data.pagemax = max(1, ceil(#data.items / ipp))
local formspec = "" local fs = {}
if not sfinv_only then if not sfinv_only then
formspec = formspec .. fs[#fs + 1] = "size[" .. (data.iX - 0.35) .. "," .. (iY + 4) .. ";]"
"size[" .. (data.iX - 0.35) .. "," .. (iY + 4) .. ";]" .. fs[#fs + 1] = "background[1,1;1,1;craftguide_bg.png;true]"
"background[1,1;1,1;craftguide_bg.png;true]" .. fs[#fs + 1] = "tooltip[size_inc;" .. S("Increase window size") .. "]"
"tooltip[size_inc;" .. S("Increase window size") .. "]" .. fs[#fs + 1] = "tooltip[size_dec;" .. S("Decrease window size") .. "]"
"tooltip[size_dec;" .. S("Decrease window size") .. "]" .. fs[#fs + 1] = "image_button[" .. (data.iX * 0.47) ..
"image_button[" .. (data.iX * 0.47) .. ",0.12;0.8,0.8;craftguide_zoomin_icon.png;size_inc;]"
",0.12;0.8,0.8;craftguide_zoomin_icon.png;size_inc;]" .. fs[#fs + 1] = "image_button[" .. ((data.iX * 0.47) + 0.6) ..
"image_button[" .. ((data.iX * 0.47) + 0.6) ..
",0.12;0.8,0.8;craftguide_zoomout_icon.png;size_dec;]" ",0.12;0.8,0.8;craftguide_zoomout_icon.png;size_dec;]"
end end
formspec = formspec .. [[ fs[#fs + 1] = [[
image_button[2.4,0.12;0.8,0.8;craftguide_search_icon.png;search;] image_button[2.4,0.12;0.8,0.8;craftguide_search_icon.png;search;]
image_button[3.05,0.12;0.8,0.8;craftguide_clear_icon.png;clear;] image_button[3.05,0.12;0.8,0.8;craftguide_clear_icon.png;clear;]
field_close_on_enter[filter;false] field_close_on_enter[filter;false]
]] .. ]]
"tooltip[search;" .. S("Search") .. "]" ..
"tooltip[clear;" .. S("Reset") .. "]" .. fs[#fs + 1] = "tooltip[search;" .. S("Search") .. "]"
"tooltip[prev;" .. S("Previous page") .. "]" .. fs[#fs + 1] = "tooltip[clear;" .. S("Reset") .. "]"
"tooltip[next;" .. S("Next page") .. "]" .. fs[#fs + 1] = "tooltip[prev;" .. S("Previous page") .. "]"
"image_button[" .. (data.iX - (sfinv_only and 2.6 or 3.1)) .. fs[#fs + 1] = "tooltip[next;" .. S("Next page") .. "]"
",0.12;0.8,0.8;craftguide_prev_icon.png;prev;]" .. fs[#fs + 1] = "image_button[" .. (data.iX - (sfinv_only and 2.6 or 3.1)) ..
"label[" .. (data.iX - (sfinv_only and 1.7 or 2.2)) .. ",0.22;" .. ",0.12;0.8,0.8;craftguide_prev_icon.png;prev;]"
colorize(data.pagenum) .. " / " .. data.pagemax .. "]" .. fs[#fs + 1] = "label[" .. (data.iX - (sfinv_only and 1.7 or 2.2)) .. ",0.22;" ..
"image_button[" .. (data.iX - (sfinv_only and 0.7 or 1.2) - colorize(data.pagenum) .. " / " .. data.pagemax .. "]"
fs[#fs + 1] = "image_button[" .. (data.iX - (sfinv_only and 0.7 or 1.2) -
(data.iX >= 11 and 0.08 or 0)) .. (data.iX >= 11 and 0.08 or 0)) ..
",0.12;0.8,0.8;craftguide_next_icon.png;next;]" .. ",0.12;0.8,0.8;craftguide_next_icon.png;next;]"
"field[0.3,0.32;2.5,1;filter;;" .. mt.formspec_escape(data.filter) .. "]" fs[#fs + 1] = "field[0.3,0.32;2.5,1;filter;;" .. mt.formspec_escape(data.filter) .. "]"
local xoffset = data.iX / 2.15 local xoffset = data.iX / 2.15
if not next(data.items) then if not next(data.items) then
formspec = formspec .. fs[#fs + 1] = "label[" .. ((data.iX / 2) - 1) ..
"label[" .. ((data.iX / 2) - 1) .. ",2;" .. S("No item to show") .. "]" ",2;" .. S("No item to show") .. "]"
end end
local first_item = (data.pagenum - 1) * ipp local first_item = (data.pagenum - 1) * ipp
@ -333,8 +329,7 @@ local function get_formspec(player_name)
local X = i % data.iX local X = i % data.iX
local Y = (i % ipp - X) / data.iX + 1 local Y = (i % ipp - X) / data.iX + 1
formspec = formspec .. fs[#fs + 1] = "item_image_button[" ..
"item_image_button[" ..
(X - (sfinv_only and 0 or (X * 0.05))) .. "," .. (X - (sfinv_only and 0 or (X * 0.05))) .. "," ..
Y .. ";" .. BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" .. Y .. ";" .. BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" ..
name .. ";" .. name .. "_inv;]" name .. ";" .. name .. "_inv;]"
@ -343,39 +338,39 @@ local function get_formspec(player_name)
if data.item and reg_items[data.item] then if data.item and reg_items[data.item] then
if not data.recipes_item or (data.fuel and not get_recipe(data.item).items) then if not data.recipes_item or (data.fuel and not get_recipe(data.item).items) then
local X = floor(xoffset) - (sfinv_only and 0 or 0.2) local X = floor(xoffset) - (sfinv_only and 0 or 0.2)
formspec = formspec ..
"item_image_button[" .. X .. "," .. fs[#fs + 1] = "item_image_button[" .. X .. "," ..
(iY + (sfinv_only and 2.7 or 2.2)) .. (iY + (sfinv_only and 2.7 or 2.2)) ..
";" .. BUTTON_SIZE .. "," .. BUTTON_SIZE .. ";" .. BUTTON_SIZE .. "," .. BUTTON_SIZE ..
";" .. data.item .. ";" .. data.item .. ";]" .. ";" .. data.item .. ";" .. data.item .. ";]"
"image[" .. (X + 1.1) .. "," .. fs[#fs + 1] = "image[" .. (X + 1.1) .. "," ..
(iY + (sfinv_only and 2.85 or 2.35)) .. (iY + (sfinv_only and 2.85 or 2.35)) ..
";0.9,0.7;craftguide_arrow.png]" .. ";0.9,0.7;craftguide_arrow.png]"
get_tooltip(data.item) .. fs[#fs + 1] = get_tooltip(data.item)
"image[" .. (X + 2.1) .. "," .. fs[#fs + 1] = "image[" .. (X + 2.1) .. "," ..
(iY + (sfinv_only and 2.68 or 2.18)) .. (iY + (sfinv_only and 2.68 or 2.18)) ..
";1.1,1.1;craftguide_fire.png]" ";1.1,1.1;craftguide_fire.png]"
else else
local show_usage = data.show_usage local usage = data.show_usage
formspec = formspec .. fs[#fs + 1] = _get_recipe(data.iX,
_get_recipe(data.iX,
iY, iY,
xoffset, xoffset,
data.rnum, data.rnum,
(show_usage and data.usages or data.recipes_item), (usage and data.usages or data.recipes_item),
show_usage) usage)
end end
end end
data.formspec = formspec fs = concat(fs)
data.formspec = fs
if sfinv_only then if sfinv_only then
return formspec return fs
else else
show_formspec(player_name, "craftguide", formspec) show_formspec(player_name, "craftguide", fs)
end end
end end