X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=worktable.lua;h=c67b5d74e2ad5377b595886f115870598d3b6c53;hb=f2d17916a29de47b3962f08891d7656d0c05c907;hp=f9946cfb58b4d9328ac8b9466c0f339e057e2626;hpb=573c6e7dece7ef90dec6800c2a00ccefd7d748f8;p=xdecor.git diff --git a/worktable.lua b/worktable.lua index f9946cf..c67b5d7 100644 --- a/worktable.lua +++ b/worktable.lua @@ -40,34 +40,38 @@ function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, recipe_ 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;]"..xbg.. + 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).."]".. - "list[context;item_craft_input;3,6.3;1,1;]".. - "tablecolumns[color;text;color;text]".. - "tableoptions[background=#00000000;highlight=#00000000;border=false]".. "table[6.1,0.2;1.1,0.5;pagenum;#FFFF00,"..tostring(math.floor(pagenum)).. ",#FFFFFF,/ "..tostring(pagemax).."]".. - "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]".. - "field[1.8,0.32;2.6,1;filter;;"..filter.."]" + "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+)") - local items_num = #minetest.get_all_craft_recipes(stackname) if items_num > 1 then - formspec = formspec.. - "button[0,5.7;1.6,1;alternate;Alternate]".. + formspec = formspec.."button[0,5.7;1.6,1;alternate;Alternate]".. "label[0,5.2;Recipe "..recipe_num.." of "..items_num.."]" end @@ -94,31 +98,22 @@ function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, recipe_ else formspec = formspec.."list[context;craft_output_recipe;5,5.3;1,"..#stack_items..";]" end - inv:set_size("craft_output_recipe", 1 * #stack_items) + inv:set_size("craft_output_recipe", #stack_items) elseif stack_width == 2 then - if #stack_items <= 2 then - formspec = formspec.."list[context;craft_output_recipe;5,6.3;2,1;]" - inv:set_size("craft_output_recipe", 2) - elseif #stack_items > 2 and #stack_items <= 4 then - formspec = formspec.."list[context;craft_output_recipe;5,5.3;2,2;]" - inv:set_size("craft_output_recipe", 2*2) - else - formspec = formspec.."list[context;craft_output_recipe;5,5.3;2,3;]" - inv:set_size("craft_output_recipe", 2*3) - end + formspec = formspec.."list[context;craft_output_recipe;5,5.3;2,3;]" + inv:set_size("craft_output_recipe", 2*3) elseif stack_width == 3 then if stack_type == "cooking" then - formspec = formspec.."list[context;craft_output_recipe;5,6.3;1,1;]".. - "image[4.25,5.9;0.5,0.5;default_furnace_fire_fg.png]" + formspec = formspec..[[ list[context;craft_output_recipe;5,6.3;1,1;] + image[4.25,5.9;0.5,0.5;default_furnace_fire_fg.png] ]] inv:set_size("craft_output_recipe", 1) else formspec = formspec.."list[context;craft_output_recipe;5,5.3;3,3;]" inv:set_size("craft_output_recipe", 3*3) end - elseif stack_type == "cooking" and stack_width == 15 then - formspec = formspec.. - "list[context;craft_output_recipe;5,6.3;1,1;]".. - "image[4.25,5.9;0.5,0.5;default_furnace_fire_fg.png]" + elseif stack_type == "cooking" and stack_width > 3 then + formspec = formspec..[[ list[context;craft_output_recipe;5,6.3;1,1;] + image[4.25,5.9;0.5,0.5;default_furnace_fire_fg.png] ]] inv:set_size("craft_output_recipe", 1) end @@ -127,42 +122,33 @@ function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, recipe_ for k, def in pairs(stack_items) do craft[#craft+1] = def if def and def:find("^group:") then - if def:find("liquid$") then - def = "default:water_source" - elseif def:find("vessel$") then - def = "vessels:glass_bottle" - elseif def:find("wool$") then + if def:find("wool$") then def = "wool:white" elseif def:find("dye$") then - local dye_color = def:match(".*_([%w_]+)") - def = "dye:"..dye_color - elseif def:find("^group:flower") then - local flower_color = def:match(".*_([%w_]+)") - if flower_color == "red" then - def = "flowers:rose" - elseif flower_color == "yellow" then - def = "flowers:dandelion_yellow" - elseif flower_color == "white" then - def = "flowers:dandelion_white" - elseif flower_color == "blue" then - def = "flowers:geranium" - elseif flower_color == "orange" then - def = "flowers:tulip" + def = "dye:white" + else + if minetest.registered_items["default:"..def:match("^group:([%w_]+)$")] then + def = def:gsub("group", "default") else - def = "flowers:rose" + 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 - else - def = def:gsub("group", "default") 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).."]" + 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) @@ -189,52 +175,52 @@ end function worktable.crafting(pos) local meta = minetest.get_meta(pos) - local formspec = "size[8,7;]"..xbg.. - default.get_hotbar_bg(0,3.3).. - "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]" + 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 meta = minetest.get_meta(pos) - local formspec = "size[8,7]"..xbg.. - default.get_hotbar_bg(0,3.25).. - "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]" + 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;]"..xbg.. - default.get_hotbar_bg(0,3.25).. - "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]" + 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 @@ -280,11 +266,7 @@ function worktable.fields(pos, _, fields, sender) local inputstack = inv:get_stack("item_craft_input", 1):get_name() local recipe_num = tonumber(formspec:match("Recipe%s(%d+)")) or 1 - if recipe_num >= #minetest.get_all_craft_recipes(inputstack) then - recipe_num = 1 - else - recipe_num = recipe_num + 1 - end + 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 @@ -338,14 +320,13 @@ end function worktable.put(_, listname, _, stack, _) local stn = stack:get_name() - local count = stack:get_count() 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)) or listname == "storage" then - return count + return stack:get_count() elseif (listname == "hammer" and stn == "xdecor:hammer") or (listname == "tool" and tdef and twear > 0) then return 1 @@ -355,14 +336,9 @@ function worktable.put(_, listname, _, stack, _) 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("([%w_]+):([%w_]+)") - 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 @@ -382,7 +358,6 @@ function worktable.move(pos, from_list, from_index, to_list, to_index, count, _) return count elseif inv:is_empty("item_craft_input") and from_list == "inv_items_list" and to_list == "item_craft_input" then - --print(dump(minetest.get_all_craft_recipes(stackname))) 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 "" @@ -405,16 +380,11 @@ local function update_inventory(inv, inputstack) end local output = {} - for _, n in pairs(def) do - local mat = inputstack:get_name() - local input = inv:get_stack("input", 1) - local mod, node = mat:match("([%w_]+):([%w_]+)") - local count = math.min(n[2] * input:get_count(), inputstack:get_stack_max()) + local input = inv:get_stack("input", 1) - if not worktable.contains(nodes[mod], node) then - return - end - output[#output+1] = mat.."_"..n[1].." "..count + 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 end inv:set_list("forms", output) @@ -430,7 +400,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]))