Corrige problème de stack des lampes dans inventaire après récolte.

L'auteur du mod a oublié de définir la variable drop des objets
concernés :
- homedecor:glowlight_half,
- homedecor:glowlight_quarter,
- homedecor:glowlight_small_cube,
- homedecor:standing_lamp_off,
- homedecor:desk_lamp.

building_blocks/init.lua

@@ -4,4 +4,6 @@ local modpath = minetest.get_modpath("building_blocks")
 dofile(modpath.."/alias.lua")
 dofile(modpath.."/node_stairs.lua")
 dofile(modpath.."/others.lua")
-dofile(modpath.."/recipes.lua")
+dofile(modpath.."/recipes.lua")
+
+minetest.log("action", "[building_blocks] loaded.")

chains/init.lua

@@ -177,3 +177,5 @@ minetest.register_craft({
 		{'technic:brass_ingot', 'technic:brass_ingot', 'technic:brass_ingot'},
 	}
 })
+
+minetest.log("action", "[chains] loaded.")

computer/init.lua

@@ -97,3 +97,5 @@ dofile(MODPATH.."/computers.lua")
 dofile(MODPATH.."/miscitems.lua")
 dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/tetris.lua")
+
+minetest.log("action", "[computer] loaded.")

fake_fire/init.lua

@@ -214,3 +214,5 @@ minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire")
 minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone")
 minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone")
 minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
+
+minetest.log("action", "[fake_fire] loaded.")

homedecor/bathroom_furniture.lua

