]> git.lizzy.rs Git - xdecor.git/blobdiff - worktable.lua
Some preparative cleanup in Work Table's code
[xdecor.git] / worktable.lua
index 4a44b592ec3ef5770ce9255517fdb4cbc25bf9ae..ded1cfbeb9762884e138a87cd812d4c64a6ba457 100644 (file)
 local worktable = {}
 screwdriver = screwdriver or {}
 
-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"},
+-- Nodes allowed to be cut.
+-- Only the regular, solid blocks without formspec or explosivity can be cut.
+function worktable:nodes(def)
+       return (def.drawtype == "normal" or def.drawtype:find("glass")) and
+               (def.groups.cracky or def.groups.choppy) and not
+               def.on_construct and not def.after_place_node and not
+               def.after_place_node and not def.on_rightclick and not
+               def.on_blast and not def.allow_metadata_inventory_take and not
+               (def.groups.not_in_creative_inventory == 1) and not
+               def.groups.wool and not def.description:find("Ore") and
+               def.description and def.description ~= "" and def.light_source == 0
+end
+
+-- Nodeboxes definitions.
+worktable.defs = {
+       -- Name       Yield   X  Y   Z  W   H  L
+       {"nanoslab",    16, { 0, 0,  0, 8,  1, 8  }},
+       {"micropanel",  16, { 0, 0,  0, 16, 1, 8  }},
+       {"microslab",   8,  { 0, 0,  0, 16, 1, 16 }},
+       {"thinstair",   8,  { 0, 7,  0, 16, 1, 8  },
+                           { 0, 15, 8, 16, 1, 8  }},
+       {"cube",        4,  { 0, 0,  0, 8,  8, 8  }},
+       {"panel",       4,  { 0, 0,  0, 16, 8, 8  }},
+       {"slab",        2,  nil                   },
+       {"doublepanel", 2,  { 0, 0,  0, 16, 8, 8  },
+                           { 0, 8,  8, 16, 8, 8  }},
+       {"halfstair",   2,  { 0, 0,  0, 8,  8, 16 },
+                           { 0, 8,  8, 8,  8, 8  }},
+       {"outerstair",  1,  { 0, 0,  0, 16, 8, 16 },
+                           { 0, 8,  8, 8,  8, 8  }},
+       {"stair",       1,  nil                   },
+       {"innerstair",  1,  { 0, 0,  0, 16, 8, 16 },
+                           { 0, 8,  8, 16, 8, 8  },
+                           { 0, 8,  0, 8,  8, 8  }}
 }
 
-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}}}
+-- Tools allowed to be repaired.
+worktable.repairable_tools = [[
+       pick, axe, shovel, sword, hoe, armor, shield
+]]
+
+-- Nodeboxes's combination table.
+worktable.nodebox_blender = {
+       {"nanoslab",   nil,          2  },
+       {"micropanel", nil,          3  },
+       {"cube",       nil,          6  },
+       {"cube",       "panel",      9  },
+       {"cube",       "outerstair", 11 },
+       {"cube",       "halfstair",  7  },
+       {"cube",       "innerstair", nil},
+       {"panel",      nil,          7  },
+       {"panel",      "cube",       9  },
+       {"panel",      "outerstair", 12 },
+       {"halfstair",  nil,          11 },
+       {"halfstair",  "outerstair", nil}
 }
 
-function worktable.get_recipe(item)
-       if item:find("^group:") then
-               if item:find("wool$") or item:find("dye$") then
+function worktable:get_recipe(item)
+       if item:sub(1,6) == "group:" then
+               if item:sub(-4) == "wool" or item:sub(-3) == "dye" then
                        item = item:sub(7)..":white"
                elseif minetest.registered_items["default:"..item:sub(7)] then
                        item = item:gsub("group:", "default:")
-               else
-                       for node, def in pairs(minetest.registered_items) do
-                               if def.groups[item:match("[^,:]+$")] then
-                                       item = node
-                               end
-                       end
+               else for node, def in pairs(minetest.registered_items) do
+                        if def.groups[item:match("[^,:]+$")] then item = node end
+                    end
                end
        end
        return item
 end
 
-function worktable.craftguide_formspec(meta, pagenum, item, recipe_num, filter, tab_id)
+function worktable:craftguide_formspec(meta, pagenum, item, recipe_num, filter)
        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
+       if     pagenum > pagemax then pagenum = 1
+       elseif pagenum == 0      then pagenum = pagemax end
 
        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;<]
