]> git.lizzy.rs Git - xdecor.git/blobdiff - worktable.lua
Crafting guide : better output shaping
[xdecor.git] / worktable.lua
index ebf4df386f5fd046c4a24d6872f43ce28e632b81..38f689e69ba3f248b4f788a6958beaf8bd78bfb6 100644 (file)
@@ -1,9 +1,9 @@
 local worktable = {}
 screwdriver = screwdriver or {}
-local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots..default.get_hotbar_bg(0,3.25)
+local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
 
 local nodes = { -- Nodes allowed to be cut. Mod name = {node name}.
-       default = {"wood", "junglewood", "pine_wood", "acacia_wood",
+       ["default"] = {"wood", "junglewood", "pine_wood", "acacia_wood",
                "tree", "jungletree", "pine_tree", "acacia_tree",
                "cobble", "mossycobble", "desert_cobble",
                "stone", "sandstone", "desert_stone", "obsidian",
@@ -12,11 +12,11 @@ local nodes = { -- Nodes allowed to be cut. Mod name = {node name}.
                "bronzeblock", "mese", "diamondblock",
                "brick", "cactus", "ice", "meselamp", "glass", "obsidian_glass"},
 
-       xdecor = {"coalstone_tile", "desertstone_tile", "stone_rune", "stone_tile",
+       ["xdecor"] = {"coalstone_tile", "desertstone_tile", "stone_rune", "stone_tile",
                "cactusbrick", "hard_clay", "packed_ice", "moonbrick",
                "woodframed_glass", "wood_tile"},
 
-       oresplus = {"emerald_block", "glowstone"},
+       ["oresplus"] = {"emerald_block", "glowstone"},
 }
 
 local def = { -- Nodebox name, yield, definition.
@@ -34,41 +34,246 @@ 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.crafting()
-       return "size[8,7;]"..xbg..
-               "list[current_player;main;0,3.3;8,4;]image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]list[current_player;craft;2,0;3,3;]list[current_player;craftpreview;6,1;1,1;]"
+function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, recipe_num, filter)
+       local meta = minetest.get_meta(pos)
+       local inv = meta:get_inventory()
+       local inventory_size = #meta:to_table().inventory.inv_items_list
+       local pagemax = math.floor((inventory_size - 1) / (8*4) + 1)
+
+       local formspec = [[ size[8,8;]
+                       list[context;item_craft_input;3,6.3;1,1;]
+                       tablecolumns[color;text;color;text]
+                       tableoptions[background=#00000000;highlight=#00000000;border=false]
+                       button[5.5,0;0.7,1;prev;<]
+                       button[7.3,0;0.7,1;next;>]
+                       button[4,0.2;0.7,0.5;search;?]
+                       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))..
+                       ",#FFFFFF,/ "..tostring(pagemax).."]"..
+                       "field[1.8,0.32;2.6,1;filter;;"..filter.."]"..xbg
+
+       if stackname then
+               local items_num = #minetest.get_all_craft_recipes(stackname)
+               if recipe_num > items_num then
+                       recipe_num = 1
+               end
+
+               --print(dump(minetest.get_all_craft_recipes(stackname)))
+               local stack_width = minetest.get_all_craft_recipes(stackname)[recipe_num].width
+               local stack_items = minetest.get_all_craft_recipes(stackname)[recipe_num].items
+               local stack_type = minetest.get_all_craft_recipes(stackname)[recipe_num].type
+               local stack_output = minetest.get_all_craft_recipes(stackname)[recipe_num].output
+               local stack_count = stack_output:match("%s(%d+)")
+
+               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.."]"
+               end
+
+               if stack_count then
+                       inv:set_stack("item_craft_input", 1, stackname.." "..stack_count)
+               else
+                       inv:set_stack("item_craft_input", 1, stackname)
+               end
+
+               if stack_type == "cooking" or table.maxn(stack_items) == 1 then
+                       if stack_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 stack_width == 0 then
+                               formspec = formspec.."list[context;craft_output_recipe;5,5.3;3,3;]"
+                       else
+                               formspec = formspec.."list[context;craft_output_recipe;5,5.3;"..stack_width..
+                                               ","..math.ceil(table.maxn(stack_items) / stack_width)..";]"
+                       end
+               end
+
+               local craft = {}
+               for k, def in pairs(stack_items) do
+                       craft[#craft+1] = def
+                       if def and def:find("^group:") then
+                               if def:find("wool$") or def:find("dye$") then
+                                       def = def:match(":([%w_]+)")..":white"
+                               else
+                                       if 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
+                                               end
+                                       end
+                               end
+                       end
+
+                       inv:set_stack("craft_output_recipe", k, def)
+               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).."]"
+       end
+
+       meta:set_string("formspec", formspec)
+end
+
+function worktable.craftguide_update(pos, filter)
+       local meta = minetest.get_meta(pos)
+       local inv = meta:get_inventory()
+       local inv_items_list = {}
+
+       for name, def in pairs(minetest.registered_items) 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
+               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)
+end
+
+function worktable.crafting(pos)
+       local meta = minetest.get_meta(pos)
+       local 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]
+                       button[0,1;1.5,1;craftguide;Guide]
+                       list[current_player;craft;2,0;3,3;]
+                       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(pos)
-       local inv = minetest.get_meta(pos):get_inventory()
-       inv:set_size("storage", 8*2)
-       return "size[8,7]"..xbg.."list[context;storage;0,0;8,2;]list[current_player;main;0,3.25;8,4;]"
+       local meta = minetest.get_meta(pos)
+       local 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(pos)
+       local meta = minetest.get_meta(pos)
+       local 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]
+                       box[-0.05,2;2.05,0.9;#555555]
+                       image[3,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
+                       image[0,1;1,1;worktable_saw.png]
+                       image[0,2;1,1;worktable_anvil.png]
+                       image[3,2;1,1;hammer_layout.png]
+                       list[context;input;2,1;1,1;]
+                       list[context;tool;2,2;1,1;]
+                       list[context;hammer;3,2;1,1;]
+                       list[context;forms;4,0;4,3;]
+                       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
 
 function worktable.construct(pos)
        local meta = minetest.get_meta(pos)
        local inv = meta:get_inventory()
 
-       local formspec = "size[8,7;]"..xbg..
-               "list[context;forms;4,0;4,3;]label[0.95,1.23;Cut]box[-0.05,1;2.05,0.9;#555555]image[3,1;1,1;gui_furnace_arrow_bg.png^[transformR270]label[0.95,2.23;Repair]box[-0.05,2;2.05,0.9;#555555]image[0,1;1,1;worktable_saw.png]image[0,2;1,1;worktable_anvil.png]image[3,2;1,1;hammer_layout.png]list[context;input;2,1;1,1;]list[context;tool;2,2;1,1;]list[context;hammer;3,2;1,1;]button[0,0;2,1;craft;Crafting]button[2,0;2,1;storage;Storage]list[current_player;main;0,3.25;8,4;]"
-
-       inv:set_size("forms", 4*3)
-       inv:set_size("input", 1)
        inv:set_size("tool", 1)
+       inv:set_size("input", 1)
        inv:set_size("hammer", 1)
-
-       meta:set_string("formspec", formspec)
+       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(pos)
+       worktable.craftguide_update(pos, nil)
 end
 
 function worktable.fields(pos, _, fields, sender)
-       local player = sender:get_player_name()
-       local inv = minetest.get_meta(pos):get_inventory()
+       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
-               minetest.show_formspec(player, "", worktable.storage(pos))
-       elseif fields.craft then
-               minetest.show_formspec(player, "", worktable.crafting(pos))
+               worktable.storage(pos)
+       elseif fields.back then
+               worktable.main(pos)
+       elseif fields.backcraft or fields.craft then
+               if fields.backcraft then
+                       inv:set_list("item_craft_input", {})
+                       inv:set_list("craft_output_recipe", {})
+               end
+               worktable.crafting(pos)
+       elseif fields.craftguide then
+               if not meta:to_table().inventory.inv_items_list then return end -- legacy code
+               worktable.craft_output_recipe(pos, 0, 1, nil, 1, "")
+       elseif fields.alternate then
+               inv:set_list("craft_output_recipe", {})
+               local inputstack = inv:get_stack("item_craft_input", 1):get_name()
+               local recipe_num = tonumber(formspec:match("Recipe%s(%d+)")) or 1
+
+               recipe_num = recipe_num + 1
+               worktable.craft_output_recipe(pos, start_i, start_i / (8*4) + 1, inputstack, recipe_num, filter)
+       elseif fields.trash or fields.search or fields.clearfilter or
+                       fields.prev or fields.next then
+               if fields.trash then
+                       worktable.craft_output_recipe(pos, start_i, start_i / (8*4) + 1, nil, 1, filter)
+               elseif fields.search then
+                       worktable.craftguide_update(pos, fields.filter:lower())
+                       worktable.craft_output_recipe(pos, 0, 1, nil, 1, fields.filter:lower())
+               elseif fields.clearfilter then
+                       worktable.craftguide_update(pos, nil)
+                       worktable.craft_output_recipe(pos, 0, 1, nil, 1, "")
+               elseif fields.prev or fields.next then
+                       local inventory_size = #meta:to_table().inventory.inv_items_list
+
+                       if fields.prev or start_i >= inventory_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 >= inventory_size then
+                               start_i = 0
+                       elseif start_i < 0 then
+                               start_i = inventory_size - (inventory_size % (8*4))
+                       end
+
+                       worktable.craft_output_recipe(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
 
@@ -81,7 +286,9 @@ end
 function worktable.contains(table, element)
        if table then
                for _, value in pairs(table) do
-                       if value == element then return true end
+                       if value == element then
+                               return true
+                       end
                end
        end
        return false
@@ -89,55 +296,73 @@ end
 
 function worktable.put(_, listname, _, stack, _)
        local stn = stack:get_name()
-       local count = stack:get_count()
-       local mod, node = stn:match("([%a_]+):([%a_]+)")
+       local mod, node = stn:match("([%w_]+):([%w_]+)")
        local tdef = minetest.registered_tools[stn]
        local twear = stack:get_wear()
 
-       if listname == "input" and
-               worktable.contains(nodes[mod], node) then return count
-       elseif listname == "hammer" and
-               stn == "xdecor:hammer" then return 1
-       elseif listname == "tool" and tdef and twear > 0 then
+       if (listname == "input" and worktable.contains(nodes[mod], node)) 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
 
 function worktable.take(pos, listname, _, stack, player)
-       local inv = minetest.get_meta(pos):get_inventory()
-       local user_inv = player:get_inventory()
-       local inputstack = inv:get_stack("input", 1):get_name()
-       local mod, node = inputstack:match("([%a_]+):([%a_]+)")
-
        if listname == "forms" then
-               if worktable.contains(nodes[mod], node) and
-                       user_inv:room_for_item("main", stack:get_name()) then
+               local user_inv = player:get_inventory()
+               if user_inv:room_for_item("main", stack:get_name()) then
                        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(_, from_list, _, to_list, _, count, _)
-       if from_list == "storage" and to_list == "storage" then return 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()
+
+       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.craft_output_recipe(pos, start_i, start_i / (8*4) + 1, stackname, 1, filter)
+
+               minetest.after(0, function()
+                       inv:set_stack(from_list, from_index, stackname)
+               end)
+       end
+
        return 0
 end
 
 local function update_inventory(inv, inputstack)
-       if inv:is_empty("input") then inv:set_list("forms", {}) return end
+       if inv:is_empty("input") then
+               inv:set_list("forms", {})
+               return
+       end
+
        local output = {}
+       local input = inv:get_stack("input", 1)
 
        for _, n in pairs(def) do
-               local mat = inputstack:get_name()
-               local input = inv:get_stack("input", 1)
-               local mod, node = mat:match("([%a_]+):([%a_]+)")
-               local count = math.min(n[2] * input:get_count(), inputstack:get_stack_max())
-
-               if not worktable.contains(nodes[mod], node) then return end
-               output[#output+1] = mat.."_"..n[1].." "..count
+               local count = math.min(n[2] * input:get_count(), input:get_stack_max())
+               output[#output+1] = inputstack:get_name().."_"..n[1].." "..count
        end
+
        inv:set_list("forms", output)
 end
 
@@ -151,7 +376,11 @@ end
 function worktable.on_take(pos, listname, index, stack, _)
        local inv = minetest.get_meta(pos):get_inventory()
        if listname == "input" then
-               update_inventory(inv, stack)
+               if stack:get_name() == inv:get_stack("input", 1):get_name() then
+                       update_inventory(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]))
@@ -185,8 +414,8 @@ for mod, n in pairs(nodes) do
 for _, name in pairs(n) do
        local ndef = minetest.registered_nodes[mod..":"..name]
        if ndef then
-               local groups = {}
-               groups.not_in_creative_inventory=1
+               local groups, tiles, light = {}, {}
+               groups.not_in_creative_inventory = 1
 
                for k, v in pairs(ndef.groups) do
                        if k ~= "wood" and k ~= "stone" and k ~= "level" then
@@ -194,21 +423,31 @@ for _, name in pairs(n) do
                        end
                end
 
+               if #ndef.tiles > 1 and not ndef.drawtype:find("glass") then
+                       tiles = ndef.tiles
+               else
+                       tiles = {ndef.tiles[1]}
+               end
+
+               if ndef.light_source > 3 then
+                       light = ndef.light_source - 1
+               end
+
                minetest.register_node(":"..mod..":"..name.."_"..d[1], {
                        description = ndef.description.." "..d[1]:gsub("^%l", string.upper),
                        paramtype = "light",
                        paramtype2 = "facedir",
                        drawtype = "nodebox",
-                       light_source = ndef.light_source,
+                       light_source = light,
                        sounds = ndef.sounds,
-                       tiles = {ndef.tiles[1]},
+                       tiles = tiles,
                        groups = groups,
                        node_box = {type = "fixed", fixed = d[3]},
                        sunlight_propagates = true,
                        on_place = minetest.rotate_node
                })
        end
-       minetest.register_alias("xdecor:"..d[1].."_"..name, mod..":"..name.."_"..d[1])
+       minetest.register_alias("xdecor:"..d[1].."_"..name, mod..":"..name.."_"..d[1]) -- legacy code
 end
 end
 end
@@ -222,13 +461,16 @@ minetest.register_abm({
                local hammer = inv:get_stack("hammer", 1)
                local wear = tool:get_wear()
 
-               if tool:is_empty() or hammer:is_empty() or wear == 0 then return end
+               if tool:is_empty() or hammer:is_empty() or wear == 0 then
+                       return
+               end
 
                -- Wear : 0-65535 | 0 = new condition.
                tool:add_wear(-500)
-               hammer:add_wear(300)
+               hammer:add_wear(700)
 
                inv:set_stack("tool", 1, tool)
                inv:set_stack("hammer", 1, hammer)
        end
 })
+