move door 3d models to "3d extras" mod

by extension, require its presence to cause doors to be 3d

for consistency with the appearance/style of mtg doors in worlds that
wouldn't normally use the 3d extras mod

homedecor_doors_and_gates/init.lua

@@ -40,41 +40,41 @@ local door_list = {
 		custom_model = "homedecor_door_fancy"
 	},
 
-	{	name = "french_oak",
-		description = "French door, Oak-colored",
+	{	name = "wood_glass_oak",
+		description = "Glass and Wood, Oak-colored",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_glass_defaults(),
 		},
 		backface = true,
 		alpha = true,
-		custom_model = "homedecor_door_french"
+		custom_model = "homedecor_door_wood_glass"
 	},
 
-	{	name = "french_mahogany",
-		description = "French door, Mahogany-colored",
+	{	name = "wood_glass_mahogany",
+		description = "Glass and Wood, Mahogany-colored",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_glass_defaults(),
 		},
 		backface = true,
 		alpha = true,
-		custom_model = "homedecor_door_french"
+		custom_model = "homedecor_door_wood_glass"
 	},
 
-	{	name = "french_white",
-		description = "French door, White",
+	{	name = "wood_glass_white",
+		description = "Glass and Wood, White",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_glass_defaults(),
 		},
 		backface = true,
 		alpha = true,
-		custom_model = "homedecor_door_french"
+		custom_model = "homedecor_door_wood_glass"
 	},
 
