X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=worktable.lua;h=1c9dc8f4efc4cfdb5c9047d3dc5541875fc5f45f;hb=ad8e84f24979926a3af46838df80eee43edce5a4;hp=c67b5d74e2ad5377b595886f115870598d3b6c53;hpb=f2d17916a29de47b3962f08891d7656d0c05c907;p=xdecor.git

diff --git a/worktable.lua b/worktable.lua
index c67b5d7..1c9dc8f 100644
--- a/worktable.lua
+++ b/worktable.lua
@@ -1,47 +1,70 @@
 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",
-		"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 = { -- 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}}}
+-- 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.description:find("Ore") and not def.name:find("wool") 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  }}
 }
 
-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)
+-- Tools allowed to be repaired.
+worktable.repairable_tools = [[
+	pick, axe, shovel, sword, hoe, armor, shield
+]]
+
+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
+		end
+	end
+	return item
+end
+
+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)
 
-	local formspec = [[ size[8,8;]
-			list[context;item_craft_input;3,6.3;1,1;]
+	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;<]
@@ -50,161 +73,115 @@ function worktable.craft_output_recipe(pos, start_i, pagenum, stackname, recipe_
 			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))..
+			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
 
-	if stackname then
-		local items_num = #minetest.get_all_craft_recipes(stackname)
-		if recipe_num > items_num then
-			recipe_num = 1
+	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
 
-		--print(dump(minetest.get_all_craft_recipes(stackname)))
-		local stack_width = minetest.get_all_craft_recipes(stackname)[recipe_num].width
-		local stack_items = minetest.get_all_craft_recipes(stackname)[recipe_num].items
-		local stack_type = minetest.get_all_craft_recipes(stackname)[recipe_num].type
-		local stack_output = minetest.get_all_craft_recipes(stackname)[recipe_num].output
-		local stack_count = stack_output:match("%s(%d+)")
+	if 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
 
-		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.."]"
+		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
-
-		if stack_count then
-			inv:set_stack("item_craft_input", 1, stackname.." "..stack_count)
-		else
-			inv:set_stack("item_craft_input", 1, stackname)
+		
+		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
 
