]> git.lizzy.rs Git - xdecor.git/blobdiff - worktable.lua
Craft guide : remember tab id on clearing filter
[xdecor.git] / worktable.lua
index c2a4bca5c38bf79c5cab1e93e1eb25b5542670a6..4a44b592ec3ef5770ce9255517fdb4cbc25bf9ae 100644 (file)
@@ -1,6 +1,5 @@
 local worktable = {}
 screwdriver = screwdriver or {}
-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",
@@ -15,8 +14,6 @@ local nodes = { -- Nodes allowed to be cut. Mod name = {node name}.
        ["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 = { -- Nodebox name, yield, definition.
@@ -34,341 +31,324 @@ 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.craft_output_recipe(pos, start_i, pagenum, stackname)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       pagenum = math.floor(pagenum)
-       local inventory_size = meta:get_int("inventory_size")
-       local pagemax = math.floor((inventory_size-1) / (8*4) + 1) or 0
-       local craft, dye_color = {}, ""
-
-       local formspec = "size[8,8;]"..xbg..
-                       "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(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;;]"
-
-       if stackname then
-               local stack_width = minetest.get_craft_recipe(stackname).width
-               local stack_items = minetest.get_craft_recipe(stackname).items
-               local stack_type = minetest.get_craft_recipe(stackname).type
-               local stack_output = minetest.get_craft_recipe(stackname).output
-               local stack_count = stack_output:match("%s(%d+)")
-
-               if stack_count and inv:is_empty("item_craft_input") then
-                       inv:add_item("item_craft_input", stackname.." "..stack_count-1)
-               end
-
-               if stack_width == 0 or stack_width == 1 then
-                       if #stack_items == 1 then
-                               formspec = formspec.."list[context;craft_output_recipe;5,6.3;1,1;]"
-                       else
-                               formspec = formspec.."list[context;craft_output_recipe;5,5.3;1,"..#stack_items..";]"
-                       end
-                       inv:set_size("craft_output_recipe", 1 * #stack_items)
-               elseif stack_width == 2 then
-                       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]"
-                               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]"
-                       inv:set_size("craft_output_recipe", 1)
-               end
-
-               for k, def in pairs(stack_items) do
-                       craft[#craft+1] = def
-                       if def and def:sub(1, 6) == "group:" then
-                               if def == "group:liquid" then
-                                       def = "default:water_source"
-                               elseif def == "group:vessel" then
-                                       def = "vessels:glass_bottle"
-                               elseif def == "group:wool" then
-                                       def = "wool:white"
-                               elseif def:find("group:dye") then
-                                       dye_color = def:match("group:dye,%w+_([%w_]+)")
-                                       def = "dye:"..dye_color
-                               elseif def:match("group:stone") or def:match("group:wood") or
-                                               def:match("group:leaves") or def:match("group:stick") or
-                                               def:match("group:sand") or def:match("group:tree") or
-                                               def:match("group:sapling") or def:match("group:book") then
-                                       def = "default:"..def:sub(7, string.len(def))
+function worktable.get_recipe(item)
+       if item:find("^group:") then
+               if item:find("wool$") or item:find("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
-                       inv:set_stack("craft_output_recipe", k, def)    
                end
-
-               formspec = formspec.."image[4,6.3;1,1;gui_furnace_arrow_bg.png^[transformR90]"..
-                               "button[1.2,6.35;1.5,1;trash;Clear]"..
-                               "label["..(12/string.len(stackname))..",7.5;"..stackname:sub(1,30).."]"
        end
-
-       meta:set_int("start_i", tostring(start_i))
-       meta:set_string("formspec", formspec)
+       return item
 end
 
-function worktable.craftguide_update(pos, filter)
-       local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       local inv_items_list = {}
+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)
 
-       for name, def in pairs(minetest.registered_items) do
-               if not (def.groups.not_in_creative_inventory == 1) and def.name ~= "unknown"
-                               and def.description and def.description ~= "" then
+       if pagenum > pagemax then
+               pagenum = 1
+       elseif pagenum == 0 then
+               pagenum = pagemax
+       end
 
-                       if filter and def.name:find(filter) then
-                               inv_items_list[#inv_items_list+1] = name
-                       elseif filter == "all" then
-                               inv_items_list[#inv_items_list+1] = name
-                       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[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)..
+                       ",#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
+               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
-       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("inventory_size", #inv_items_list)
-end
+       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
 
-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;craft_output_recipe;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]"
+               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]"
+               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
+
+               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
+
+               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.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 function tab_category(tab_id)
+       local id_category = {
+               minetest.registered_items,
+               minetest.registered_nodes,
+               minetest.registered_tools,
+               minetest.registered_craftitems
+       }
 
-       meta:set_string("formspec", formspec)
+       return id_category[tab_id] or id_category[1]
 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]"
-       meta:set_string("formspec", formspec)
-       return formspec
+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
+                       items_list[#items_list+1] = name
+               end
+       end
+
+       meta:set_int("inv_size", #items_list)
+       table.sort(items_list)
+       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))
+       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("trash", 1)
+       inv:set_size("input", 1)
        inv:set_size("hammer", 1)
+       inv:set_size("forms", 4*3)
        inv:set_size("storage", 8*2)
-       inv:set_size("item_craft_input", 1)
-
-       meta:set_int("start_i", 0)
        meta:set_string("infotext", "Work Table")
-       worktable.main(pos)
-       worktable.craftguide_update(pos, "all")
+
+       worktable.formspecs.main(meta)
 end
 
-function worktable.fields(pos, _, fields, sender)
+function worktable.fields(pos, _, fields)
+       if fields.quit then return end
        local meta = minetest.get_meta(pos)
-       local inv = meta:get_inventory()
-       local start_i = meta:get_int("start_i")
-       local inventory_size = meta:get_int("inventory_size")
-       start_i = tonumber(start_i) or 0
-
-       if fields.storage then
-               worktable.storage(pos)
-       elseif fields.craft then
-               worktable.crafting(pos)
-       elseif fields.back then
-               worktable.main(pos)
-       elseif fields.backcraft then
-               worktable.crafting(pos)
-       elseif fields.craft_output_recipe then
-               worktable.craft_output_recipe(pos, 0, 1)
-       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)
-               elseif fields.search then
-                       worktable.craftguide_update(pos, fields.filter)
-                       worktable.craft_output_recipe(pos, 0, 1, nil)
-               elseif fields.clearfilter then
-                       worktable.craftguide_update(pos, "all")
-                       worktable.craft_output_recipe(pos, 0, 1, nil)
-               elseif fields.prev or fields.next then
-                       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 < 0 or start_i >= inventory_size then
-                               start_i = 0
+       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)
+       elseif fields.storage then
+               worktable.formspecs.storage(meta)
+       elseif fields.craftguide or fields.clearfilter then
+               worktable.craftguide_main_list(meta, nil, tab_id)
+               worktable.craftguide_formspec(meta, 1, nil, 1, "", tab_id)
+       elseif fields.alternate then
+               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(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
+                       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
-
-                       worktable.craft_output_recipe(pos, start_i, start_i / (8*4) + 1, nil)
                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")
 end
 
-function worktable.contains(table, element)
-       if table then
-               for _, value in pairs(table) do
-                       if value == element then return true end
-               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
        end
        return false
 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) then return count
