]> git.lizzy.rs Git - xdecor.git/blobdiff - worktable.lua
Small simplifications
[xdecor.git] / worktable.lua
index ee5c65b2077fc6528c3720c60e69c2f23e5d480c..bd59cd7681203e00d5d6a06dfd904124cdbbda5c 100644 (file)
@@ -31,42 +31,35 @@ local def = { -- Nodebox name, yield, definition.
        {"innerstair", 1, {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5},{-.5,0,-.5,0,.5,0}}}
 }
 
-function worktable.craftguide_output_lists(meta, num, items, stackname)
-       local inv = meta:get_inventory()
-       local output = minetest.get_all_craft_recipes(stackname)[num].output
-       local yield = output:match("%s(%d+)") or 1
-       inv:set_stack("item_craft_input", 1, stackname.." "..yield)
-
-       for k, def in pairs(items) do
-               if def and def:find("^group:") then
-                       if def:find("wool$") or def:find("dye$") then
-                               def = def:match(":([%w_]+)")..":white"
-                       elseif minetest.registered_items["default:"..def:match("^group:([%w_,]+)$")] then
-                               def = def:gsub("group:", "default:")
-                       else
-                               for node, definition in pairs(minetest.registered_items) do
-                               for group in pairs(definition.groups) do
-                                       if def:match("^group:"..group.."$") or
-                                                       ((def:find("dye") or def:find("flower")) and
-                                                       group == def:match("^group:.*,("..group..")")) then
-                                               def = node
-                                       end
-                               end
+function worktable.get_recipe(item)
+       if item:find("^group:") then
+               if item:find("wool$") or item:find("dye$") then
+                       item = item:match("[^,:]+$")..":white"
+               elseif minetest.registered_items["default:"..item:match("[^,:]+$")] then
+                       item = item:gsub("group:", "default:")
+               else
+                       for node, definition in pairs(minetest.registered_items) do
+                               if definition.groups[item:match("[^,:]+$")] then
+                                       item = node
                                end
                        end
                end
-
-               inv:set_stack("craft_output_recipe", k, def)
        end
+       return item
 end
 
-function worktable.craftguide_formspec(pos, start_i, pagenum, stackname, recipe_num, filter)
-       local meta = minetest.get_meta(pos)
-       local inv_size = #meta:to_table().inventory.inv_items_list
-       local pagemax = math.floor((inv_size - 1) / (8*4) + 1)
+function worktable.craftguide_formspec(meta, pagenum, item, recipe_num, filter, tab_id)
+       local inv_size = meta:get_int("inv_size")
+       local npp, i, s = 8*3, 0, 0
+       local pagemax = math.floor((inv_size - 1) / npp + 1)
+
+       if pagenum > pagemax then
+               pagenum = 1
+       elseif pagenum == 0 then
+               pagenum = pagemax
+       end
 
