The mod depends on moreores now. Added plastic_sheet, metal_wire, bulb and lampshade

craft_ingredients/init.lua

@@ -93,6 +93,30 @@ minetest.register_craftitem(":multidecor:steel_scissors",
 	inventory_image = "multidecor_steel_scissors.png"
 })
 
+minetest.register_craftitem(":multidecor:bulb",
+{
+	description = "Bulb",
+	inventory_image = "multidecor_bulb.png"
+})
+
+minetest.register_craftitem(":multidecor:lampshade",
+{
+	description = "Lampshade",
+	inventory_image = "multidecor_lampshade.png"
+})
+
+minetest.register_craftitem(":multidecor:plastic_sheet",
+{
+	description = "Plastic Sheet",
+	inventory_image = "multidecor_plastic_sheet.png"
+})
+
+minetest.register_craftitem(":multidecor:metal_wire",
+{
+	description = "Metal Wire",
+	inventory_image = "multidecor_metal_wire.png"
+})
+
 minetest.register_craft(
 {
 	type = "shapeless",
@@ -123,6 +147,19 @@ minetest.register_craft(
 	recipe = {"multidecor:plank", "default:steel_ingot"}
 })
 
+minetest.register_craft(
+{
+	type = "shapeless",
+	output = "multidecor:lampshade 3",
+	recipe = {"wool:white", "multidecor:metal_wire"}
+})
+
+minetest.register_craft({
+    type = "cooking",
+    output = "multidecor:plastic_sheet",
+    recipe = "default:leaves",
+	cooktime = 10
+})
 
 minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
 	local contains_saw = false

decor_api/init.lua

@@ -5,6 +5,7 @@ local modpath = minetest.get_modpath("decor_api")
 dofile(modpath .. "/connecting.lua")
 dofile(modpath .. "/register.lua")
 dofile(modpath .. "/bed.lua")
+dofile(modpath .. "/lighting.lua")
 dofile(modpath .. "/sitting.lua")
 dofile(modpath .. "/seat.lua")
 dofile(modpath .. "/shelves.lua")

decor_api/lighting.lua

@@ -0,0 +1,52 @@
+local default_on_rightclick = function(pos)
+	local node = minetest.get_node(pos)
+	local add_props = minetest.registered_nodes[node.name].add_properties
+
+	if not add_props or not add_props.swap_light then
+		return
+	end
+
+	minetest.set_node(pos, {name="multidecor:" .. add_props.swap_light.name})
+end
+
+
+function register.register_light(name, base_def, add_def, craft_def)
+	local def = table.copy(base_def)
+
+	def.type = "light"
+	def.paramtype2 = "facedir"
+
+	if add_def then
+		if add_def.recipe then
+			craft_def = add_def
+		else
+			def.add_properties = add_def
+		end
+	end
+
+	if def.callbacks then
+		def.callbacks.on_rightclick = def.callbacks.on_rightclick or default_on_rightclick
+	else
+		def.callbacks = {on_rightclick = default_on_rightclick}
+	end
+
+	register.register_furniture_unit(name, def, craft_def)
+
+	local def2 = table.copy(def)
+	local swap_light_name = def2.add_properties.swap_light.name
+	def2.light_source = def2.add_properties.swap_light.light_level or 8
+	def2.drop = "multidecor:" .. name
+
+	if def2.groups then
+		def2.groups.not_in_creative_inventory = 1
+	else
+		def2.groups = {not_in_creative_inventory = 1}
+	end
+	def2.add_properties.swap_light = {name=name}
+
+	register.register_furniture_unit(swap_light_name, def2)
+
+	minetest.debug(name .. ": " .. dump(minetest.registered_nodes["multidecor:" .. name]))
+	minetest.debug(swap_light_name .. ": " .. dump(minetest.registered_nodes["multidecor:" .. swap_light_name]))
+end
+

decor_api/mod.conf

@@ -1,4 +1,4 @@
 name = decor_api
 description = Set of API functions for various furniture stuff
-depends = default
+depends = default, moreores
 author = Andrey01

decor_api/register.lua

@@ -9,7 +9,8 @@ register.supported_types = {
 	"seat",
 	"table",
 	"shelf",
-	"bed"
+	"bed",
+	"light"
 }
 
 -- Default furniture styles
@@ -111,6 +112,8 @@ function register.register_furniture_unit(name, def, craft_def)
 	f_def.paramtype2 = def.paramtype2 or "facedir"
 	f_def.use_texture_alpha = "clip"
 	f_def.drop = def.drop
+	f_def.light_source = def.light_source
+	f_def.use_texture_alpha = def.use_texture_alpha
 
 	if f_def.drawtype == "mesh" then
 		f_def.mesh = def.mesh

modern/beds.lua

@@ -29,6 +29,13 @@ register.register_bed("jungle_bed", {
 		inv_image = "multidecor_double_jungle_bed_inv.png",
 		mesh = "multidecor_double_jungle_bed.obj"
 	}
+},
+{
+	recipe = {
+		{"multidecor:jungleboard", "wool:white", "multidecor:jungleboard"},
+		{"multidecor:jungleboard", "wool:white", "multidecor:jungleboard"},
+		{"multidecor:jungleplank", "multidecor:jungleplank", "multidecor:jungleplank"}
+	}
 })
 
 register.register_bed("wooden_bed_with_legs", {
@@ -63,4 +70,11 @@ register.register_bed("wooden_bed_with_legs", {
 		inv_image = "multidecor_double_wooden_bed_inv.png",
 		mesh = "multidecor_double_wooden_bed_with_legs.b3d"
 	}
+},
+{
+	recipe = {
+		{"multidecor:board", "wool:white", "multidecor:plank"},
+		{"multidecor:board", "wool:white", "multidecor:plank"},
+		{"multidecor:board", "multidecor:plank", ""}
+	}
 })

modern/chairs.lua

@@ -65,7 +65,7 @@ register.register_seat("soft_modern_jungle_chair", {
 	material = "wood",
 	description = "Soft Modern Jungle Chair",
 	mesh = "multidecor_soft_modern_jungle_chair.b3d",
-	tiles = {"multidecor_modern_jungle_chair.png"},
+	tiles = {"multidecor_jungle_wood.png", "multidecor_wool_material.png"},
 	bounding_boxes = {
 		{-0.35, -0.5, -0.35, 0.35, 0.25, 0.25},
 		{-0.35, -0.5, 0.25, 0.35, 1.2, 0.35}
@@ -96,7 +96,7 @@ register.register_seat("soft_round_modern_metallic_chair", {
 	material = "metal",
 	description = "Soft Round Modern Metallic Chair",
 	mesh = "multidecor_round_soft_metallic_chair.b3d",
-	tiles = {"multidecor_round_soft_metallic_chair.png"},
+	tiles = {"multidecor_wool_material.png", "multidecor_metal_material.png"},
 	bounding_boxes = {
 		{-0.5, -0.5, -0.5, 0.5, 0.25, 0.25},
 		{-0.5, -0.5, 0.25, 0.5, 0.95, 0.5}
@@ -127,7 +127,7 @@ register.register_seat("round_modern_metallic_stool", {
 	material = "metal",
 	description = "Round Modern Jungle Stool",
 	mesh = "multidecor_modern_round_metallic_stool.b3d",
-	tiles = {"multidecor_modern_round_metallic_stool.png"},
+	tiles = {"multidecor_wool_material.png", "multidecor_metal_material.png"},
 	bounding_boxes = {
 		{-0.4, -0.5, -0.4, 0.4, 0.35, 0.4}
 	}

modern/init.lua

@@ -2,5 +2,6 @@ local modpath = minetest.get_modpath("modern")
 
 dofile(modpath .. "/beds.lua")
 dofile(modpath .. "/chairs.lua")
+dofile(modpath .. "/lamps.lua")
 dofile(modpath .. "/shelves.lua")
 dofile(modpath .. "/tables.lua")

modern/lamps.lua

@@ -0,0 +1,73 @@
+local silvered_lamp_recipe
+
+if minetest.get_modpath("moreores") then
+	silvered_lamp_recipe = {
+		recipe = {
+			{"moreores:silver_ingot", "multidecor:bulb", "moreores:silver_ingot"},
+			{"moreores:silver_ingot", "multidecor:lampshade", "moreores:silver_ingot"},
+			{"", "", ""}
+		}
+	}
+end
+
+
+register.register_light("silvered_desk_lamp_off", {
+	style = "modern",
+	material = "metal",
+	description = "Silvered Desk Lamp",
+	use_texture_alpha = "blend",
+	mesh = "multidecor_silvered_desk_lamp.b3d",
+	tiles = {"multidecor_silver_material.png", "multidecor_silvered_lampshade.png"},
+	bounding_boxes = {{-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}},
+},
+{
+	swap_light = {
+		name = "silvered_desk_lamp_on",
+		light_level = 10
+	}
+}, silvered_lamp_recipe)
+
+register.register_light("copper_wall_sconce_off", {
+	style = "modern",
+	material = "glass",
+	description = "Copper Wall Sconce",
+	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}},
+},
+{
+	swap_light = {
+		name = "copper_wall_sconce_on"
+	}
+},
+{
+	recipe = {
+		{"default:copper_ingot", "multidecor:bulb", ""},
+		{"default:copper_ingot", "", ""},
+		{"", "", ""}
+	}
+})
+
+register.register_light("plastic_desk_lamp_off", {
+	style = "modern",
+	material = "plastic",
+	description = "Plastic Desk Lamp",
+	use_texture_alpha = "blend",
+	mesh = "multidecor_plastic_desk_lamp.b3d",
+	tiles = {"multidecor_plastic_material.png", "multidecor_plastic_desk_lampshade.png"},
+	bounding_boxes = {{-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}},
+},
+{
+	swap_light = {
+		name = "plastic_desk_lamp_on",
+		light_level = 10
+	}
+},
+{
+	recipe = {
+		{"multidecor:plastic_sheet", "multidecor:lampshade", "multidecor:plastic_sheet"},
+		{"multidecor:plastic_sheet", "multidecor:bulb", "multidecor:plastic_sheet"},
+		{"", "multidecor:plastic_sheet", ""}
+	}
+})

modern/tables.lua

@@ -38,8 +38,8 @@ register.register_table("round_modern_metallic_table", {
 	style = "modern",
 	material = "metal",
 	description = "Round Modern Metallic Table",
-	mesh = "multidecor_round_metallic_table.obj",
-	tiles = {"multidecor_round_metallic_table.png"},
+	mesh = "multidecor_round_metallic_table.b3d",
+	tiles = {"multidecor_metal_material.png", "multidecor_aspen_wood.png"},
 	bounding_boxes = {
 		{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
 	}
@@ -143,8 +143,8 @@ register.register_table("modern_wooden_table_with_metallic_legs", {
 	style = "modern",
 	material = "metal",
 	description = "Modern Wooden Table With Metallic Legs",
-	mesh = "multidecor_wooden_table_with_metallic_legs.obj",
-	tiles = {"multidecor_wooden_table_with_metallic_legs.png"},
+	mesh = "multidecor_wooden_table_with_metallic_legs.b3d",
+	tiles = {"multidecor_aspen_wood.png", "multidecor_metal_material.png"},
 	bounding_boxes = {
 		{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
 	}