-       elseif listname == "hammer" and
-               stn == "xdecor:hammer" then return 1
-       elseif listname == "tool" and tdef and twear > 0 then
-               return 1
-       elseif listname == "storage" then
-               return count
+local function trash_delete(pos)
+       local inv = minetest.get_meta(pos):get_inventory()
+       minetest.after(0, function()
+               inv:set_stack("trash", 1, "")
+       end)
+end
+
+function worktable.put(pos, 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
+                       (listname == "hammer" and stackname == "xdecor:hammer") or
+                       listname == "storage" or listname == "trash" then
+               if listname == "trash" then trash_delete(pos) end
+               return stack:get_count()
        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("([%w_]+):([%w_]+)")
-
+function worktable.take(_, listname, _, stack, player)
        if listname == "forms" then
-               if worktable.contains(nodes[mod], node) and
-                       user_inv:room_for_item("main", stack:get_name()) then
+               local inv = player:get_inventory()
+               if 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(pos, from_list, from_index, to_list, to_index, count, _)
-       local inv = minetest.get_meta(pos):get_inventory()
-       local stackname = inv:get_stack(from_list, from_index):get_name()
-       local meta = minetest.get_meta(pos)
-       local start_i = meta:get_int("start_i")
-
-       if from_list == "storage" and to_list == "storage" then
+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
-       if minetest.get_craft_recipe(stackname).items and inv:is_empty("item_craft_input") and
-               from_list == "inv_items_list" and to_list == "item_craft_input" then
-               --print(dump(minetest.get_craft_recipe(stackname)))
-               worktable.craft_output_recipe(pos, start_i, start_i / (8*4) + 1, stackname)
-
-               minetest.after(0, function()
-                       inv:set_stack(from_list, from_index, stackname)
-               end)
-
-               return 1
        end
        return 0
 end
 
-local function update_inventory(inv, inputstack)
-       if inv:is_empty("input") then inv:set_list("forms", {}) return end
-       local output = {}
+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 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())
-
-               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] = 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()
-               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
-               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)
-               update_inventory(inv, inputstack)
+               worktable.get_output(inv, inputstack)
        end
 end
 
@@ -397,8 +377,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
@@ -406,21 +386,30 @@ 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])
 end
 end
 end
@@ -428,17 +417,18 @@ 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 return end
+               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(300)
+               hammer:add_wear(700)
 
                inv:set_stack("tool", 1, tool)
                inv:set_stack("hammer", 1, hammer)