X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=worktable.lua;h=576c69e64a67ba5e42cdd14d15a48a2502800ca4;hb=30424d9ff3e20b5f87b2e5b6dcc17d948e75e611;hp=b29b4d25d1a25b0ddba392240b84e08c207d3f2a;hpb=0137f17e6c4d77811ac4dd8174adc4084fb62a82;p=xdecor.git diff --git a/worktable.lua b/worktable.lua index b29b4d2..576c69e 100644 --- a/worktable.lua +++ b/worktable.lua @@ -1,183 +1,398 @@ local worktable = {} +screwdriver = screwdriver or {} local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots -local material = { - "wood", "junglewood", "pine_wood", "acacia_wood", - "tree", "jungletree", "pine_tree", "acacia_tree", - "cobble", "mossycobble", "desert_cobble", - "stone", "sandstone", "desert_stone", "obsidian", - "stonebrick", "sandstonebrick", "desert_stonebrick", "obsidianbrick", - "coalblock", "copperblock", "steelblock", "goldblock", - "bronzeblock", "mese", "diamondblock", - "brick", "cactus", "ice", "meselamp", - "glass", "obsidian_glass" +local nodes = { -- Nodes allowed to be cut. Mod name = {node name}. + ["default"] = {"wood", "junglewood", "pine_wood", "acacia_wood", + "tree", "jungletree", "pine_tree", "acacia_tree", + "cobble", "mossycobble", "desert_cobble", + "stone", "sandstone", "desert_stone", "obsidian", + "stonebrick", "sandstonebrick", "desert_stonebrick", "obsidianbrick", + "coalblock", "copperblock", "steelblock", "goldblock", + "bronzeblock", "mese", "diamondblock", + "brick", "cactus", "ice", "meselamp", "glass", "obsidian_glass"}, + + ["xdecor"] = {"coalstone_tile", "desertstone_tile", "stone_rune", "stone_tile", + "cactusbrick", "hard_clay", "packed_ice", "moonbrick", + "woodframed_glass", "wood_tile"}, + + ["oresplus"] = {"emerald_block", "glowstone"}, } -local def = { -- Node name, nodebox shape. - {"nanoslab", {-.5,-.5,-.5,0,-.4375,0}}, - {"micropanel", {-.5,-.5,-.5,.5,-.4375,0}}, - {"microslab", {-.5,-.5,-.5,.5,-.4375,.5}}, - {"thinstair", {{-.5,-.0625,-.5,.5,0,0},{-.5,.4375,0,.5,.5,.5}}}, - {"cube", {-.5,-.5,0,0,0,.5}}, - {"panel", {-.5,-.5,-.5,.5,0,0}}, - {"slab", {-.5,-.5,-.5,.5,0,.5}}, - {"doublepanel", {{-.5,-.5,-.5,.5,0,0},{-.5,0,0,.5,.5,.5}}}, - {"halfstair", {{-.5,-.5,-.5,0,0,.5},{-.5,0,0,0,.5,.5}}}, - {"outerstair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,0,.5,.5}}}, - {"stair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5}}}, - {"innerstair", {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5},{-.5,0,-.5,0,.5,0}}} +local def = { -- Nodebox name, yield, definition. + {"nanoslab", 16, {-.5,-.5,-.5,0,-.4375,0}}, + {"micropanel", 16, {-.5,-.5,-.5,.5,-.4375,0}}, + {"microslab", 8, {-.5,-.5,-.5,.5,-.4375,.5}}, + {"thinstair", 8, {{-.5,-.0625,-.5,.5,0,0},{-.5,.4375,0,.5,.5,.5}}}, + {"cube", 4, {-.5,-.5,0,0,0,.5}}, + {"panel", 4, {-.5,-.5,-.5,.5,0,0}}, + {"slab", 2, {-.5,-.5,-.5,.5,0,.5}}, + {"doublepanel", 2, {{-.5,-.5,-.5,.5,0,0},{-.5,0,0,.5,.5,.5}}}, + {"halfstair", 2, {{-.5,-.5,-.5,0,0,.5},{-.5,0,0,0,.5,.5}}}, + {"outerstair", 1, {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,0,.5,.5}}}, + {"stair", 1, {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5}}}, + {"innerstair", 1, {{-.5,-.5,-.5,.5,0,.5},{-.5,0,0,.5,.5,.5},{-.5,0,-.5,0,.5,0}}} } +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 and minetest.registered_items[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+)") or 1 + + inv:set_stack("item_craft_input", 1, stackname.." "..stack_count) + + 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_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 + local rows, r = math.ceil(#stack_items / math.min(3, #stack_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, #stack_items)..","..rows..";]" + else + local rows, r = math.ceil(table.maxn(stack_items) / stack_width) + if rows == 3 then r = 2 else r = rows end + + formspec = formspec.."list[context;craft_output_recipe;5,"..(7.3-r).. + ";"..stack_width..","..rows..";]" + end + end + + for k, def in pairs(stack_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 + 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) - 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;]" + 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() - local f = "size[8,7]"..xbg.. - "list[context;storage;0,0;8,2;]list[current_player;main;0,3.25;8,4;]" - inv:set_size("storage", 8*2) - return f + 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() - 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) - - 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;xdecor_saw.png]image[0,2;1,1;xdecor_anvil.png]".. - "image[3,2;1,1;hammer_layout.png]".. - "list[current_name;input;2,1;1,1;]".. - "list[current_name;tool;2,2;1,1;]list[current_name;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;]" - - 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) 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)) - end - if 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 + worktable.craftguide_update(pos, nil) + 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 -function worktable.anz(n) - if n == "nanoslab" or n == "micropanel" then return 16 - elseif n == "microslab" or n == "thinstair" then return 8 - elseif n == "panel" or n == "cube" then return 4 - elseif n == "slab" or n == "halfstair" or n == "doublepanel" then return 2 - else return 1 end -end - function worktable.dig(pos, _) local inv = minetest.get_meta(pos):get_inventory() - if not inv:is_empty("input") or not inv:is_empty("forms") or not - inv:is_empty("hammer") or not inv:is_empty("tool") or not - inv:is_empty("storage") then - return false - end - return true + return inv:is_empty("input") and inv:is_empty("hammer") and + inv:is_empty("tool") and inv:is_empty("storage") end -function worktable.put(pos, listname, _, stack, _) - local stackname = stack:get_name() - local count = stack:get_count() - local mat = table.concat(material) - - if listname == "forms" then return 0 end - if listname == "input" then - if stackname:find("default:") and mat:match(stackname:sub(9)) then - return count - else return 0 end - end - if listname == "hammer" then - if not (stackname == "xdecor:hammer") then return 0 end +function worktable.contains(table, element) + if table then + for _, value in pairs(table) do + if value == element then + return true + end + end end - if listname == "tool" then - local tdef = minetest.registered_tools[stackname] - local twear = stack:get_wear() - if not (tdef and twear > 0) then return 0 end + 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() + + 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 count + return 0 end -function worktable.take(pos, listname, index, stack, player) - if listname == "forms" then return -1 end +function worktable.take(pos, listname, _, stack, player) + if listname == "forms" 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, _) +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 else return 0 end + 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) + end + + return 0 end -local function update_form_inventory(inv, input_stack) - if inv:is_empty("input") then inv:set_list("forms", {}) return end +local function update_inventory(inv, inputstack) + if inv:is_empty("input") then + inv:set_list("forms", {}) + return + end - local form_inv_list = {} - for _, form in pairs(def) do - local material_name = input_stack:get_name():match("%a+:(.+)") - local form_name = form[1] - local count = math.min(worktable.anz(form_name) * inv:get_stack("input", 1):get_count(), input_stack:get_stack_max()) + local output = {} + local input = inv:get_stack("input", 1) - form_inv_list[#form_inv_list+1] = string.format("xdecor:%s_%s %d", form_name, material_name, 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", form_inv_list) + + inv:set_list("forms", output) end function worktable.on_put(pos, listname, _, stack, _) if listname == "input" then local inv = minetest.get_meta(pos):get_inventory() - update_form_inventory(inv, stack) + update_inventory(inv, stack) end end -function worktable.on_take(pos, listname, index, stack, player) +function worktable.on_take(pos, listname, index, stack, _) local inv = minetest.get_meta(pos):get_inventory() if listname == "input" then - update_form_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 form_name = stack:get_name():match("%a+:(%a+)_%a+") - local input_stack = inv:get_stack("input", 1) - - input_stack:take_item(math.ceil(stack:get_count() / worktable.anz(form_name))) - inv:set_stack("input", 1, input_stack) - update_form_inventory(inv, input_stack) + local inputstack = inv:get_stack("input", 1) + inputstack:take_item(math.ceil(stack:get_count() / def[index][2])) + inv:set_stack("input", 1, inputstack) + update_inventory(inv, inputstack) end end xdecor.register("worktable", { description = "Work Table", - groups = {cracky=2, choppy=2}, + groups = {cracky=2, choppy=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), tiles = { "xdecor_worktable_top.png", "xdecor_worktable_top.png", "xdecor_worktable_sides.png", "xdecor_worktable_sides.png", "xdecor_worktable_front.png", "xdecor_worktable_front.png" }, + on_rotate = screwdriver.rotate_simple, can_dig = worktable.dig, on_construct = worktable.construct, on_receive_fields = worktable.fields, @@ -188,40 +403,45 @@ xdecor.register("worktable", { allow_metadata_inventory_move = worktable.move }) -local function description(m, w) - local d = m:gsub("%W", "") - return d:gsub("^%l", string.upper).." "..w:gsub("^%l", string.upper) -end - -local function groups(m) - if m:find("tree") or m:find("wood") or m == "cactus" then - return {choppy=3, not_in_creative_inventory=1} +for _, d in pairs(def) do +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, 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 + groups[k] = v + 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 = light, + sounds = ndef.sounds, + tiles = tiles, + groups = groups, + node_box = {type = "fixed", fixed = d[3]}, + sunlight_propagates = true, + on_place = minetest.rotate_node + }) end - return {cracky=3, not_in_creative_inventory=1} end - -local function shady(w) - if w:find("stair") or w == "slab" then return false end - return true -end - -for n = 1, #def do -for m = 1, #material do - local w, x = def[n], material[m] - local nodename = "default:"..x - local ndef = minetest.registered_nodes[nodename] - if not ndef then break end - - xdecor.register(w[1].."_"..x, { - description = description(x, w[1]), - light_source = ndef.light_source, - sounds = ndef.sounds, - tiles = ndef.tiles, - groups = groups(x), - node_box = {type = "fixed", fixed = w[2]}, - sunlight_propagates = shady(w[1]), - on_place = minetest.rotate_node - }) end end @@ -234,13 +454,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. + -- Wear : 0-65535 | 0 = new condition. tool:add_wear(-500) - hammer:add_wear(250) + hammer:add_wear(700) inv:set_stack("tool", 1, tool) inv:set_stack("hammer", 1, hammer) end }) +