@@ -12,9 +12,12 @@ minetest.register_node("homedecor:bathroom_tiles_dark", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:bathroom_tiles_medium", {
@@ -28,9 +31,12 @@ minetest.register_node("homedecor:bathroom_tiles_medium", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:bathroom_tiles_light", {
@@ -44,9 +50,12 @@ minetest.register_node("homedecor:bathroom_tiles_light", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 local tr_cbox = {
@@ -164,3 +173,21 @@ minetest.register_lbm({
 		meta:set_string("palette", "ext")
 	end
 })
+
+minetest.register_lbm({
+	name = "homedecor:recolor_bathroom_tiles",
+	label = "Convert bathroom tiles to use UD extended palette",
+	run_at_every_load = false,
+	nodenames = {
+		"homedecor:bathroom_tiles_light",
+		"homedecor:bathroom_tiles_medium",
+		"homedecor:bathroom_tiles_dark",
+	},
+	action = function(pos, node)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("palette") ~= "ext" then
+			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
+			meta:set_string("palette", "ext")
+		end
+	end
+})

homedecor/bedroom.lua

@@ -52,11 +52,13 @@ homedecor.register("bed_regular", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		if not placer:get_player_control().sneak then
 			return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing)
 		end
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -89,7 +91,9 @@ homedecor.register("bed_extended", {
 	sounds = default.node_sound_wood_defaults(),
 	expand = { forward = "air" },
 	on_rotate = screwdriver.disallow,
+	after_place_node = unifieddyes.recolor_on_place,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -120,8 +124,10 @@ homedecor.register("bed_kingsize", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		local inv = digger:get_inventory()
 		if digger:get_player_control().sneak and inv:room_for_item("main", "homedecor:bed_regular 2") then
 			inv:remove_item("main", "homedecor:bed_kingsize 1")
@@ -131,7 +137,7 @@ homedecor.register("bed_kingsize", {
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		homedecor.beds_on_rightclick(pos, node, clicker)
 		return itemstack
-	end,
+	end
 })
 
 for _, w in pairs({ N_("mahogany"), N_("oak") }) do

homedecor/crafts.lua

@@ -546,17 +546,6 @@ minetest.register_craft( {
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:shutter_colored",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:shutter",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
         type = "fuel",
         recipe = "homedecor:shutter_oak",
@@ -878,28 +867,6 @@ minetest.register_craft( {
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:curtain_closed",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:curtain_closed",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:curtain_open",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:curtain_open",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 local mats = {
 	{ "brass", "homedecor:pole_brass" },
 	{ "wrought_iron", "homedecor:pole_wrought_iron" },
@@ -1228,6 +1195,7 @@ minetest.register_craft( {
 minetest.register_craft({
 	output = "homedecor:glowlight_half 6",
 	recipe = {
+		{ "dye:white", "dye:white", "dye:white" },
 		{ "default:glass", "homedecor:power_crystal", "default:glass", },
 	}
 })
@@ -1235,38 +1203,11 @@ minetest.register_craft({
 minetest.register_craft({
         output = "homedecor:glowlight_half 6",
         recipe = {
+		{ "dye:white", "dye:white", "dye:white" },
 		{"moreblocks:super_glow_glass", "moreblocks:glow_glass", "moreblocks:super_glow_glass", },
 	}
 })
 
-minetest.register_craft({
-        output = "homedecor:glowlight_half",
-        recipe = {
-		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"},
-		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}
-	}
-})
-
-minetest.register_craft({
-		output = "homedecor:glowlight_half",
-		type = "shapeless",
-		recipe = {
-		"homedecor:glowlight_quarter",
-		"homedecor:glowlight_quarter"
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:glowlight_half",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:glowlight_half",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
         output = "homedecor:glowlight_quarter 6",
         recipe = {
@@ -1274,17 +1215,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:glowlight_quarter",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:glowlight_quarter",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	output = "homedecor:glowlight_small_cube 8",
 	recipe = {
@@ -1309,14 +1239,20 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
+minetest.register_craft({
-	output = "homedecor:glowlight_small_cube",
+        output = "homedecor:glowlight_half",
-	palette = "wallmounted",
+        recipe = {
-	type = "shapeless",
+		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"},
-	neutral_node = "homedecor:glowlight_small_cube",
+		{"homedecor:glowlight_small_cube","homedecor:glowlight_small_cube"}
-	recipe = {
+	}
-		"NEUTRAL_NODE",
+})
-		"MAIN_DYE"
+
+minetest.register_craft({
+		output = "homedecor:glowlight_half",
+		type = "shapeless",
+		recipe = {
+		"homedecor:glowlight_quarter",
+		"homedecor:glowlight_quarter"
 	}
 })
 
@@ -2291,17 +2227,6 @@ minetest.register_craft( {
 		},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:bathroom_tiles_light",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:bathroom_tiles_light",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft( {
 		output = "homedecor:bathroom_tiles_medium 4",
 		recipe = {
@@ -2310,17 +2235,6 @@ minetest.register_craft( {
 		},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:bathroom_tiles_medium",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:bathroom_tiles_medium",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft( {
 		output = "homedecor:bathroom_tiles_dark 4",
 		recipe = {
@@ -2329,17 +2243,6 @@ minetest.register_craft( {
 		},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:bathroom_tiles_dark",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:bathroom_tiles_dark",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- misc electrical
 
 minetest.register_craft( {
@@ -2573,17 +2476,6 @@ minetest.register_craft( {
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:bed_regular",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:bed_regular",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft( {
 	output = "homedecor:bed_kingsize",
 	recipe = {
@@ -2591,29 +2483,6 @@ minetest.register_craft( {
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:bed_kingsize",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:bed_kingsize",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:bed_kingsize",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:bed_regular",
-	recipe = {
-		"NEUTRAL_NODE",
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft( {
         output = "homedecor:bottle_green",
         recipe = {
@@ -2974,17 +2843,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:desk_lamp",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:desk_lamp",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	output = "homedecor:hanging_lantern 2",
 	recipe = {
@@ -3273,19 +3131,6 @@ for i in ipairs(homedecor.banister_materials) do
 	})
 end
 
-unifieddyes.register_color_craft({
-	output = "",
-	palette = "split",
-	neutral_node = "homedecor:banister_wood_horizontal",
-	type = "shapeless",
-	output_prefix = "homedecor:banister_wood_horizontal_",
-	output_suffix = "",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE",
-	}
-})
-
 if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
 	technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} })
 end

homedecor/depends.txt

@@ -13,4 +13,3 @@ beds?
 flowers?
 3d_armor?
 skinsdb?
-mesecons?

homedecor/doors_and_gates.lua

@@ -4,8 +4,6 @@ local S = homedecor_i18n.gettext
 
 local function N_(x) return x end
 
-local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
-
 -- doors
 
 local function isSolid(pos, adjust)
@@ -266,7 +264,6 @@ for i, side in ipairs(sides) do
 			drop = "homedecor:door_"..doorname.."_left",
 		    mesecons = {
 		        effector = {
-					rules = m_rules,
 		            action_on = function(pos,node)
 		                local isClosed = getClosed(pos)
 		                if isClosed then
@@ -408,7 +405,6 @@ for i, g in ipairs(gate_list) do
 		end,
         mesecons = {
             effector = {
-				rules = m_rules,
                 action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end
             }
         }
@@ -437,7 +433,6 @@ for i, g in ipairs(gate_list) do
         return itemstack
 	end
     def.mesecons.effector = {
-		rules = m_rules,
         action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end
     }
 

homedecor/furniture.lua

@@ -83,7 +83,9 @@ homedecor.register("kitchen_chair_padded", {
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		pos.y = pos.y+0 -- where do I put my ass ?
@@ -108,7 +110,9 @@ homedecor.register("armchair", {
 	node_box = ac_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 })
 

homedecor/furniture_recipes.lua

@@ -70,17 +70,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:armchair",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:armchair",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	type = "shapeless",
 	output = "homedecor:kitchen_chair_padded",
@@ -90,17 +79,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:kitchen_chair_padded",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:kitchen_chair_padded",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "homedecor:kitchen_chair_wood",
@@ -128,17 +106,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:standing_lamp_off",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:standing_lamp_off",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "homedecor:table_lamp_off",
@@ -181,15 +148,13 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
+minetest.register_craft({
-	output = "homedecor:table_lamp_off",
+	output = "homedecor:standing_lamp_off",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:table_lamp_off",
 	recipe = {
-		"NEUTRAL_NODE",
+		{ "homedecor:table_lamp_off"},
-		"MAIN_DYE"
+		{ "group:stick"},
-	}
+		{ "group:stick"},
+	},
 })
 
 minetest.register_craft({

homedecor/handlers/expansion.lua

@@ -211,21 +211,22 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks
 	local rightnode = minetest.get_node(rightpos)
 
 	local inv = placer:get_inventory()
+	local lastdye = unifieddyes.last_used_dye[placer_name]
 
 	if leftnode.name == "homedecor:bed_regular" then
 		local newname = string.gsub(thisnode.name, "_regular", "_kingsize")
-		local meta = minetest.get_meta(pos)
+		local meta = minetest.get_meta(leftpos)
-		local leftmeta = minetest.get_meta(leftpos)
-
 		minetest.set_node(pos, {name = "air"})
-		minetest.swap_node(leftpos, { name = newname, param2 = param2})
+		minetest.set_node(leftpos, { name = newname, param2 = param2})
+		meta:set_string("dye", lastdye)
+		inv:add_item("main", lastdye)
 	elseif rightnode.name == "homedecor:bed_regular" then
 		local newname = string.gsub(thisnode.name, "_regular", "_kingsize")
-		local meta = minetest.get_meta(pos)
+		local meta = minetest.get_meta(rightpos)
-		local rightmeta = minetest.get_meta(rightpos)
-
 		minetest.set_node(rightpos, {name = "air"})
-		minetest.swap_node(pos, { name = newname, param2 = param2})
+		minetest.set_node(pos, { name = newname, param2 = param2})
+		meta:set_string("dye", lastdye)
+		inv:add_item("main", lastdye)
 	end
 
 	local toppos = {x=pos.x, y=pos.y+1.0, z=pos.z}
@@ -234,7 +235,14 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks
 	if trybunks and is_buildable_to(placer_name, toppos, topposfwd) then
 		local newname = string.gsub(thisnode.name, "_regular", "_extended")
 		local newparam2 = param2 % 8
-		minetest.swap_node(toppos, { name = thisnode.name, param2 = param2})
+		if inv:contains_item("main", lastdye) then
+			minetest.set_node(toppos, { name = thisnode.name, param2 = param2})
+			if lastdye then inv:remove_item("main", lastdye.." 1") end
+		else
+			minetest.set_node(toppos, { name = thisnode.name, param2 = newparam2})
+			minetest.chat_send_player(placer_name, "Ran out of "..lastdye..", using neutral color.")
+			unifieddyes.last_used_dye[placer_name] = nil
+		end
 		minetest.swap_node(pos, { name = newname, param2 = param2})
 		itemstack:take_item()
 	end
@@ -257,8 +265,6 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 	if not pos then return itemstack end
 
 	local fdir = minetest.dir_to_facedir(placer:get_look_dir())
-	local meta = itemstack:get_meta()
-	local pindex = meta:get_int("palette_index")
 
 	local abovepos  = { x=pos.x, y=pos.y+1, z=pos.z }
 	local abovenode = minetest.get_node(abovepos)
@@ -373,7 +379,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 		end
 	end
 
-	minetest.set_node(pos, {name = new_place_name, param2 = fdir+pindex})
+	minetest.set_node(pos, {name = new_place_name, param2 = fdir})
 	itemstack:take_item()
 	return itemstack
 end

homedecor/init.lua

@@ -119,6 +119,6 @@ dofile(modpath.."/wardrobe.lua")
 
 dofile(modpath.."/crafts.lua")
 
-if minetest.settings:get_bool("log_mod") then
+if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "[HomeDecor] " .. S("Loaded!"))
 end

homedecor/lighting.lua

@@ -46,7 +46,10 @@ minetest.register_node("homedecor:glowlight_half", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
+	drop = "homedecor:glowlight_half"
 })
 
 minetest.register_node("homedecor:glowlight_quarter", {
@@ -84,7 +87,10 @@ minetest.register_node("homedecor:glowlight_quarter", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
+	drop = "homedecor:glowlight_quarter"
 })
 
 minetest.register_node("homedecor:glowlight_small_cube", {
@@ -122,7 +128,10 @@ minetest.register_node("homedecor:glowlight_small_cube", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
+	drop = "homedecor:glowlight_small_cube"
 })
 
 homedecor.register("plasma_lamp", {
@@ -443,6 +452,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
+		place_param2 = 240,
 		walkable = false,
 		light_source = light,
 		selection_box = tlamp_cbox,
@@ -450,17 +460,14 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1,
 			not_in_creative_inventory=((light ~= nil) and 1) or nil,
 		},
+		drop = "homedecor:table_lamp_off",
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			node.name = "homedecor:table_lamp_"..repl[suffix]
 			minetest.set_node(pos, node)
 		end,
 		on_construct = unifieddyes.on_construct,
-		drop = {
+		after_place_node = unifieddyes.recolor_on_place,
-			items = {
+		after_dig_node = unifieddyes.after_dig_node
-				{items = {"homedecor:table_lamp_off"}, inherit_color = true },
-			}
-		}
-
 	})
 
 	homedecor.register("standing_lamp_"..suffix, {
@@ -476,6 +483,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
+		place_param2 = 240,
 		walkable = false,
 		light_source = light,
 		groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1,
@@ -484,17 +492,15 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		selection_box = slamp_cbox,
 		sounds = default.node_sound_wood_defaults(),
 		on_rotate = screwdriver.rotate_simple,
+		drop = "homedecor:standing_lamp_off",
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			node.name = "homedecor:standing_lamp_"..repl[suffix]
 			minetest.set_node(pos, node)
 		end,
 		on_construct = unifieddyes.on_construct,
-		--expand = { top="air" },
+		after_place_node = unifieddyes.recolor_on_place,
-		drop = {
+		after_dig_node = unifieddyes.after_dig_node,
-			items = {
+		expand = { top="air" },
-				{items = {"homedecor:standing_lamp_off"}, inherit_color = true },
-			}
-		}
 	})
 
 	-- for old maps that had the original 3dforniture mod
@@ -531,9 +537,12 @@ homedecor.register("desk_lamp", {
 	node_box = dlamp_cbox,
 	walkable = false,
 	groups = {snappy=3, ud_param2_colorable = 1},
+	drop = "homedecor:desk_lamp",
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew
 })
 
@@ -735,3 +744,28 @@ minetest.register_lbm({
 		meta:set_string("dye", "unifieddyes:"..color)
 	end
 })
+
+minetest.register_lbm({
+	name = "homedecor:recolor_lighting",
+	label = "Convert some kinds of lights to use UD extended palette",
+	run_at_every_load = false,
+	nodenames = {
+		"homedecor:table_lamp_off",
+		"homedecor:table_lamp_low",
+		"homedecor:table_lamp_med",
+		"homedecor:table_lamp_hi",
+		"homedecor:table_lamp_max",
+		"homedecor:standing_lamp_off",
+		"homedecor:standing_lamp_low",
+		"homedecor:standing_lamp_med",
+		"homedecor:standing_lamp_hi",
+		"homedecor:standing_lamp_max",
+	},
+	action = function(pos, node)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("palette") ~= "ext" then
+			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
+			meta:set_string("palette", "ext")
+		end
+	end
+})

homedecor/misc-nodes.lua

@@ -483,19 +483,23 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 		local name, matdesc, tile1, tile2 = unpack(mat)
 		local nodename = "banister_"..name.."_"..side
 
+		local groups = { snappy = 3, not_in_creative_inventory = 1 }
 		local cbox = {
 			type = "fixed",
 			fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 }
 		}
 
 		if side == "horizontal" then
+			groups = { snappy = 3 }
 			cbox = {
 				type = "fixed",
 				fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 }
 			}
+		else
+			minetest.register_alias(string.gsub("homedecor:"..nodename, "diagonal_", ""), "homedecor:"..nodename)
 		end
 
-		local def = {
+		homedecor.register(nodename, {
 			description = S("Banister for Stairs (@1, @2)", matdesc, sidedesc),
 			mesh = "homedecor_banister_"..side..".obj",
 			tiles = {
@@ -503,36 +507,12 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 				tile2,
 			},
 			inventory_image = "homedecor_banister_"..name.."_inv.png",
+			groups = groups,
 			selection_box = cbox,
 			collision_box = cbox,
-			groups = { snappy = 3},
 			on_place = homedecor.place_banister,
 			drop = "homedecor:banister_"..name.."_horizontal",
-		}
+		})
-
-		if side ~= "horizontal" then
-			def.groups.not_in_creative_inventory = 1 
-		end
-
-		if name == "wood" then
-			def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey"
-			def.groups.ud_param2_colorable = 1
-			def.paramtype2 = "colorfacedir"
-		end
-		homedecor.register(nodename, def)
-
-		if name == "wood" then
-			local nn = "homedecor:"..nodename
-			local def2 = table.copy(minetest.registered_items[nn])
-			def2.tiles = {
-				homedecor.white_wood,
-				homedecor.white_wood
-			}
-			def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
-			def2.groups.not_in_creative_inventory = 1 
-
-			unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
-		end
 	end
 end
 

homedecor/shutters.lua

@@ -41,7 +41,9 @@ homedecor.register("shutter", {
 	node_box = shutter_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 homedecor.register("shutter_colored", {
@@ -58,7 +60,10 @@ homedecor.register("shutter_colored", {
 	node_box = shutter_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
+	drop = "homedecor:shutter"
 })
 
 minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

homedecor/window_treatments.lua

@@ -112,8 +112,10 @@ minetest.register_node("homedecor:curtain_closed", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	selection_box = { type = "wallmounted" },
+	after_dig_node = unifieddyes.after_dig_node,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})
@@ -139,8 +141,10 @@ minetest.register_node("homedecor:curtain_open", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	selection_box = { type = "wallmounted" },
+	after_dig_node = unifieddyes.after_dig_node,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})

homedecor_3d_extras/init.lua

@@ -89,3 +89,5 @@ if minetest.get_modpath("moreblocks") then
 		}
 	})
 end
+
+minetest.log("action", "[homedecor_3d_extra] loaded.")

homedecor_i18n/init.lua

@@ -5,3 +5,5 @@ homedecor_i18n = { }
 
 local MP = minetest.get_modpath(minetest.get_current_modname())
 homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua")
+
+minetest.log("action", "[homedecor_i18n] loaded.")

inbox/init.lua

@@ -126,3 +126,5 @@ function inbox.get_inbox_insert_formspec(pos)
 		"listring[]"
 	return formspec
 end
+
+minetest.log("action", "[inbox] loaded.")

itemframes/init.lua

@@ -299,4 +299,6 @@ minetest.register_craft({
 if minetest.get_modpath("mesecons_mvps") then
 	mesecon.register_mvps_stopper("itemframes:frame")
 	mesecon.register_mvps_stopper("itemframes:pedestal")
-end
+end
+
+minetest.log("action", "[itemframes] loaded.")

lavalamp/init.lua

@@ -28,6 +28,7 @@ minetest.register_node("lavalamp:lavalamp", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	sunlight_propagates = true,
 	walkable = false,
 	light_source = 14,
@@ -38,6 +39,8 @@ minetest.register_node("lavalamp:lavalamp", {
 	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_glass_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp_off"
 		minetest.swap_node(pos, node)
@@ -56,6 +59,7 @@ minetest.register_node("lavalamp:lavalamp_off", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
@@ -66,16 +70,13 @@ minetest.register_node("lavalamp:lavalamp_off", {
 	sounds = default.node_sound_glass_defaults(),
 	drop = "lavalamp:lavalamp",
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp"
 		minetest.swap_node(pos, node)
 		return itemstack
 	end,
-	drop = {
-		items = {
-			{items = {"lavalamp:lavalamp"}, inherit_color = true },
-		}
-	}
 })
 
 minetest.register_craft({
@@ -87,17 +88,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lavalamp:lavalamp",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "lavalamp:lavalamp",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert to param2 coloring
 
 local colors = {
@@ -146,3 +136,22 @@ minetest.register_lbm({
 
 	end
 })
+
+minetest.register_lbm({
+	name = "lavalamp:recolor",
+	label = "Convert 89-color lamps to use UD extended palette",
+	run_at_every_load = false,
+	nodenames = {
+		"lavalamp:lavalamp",
+		"lavalamp:lavalamp_off"
+	},
+	action = function(pos, node)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("palette") ~= "ext" then
+			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
+			meta:set_string("palette", "ext")
+		end
+	end
+})
+
+minetest.log("action", "[lavalamp] loaded.")

lrfurn/armchairs.lua

@@ -25,7 +25,9 @@ minetest.register_node("lrfurn:armchair", {
 	node_box = armchair_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
@@ -56,17 +58,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lrfurn:armchair",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "lrfurn:armchair",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert old static nodes to param2 color
 
 lrfurn.old_static_armchairs = {}

lrfurn/init.lua

@@ -1,4 +1,3 @@
-local S = homedecor_i18n.gettext
 
 lrfurn = {}
 screwdriver = screwdriver or {}
@@ -61,11 +60,10 @@ end
 
 function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	local node = minetest.get_node(pos)
-	local colorbits = node.param2 - (node.param2 % 8)
 	local yaw = placer:get_look_yaw()
 	local dir = minetest.yaw_to_dir(yaw-1.5)
 	local fdir = minetest.dir_to_wallmounted(dir)
-	minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
+	minetest.swap_node(pos, { name = node.name, param2 = fdir })
 end
 
 dofile(minetest.get_modpath("lrfurn").."/longsofas.lua")
@@ -73,3 +71,5 @@ dofile(minetest.get_modpath("lrfurn").."/sofas.lua")
 dofile(minetest.get_modpath("lrfurn").."/armchairs.lua")
 dofile(minetest.get_modpath("lrfurn").."/coffeetable.lua")
 dofile(minetest.get_modpath("lrfurn").."/endtable.lua")
+
+minetest.log("action", "[lrfurn] loaded.")

lrfurn/longsofas.lua

@@ -26,6 +26,7 @@ minetest.register_node("lrfurn:longsofa", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		local playername = placer:get_player_name()
 		if minetest.is_protected(pos, placer:get_player_name()) then return true end
 
@@ -41,6 +42,7 @@ minetest.register_node("lrfurn:longsofa", {
 		end
 		return itemstack
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack
@@ -70,17 +72,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lrfurn:longsofa",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "lrfurn:longsofa",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert old static nodes to param2 colorization
 
 lrfurn.old_static_longsofas = {}

lrfurn/sofas.lua

@@ -26,6 +26,7 @@ minetest.register_node("lrfurn:sofa", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		local playername = placer:get_player_name()
 		if minetest.is_protected(pos, placer:get_player_name()) then return true end
 
@@ -41,6 +42,7 @@ minetest.register_node("lrfurn:sofa", {
 		end
 		return itemstack
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack
@@ -70,17 +72,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lrfurn:sofa",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "lrfurn:sofa",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert old static nodes to param2 color
 
 lrfurn.old_static_sofas = {}

plasmascreen/init.lua

@@ -186,3 +186,5 @@ minetest.register_craft({
 		{'group:stick', 'default:coal_lump', 'group:stick'},
 	}
 })
+
+minetest.log("action", "[plasmascreen] loaded.")