-       local formspec = [[ size[8,8;]
-                       list[context;item_craft_input;3,6.3;1,1;]
+       local formspec = [[ size[8,6.6;]
                        tablecolumns[color;text;color;text]
                        tableoptions[background=#00000000;highlight=#00000000;border=false]
                        button[5.5,0;0.7,1;prev;<]
@@ -75,81 +68,90 @@ function worktable.craftguide_formspec(pos, start_i, pagenum, stackname, recipe_
                        button[4.6,0.2;0.7,0.5;clearfilter;X]
                        button[0,0;1.5,1;backcraft;< Back]
                        tooltip[search;Search]
-                       tooltip[clearfilter;Reset]
-                       label[3,5.8;Input] ]]
-                       .."list[context;inv_items_list;0,1;8,4;"..tostring(start_i).."]"..
-                       "table[6.1,0.2;1.1,0.5;pagenum;#FFFF00,"..tostring(math.floor(pagenum))..
+                       tooltip[clearfilter;Reset] ]]
+                       .."tabheader[0,0;tabs;All,Nodes,Tools,Items;"..tostring(tab_id)..";true;false]"..
+                       "table[6.1,0.2;1.1,0.5;pagenum;#FFFF00,"..tostring(pagenum)..
                        ",#FFFFFF,/ "..tostring(pagemax).."]"..
                        "field[1.8,0.32;2.6,1;filter;;"..filter.."]"..xbg
 
-       if stackname and minetest.registered_items[stackname] then
-               local items_num = #minetest.get_all_craft_recipes(stackname)
-               if recipe_num > items_num then
-                       recipe_num = 1
+       for _, name in pairs(worktable.craftguide_main_list(meta, filter, tab_id)) do
+               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
 
-               --print(dump(minetest.get_all_craft_recipes(stackname)))
-               local items = minetest.get_all_craft_recipes(stackname)[recipe_num].items
-               local width = minetest.get_all_craft_recipes(stackname)[recipe_num].width
-               local type = minetest.get_all_craft_recipes(stackname)[recipe_num].type
+       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 items_num > 1 then
-                       formspec = formspec.."button[0,5.7;1.6,1;alternate;Alternate]"..
-                                       "label[0,5.2;Recipe "..recipe_num.." of "..items_num.."]"
+                       formspec = formspec.."button[0,6;1.6,1;alternate;Alternate]"..
+                                       "label[0,5.5;Recipe "..recipe_num.." of "..items_num.."]"
+               end
+               
+               local type = minetest.get_all_craft_recipes(item)[recipe_num].type
+               if type == "cooking" then
+                       formspec = formspec.."image[3.75,4.6;0.5,0.5;default_furnace_fire_fg.png]"
                end
 
-               if type == "cooking" or table.maxn(items) == 1 then
-                       if type == "cooking" then
-                               formspec = formspec.."image[4.25,5.9;0.5,0.5;default_furnace_fire_fg.png]"
-                       end
-                       formspec = formspec.."list[context;craft_output_recipe;5,6.3;1,1;]"
-               else
-                       if width == 0 then
-                               local rows, r = math.ceil(#items / math.min(3, #items))
-                               if rows == 3 then r = 2 else r = rows end
-
-                               formspec = formspec.."list[context;craft_output_recipe;5,"..
-                                               (7.3-r)..";"..math.min(3, #items)..","..rows..";]"
-                       else
-                               local rows, r = math.ceil(table.maxn(items) / width)
-                               if rows == 3 then r = 2 else r = rows end
-
-                               formspec = formspec.."list[context;craft_output_recipe;5,"..
-                                               (7.3-r)..";"..width..","..rows..";]"
-                       end
+               local items = minetest.get_all_craft_recipes(item)[recipe_num].items
+               local width = minetest.get_all_craft_recipes(item)[recipe_num].width
+               if width == 0 then width = math.min(3, #items) end
+               local rows = math.ceil(table.maxn(items) / width)
+
+               local function is_group(item)
+                       if item:find("^group:") then return "G" end
+                       return ""
                end
 
-               formspec = formspec..[[ image[4,6.3;1,1;gui_furnace_arrow_bg.png^[transformR90]
-                                       button[0,6.5;1.6,1;trash;Clear] ]]
-                                       .."label[0,7.5;"..stackname:sub(1, 30).."]"
+               for i, v in pairs(items) do
+                       formspec = formspec.."item_image_button["..((i-1) % width + 4.5)..","..
+                               (math.floor((i-1) / width + (6 - math.min(2, rows))))..";1,1;"..
+                               worktable.get_recipe(v)..";"..worktable.get_recipe(v)..";"..is_group(v).."]"
+               end
 
-               worktable.craftguide_output_lists(meta, recipe_num, items, stackname)
+               formspec = formspec.."item_image[2.5,5;1,1;"..item.."]"..
+                               "image[3.5,5;1,1;gui_furnace_arrow_bg.png^[transformR90]"
        end
 
        meta:set_string("formspec", formspec)
 end
 
-function worktable.craftguide_main_list(pos, filter)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       local inv_items_list = {}
+local function tab_category(tab_id)
+       local id_category = {
+               minetest.registered_items,
+               minetest.registered_nodes,
+               minetest.registered_tools,
+               minetest.registered_craftitems }
+
+       return id_category[tab_id] or id_category[1]
+end
 
-       for name, def in pairs(minetest.registered_items) do
+function worktable.craftguide_main_list(meta, filter, tab_id)
+       local items_list = {}
+       for name, def in pairs(tab_category(tab_id)) do
                if not (def.groups.not_in_creative_inventory == 1) and
                                minetest.get_craft_recipe(name).items and
                                def.description and def.description ~= "" and
                                (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
-       table.sort(inv_items_list)
 
-       inv:set_size("inv_items_list", #inv_items_list)
-       inv:set_list("inv_items_list", inv_items_list)
+       meta:set_int("inv_size", #items_list)
+       table.sort(items_list)
+       return items_list
 end
 
-function worktable.crafting(meta)
-       local formspec = [[ size[8,7;]
+worktable.formspecs = {
+       crafting = function(meta)
+               meta:set_string("formspec", [[ size[8,7;]
                        list[current_player;main;0,3.3;8,4;]
                        image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
                        button[0,0;1.5,1;back;< Back]
@@ -158,25 +160,19 @@ function worktable.crafting(meta)
                        list[current_player;craftpreview;6,1;1,1;]
                        listring[current_player;main]
                        listring[current_player;craft] ]]
-                       ..xbg..default.get_hotbar_bg(0,3.3)
-
-       meta:set_string("formspec", formspec)
-end
-
-function worktable.storage(meta)
-       local formspec = [[ size[8,7]
+                       ..xbg..default.get_hotbar_bg(0,3.3))
+       end,
+       storage = function(meta)
+               meta:set_string("formspec", [[ size[8,7]
                        list[context;storage;0,1;8,2;]
                        list[current_player;main;0,3.25;8,4;]
                        listring[context;storage]
                        listring[current_player;main]
                        button[0,0;1.5,1;back;< Back] ]]
-                       ..xbg..default.get_hotbar_bg(0,3.25)
-
-       meta:set_string("formspec", formspec)
-end
-
-function worktable.main(meta)
-       local formspec = [[ size[8,7;]
+                       ..xbg..default.get_hotbar_bg(0,3.25))
+       end,
+       main = function(meta)
+               meta:set_string("formspec", [[ size[8,7;]
                        label[0.9,1.23;Cut]
                        label[0.9,2.23;Repair]
                        box[-0.05,1;2.05,0.9;#555555]
@@ -192,10 +188,9 @@ function worktable.main(meta)
                        list[current_player;main;0,3.25;8,4;]
                        button[0,0;2,1;craft;Crafting]
                        button[2,0;2,1;storage;Storage] ]]
-                       ..xbg..default.get_hotbar_bg(0,3.25)
-
-       meta:set_string("formspec", formspec)
-end
+                       ..xbg..default.get_hotbar_bg(0,3.25))
+       end
+}
 
 function worktable.construct(pos)
        local meta = minetest.get_meta(pos)
@@ -206,67 +201,57 @@ function worktable.construct(pos)
        inv:set_size("hammer", 1)
        inv:set_size("forms", 4*3)
        inv:set_size("storage", 8*2)
-       inv:set_size("item_craft_input", 1)
-       inv:set_size("craft_output_recipe", 3*3)
        meta:set_string("infotext", "Work Table")
 
-       worktable.main(meta)
+       worktable.formspecs.main(meta)
 end
 
-function worktable.fields(pos, _, fields, _)
+function worktable.fields(pos, _, fields)
        if fields.quit then return end
        local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
        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
-
-       if fields.storage then
-               worktable.storage(meta)
-       elseif fields.back then
-               worktable.main(meta)
-       elseif fields.craft then
-               worktable.crafting(meta)
+       local pagenum = tonumber(formspec:match("#FFFF00,(%d+)")) or 1
+       local tab_id = tonumber(formspec:match("tabheader%[.*;(%d+)%;.*]")) or 1
+
+       if fields.back then
+               worktable.formspecs.main(meta)
+       elseif fields.craft or fields.backcraft then
+               worktable.formspecs.crafting(meta)
+       elseif fields.storage then
+               worktable.formspecs.storage(meta)
+       elseif fields.craftguide or fields.clearfilter then
+               worktable.craftguide_main_list(meta, nil, 1)
+               worktable.craftguide_formspec(meta, 1, nil, 1, "", 1)
        elseif fields.alternate then
-               inv:set_list("craft_output_recipe", {})
-               local inputstack = inv:get_stack("item_craft_input", 1):get_name()
+               local item = formspec:match("item_image%[.*;([%w_:]+)%]") or ""
                local recipe_num = tonumber(formspec:match("Recipe%s(%d+)")) or 1
                recipe_num = recipe_num + 1
-               worktable.craftguide_formspec(pos, start_i, start_i / (8*4) + 1, inputstack, recipe_num, filter)
-       else
-               if fields.backcraft then
-                       worktable.crafting(meta)
-               elseif fields.search then
-                       worktable.craftguide_main_list(pos, fields.filter:lower())
-                       worktable.craftguide_formspec(pos, 0, 1, nil, 1, fields.filter:lower())
-               elseif fields.craftguide or fields.clearfilter then
-                       worktable.craftguide_main_list(pos, nil)
-                       worktable.craftguide_formspec(pos, 0, 1, nil, 1, "")
+               worktable.craftguide_formspec(meta, pagenum, item, recipe_num, filter, tab_id)
+       elseif fields.search then
+               worktable.craftguide_main_list(meta, fields.filter:lower(), tab_id)
+               worktable.craftguide_formspec(meta, 1, nil, 1, fields.filter:lower(), tab_id)
+       elseif fields.tabs then
+               worktable.craftguide_main_list(meta, filter, tonumber(fields.tabs))
+               worktable.craftguide_formspec(meta, 1, nil, 1, filter, tonumber(fields.tabs))
+       elseif fields.prev or fields.next then
+               if fields.prev then
+                       pagenum = pagenum - 1
                else
-                       if fields.prev or fields.next then
-                               local inv_size = #meta:to_table().inventory.inv_items_list
-                               if fields.prev or start_i >= inv_size then
-                                       start_i = start_i - 8*4
-                               elseif fields.next or start_i < 0 then
-                                       start_i = start_i + 8*4
-                               end
-
-                               if start_i >= inv_size then
-                                       start_i = 0
-                               elseif start_i < 0 then
-                                       start_i = inv_size - (inv_size % (8*4))
-                               end
+                       pagenum = pagenum + 1
+               end
+               worktable.craftguide_formspec(meta, pagenum, nil, 1, filter, tab_id)
+       else
+               for item in pairs(fields) do
+                       if item:match("[%w_]+:[%w_]+") and
+                                       minetest.get_craft_recipe(item).items then
+                               worktable.craftguide_formspec(meta, pagenum, item, 1, filter, tab_id)
                        end
-
-                       worktable.craftguide_formspec(pos, start_i, start_i / (8*4) + 1, nil, 1, filter)
                end
-
-               inv:set_list("item_craft_input", {})
-               inv:set_list("craft_output_recipe", {})
        end
 end
 
-function worktable.dig(pos, _)
+function worktable.dig(pos)
        local inv = minetest.get_meta(pos):get_inventory()
        return inv:is_empty("input") and inv:is_empty("hammer") and
                inv:is_empty("tool") and inv:is_empty("storage")
@@ -283,20 +268,16 @@ function worktable.contains(table, element)
        return false
 end
 
-function worktable.put(_, listname, _, stack, _)
-       local stn = stack:get_name()
-       local mod, node = stn:match("([%w_]+):([%w_]+)")
-       local tdef = minetest.registered_tools[stn]
-       local twear = stack:get_wear()
+function worktable.put(_, listname, _, stack)
+       local stackname = stack:get_name()
+       local mod, node = stackname:match("([%w_]+):([%w_]+)")
 
-       if (listname == "input" and worktable.contains(nodes[mod], node)) or
+       if (listname == "tool" and stack:get_wear() > 0 and stackname ~= "xdecor:hammer") or
+                       (listname == "input" and worktable.contains(nodes[mod], node)) or
+                       (listname == "hammer" and stackname == "xdecor:hammer") or
                        listname == "storage" then
                return stack:get_count()
-       elseif (listname == "hammer" and stn == "xdecor:hammer") or
-                       (listname == "tool" and tdef and twear > 0) then
-               return 1
        end
-
        return 0
 end
 
@@ -307,70 +288,53 @@ function worktable.take(pos, listname, _, stack, player)
                        return -1
                end
                return 0
-       elseif listname == "inv_items_list" or listname == "item_craft_input" or
-                       listname == "craft_output_recipe" then
-               return 0
        end
-
        return stack:get_count()
 end
 
-function worktable.move(pos, from_list, from_index, to_list, to_index, count, _)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-
+function worktable.move(_, from_list, _, to_list, _, count)
        if from_list == "storage" and to_list == "storage" then
                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
-
-               worktable.craftguide_formspec(pos, start_i, start_i / (8*4) + 1, stackname, 1, filter)
        end
-
        return 0
 end
 
-function worktable.update_inventory(inv, inputstack)
+function worktable.get_output(inv, stack)
        if inv:is_empty("input") then
                inv:set_list("forms", {})
                return
        end
 
-       local output = {}
-       local input = inv:get_stack("input", 1)
-
+       local input, output = inv:get_stack("input", 1), {}
        for _, n in pairs(def) do
                local count = math.min(n[2] * input:get_count(), input:get_stack_max())
-               output[#output+1] = inputstack:get_name().."_"..n[1].." "..count
+               output[#output+1] = stack:get_name().."_"..n[1].." "..count
        end
 
        inv:set_list("forms", output)
 end
 
-function worktable.on_put(pos, listname, _, stack, _)
+function worktable.on_put(pos, listname, _, stack)
        if listname == "input" then
                local inv = minetest.get_meta(pos):get_inventory()
-               worktable.update_inventory(inv, stack)
+               worktable.get_output(inv, stack)
        end
 end
 
-function worktable.on_take(pos, listname, index, stack, _)
+function worktable.on_take(pos, listname, index, stack)
        local inv = minetest.get_meta(pos):get_inventory()
+       local inputstack = inv:get_stack("input", 1)
+
        if listname == "input" then
-               if stack:get_name() == inv:get_stack("input", 1):get_name() then
-                       worktable.update_inventory(inv, stack)
+               if stack:get_name() == inputstack:get_name() then
+                       worktable.get_output(inv, stack)
                else
                        inv:set_list("forms", {})
                end
        elseif listname == "forms" then
-               local inputstack = inv:get_stack("input", 1)
                inputstack:take_item(math.ceil(stack:get_count() / def[index][2]))
                inv:set_stack("input", 1, inputstack)
-               worktable.update_inventory(inv, inputstack)
+               worktable.get_output(inv, inputstack)
        end
 end
 
@@ -439,13 +403,12 @@ end
 minetest.register_abm({
        nodenames = {"xdecor:worktable"},
        interval = 3, chance = 1,
-       action = function(pos, _, _, _)
+       action = function(pos)
                local inv = minetest.get_meta(pos):get_inventory()
                local tool = inv:get_stack("tool", 1)
                local hammer = inv:get_stack("hammer", 1)
-               local wear = tool:get_wear()
 
-               if tool:is_empty() or hammer:is_empty() or wear == 0 then
+               if tool:is_empty() or hammer:is_empty() or tool:get_wear() == 0 then
                        return
                end