move some images to the right places :P

make them mesecon/digiline controllable (on/off only, alldir rules)

also fix a couple of old texture references

homedecor_electrical/init.lua

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

homedecor_furniture_medieval/init.lua

@@ -58,61 +58,10 @@ 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,3 +7,4 @@ moreblocks?
 building_blocks?
 darkage?
 mesecons?
+digilines?