-                       button[7.3,0;0.7,1;next;>]
+                       button[5.5,0;0.7,0.95;prev;<]
+                       button[7.3,0;0.7,0.95;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] ]]
-                       .."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)..
+                       tooltip[clearfilter;Reset] ]] ..
+                       "table[6.1,0.18;1.1,0.5;pagenum;#FFFF00,"..tostring(pagenum)..
                        ",#FFFFFF,/ "..tostring(pagemax).."]"..
                        "field[1.8,0.32;2.6,1;filter;;"..filter.."]"..xbg
 
-       for _, name in pairs(worktable.craftguide_main_list(meta, filter, tab_id)) do
+       for _, name in pairs(self:craftguide_items(meta, filter)) do
                if s < (pagenum - 1) * npp then
                        s = s + 1
-               else
-                       if i >= npp then break end
+               else if i >= npp then break end
                        formspec = formspec.."item_image_button["..(i%8)..","..
-                                       (math.floor(i/8)+1)..";1,1;"..name..";"..name..";]"
+                                            (math.floor(i/8)+1)..";1,1;"..name..";"..name..";]"
                        i = i + 1
                end
        end
@@ -90,57 +109,49 @@ function worktable.craftguide_formspec(meta, pagenum, item, recipe_num, filter,
                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,6;1.6,1;alternate;Alternate]"..
-                                       "label[0,5.5;Recipe "..recipe_num.." of "..items_num.."]"
+               if items_num > 1 then 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]"
+               if type == "cooking" then formspec = formspec..
+                       "image[3.75,4.6;0.5,0.5;default_furnace_fire_fg.png]"
                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
+               -- Lua 5.3 removed `table.maxn`, use `xdecor.maxn` in case of breakage.
                local rows = math.ceil(table.maxn(items) / width)
 
                local function is_group(item)
-                       if item:find("^group:") then return "G" end
+                       if item:sub(1,6) == "group:" then return "\nG" end
                        return ""
                end
 
-               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).."]"
+               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;"..
+                       self:get_recipe(v)..";"..self:get_recipe(v)..";"..is_group(v).."]"
                end
 
-               formspec = formspec.."item_image[2.5,5;1,1;"..item.."]"..
-                               "image[3.5,5;1,1;gui_furnace_arrow_bg.png^[transformR90]"
+               local output = minetest.get_all_craft_recipes(item)[recipe_num].output
+               formspec = formspec.."item_image_button[2.5,5;1,1;"..output..";"..item..";]"..
+                                    "image[3.5,5;1,1;gui_furnace_arrow_bg.png^[transformR90]"
        end
 
        meta:set_string("formspec", formspec)
 end
 
-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
-
-function worktable.craftguide_main_list(meta, filter, tab_id)
+function worktable:craftguide_items(meta, filter)
        local items_list = {}
-       for name, def in pairs(tab_category(tab_id)) do
+       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
+                               (not filter or def.name:find(filter, 1, true) or
+                                       def.description:lower():find(filter, 1, true)) then
                        items_list[#items_list+1] = name
                end
        end
@@ -150,66 +161,68 @@ function worktable.craftguide_main_list(meta, filter, tab_id)
        return items_list
 end
 
-worktable.formspecs = {
-       crafting = function(meta)
-               meta:set_string("formspec", [[ size[8,7;]
-                       image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
-                       image[0.06,2.12;0.8,0.8;trash_icon.png]
-                       button[0,0;1.5,1;back;< Back]
-                       button[0,0.85;1.5,1;craftguide;Guide]
-                       list[context;trash;0,2;1,1;]
-                       list[current_player;main;0,3.3;8,4;]
-                       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))
-       end,
-       storage = function(meta)
-               meta:set_string("formspec", [[ size[8,7]
-                       image[7.06,0.12;0.8,0.8;trash_icon.png]
-                       list[context;trash;7,0;1,1;]
-                       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))
-       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]
-                       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))
+function worktable:get_output(inv, input, name)
+       if inv:is_empty("input") then
+               inv:set_list("forms", {}) return
        end
-}
+
+       local output = {}
+       for _, n in pairs(self.defs) do
+               local count = math.min(n[2] * input:get_count(), input:get_stack_max())
+               local item = name.."_"..n[1]
+               if not n[3] then item = "stairs:"..n[1].."_"..name:match(":(.*)") end
+               output[#output+1] = item.." "..count
+       end
+       inv:set_list("forms", output)
+end
+
+function worktable.formspecs(meta, id)
+       local formspecs = {
+               -- Main formspec.
+               [[ 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]
+                  button[0,0;2,1;craft;Crafting]
+                  button[2,0;2,1;storage;Storage]
+                  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;] ]],
+               -- Crafting formspec.
+               [[ image[5,1;1,1;gui_furnace_arrow_bg.png^[transformR270]
+                  button[0,0;1.5,1;back;< Back]
+                  list[current_player;craft;2,0;3,3;]
+                  list[current_player;craftpreview;6,1;1,1;]
+                  listring[current_player;main]
+                  listring[current_player;craft] ]],
+               -- Storage formspec.
+               [[ list[context;storage;0,1;8,2;]
+                  button[0,0;1.5,1;back;< Back]
+                  listring[context;storage]
+                  listring[current_player;main] ]]
+       }
+
+       meta:set_string("formspec", "size[8,7;]list[current_player;main;0,3.25;8,4;]"..
+                       formspecs[id]..xbg..default.get_hotbar_bg(0,3.25))
+end
 
 function worktable.construct(pos)
        local meta = minetest.get_meta(pos)
        local inv = meta:get_inventory()
 
        inv:set_size("tool", 1)
