MTSR/xdecor-libre
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Crafting guide : convert all lists to image_item_button (much more responsive)

Browse Source
This commit is contained in:
kilbith 2016-01-11 15:25:33 +01:00
parent e6982d8b9b
commit 7c09adf120
1 changed files with 68 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
worktable.lua
View File

@ -50,12 +50,17 @@ function worktable.get_recipe(item)
return item return item
end end
function worktable.craftguide_formspec(meta, start_i, pagenum, stackname, recipe_num, filter, tab_id) function worktable.craftguide_formspec(meta, pagenum, item, recipe_num, filter, tab_id)
local inv_size = #meta:to_table().inventory.inv_items_list local inv_size = meta:get_int("inv_size")
local pagemax = math.floor((inv_size - 1) / (8*3) + 1) local pagemax = math.floor((inv_size - 1) / (8*3) + 1)
if pagenum > pagemax then
pagenum = 1
elseif pagenum == 0 then
pagenum = pagemax
end
local formspec = [[ size[8,6.6;] local formspec = [[ size[8,6.6;]
list[context;item_craft_input;3,5;1,1;]
tablecolumns[color;text;color;text] tablecolumns[color;text;color;text]
tableoptions[background=#00000000;highlight=#00000000;border=false] tableoptions[background=#00000000;highlight=#00000000;border=false]
button[5.5,0;0.7,1;prev;<] button[5.5,0;0.7,1;prev;<]
@ -64,31 +69,41 @@ function worktable.craftguide_formspec(meta, start_i, pagenum, stackname, recipe
button[4.6,0.2;0.7,0.5;clearfilter;X] button[4.6,0.2;0.7,0.5;clearfilter;X]
button[0,0;1.5,1;backcraft;< Back] button[0,0;1.5,1;backcraft;< Back]
tooltip[search;Search] tooltip[search;Search]
tooltip[clearfilter;Reset] tooltip[clearfilter;Reset] ]]
label[3,4.5;Input] ]]
.."tabheader[0,0;tabs;All,Nodes,Tools,Items;"..tostring(tab_id)..";true;false]".. .."tabheader[0,0;tabs;All,Nodes,Tools,Items;"..tostring(tab_id)..";true;false]"..
"list[context;inv_items_list;0,1;8,3;"..tostring(start_i).."]".. "table[6.1,0.2;1.1,0.5;pagenum;#FFFF00,"..tostring(pagenum)..
"table[6.1,0.2;1.1,0.5;pagenum;#FFFF00,"..tostring(math.floor(pagenum))..
",#FFFFFF,/ "..tostring(pagemax).."]".. ",#FFFFFF,/ "..tostring(pagemax).."]"..
"field[1.8,0.32;2.6,1;filter;;"..filter.."]"..xbg "field[1.8,0.32;2.6,1;filter;;"..filter.."]"..xbg
if stackname and minetest.registered_items[stackname] then local npp, i, s = 8*3, 0, 0
--print(dump(minetest.get_all_craft_recipes(stackname))) for _, name in pairs(worktable.craftguide_main_list(meta, filter, tab_id)) do
local items_num = #minetest.get_all_craft_recipes(stackname) if s < (pagenum - 1) * npp then
s = s + 1
else
if i >= npp then break end
formspec = formspec.."item_image_button["..(i%8)..","..
(math.floor(i/8)+1)..";1,1;"..name..";"..name..";]"
i = i + 1
end
end
if item and minetest.registered_items[item] then
--print(dump(minetest.get_all_craft_recipes(item)))
local items_num = #minetest.get_all_craft_recipes(item)
if recipe_num > items_num then recipe_num = 1 end if recipe_num > items_num then recipe_num = 1 end
if items_num > 1 then if items_num > 1 then
formspec = formspec.."button[0,4.7;1.6,1;alternate;Alternate]".. formspec = formspec.."button[0,5;1.6,1;alternate;Alternate]"..
"label[0,4.2;Recipe "..recipe_num.." of "..items_num.."]" "label[0,4.5;Recipe "..recipe_num.." of "..items_num.."]"
end end
local type = minetest.get_all_craft_recipes(stackname)[recipe_num].type local type = minetest.get_all_craft_recipes(item)[recipe_num].type
if type == "cooking" then if type == "cooking" then
formspec = formspec.."image[4.25,4.6;0.5,0.5;default_furnace_fire_fg.png]" formspec = formspec.."image[4.25,4.6;0.5,0.5;default_furnace_fire_fg.png]"
end end
local items = minetest.get_all_craft_recipes(stackname)[recipe_num].items local items = minetest.get_all_craft_recipes(item)[recipe_num].items
local width = minetest.get_all_craft_recipes(stackname)[recipe_num].width local width = minetest.get_all_craft_recipes(item)[recipe_num].width
if width == 0 then width = math.min(3, #items) end if width == 0 then width = math.min(3, #items) end
local rows = math.ceil(table.maxn(items) / width) local rows = math.ceil(table.maxn(items) / width)
@ -97,19 +112,15 @@ function worktable.craftguide_formspec(meta, start_i, pagenum, stackname, recipe
return "" return ""
end end
for i, item in pairs(items) do for i, v in pairs(items) do
formspec = formspec.."item_image_button["..((i-1) % width + 5)..",".. formspec = formspec.."item_image_button["..((i-1) % width + 5)..","..
(math.floor((i-1) / width + (6 - math.min(2, rows))))..";1,1;".. (math.floor((i-1) / width + (6 - math.min(2, rows))))..";1,1;"..
worktable.get_recipe(item)..";"..worktable.get_recipe(item)..";"..is_group(item).."]" worktable.get_recipe(v)..";"..worktable.get_recipe(v)..";"..is_group(v).."]"
end end
formspec = formspec..[[ image[4,5;1,1;gui_furnace_arrow_bg.png^[transformR90] formspec = formspec.."image[4,5;1,1;gui_furnace_arrow_bg.png^[transformR90]"..
button[0,5.5;1.6,1;trash;Clear] ]] "item_image_button[3,5;1,1;"..item..";"..item..";]"..
.."label[0,6.4;"..stackname:sub(1, 30).."]" "label[0,6.1;"..item:sub(1,30).."]"
local output = minetest.get_all_craft_recipes(stackname)[recipe_num].output
local yield = output:match("%s(%d+)") or 1
meta:get_inventory():set_stack("item_craft_input", 1, stackname.." "..yield)
end end
meta:set_string("formspec", formspec) meta:set_string("formspec", formspec)
@ -120,26 +131,25 @@ local function tab_category(tab_id)
minetest.registered_items, minetest.registered_items,
minetest.registered_nodes, minetest.registered_nodes,
minetest.registered_tools, minetest.registered_tools,
minetest.registered_craftitems minetest.registered_craftitems }
}
return id_category[tab_id] or id_category[1] return id_category[tab_id] or id_category[1]
end end
function worktable.craftguide_main_list(inv, filter, tab_id) function worktable.craftguide_main_list(meta, filter, tab_id)
local inv_items_list = {} local items_list = {}
for name, def in pairs(tab_category(tab_id)) do for name, def in pairs(tab_category(tab_id)) do
if not (def.groups.not_in_creative_inventory == 1) and if not (def.groups.not_in_creative_inventory == 1) and
minetest.get_craft_recipe(name).items and minetest.get_craft_recipe(name).items and
def.description and def.description ~= "" and def.description and def.description ~= "" and
(not filter or def.name:find(filter, 1, true)) then (not filter or def.name:find(filter, 1, true)) then
inv_items_list[#inv_items_list+1] = name items_list[#items_list+1] = name
end end
end end
table.sort(inv_items_list) meta:set_int("inv_size", #items_list)
inv:set_size("inv_items_list", #inv_items_list) table.sort(items_list)
inv:set_list("inv_items_list", inv_items_list) return items_list
end end
worktable.formspecs = { worktable.formspecs = {
@ -193,6 +203,7 @@ function worktable.construct(pos)
inv:set_size("input", 1) inv:set_size("input", 1)
inv:set_size("hammer", 1) inv:set_size("hammer", 1)
inv:set_size("forms", 4*3) inv:set_size("forms", 4*3)
inv:set_size("storage", 8*2)
meta:set_string("infotext", "Work Table") meta:set_string("infotext", "Work Table")
worktable.formspecs.main(meta) worktable.formspecs.main(meta)
@ -201,58 +212,44 @@ end
function worktable.fields(pos, _, fields) function worktable.fields(pos, _, fields)
if fields.quit then return end if fields.quit then return end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
local formspec = meta:to_table().fields.formspec local formspec = meta:to_table().fields.formspec
local filter = formspec:match("filter;;([%w_:]+)") or "" local filter = formspec:match("filter;;([%w_:]+)") or ""
local start_i = tonumber(formspec:match("inv_items_list;.*;(%d+)%]")) or 0 local pagenum = tonumber(formspec:match("#FFFF00,(%d+)")) or 1
local current_item = formspec:match("item_image_button%[3,5;1,1;([%w_:]+)") or ""
local current_tab_id = tonumber(formspec:match("tabheader%[.*;(%d+)%;.*]")) or 1 local current_tab_id = tonumber(formspec:match("tabheader%[.*;(%d+)%;.*]")) or 1
if fields.back then if fields.back then
worktable.formspecs.main(meta) worktable.formspecs.main(meta)
elseif fields.craft then elseif fields.craft or fields.backcraft then
worktable.formspecs.crafting(meta) worktable.formspecs.crafting(meta)
elseif fields.storage then elseif fields.storage then
inv:set_size("storage", 8*2)
worktable.formspecs.storage(meta) worktable.formspecs.storage(meta)
elseif fields.craftguide then elseif fields.craftguide or fields.clearfilter then
inv:set_size("item_craft_input", 1) worktable.craftguide_main_list(meta, nil, 1)
worktable.craftguide_main_list(inv, nil, 1) worktable.craftguide_formspec(meta, 1, nil, 1, "", 1)
worktable.craftguide_formspec(meta, 0, 1, nil, 1, "", 1)
elseif fields.alternate then elseif fields.alternate then
local inputstack = inv:get_stack("item_craft_input", 1):get_name()
local recipe_num = tonumber(formspec:match("Recipe%s(%d+)")) or 1 local recipe_num = tonumber(formspec:match("Recipe%s(%d+)")) or 1
recipe_num = recipe_num + 1 recipe_num = recipe_num + 1
worktable.craftguide_formspec(meta, start_i, start_i / (8*3) + 1, inputstack, recipe_num, filter, current_tab_id) worktable.craftguide_formspec(meta, pagenum, current_item, recipe_num, filter, current_tab_id)
else elseif fields.search then
if fields.backcraft then worktable.craftguide_main_list(meta, fields.filter:lower(), current_tab_id)
worktable.formspecs.crafting(meta) worktable.craftguide_formspec(meta, 1, nil, 1, fields.filter:lower(), current_tab_id)
elseif fields.search then elseif fields.tabs then
worktable.craftguide_main_list(inv, fields.filter:lower(), current_tab_id) worktable.craftguide_main_list(meta, filter, tonumber(fields.tabs))
worktable.craftguide_formspec(meta, 0, 1, nil, 1, fields.filter:lower(), current_tab_id) worktable.craftguide_formspec(meta, 1, nil, 1, filter, tonumber(fields.tabs))
elseif fields.clearfilter then elseif fields.prev or fields.next then
worktable.craftguide_main_list(inv, nil, 1) if fields.prev then
worktable.craftguide_formspec(meta, 0, 1, nil, 1, "", 1) pagenum = pagenum - 1
elseif fields.tabs then
worktable.craftguide_main_list(inv, nil, tonumber(fields.tabs))
worktable.craftguide_formspec(meta, 0, 1, nil, 1, "", tonumber(fields.tabs))
else else
local inv_size = #meta:to_table().inventory.inv_items_list pagenum = pagenum + 1
if fields.prev then end
start_i = start_i - 8*3 worktable.craftguide_formspec(meta, pagenum, nil, 1, filter, current_tab_id)
if start_i < 0 then else
start_i = inv_size - (inv_size % (8*3)) for item in pairs(fields) do
end if item:match("[%w_]+:[%w_]+") then
elseif fields.next then worktable.craftguide_formspec(meta, pagenum, item, 1, filter, current_tab_id)
start_i = start_i + 8*3 end
if start_i >= inv_size then
start_i = 0
end
end
worktable.craftguide_formspec(meta, start_i, start_i / (8*3) + 1, nil, 1, filter, current_tab_id)
end end
inv:set_list("item_craft_input", {})
end end
end end
@ -283,7 +280,6 @@ function worktable.put(_, listname, _, stack)
listname == "storage" then listname == "storage" then
return stack:get_count() return stack:get_count()
end end
return 0 return 0
end end
@ -294,30 +290,14 @@ function worktable.take(pos, listname, _, stack, player)
return -1 return -1
end end
return 0 return 0
elseif listname == "inv_items_list" or listname == "item_craft_input" then
return 0
end end
return stack:get_count() return stack:get_count()
end end
function worktable.move(pos, from_list, from_index, to_list, to_index, count) function worktable.move(_, from_list, _, to_list, _, count)
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
if from_list == "storage" and to_list == "storage" then if from_list == "storage" and to_list == "storage" then
return count return count
elseif inv:is_empty("item_craft_input") and from_list == "inv_items_list" and
to_list == "item_craft_input" then
local stackname = inv:get_stack(from_list, from_index):get_name()
local formspec = meta:to_table().fields.formspec
local filter = formspec:match("filter;;([%w_:]+)") or ""
local start_i = tonumber(formspec:match("inv_items_list;.*;(%d+)%]")) or 0
local current_tab_id = tonumber(formspec:match("tabheader%[.*;(%d+)%;.*]"))
worktable.craftguide_formspec(meta, start_i, start_i / (8*3) + 1, stackname, 1, filter, current_tab_id)
end end
return 0 return 0
end end