Added craft recipes for all new items and the granite sheets generation

craft_ingredients/init.lua

@@ -20,6 +20,11 @@ local craft_sounds_durabilities = {
 multidecor.players_actions_sounds = {}
 
 local woods = {"", "jungle", "aspen", "pine"}
+
+if minetest.get_modpath("ethereal") then
+	table.insert(woods, "redwood")
+end
+
 local items_and_crafts = {
 	["board"] = {
 		{
@@ -78,12 +83,21 @@ for _, wood in ipairs(woods) do
 			inventory_image = "multidecor_" .. (wood == "jungle" and wood .. "_" or wood) .. item .. ".png"
 		})
 
-		for _, recipe in ipairs(recipes) do
+		for i, recipe in ipairs(recipes) do
+			local recipe_c = table.copy(recipe)
+
+			if wood == "redwood_" and item == "board" then
+				if i == 1 then
+					recipe_c.recipe[1] = "ethereal:%swood"
+				end
+			end
+			recipe_c.recipe = format_nested_strings(recipe_c.recipe, wood)
+
 			local def = {
-				type = recipe.type,
-				output = "multidecor:" .. wood .. item .. " " .. recipe.amount,
-				recipe = format_nested_strings(recipe.recipe, wood),
-				replacements = recipe.type == "shapeless" and {{"multidecor:saw", "multidecor:saw"}} or nil
+				type = recipe_c.type,
+				output = "multidecor:" .. wood .. item .. " " .. recipe_c.amount,
+				recipe = recipe_c.recipe,
+				replacements = recipe_c.type == "shapeless" and {{"multidecor:saw", "multidecor:saw"}} or nil
 			}
 			minetest.register_craft(def)
 		end
@@ -100,6 +114,16 @@ bucket.register_liquid(
 	true
 )
 
+minetest.register_node(":multidecor:marble_block", {
+	description = "Marble Block",
+	paramtype = "light",
+	paramtype2 = "none",
+	sunlight_propagates = true,
+	tiles = {"multidecor_marble_material.png^[sheet:2x2:0,0"},
+	groups = {cracky=2.5},
+	sounds = default.node_sound_stone_defaults()
+})
+
 
 minetest.register_craftitem(":multidecor:cabinet_door",
 {
@@ -143,6 +167,12 @@ minetest.register_craftitem(":multidecor:steel_sheet",
 	inventory_image = "multidecor_steel_sheet.png"
 })
 
+minetest.register_craftitem(":multidecor:coarse_steel_sheet",
+{
+	description = "Coarse Steel Sheet",
+	inventory_image = "multidecor_coarse_steel_sheet.png"
+})
+
 minetest.register_craftitem(":multidecor:steel_scissors",
 {
 	description = "Steel Scissors",
@@ -173,6 +203,12 @@ minetest.register_craftitem(":multidecor:plastic_sheet",
 	inventory_image = "multidecor_plastic_sheet.png"
 })
 
+minetest.register_craftitem(":multidecor:plastic_strip",
+{
+	description = "Plastic Strip",
+	inventory_image = "multidecor_plastic_strip.png"
+})
+
 minetest.register_craftitem(":multidecor:metal_wire",
 {
 	description = "Metal Wire",
@@ -322,6 +358,13 @@ minetest.register_craft(
 	replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 })
 
+minetest.register_craft(
+{
+	type = "shapeless",
+	output = "multidecor:coarse_steel_sheet",
+	recipe = {"multidecor:steel_sheet"}
+})
+
 minetest.register_craft(
 {
 	type = "shapeless",
@@ -380,6 +423,12 @@ minetest.register_craft({
 	cooktime = 10
 })
 
+minetest.register_craft({
+    type = "shapeless",
+    output = "multidecor:plastic_strip 2",
+    recipe = {"multidecor:plastic_sheet"}
+})
+
 minetest.register_craft({
 	type = "shapeless",
 	output = "multidecor:terracotta_fragment 4",
@@ -533,12 +582,16 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
+	output = "multidecor:marble_block",
+	recipe = {"default:clay", "default:silver_sandstone", "default:coal_lump"}
+})
+
+minetest.register_craft({
+	type = "shapeless",
 	output = "multidecor:marble_sheet 5",
-	recipe = {
-		{"default:sandstone", "default:silver_sandstone", "default:coal_lump"},
-		{"", "", ""},
-		{"", "", ""}
-	}
+	recipe = {"multidecor:marble_block", "multidecor:hammer"},
+	replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 })
 
 minetest.register_craft({

craft_ingredients/mod.conf

@@ -1,5 +1,5 @@
 name = craft_ingredients
 description = Set of items necessary for crafting the furniture
 depends = bucket, default, doors
-optional_depends = moreores
+optional_depends = moreores, ethereal
 author = Andrey01

craft_ingredients/ores.lua

@@ -152,6 +152,36 @@ minetest.register_craft({
 	cooktime = 5
 })
 
+minetest.register_node(":multidecor:granite_block", {
+	description = "Granite Block",
+	paramtype = "light",
+	paramtype2 = "none",
+	sunlight_propagates = true,
+	tiles = {"multidecor_granite_material.png^[sheet:2x2:0,0"},
+	groups = {cracky=3},
+	sounds = default.node_sound_stone_defaults()
+})
+
+minetest.register_ore({
+    ore_type = "sheet",
+    ore = "multidecor:granite_block",
+    wherein = "default:stone",
+    column_height_min = 5,
+    column_height_max = 15,
+    column_midpoint_factor = 0,
+    y_min = -500,
+    y_max = 0
+})
+
+minetest.register_ore({
+    ore_type = "stratum",
+    ore = "multidecor:granite_block",
+    wherein = "default:desert_stone",
+    np_stratum_thickness = 8,
+    y_min = -500,
+    y_max = 0
+})
+
 
 minetest.register_node(":multidecor:consolidated_oil", {
     description = "Consolidated Oil (use furnace to melt)",

modern/bathroom.lua

@@ -79,11 +79,13 @@ for _, tile in ipairs(ceramic_tiles) do
 
 	local recipe = {"default:clay_lump", "default:clay_lump"}
 	table.copy_to(tile[2], recipe)
+	table.insert(recipe, "multidecor:paint_brush")
 
 	minetest.register_craft({
 		type = "shapeless",
 		output = tile_name,
-		recipe = recipe
+		recipe = recipe,
+		replacements = {{"multidecor:paint_brush", "multidecor:paint_brush"}}
 	})
 
 	local block_name = "multidecor:bathroom_ceramic_" .. tile[1] .. "_tiles_block"
@@ -120,11 +122,13 @@ for _, style in ipairs(bathroom_styles) do
 
 	local panel_craft = {"multidecor:pine_board"}
 	table.copy_to(craft, panel_craft)
+	table.insert(panel_craft, "multidecor:paint_brush")
 
 	minetest.register_craft({
 		type = "shapeless",
 		output = panel_name,
-		recipe = panel_craft
+		recipe = panel_craft,
+		replacements = {{"multidecor:paint_brush", "multidecor:paint_brush"}}
 	})
 
 	local bathtub_with_shields_def = table.copy(bathtub_def)
@@ -688,17 +692,6 @@ multidecor.register.register_furniture_unit("shower_head", {
 	}
 })
 
-local crooked_shower_head_recipe
-if minetest.get_modpath("technic_worldgen") then
-	crooked_shower_head_recipe = {
-		recipe = {
-			{"technic:cast_iron_ingot", "technic:cast_iron_ingot", "multidecor:plastic_sheet"},
-			{"technic:cast_iron_ingot", "", ""},
-			{"", "", ""}
-		}
-	}
-end
-
 multidecor.register.register_furniture_unit("crooked_shower_head", {
 	type = "decoration",
 	style = "modern",
@@ -729,7 +722,13 @@ multidecor.register.register_furniture_unit("crooked_shower_head", {
 		}
 	}
 },
-crooked_shower_head_recipe)
+{
+	recipe = {
+		{"multidecor:coarse_steel_sheet", "multidecor:coarse_steel_sheet", "multidecor:plastic_sheet"},
+		{"multidecor:coarse_steel_sheet", "", ""},
+		{"", "", ""}
+	}
+})
 
 multidecor.register.register_furniture_unit("bathroom_mirror", {
 	type = "decoration",

modern/covering.lua

@@ -5,6 +5,13 @@ local wallpapers = {
 	"white_patterned",
 }
 
+local wallpapers_crafts = {
+	{"dye:white"},
+	{"dye:cyan", "dye:blue"},
+	{"dye:yellow", "dye:white"},
+	{"dye:white", "dye:grey"}
+}
+
 local cover_sbox = {-0.5, -0.5, -0.05, 0.5, 0.5, 0.05}
 
 minetest.register_entity(":multidecor:cover", {
@@ -79,7 +86,7 @@ local function on_place_cover(pointed_thing, cover_stack, cover_name)
 	return cover_stack
 end
 
-for _, wallpaper_sort in ipairs(wallpapers) do
+for i, wallpaper_sort in ipairs(wallpapers) do
 	local itemname = wallpaper_sort .. "_wallpaper"
 	minetest.register_craftitem(":multidecor:" .. itemname, {
 		description = hlpfuncs.upper_first_letters(itemname),
@@ -88,6 +95,17 @@ for _, wallpaper_sort in ipairs(wallpapers) do
 			return on_place_cover(pointed_thing, itemstack, itemname)
 		end
 	})
+
+	local recipe = table.copy(wallpapers_crafts[i])
+	table.insert(recipe, "default:paper")
+	table.insert(recipe, "multidecor:paint_brush")
+
+	minetest.register_craft({
+		type = "shapeless",
+		output = "multidecor:" .. itemname,
+		recipe = recipe,
+		replacements = {{"multidecor:paint_brush", "multidecor:paint_brush"}}
+	})
 end
 
 minetest.register_tool(":multidecor:scraper", {
@@ -95,11 +113,24 @@ minetest.register_tool(":multidecor:scraper", {
 	inventory_image = "multidecor_scraper.png"
 })
 
+minetest.register_craft({
+	type = "shapeless",
+	output = "multidecor:scraper",
+	recipe = {"multidecor:steel_sheet", "multidecor:coarse_steel_sheet"}
+})
+
 minetest.register_craftitem(":multidecor:plaster_lump", {
 	description = "Plaster Lump",
 	inventory_image = "multidecor_plaster_lump.png"
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "multidecor:plaster_lump",
+	recipe = "default:clay",
+	cooktime = 8
+})
+
 
 minetest.register_tool(":multidecor:paint_brush", {
 	description = "Paint Brush (for painting armchairs, curtains, beds, chairs and etc)",
@@ -152,6 +183,16 @@ minetest.register_tool(":multidecor:paint_brush", {
 	end
 })
 
+minetest.register_craft({
+	output = "multidecor:paint_brush",
+	recipe = {
+		{"default:stick", "multidecor:wool_cloth", "multidecor:steel_scissors"},
+		{"", "", ""},
+		{"", "", ""}
+	},
+	replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
+})
+
 minetest.register_tool(":multidecor:spatula", {
 	description = "Spatula (for spreading plaster on surfaces)",
 	inventory_image = "multidecor_spatula.png",
@@ -169,3 +210,9 @@ minetest.register_tool(":multidecor:spatula", {
 		inv:set_stack("main", spatula_index+1, next_itemstack)
 	end
 })
+
+minetest.register_craft({
+	type = "shapeless",
+	output = "multidecor:spatula",
+	recipe = {"multidecor:steel_sheet", "multidecor:steel_sheet", "multidecor:coarse_steel_sheet"}
+})

modern/doors.lua

@@ -62,8 +62,8 @@ multidecor.register.register_door("dark_rusty_gate", {
 
 local woods = {
 	{name="wooden", texture="multidecor_wood"},
-	{name="pine", texture="multidecor_pine_wood"},
-	{name="dark_pine", texture="multidecor_pine_wood2"},
+	{name="pine", texture="multidecor_pine_wood2"},
+	{name="aspen", texture="multidecor_pine_wood"},
 	{name="white_pine", texture="multidecor_white_pine_wood"}
 }
 
@@ -75,19 +75,39 @@ local doors_hands_texs = {
 	"multidecor_gold_material"
 }
 
+local doors_hands_metals = {
+	"default:steel_ingot",
+	"default:copper_ingot",
+	"multidecor:brass_ingot",
+	"default:gold_ingot",
+	"default:gold_ingot"
+}
+
 if minetest.get_modpath("ethereal") then
-	table.insert(woods, {name="sequoia", texture="ethereal_redwood_wood"})
+	table.insert(woods, {name="redwood", texture="ethereal_redwood_wood"})
 end
 
 for i, wood in ipairs(woods) do
 	local upper_name = multidecor.helpers.upper_first_letters(wood.name)
 
+	local material_name = ""
+
+	local white_dye = ""
+	if wood.name == "white_pine" then
+		material_name = "pine_"
+		white_dye = "dye:white"
+	elseif wood.name ~= "wooden" then
+		material_name = wood.name .. "_"
+	end
+
+
 	local base_texture = wood.texture .. ".png"
 
-	if wood.name == "sequoia" then
+	if wood.name == "redwood" then
 		base_texture = base_texture .. "^[transform1"
 	end
 
+	local board = "multidecor:" .. material_name .. "board"
 	multidecor.register.register_door("simple_" .. wood.name .. "_door", {
 		style = "modern",
 		material = "wood",
@@ -111,8 +131,17 @@ for i, wood in ipairs(woods) do
 				close = "multidecor_wooden_door_close"
 			}
 		}
+	},
+	{
+		recipe = {
+			{board, board, "multidecor:saw"},
+			{doors_hands_metals[i], white_dye, ""},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:saw", "multidecor:saw"}}
 	})
 
+	local plinth = "multidecor:" .. wood.name .. "_plinth"
 	multidecor.register.register_furniture_unit(wood.name .. "_doorjamb", {
 		type = "decoration",
 		style = "modern",
@@ -125,8 +154,17 @@ for i, wood in ipairs(woods) do
 			{0.725, -0.5, 0.4, 0.5, 1.725, 0.5},-- right
 			{-0.5, 1.5, 0.4, 0.5, 1.725, 0.5}
 		}
+	},
+	{
+		recipe = {
+			{plinth, plinth, plinth},
+			{plinth, plinth, "multidecor:hammer"},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
+	local plank = "multidecor:" .. material_name .. "plank"
 	multidecor.register.register_furniture_unit(wood.name .. "_plinth", {
 		type = "decoration",
 		style = "modern",
@@ -135,6 +173,12 @@ for i, wood in ipairs(woods) do
 		mesh = "multidecor_wooden_plinth.b3d",
 		tiles = {base_texture},
 		bounding_boxes = {{-0.5, -0.5, 0.4, 0.5, -0.2, 0.5}}
+	},
+	{
+		type = "shapeless",
+		recipe = {plank, "multidecor:saw", white_dye},
+		count = 2,
+		replacements = {{"multidecor:saw", "multidecor:saw"}}
 	})
 
 	multidecor.register.register_furniture_unit(wood.name .. "_corner_plinth", {
@@ -148,6 +192,11 @@ for i, wood in ipairs(woods) do
 			{-0.5, -0.5, 0.4, 0.5, -0.2, 0.5},
 			{0.4, -0.5, -0.5, 0.5, -0.2, 0.4}
 		}
+	},
+	{
+		type = "shapeless",
+		recipe = {plinth, plinth, "multidecor:hammer"},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	multidecor.register.register_furniture_unit(wood.name .. "_window_segment", {
@@ -162,6 +211,14 @@ for i, wood in ipairs(woods) do
 		},
 		use_texture_alpha = "blend",
 		bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.38}}
+	},
+	{
+		recipe = {
+			{plank, plank, "multidecor:hammer"},
+			{"xpanes:pane_flat", white_dye, ""},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	-- TODO 'vertical' connection type is not workable currently, needs in a repair in next releases
@@ -208,6 +265,15 @@ for i, wood in ipairs(woods) do
 		},
 		use_texture_alpha = "blend",
 		bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.38}}
+	},
+	{
+		recipe = {
+			{plank, plank, "multidecor:hammer"},
+			{"xpanes:pane_flat", plank, plank},
+			{white_dye, "", ""}
+		},
+		count = 2,
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	multidecor.register.register_furniture_unit(wood.name .. "_window_segment_with_thin_slats", {
@@ -222,8 +288,17 @@ for i, wood in ipairs(woods) do
 		},
 		use_texture_alpha = "blend",
 		bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.38}}
+	},
+	{
+		recipe = {
+			{plank, plank, "multidecor:hammer"},
+			{"xpanes:pane_flat", plank, white_dye},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
+	local window = "multidecor:" .. wood.name .. "_window_segment"
 	multidecor.register.register_door(wood.name .. "_window_door", {
 		style = "modern",
 		material = "wood",
@@ -246,8 +321,14 @@ for i, wood in ipairs(woods) do
 				close = "multidecor_wooden_door_close"
 			}
 		}
+	},
+	{
+		type = "shapeless",
+		recipe = {window, window, plank, "multidecor:hammer", white_dye},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
+	local window_with_thin_slats = "multidecor:" .. wood.name .. "_window_segment_with_thin_slats"
 	multidecor.register.register_door(wood.name .. "_window_door_with_thin_slats", {
 		style = "modern",
 		material = "wood",
@@ -270,6 +351,11 @@ for i, wood in ipairs(woods) do
 				close = "multidecor_wooden_door_close"
 			}
 		}
+	},
+	{
+		type = "shapeless",
+		recipe = {window_with_thin_slats, window_with_thin_slats, plank, "multidecor:hammer", white_dye},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 end
 
@@ -365,12 +451,20 @@ multidecor.register.register_door("white_pine_glass_door", {
 			close = "multidecor_wooden_door_close"
 		}
 	}
+},
+{
+	recipe = {
+		{"multidecor:pine_plank", "multidecor:pine_plank", "multidecor:pine_plank"},
+		{"multidecor:pine_plank", "dye:white", "multidecor:hammer"},
+		{"xpanes:pane_flat", "xpanes:pane_flat", ""}
+	},
+	replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 })
 
-multidecor.register.register_door("patterned_pine_glass_door", {
+multidecor.register.register_door("patterned_aspen_glass_door", {
 	style = "modern",
 	material = "wood",
-	description = "Patterned Pine Glass Door",
+	description = "Patterned Aspen Glass Door",
 	mesh = "multidecor_pine_glass_door.b3d",
 	tiles = {
 		"multidecor_pine_glass_door_base2.png^multidecor_door_hinges.png",
@@ -381,7 +475,7 @@ multidecor.register.register_door("patterned_pine_glass_door", {
 	bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 1.5, -0.4}}
 },
 {
-	common_name = "pine_glass_door",
+	common_name = "patterned_aspen_glass_door",
 	door = {
 		has_mirrored_counterpart = true,
 		mesh_open = "multidecor_pine_glass_door_open.b3d",
@@ -395,18 +489,18 @@ multidecor.register.register_door("patterned_pine_glass_door", {
 },
 {
 	recipe = {
-		{"multidecor:pine_board", "xpanes:pane_flat", "multidecor:pine_plank"},
-		{"multidecor:pine_board", "xpanes:pane_flat", "multidecor:pine_plank"},
-		{"multidecor:steel_sheet", "multidecor:steel_scissors", ""}
+		{"multidecor:aspen_board", "xpanes:pane_flat", "multidecor:aspen_plank"},
+		{"multidecor:aspen_board", "xpanes:pane_flat", "multidecor:aspen_plank"},
+		{"multidecor:steel_sheet", "multidecor:hammer", ""}
 	},
-	replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
+	replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 })
 
-multidecor.register.register_door("patterned_pine_door", {
+multidecor.register.register_door("patterned_aspen_door", {
 	style = "modern",
 	material = "wood",
 	visual_scale = 0.5,
-	description = "Patterned Pine Door",
+	description = "Patterned Aspen Door",
 	mesh = "multidecor_pine_door.b3d",
 	tiles = {
 		"multidecor_pine_door.png^multidecor_door_hinges.png",
@@ -415,7 +509,7 @@ multidecor.register.register_door("patterned_pine_door", {
 	bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 1.5, -0.4}}
 },
 {
-	common_name = "pine_door",
+	common_name = "patterned_aspen_door",
 	door = {
 		has_mirrored_counterpart = true,
 		mesh_open = "multidecor_pine_door_open.b3d",
@@ -426,13 +520,21 @@ multidecor.register.register_door("patterned_pine_door", {
 			close = "multidecor_wooden_door_close"
 		}
 	}
+},
+{
+	recipe = {
+		{"multidecor:aspen_board", "multidecor:aspen_plank", "multidecor:aspen_plank"},
+		{"multidecor:aspen_board", "multidecor:steel_sheet", "multidecor:hammer"},
+		{"", "", ""}
+	},
+	replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 })
 
-multidecor.register.register_door("dark_pine_glass_door", {
+multidecor.register.register_door("pine_glass_door", {
 	style = "modern",
 	material = "wood",
 	visual_scale = 0.5,
-	description = "Dark Pine Glass Door",
+	description = "Pine Glass Door",
 	mesh = "multidecor_dark_pine_glass_door.b3d",
 	tiles = {
 		"multidecor_dark_pine_door_base.png",
@@ -443,7 +545,7 @@ multidecor.register.register_door("dark_pine_glass_door", {
 	bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 1.5, -0.4}}
 },
 {
-	common_name = "dark_pine_glass_door",
+	common_name = "pine_glass_door",
 	door = {
 		has_mirrored_counterpart = true,
 		mesh_open = "multidecor_dark_pine_glass_door_open.b3d",
@@ -454,6 +556,14 @@ multidecor.register.register_door("dark_pine_glass_door", {
 			close = "multidecor_wooden_door_close"
 		}
 	}
+},
+{
+	recipe = {
+		{"multidecor:pine_board", "multidecor:pine_plank", "xpanes:pane_flat"},
+		{"multidecor:pine_board", "multidecor:steel_sheet", "multidecor:hammer"},
+		{"", "", ""}
+	},
+	replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 })
 
 multidecor.register.register_door("technical_locked_door", {
@@ -513,13 +623,21 @@ multidecor.register.register_door("metallic_locked_door", {
 			close = "multidecor_metallic_door_close"
 		}
 	}
+},
+{
+	recipe = {
+		{"multidecor:coarse_steel_sheet", "multidecor:coarse_steel_sheet", "multidecor:steel_scissors"},
+		{"multidecor:steel_sheet", "", ""},
+		{"", "", ""}
+	},
+	replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 })
 
 if minetest.get_modpath("ethereal") then
-	multidecor.register.register_door("sequoia_locked_door", {
+	multidecor.register.register_door("redwood_locked_door", {
 		style = "modern",
 		material = "metal",
-		description = "Sequoia Locked Door",
+		description = "Redwood Locked Door",
 		mesh = "multidecor_door_with_lock.b3d",
 		use_texture_alpha = "blend",
 		tiles = {
@@ -540,15 +658,21 @@ if minetest.get_modpath("ethereal") then
 				close = "multidecor_metallic_door_close"
 			}
 		}
+	},
+	{
+		recipe = {
+			{"multidecor:redwood_board", "multidecor:redwood_board", "multidecor:steel_scissors"},
+			{"multidecor:steel_sheet", "", ""},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 	})
 end
 
 minetest.register_alias("multidecor:wooden_door", "multidecor:patterned_wooden_door")
-minetest.register_alias("multidecor:pine_glass_door", "multidecor:patterned_pine_glass_door")
-minetest.register_alias("multidecor:pine_door", "multidecor:patterned_pine_door")
+minetest.register_alias("multidecor:pine_door", "multidecor:patterned_aspen_door")
 minetest.register_alias("multidecor:technical_door", "multidecor:technical_locked_door")
 
 minetest.register_alias("multidecor:wooden_door_open", "multidecor:patterned_wooden_door_open")
-minetest.register_alias("multidecor:pine_glass_door_open", "multidecor:patterned_pine_glass_door_open")
-minetest.register_alias("multidecor:pine_door_open", "multidecor:patterned_pine_door_open")
+minetest.register_alias("multidecor:pine_door_open", "multidecor:patterned_aspen_door_open")
 minetest.register_alias("multidecor:technical_door_open", "multidecor:technical_locked_door_open")

modern/kitchen.lua

@@ -730,16 +730,6 @@ multidecor.register.register_furniture_unit("saucepans_set", {
 	}
 })
 
-local cast_iron_pan_recipe
-if minetest.get_modpath("technic_worldgen") then
-	cast_iron_pan_recipe = {
-		recipe = {
-			{"technic:cast_iron_ingot", "multidecor:plank", ""},
-			{"technic:cast_iron_ingot", "", ""},
-			{"", "", ""}
-		}
-	}
-end
 
 multidecor.register.register_furniture_unit("cast_iron_pan", {
 	type = "decoration",
@@ -754,7 +744,14 @@ multidecor.register.register_furniture_unit("cast_iron_pan", {
 	bounding_boxes = {
 		{-0.25, -0.5, -0.25, 0.25, -0.35, 0.25}
 	}
-}, cast_iron_pan_recipe)
+},
+{
+	recipe = {
+		{"multidecor:coarse_steel_sheet", "multidecor:plank", ""},
+		{"multidecor:coarse_steel_sheet", "", ""},
+		{"", "", ""}
+	}
+})
 
 multidecor.register.register_furniture_unit("porcelain_saucer_with_cup", {
 	type = "decoration",
@@ -972,7 +969,7 @@ multidecor.register.register_furniture_unit("kitchen_metallic_hanger", {
 },
 {
 	recipe = {
-		{"technic:cast_iron_ingot", "multidecor:metal_bar", ""},
+		{"multidecor:coarse_steel_sheet", "multidecor:metal_bar", ""},
 		{"", "", ""},
 		{"", "", ""}
 	}
@@ -999,8 +996,8 @@ multidecor.register.register_furniture_unit("kitchen_metallic_hanger_with_ladle_
 },
 {
 	recipe = {
-		{"technic:cast_iron_ingot", "multidecor:metal_bar", "multidecor:metal_bar"},
-		{"technic:cast_iron_ingot", "multidecor:board", ""},
+		{"multidecor:coarse_steel_sheet", "multidecor:metal_bar", "multidecor:metal_bar"},
+		{"multidecor:coarse_steel_sheet", "multidecor:board", ""},
 		{"", "", ""}
 	}
 })

modern/lamps.lua

@@ -1,6 +1,7 @@
 local silvered_lamp_recipe
 local gold_chandelier_recipe
 local silver_candlestick_recipe
+local silver_chain_recipe
 
 if minetest.get_modpath("moreores") then
 	silvered_lamp_recipe = {
@@ -24,7 +25,15 @@ if minetest.get_modpath("moreores") then
 			{"multidecor:steel_sheet", "multidecor:steel_sheet", "moreores:silver_ingot"},
 			{"multidecor:wax_candle", "", ""},
 			{"", "", ""}
+		}
 	}
+
+	silver_chain_recipe = {
+		recipe = {
+			{"multidecor:metal_chain", "default:gold_ingot", ""},
+			{"", "", ""},
+			{"", "", ""}
+		}
 	}
 end
 
@@ -69,7 +78,7 @@ multidecor.register.register_furniture_unit("silver_chain_tip", {
 	add_properties = {
 		common_name = "silver_chain"
 	}
-})
+}, silver_chain_recipe)
 
 
 multidecor.register.register_light("silvered_desk_lamp_off", {
@@ -96,7 +105,6 @@ multidecor.register.register_light("copper_wall_sconce_off", {
 	material = "glass",
 	description = "Copper Wall Sconce",
 	visual_scale = 0.4,
-	paramtype2 = "wallmounted",
 	mesh = "multidecor_copper_wall_sconce.b3d",
 	tiles = {"multidecor_copper_material.png", "multidecor_bulb_surf.png"},
 	bounding_boxes = {{-0.2, 0, 0.3, 0.2, 0.4, 0.5}},

modern/living_room.lua

@@ -58,9 +58,12 @@ for louvers, part in pairs(louvers_parts) do
 	local groups = {cracky=3}
 	groups["hanger_" .. part] = 1
 
+	if louvers ~= "louvers_top" then
+		groups.not_in_creative_inventory = 1
+	end
+
 	if louvers:find("_open") then
 		groups.open = 1
-		groups.not_in_creative_inventory = 1
 	end
 
 	multidecor.register.register_furniture_unit(louvers, {
@@ -79,6 +82,14 @@ for louvers, part in pairs(louvers_parts) do
 		add_properties = {
 			common_name = "louvers"
 		}
+	},
+	{
+		recipe = {
+			{"multidecor:plastic_strip", "multidecor:plastic_strip", "multidecor:plastic_strip"},
+			{"multidecor:plastic_strip", "multidecor:plastic_strip", "multidecor:plastic_strip"},
+			{"multidecor:plastic_strip", "multidecor:plastic_strip", "multidecor:steel_scissors"}
+		},
+		replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 	})
 end
 

modern/stairs.lua

@@ -83,8 +83,15 @@ for _, stair in ipairs(stairs_data) do
 		tiles = {stair.tex},
 		groups = {stair=1},
 		bounding_boxes = stair_ledged_bboxes
+	},
+	{
+		type = "shapeless",
+		recipe = {"stairs:stair_" .. stair.name, "multidecor:hammer"},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
+	local stair_material = stair.name == "stone" and "default:stone" or
+		"multidecor:" .. stair.name .. "_block"
 	multidecor.register.register_furniture_unit("spiral_" .. stair.name .. "_stair_base", {
 		type = "decoration",
 		style = "modern",
@@ -93,6 +100,11 @@ for _, stair in ipairs(stairs_data) do
 		mesh = "multidecor_spiral_stair_base.b3d",
 		tiles = {stair.tex},
 		bounding_boxes = {{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}}
+	},
+	{
+		type = "shapeless",
+		recipe = {stair_material, "multidecor:hammer"},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	multidecor.register.register_furniture_unit("spiral_" .. stair.name .. "_stair_segment", {
@@ -104,6 +116,15 @@ for _, stair in ipairs(stairs_data) do
 		tiles = {stair.tex},
 		groups = {stair=1, spiral=1},
 		bounding_boxes = sstair_bboxes
+	},
+	{
+		type = "shapeless",
+		recipe = {
+			"stairs:stair_" .. stair.name,
+			"multidecor:spiral_" .. stair.name .. "_stair_base",
+			"multidecor:hammer"
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	multidecor.register.register_furniture_unit("spiral_" .. stair.name .. "_ledged_stair_segment", {
@@ -115,36 +136,38 @@ for _, stair in ipairs(stairs_data) do
 		tiles = {stair.tex},
 		groups = {stair=1, spiral=1},
 		bounding_boxes = sstair_bboxes
+	},
+	{
+		type = "shapeless",
+		recipe = {
+			"multidecor:" .. stair.name .. "_ledged_stair_segment",
+			"multidecor:spiral_" .. stair.name .. "_stair_base",
+			"multidecor:hammer"
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 end
 
-minetest.register_node(":multidecor:marble_block", {
-	description = "Marble Block",
-	paramtype = "light",
-	paramtype2 = "none",
-	sunlight_propagates = true,
-	tiles = {"multidecor_marble_material.png^[sheet:2x2:0,0"},
-	groups = {cracky=2.5},
-	sounds = default.node_sound_stone_defaults()
-})
-
-minetest.register_node(":multidecor:granite_block", {
-	description = "Granite Block",
-	paramtype = "light",
-	paramtype2 = "none",
-	sunlight_propagates = true,
-	tiles = {"multidecor_granite_material.png^[sheet:2x2:0,0"},
-	groups = {cracky=3},
-	sounds = default.node_sound_stone_defaults()
-})
 
 local spiral_stairs_data = {
-	{name="metal", tex={"multidecor_coarse_metal_material.png", "multidecor_coarse_metal_material.png"}},
-	{name="plastic", tex={"multidecor_plastic_material.png", "multidecor_gold_material.png"}}
+	{
+		name="metal",
+		tex={"multidecor_coarse_metal_material.png", "multidecor_coarse_metal_material.png"},
+		base_craft_material = "multidecor:coarse_steel_sheet"
+	},
+	{
+		name="plastic",
+		tex={"multidecor_plastic_material.png", "multidecor_gold_material.png"},
+		base_craft_material = "multidecor:plastic_sheet"
+	}
 }
 
 if minetest.get_modpath("ethereal") then
-	table.insert(spiral_stairs_data, {name="sequoia", tex={"ethereal_redwood_wood.png", "ethereal_redwood_wood.png"}})
+	table.insert(spiral_stairs_data, {
+		name="redwood",
+		tex={"ethereal_redwood_wood.png", "ethereal_redwood_wood.png"},
+		base_craft_material = "multidecor:redwood_board"
+	})
 end
 
 
@@ -154,39 +177,62 @@ for _, sstair in ipairs(spiral_stairs_data) do
 	multidecor.register.register_furniture_unit(sstair.name .. "_plank_stair_segment", {
 		type = "decoration",
 		style = "modern",
-		material = sstair.name == "sequoia" and "wood" or sstair.name,
+		material = sstair.name == "redwood" and "wood" or sstair.name,
 		description = upper_name .. "Plank Stair Segment",
 		mesh = "multidecor_plank_stair_segment.b3d",
 		tiles = sstair.tex,
 		groups = {stair=1},
 		bounding_boxes = stair_plank_bboxes
+	},
+	{
+		recipe = {
+			{sstair.base_craft_material, sstair.base_craft_material, sstair.base_craft_material},
+			{"", "", ""},
+			{"", "", ""}
+		}
 	})
 
 	multidecor.register.register_furniture_unit("spiral_" .. sstair.name .. "_plank_stair_segment", {
 		type = "decoration",
 		style = "modern",
-		material = sstair.name == "sequoia" and "wood" or sstair.name,
+		material = sstair.name == "redwood" and "wood" or sstair.name,
 		description = "Spiral " .. upper_name .. "Plank Stair Segment",
 		mesh = "multidecor_spiral_plank_stair_segment.b3d",
 		tiles = sstair.tex,
 		groups = {stair=1, spiral=1},
 		bounding_boxes = sstair_plank_bboxes
+	},
+	{
+		recipe = {
+			{sstair.base_craft_material, sstair.base_craft_material, sstair.base_craft_material},
+			{sstair.base_craft_material, "multidecor:hammer", ""},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	multidecor.register.register_furniture_unit("spiral_" .. sstair.name .. "_plank_stair_segment_with_banister", {
 		type = "decoration",
 		style = "modern",
-		material = sstair.name == "sequoia" and "wood" or sstair.name,
+		material = sstair.name == "redwood" and "wood" or sstair.name,
 		description = "Spiral " .. upper_name .. "Plank Stair Segment With Banister",
 		mesh = "multidecor_spiral_plank_stair_segment_with_banister.b3d",
 		tiles = sstair.tex,
 		bounding_boxes = sstair_plank_bboxes_wban
+	},
+	{
+		recipe = {
+			{sstair.base_craft_material, sstair.base_craft_material, sstair.base_craft_material},
+			{sstair.base_craft_material, "multidecor:hammer", "multidecor:" .. sstair.name .. "_banister"},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:hammer", "multidecor:hammer"}}
 	})
 
 	local banister_common_name = sstair.name .. "_banister"
 	multidecor.register.register_banister(banister_common_name, {
 		style = "modern",
-		material = sstair.name == "sequoia" and "wood" or sstair.name,
+		material = sstair.name == "redwood" and "wood" or sstair.name,
 		description = upper_name .. " Banister",
 		mesh = "multidecor_banister.b3d",
 		tiles = sstair.tex,
@@ -201,5 +247,13 @@ for _, sstair in ipairs(spiral_stairs_data) do
 			["spiral"] = {mesh="multidecor_spiral_banister.b3d", bboxes=spiral_banister_bboxes},
 			["corner"] = {mesh="multidecor_banister_corner.b3d", bboxes=corner_banister_bboxes}
 		}
+	},
+	{
+		recipe = {
+			{sstair.base_craft_material, sstair.base_craft_material, "multidecor:steel_scissors"},
+			{"", "", ""},
+			{"", "", ""}
+		},
+		replacements = {{"multidecor:steel_scissors", "multidecor:steel_scissors"}}
 	})
 end