-       inv:set_size("trash", 1)
        inv:set_size("input", 1)
        inv:set_size("hammer", 1)
        inv:set_size("forms", 4*3)
        inv:set_size("storage", 8*2)
-       meta:set_string("infotext", "Work Table")
 
-       worktable.formspecs.main(meta)
+       meta:set_string("infotext", "Work Table")
+       worktable.formspecs(meta, 1)
 end
 
 function worktable.fields(pos, _, fields)
@@ -218,41 +231,33 @@ function worktable.fields(pos, _, fields)
        local formspec = meta:to_table().fields.formspec
        local filter = formspec:match("filter;;([%w_:]+)") or ""
        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)
+               worktable.formspecs(meta, 1)
+       elseif fields.craft then
+               worktable.formspecs(meta, 2)
        elseif fields.storage then
-               worktable.formspecs.storage(meta)
+               worktable.formspecs(meta, 3)
        elseif fields.craftguide or fields.clearfilter then
-               worktable.craftguide_main_list(meta, nil, tab_id)
-               worktable.craftguide_formspec(meta, 1, nil, 1, "", tab_id)
+               worktable:craftguide_items(meta, nil)
+               worktable:craftguide_formspec(meta, 1, nil, 1, "")
        elseif fields.alternate then
-               local item = formspec:match("item_image%[.*;([%w_:]+)%]") or ""
+               local item = formspec:match("image_button%[.*;([%w_:]+);.*%]") or ""
                local recipe_num = tonumber(formspec:match("Recipe%s(%d+)")) or 1
                recipe_num = recipe_num + 1
-               worktable.craftguide_formspec(meta, pagenum, item, recipe_num, filter, tab_id)
+               worktable:craftguide_formspec(meta, pagenum, item, recipe_num, filter)
        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))
+               worktable:craftguide_items(meta, fields.filter:lower())
+               worktable:craftguide_formspec(meta, 1, nil, 1, fields.filter:lower())
        elseif fields.prev or fields.next then
-               if fields.prev then
-                       pagenum = pagenum - 1
-               else
-                       pagenum = pagenum + 1
-               end
-               worktable.craftguide_formspec(meta, pagenum, nil, 1, filter, tab_id)
-       else
-               for item in pairs(fields) do
-                       if item:match(".-:") and minetest.get_craft_recipe(item).items then
-                               worktable.craftguide_formspec(meta, pagenum, item, 1, filter, tab_id)
-                       end
-               end
+               if fields.prev then pagenum = pagenum - 1
+               else pagenum = pagenum + 1 end
+               worktable:craftguide_formspec(meta, pagenum, nil, 1, filter)
+       else for item in pairs(fields) do
+                if minetest.get_craft_recipe(item).items then
+                       worktable:craftguide_formspec(meta, pagenum, item, 1, filter)
+                end
+            end
        end
 end
 
@@ -262,93 +267,75 @@ function worktable.dig(pos)
                inv:is_empty("tool") and inv:is_empty("storage")
 end
 