-	{	name = "basic_panel",
-		description = "Basic white panel Door",
+	{	name = "bedroom",
+		description = "White Bedroom Door",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_wood_defaults(),
@@ -95,8 +95,8 @@ local door_list = {
 		custom_model = "homedecor_door_wrought_iron"
 	},
 
-	{	name = "carolina",
-		description = "Wooden Carolina door",
+	{	name = "woodglass2",
+		description = "Wooden door with glass insert, type 2",
 		groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 		sounds = {
 			main = default.node_sound_wood_defaults(),
@@ -166,7 +166,7 @@ end
 local hd_3d = minetest.get_modpath("homedecor_3d_extras")
 
 for _, door in ipairs(door_list) do
-	doors.register("homedecor_"..door.name, {
+	doors.register(door.name, {
 			tiles = {{ name = "homedecor_door_"..door.name..".png", backface_culling = door.backface }},
 			description = door.description,
 			inventory_image = "homedecor_door_"..door.name.."_inv.png",
@@ -177,8 +177,9 @@ for _, door in ipairs(door_list) do
 			mesecons = mesecons
 	})
 
-	local nn_a = "doors:homedecor_"..door.name.."_a"
-	local nn_b = "doors:homedecor_"..door.name.."_b"
+	local nn_a = "doors:"..door.name.."_a"
+	local nn_b = "doors:"..door.name.."_b"
+
 
 	if door.alpha then
 		local def = hd_doors_clone_node(nn_a)
@@ -203,9 +204,6 @@ for _, door in ipairs(door_list) do
 
 	old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_left"
 	old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_right"
-
-	minetest.register_alias("doors:"..door.name.."_a", "doors:homedecor_"..door.name.."_a")
-	minetest.register_alias("doors:"..door.name.."_b", "doors:homedecor_"..door.name.."_b")
 end
 
 -- Gates
@@ -698,35 +696,14 @@ minetest.register_craft({
 
 -- aliases
 
-minetest.register_alias("homedecor:jpn_door_top",               "air")
-minetest.register_alias("homedecor:jpn_door_top_open",          "air")
+minetest.register_alias("homedecor:jpn_door_top", "air")
+minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_closed")
 
-minetest.register_alias("homedecor:jpn_door_bottom",            "homedecor:door_japanese_closed")
-minetest.register_alias("homedecor:jpn_door_bottom_open",       "homedecor:door_japanese_open")
+minetest.register_alias("homedecor:jpn_door_top_open", "air")
+minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open")
 
-minetest.register_alias("homedecor:door_glass_right",           "doors:door_glass_b")
-minetest.register_alias("homedecor:door_glass_left",            "doors:door_glass_a")
-
-minetest.register_alias("doors:wood_glass_oak_a",               "doors:homedecor_french_oak_a")
-minetest.register_alias("doors:wood_glass_oak_b",               "doors:homedecor_french_oak_b")
-
-minetest.register_alias("doors:wood_glass_white_a",             "doors:homedecor_french_white_a")
-minetest.register_alias("doors:wood_glass_white_b",             "doors:homedecor_french_white_b")
-
-minetest.register_alias("doors:wood_glass_mahogany_a",          "doors:homedecor_french_mahogany_a")
-minetest.register_alias("doors:wood_glass_mahogany_b",          "doors:homedecor_french_mahogany_b")
-
-minetest.register_alias("doors:homedecor_woodglass2_a",         "doors:homedecor_carolina_a")
-minetest.register_alias("doors:homedecor_woodglass2_b",         "doors:homedecor_carolina_b")
-
-minetest.register_alias("doors:woodglass2_a",                   "doors:homedecor_carolina_a")
-minetest.register_alias("doors:woodglass2_b",                   "doors:homedecor_carolina_b")
-
-minetest.register_alias("doors:homedecor_bedroom_a",            "doors:homedecor_basic_panel_a")
-minetest.register_alias("doors:homedecor_bedroom_b",            "doors:homedecor_basic_panel_b")
-
-minetest.register_alias("doors:bedroom_a",                      "doors:homedecor_basic_panel_a")
-minetest.register_alias("doors:bedroom_b",                      "doors:homedecor_basic_panel_b")
+minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b")
+minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a")
 
 -- flip old homedecor doors around, since they use minetest_game doors API now
 

homedecor_electrical/init.lua

@@ -2,10 +2,9 @@
 local S = homedecor.gettext
 
 function homedecor.toggle_switch(pos, node, clicker, itemstack, pointed_thing)
-	if not clicker then return false end
-	local playername = clicker:get_player_name()
-	if minetest.is_protected(pos, playername) then
-		minetest.record_protection_violation(pos, playername)
+	if minetest.is_protected(pos, clicker:get_player_name()) then
+		minetest.record_protection_violation(pos,
+		sender:get_player_name())
 		return false
 	end
 	local sep = string.find(node.name, "_o", -5)

homedecor_furniture_medieval/init.lua

@@ -58,10 +58,61 @@ homedecor.register("chains", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+homedecor.register("torch_wall", {
+	description = S("Wall Torch"),
+	mesh = "forniture_torch.obj",
+	tiles = {
+		{
+			name="forniture_torch_flame.png",
+			animation={
+				type="vertical_frames",
+				aspect_w=40,
+				aspect_h=40,
+				length=1.0,
+			},
+		},
+		{ name = "homedecor_generic_metal.png", color = homedecor.color_black },
+		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
+		"forniture_coal.png",
+	},
+	inventory_image="forniture_torch_inv.png",
+	walkable = false,
+	light_source = 14,
+	selection_box = {
+		type = "fixed",
+		fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 },
+	},
+	groups = {cracky=3},
+})
+
+local wl_cbox = {
+	type = "fixed",
+	fixed = { -0.2, -0.5, 0, 0.2, 0.5, 0.5 },
+}
+
+homedecor.register("wall_lamp", {
+	description = S("Wall Lamp"),
+	mesh = "homedecor_wall_lamp.obj",
+	tiles = {
+		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
+		homedecor.lux_wood,
+		"homedecor_light.png",
+		"homedecor_generic_metal_wrought_iron.png"
+	},
+	use_texture_alpha = true,
+	inventory_image = "homedecor_wall_lamp_inv.png",
+	groups = {snappy=3},
+	light_source = 11,
+	selection_box = wl_cbox,
+	walkable = false
+})
+
 minetest.register_alias("3dforniture:bars", "homedecor:bars")
 minetest.register_alias("3dforniture:L_binding_bars", "homedecor:L_binding_bars")
 minetest.register_alias("3dforniture:chains", "homedecor:chains")
+minetest.register_alias("3dforniture:torch_wall", "homedecor:torch_wall")
 
 minetest.register_alias('bars', 'homedecor:bars')
 minetest.register_alias('binding_bars', 'homedecor:L_binding_bars')
 minetest.register_alias('chains', 'homedecor:chains')
+minetest.register_alias('torch_wall', 'homedecor:torch_wall')

homedecor_lighting/depends.txt

@@ -7,4 +7,3 @@ moreblocks?
 building_blocks?
 darkage?
 mesecons?
-digilines?