-		if stack_width == 0 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;3,3;]"
-				inv:set_size("craft_output_recipe", 3*3)
-			end
-		elseif 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", #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 > 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] ]]
+		local items = minetest.get_all_craft_recipes(item)[recipe_num].items
+		local width = minetest.get_all_craft_recipes(item)[recipe_num].width
+		local yield = minetest.get_all_craft_recipes(item)[recipe_num].output:match("%s(%d+)") or ""
+		if width == 0 then width = math.min(3, #items) end
+		local rows = math.ceil(table.maxn(items) / width)
 
-			inv:set_size("craft_output_recipe", 1)
+		local function is_group(item)
+			if item:find("^group:") then return "G" end
+			return ""
 		end
 
-		local craft = {}
-		for k, def in pairs(stack_items) do
-			craft[#craft+1] = def
-			if def and def:find("^group:") then
-				if def:find("wool$") then
-					def = "wool:white"
-				elseif def:find("dye$") then
-					def = "dye:white"
-				else
-					if minetest.registered_items["default:"..def:match("^group:([%w_]+)$")] then
-						def = def:gsub("group", "default")
-					else
-						for node, definition in pairs(minetest.registered_items) do
-						for group in pairs(definition.groups) do
-							if def:match("^group:"..group.."$") or
-									((def:find("dye") or def:find("flower")) and
-									group == def:match("^group:.*,("..group..")")) then
-								def = node
-							end
-						end
-						end
-					end
-				end
-			end
-
-			inv:set_stack("craft_output_recipe", k, def)
+		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..[[ 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.."item_image_button[2.5,5;1,1;"..item..";"..item..";"..yield.."]"..
+				     "image[3.5,5;1,1;gui_furnace_arrow_bg.png^[transformR90]"
 	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 = {}
+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
 
-	for name, def in pairs(minetest.registered_items) do
+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
-			inv_items_list[#inv_items_list+1] = name
+			items_list[#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)
+	meta:set_int("inv_size", #items_list)
+	table.sort(items_list)
+	return items_list
 end
 
-function worktable.crafting(pos)
-	local meta = minetest.get_meta(pos)
-	local formspec = [[ size[8,7;]
-			list[current_player;main;0,3.3;8,4;]
+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,1;1.5,1;craftguide;Guide]
+			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)
-
-	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.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)
-
-	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))
+	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]
@@ -220,196 +197,142 @@ function worktable.main(pos)
 			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
+			..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)
-	inv:set_size("item_craft_input", 1)
 	meta:set_string("infotext", "Work Table")
 
-	worktable.main(pos)
-	worktable.craftguide_update(pos, nil)
+	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 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
-		worktable.storage(pos)
-	elseif fields.back then
-		worktable.main(pos)
-	elseif fields.backcraft or fields.craft then
-		if fields.backcraft then
-			inv:set_list("item_craft_input", {})
-			inv:set_list("craft_output_recipe", {})
-		end
-		worktable.crafting(pos)
-	elseif fields.craftguide then
-		if not meta:to_table().inventory.inv_items_list then return end -- legacy code
-		worktable.craft_output_recipe(pos, 0, 1, nil, 1, "")
+	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
-		inv:set_list("craft_output_recipe", {})
-		local inputstack = inv:get_stack("item_craft_input", 1):get_name()
+		local item = formspec:match("item_image_button%[.*;([%w_:]+);.*%]") or ""
 		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", {})
+		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 minetest.get_craft_recipe(item).items then
+			worktable.craftguide_formspec(meta, pagenum, item, 1, filter, tab_id)
+		 end
+	     end
 	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
-	end
-	return false
+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(_, 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
+function worktable.put(pos, listname, _, stack)
+	local stackname = stack:get_name()
+	if listname == "tool" and stack:get_wear() > 0 and
+			worktable.repairable_tools:find(stackname:match(":(%w+)")) then
+		return stack:get_count()
+	end
+	if (listname == "input" and worktable.nodes(minetest.registered_nodes[stackname])) 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()
-	elseif (listname == "hammer" and stn == "xdecor:hammer") or
-			(listname == "tool" and tdef and twear > 0) then
-		return 1
 	end
-
 	return 0
 end
 
-function worktable.take(pos, listname, _, stack, player)
+function worktable.take(_, 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
+		local free_space = player:get_inventory():room_for_item("main", stack:get_name())
+		if free_space then return -1 end
 		return 0
 	end
-
 	return stack:get_count()
 end
 
-function worktable.move(pos, from_list, from_index, to_list, to_index, count, _)
-	local meta = minetest.get_meta(pos)
-	local inv = meta:get_inventory()
-
-	if from_list == "storage" and to_list == "storage" then
+function worktable.move(pos, _, _, to_list, _, count)
+	if to_list == "storage" or to_list == "trash" then
+		if to_list == "trash" then trash_delete(pos) 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)
-
-		minetest.after(0, function()
-			inv:set_stack(from_list, from_index, stackname)
-		end)
 	end
-
 	return 0
 end
 
-local function update_inventory(inv, inputstack)
+function worktable.get_output(inv, input, name)
 	if inv:is_empty("input") then
-		inv:set_list("forms", {})
-		return
-	end
+		inv:set_list("forms", {}) return end
 
 	local output = {}
-	local input = inv:get_stack("input", 1)
-
-	for _, n in pairs(def) do
+	for _, n in pairs(worktable.defs) do
 		local count = math.min(n[2] * input:get_count(), input:get_stack_max())
-		output[#output+1] = inputstack:get_name().."_"..n[1].." "..count
+		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.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)
+		local input = inv:get_stack("input", 1)
+		worktable.get_output(inv, input, stack:get_name())
 	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 input = inv:get_stack("input", 1)
+
 	if listname == "input" then
-		if stack:get_name() == inv:get_stack("input", 1):get_name() then
-			update_inventory(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
-		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)
+		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
 
@@ -433,59 +356,99 @@ xdecor.register("worktable", {
 	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 node in pairs(minetest.registered_nodes) do
+for _, d in pairs(worktable.defs) do
+	local def = minetest.registered_nodes[node]
+	if worktable.nodes(def) and d[3] then
+		local groups, tiles = {}, {def.tiles[1]}
 		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
-		else
-			tiles = {ndef.tiles[1]}
+		if #def.tiles > 1 and not def.drawtype:find("glass") then
+			tiles = def.tiles
 		end
 
-		if ndef.light_source > 3 then
-			light = ndef.light_source - 1
-		end
+		stairs.register_stair_and_slab(node:match(":(.*)"), node, groups, tiles,
+			def.description.." Stair", def.description.." Slab", def.sounds)
 
-		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]},
+			node_box = xdecor.pixelnodebox(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 T = {
+					{"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",      "outerstair", 12},
+					{"halfstair",  nil,	     11},
+					{"halfstair",  "outerstair", nil}
+				}
+
+				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(T) 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
-	minetest.register_alias("xdecor:"..d[1].."_"..name, mod..":"..name.."_"..d[1]) -- legacy code
-end
+	if node:find("meselamp") then
+		if d[3] then
+			minetest.register_alias("default:meselamp_"..d[1], "default:glass_"..d[1])
+		else minetest.register_alias("stairs:"..d[1].."_meselamp", "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
 
 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()
+		local tool, hammer = inv:get_stack("tool", 1), inv:get_stack("hammer", 1)
 
-		if tool:is_empty() or hammer:is_empty() or wear == 0 then
+		if tool:is_empty() or hammer:is_empty() or tool:get_wear() == 0 then
 			return
 		end