-function worktable.allowed(mod, node)
-       if not mod then return end
-       for _, it in pairs(mod) do
-               if it == node then return true end
+function worktable.timer(pos)
+       local timer = minetest.get_node_timer(pos)
+       local inv = minetest.get_meta(pos):get_inventory()
+       local tool = inv:get_stack("tool", 1)
+       local hammer = inv:get_stack("hammer", 1)
+
+       if tool:is_empty() or hammer:is_empty() or tool:get_wear() == 0 then
+               timer:stop() return
        end
-       return false
-end
 
-local function trash_delete(pos)
-       local inv = minetest.get_meta(pos):get_inventory()
-       minetest.after(0, function()
-               inv:set_stack("trash", 1, "")
-       end)
+       -- Tool's wearing range: 0-65535 | 0 = new condition.
+       tool:add_wear(-500)
+       hammer:add_wear(700)
+
+       inv:set_stack("tool", 1, tool)
+       inv:set_stack("hammer", 1, hammer)
+
+       return true
 end
 
-function worktable.put(pos, listname, _, stack)
+function worktable.put(_, listname, _, stack)
        local stackname = stack:get_name()
-       local mod, node = stackname:match("(.*):(.*)")
-
-       if (listname == "tool" and stack:get_wear() > 0 and stackname ~= "xdecor:hammer") or
-                       (listname == "input" and worktable.allowed(nodes[mod], node)) or
+       if (listname == "tool" and stack:get_wear() > 0 and
+                       worktable.repairable_tools:find(stackname:match(":(%w+)"))) or
+                       (listname == "input" and minetest.registered_nodes[stackname.."_cube"]) or
                        (listname == "hammer" and stackname == "xdecor:hammer") or
-                       listname == "storage" or listname == "trash" then
-               if listname == "trash" then trash_delete(pos) end
+                       listname == "storage" then
                return stack:get_count()
        end
-
        return 0
 end
 
 function worktable.take(_, listname, _, stack, player)
        if listname == "forms" then
                local inv = player:get_inventory()
-               if inv:room_for_item("main", stack:get_name()) then
-                       return -1
-               end
+               if inv:room_for_item("main", stack:get_name()) then return -1 end
                return 0
        end
        return stack:get_count()
 end
 
-function worktable.move(pos, _, _, to_list, _, count)
-       if to_list == "storage" then
-               return count
-       elseif to_list == "trash" then
-               trash_delete(pos)
-               return count
-       end
+function worktable.move(_, _, _, to_list, _, count)
+       if to_list == "storage" then return count end
        return 0
 end
 
-function worktable.get_output(inv, stack)
-       if inv:is_empty("input") then
-               inv:set_list("forms", {})
-               return
-       end
-
-       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] = stack:get_name().."_"..n[1].." "..count
-       end
-
-       inv:set_list("forms", output)
-end
-
 function worktable.on_put(pos, listname, _, stack)
+       local inv = minetest.get_meta(pos):get_inventory()
        if listname == "input" then
-               local inv = minetest.get_meta(pos):get_inventory()
-               worktable.get_output(inv, stack)
+               local input = inv:get_stack("input", 1)
+               worktable:get_output(inv, input, stack:get_name())
+       elseif listname == "tool" or listname == "hammer" then
+               local timer = minetest.get_node_timer(pos)
+               timer:start(3.0)
        end
 end
 
 function worktable.on_take(pos, listname, index, stack)
        local inv = minetest.get_meta(pos):get_inventory()
-       local inputstack = inv:get_stack("input", 1)
+       local input = inv:get_stack("input", 1)
 
        if listname == "input" then
-               if stack:get_name() == inputstack:get_name() then
-                       worktable.get_output(inv, stack)
-               else
-                       inv:set_list("forms", {})
-               end
+               if stack:get_name() == input:get_name() then
+                       worktable:get_output(inv, input, stack:get_name())
+               else inv:set_list("forms", {}) end
        elseif listname == "forms" then
-               inputstack:take_item(math.ceil(stack:get_count() / def[index][2]))
-               inv:set_stack("input", 1, inputstack)
-               worktable.get_output(inv, inputstack)
+               input:take_item(math.ceil(stack:get_count() / worktable.defs[index][2]))
+               inv:set_stack("input", 1, input)
+               worktable:get_output(inv, input, input:get_name())
        end
 end
 
@@ -363,75 +350,93 @@ xdecor.register("worktable", {
        },
        on_rotate = screwdriver.rotate_simple,
        can_dig = worktable.dig,
+       on_timer = worktable.timer,
        on_construct = worktable.construct,
        on_receive_fields = worktable.fields,
        on_metadata_inventory_put = worktable.on_put,
        on_metadata_inventory_take = worktable.on_take,
+       on_metadata_inventory_move = worktable.on_move,
        allow_metadata_inventory_put = worktable.put,
        allow_metadata_inventory_take = worktable.take,
        allow_metadata_inventory_move = worktable.move
 })
 
-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 = {}, {}
+for _, d in pairs(worktable.defs) do
+for node in pairs(minetest.registered_nodes) do
+       local def = minetest.registered_nodes[node]
+       if worktable:nodes(def) and d[3] then
+               local groups, tiles = {}, {}
                groups.not_in_creative_inventory = 1
 
-               for k, v in pairs(ndef.groups) do
+               for k, v in pairs(def.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
+               if def.tiles then
+                       if #def.tiles > 1 and not def.drawtype:find("glass") then
+                               tiles = def.tiles
+                       else tiles = {def.tiles[1]} end
                else
-                       tiles = {ndef.tiles[1]}
+                       tiles = {def.tile_images[1]}
                end
 
-               if ndef.light_source > 3 then
-                       light = ndef.light_source - 1
+               if not minetest.registered_nodes["stairs:slab_"..node:match(":(.*)")] then
+                       stairs.register_stair_and_slab(node:match(":(.*)"), node, groups, tiles,
+                               def.description.." Stair", def.description.." Slab", def.sounds)
                end
 
-               minetest.register_node(":"..mod..":"..name.."_"..d[1], {
-                       description = ndef.description.." "..d[1]:gsub("^%l", string.upper),
+               minetest.register_node(":"..node.."_"..d[1], {
+                       description = def.description.." "..d[1]:gsub("^%l", string.upper),
                        paramtype = "light",
                        paramtype2 = "facedir",
                        drawtype = "nodebox",
-                       light_source = light,
-                       sounds = ndef.sounds,
+                       sounds = def.sounds,
                        tiles = tiles,
                        groups = groups,
-                       node_box = {type = "fixed", fixed = d[3]},
+                       -- `unpack` has been changed to `table.unpack` in newest Lua versions.
+                       node_box = xdecor.pixelbox(16, {unpack(d, 3)}),
                        sunlight_propagates = true,
-                       on_place = minetest.rotate_node
+                       on_place = minetest.rotate_node,
+                       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+                               local player_name = clicker:get_player_name()
+                               if minetest.is_protected(pos, player_name) then
+                                       minetest.record_protection_violation(pos, player_name) return
+                               end
+
+                               local newnode, combined = def.name, false
+                               if clicker:get_player_control().sneak then
+                                       local wield_item = clicker:get_wielded_item():get_name()
+                                       for _, x in pairs(worktable.nodebox_blender) do
+                                               if wield_item == newnode.."_"..x[1] then
+                                                       if not x[2] then x[2] = x[1] end
+                                                       local pointed_nodebox = minetest.get_node(pos).name:match("(%w+)$")
+
+                                                       if x[2] == pointed_nodebox then
+                                                               if x[3] then newnode = newnode.."_"..worktable.defs[x[3]][1] end
+                                                               combined = true
+                                                               minetest.set_node(pos, {name=newnode, param2=node.param2})
+                                                       end
+                                               end
+                                       end
+                               else
+                                       minetest.item_place_node(itemstack, clicker, pointed_thing)
+                               end
+
+                               if combined and not minetest.setting_getbool("creative_mode") then
+                                       itemstack:take_item()
+                               end
+                               return itemstack
+                       end
                })
        end
+       if node:match(":mese") then
+               if d[3] then minetest.register_alias(node.."_"..d[1], "default:glass_"..d[1])
+               else minetest.register_alias("stairs:"..d[1].."_"..node:match(":(.*)"), "stairs:"..d[1].."_glass") end
+       elseif worktable:nodes(def) and not d[3] then
+               minetest.register_alias(node.."_"..d[1], "stairs:"..d[1].."_"..node:match(":(.*)"))
+       end
 end
 end
-end
-
-minetest.register_abm({
-       nodenames = {"xdecor:worktable"},
-       interval = 3, chance = 1,
-       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)
-
-               if tool:is_empty() or hammer:is_empty() or tool:get_wear() == 0 then
-                       return
-               end
-
-               -- Wear : 0-65535 | 0 = new condition.
-               tool:add_wear(-500)
-               hammer:add_wear(700)
-
-               inv:set_stack("tool", 1, tool)
-               inv:set_stack("hammer", 1, hammer)
-       end
-})