updated several mods to use newer unified dyes API

blox, bobblocks, coloredwood, framedglass, homedecor, ilights,
plasticbox, stained_glass, unifiedbricks, and of course unified dyes.

3 files changed, 18 insertions, 35 deletions

diff --git a/lrfurn/armchairs.lua b/lrfurn/armchairs.lua
index fc9d096..e471267 100644
--- a/lrfurn/armchairs.lua
+++ b/lrfurn/armchairs.lua
@@ -20,25 +20,20 @@ minetest.register_node("lrfurn:armchair", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	inventory_image = "lrfurn_armchair_inv.png",
-	groups = {snappy=3},
+	groups = {snappy=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_wood_defaults(),
 	node_box = armchair_cbox,
 	after_place_node = lrfurn.fix_rotation,
 	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local itemname = itemstack:get_name()
-		if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then
-			unifieddyes.on_rightclick(pos, node, clicker,
-			itemstack, pointed_thing, "lrfurn:armchair", "wallmounted")
-		else
-			if not clicker:is_player() then
-				return itemstack
-			end
-			pos.y = pos.y-0.5
-			clicker:setpos(pos)
-			clicker:set_hp(20)
+		if not clicker:is_player() then
 			return itemstack
 		end
+		pos.y = pos.y-0.5
+		clicker:setpos(pos)
+		clicker:set_hp(20)
+		return itemstack
 	end
 })
 
diff --git a/lrfurn/longsofas.lua b/lrfurn/longsofas.lua
index b741aa9..b5216c2 100644
--- a/lrfurn/longsofas.lua
+++ b/lrfurn/longsofas.lua
@@ -18,7 +18,7 @@ minetest.register_node("lrfurn:longsofa", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	inventory_image = "lrfurn_longsofa_inv.png",
-	groups = {snappy=3},
+	groups = {snappy=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_wood_defaults(),
 	selection_box = longsofa_cbox,
 	node_box = longsofa_cbox,
@@ -40,19 +40,13 @@ minetest.register_node("lrfurn:longsofa", {
 	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local itemname = itemstack:get_name()
-		if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then
-			unifieddyes.on_rightclick(pos, node, clicker,
-			itemstack, pointed_thing, "lrfurn:longsofa", "wallmounted")
-		else
-			if not clicker:is_player() then
-				return itemstack
-			end
-
-			pos.y = pos.y-0.5
-			clicker:setpos(pos)
-			clicker:set_hp(20)
+		if not clicker:is_player() then
 			return itemstack
 		end
+		pos.y = pos.y-0.5
+		clicker:setpos(pos)
+		clicker:set_hp(20)
+		return itemstack
 	end
 })
 
diff --git a/lrfurn/sofas.lua b/lrfurn/sofas.lua
index b05414c..57d4904 100644
--- a/lrfurn/sofas.lua
+++ b/lrfurn/sofas.lua
@@ -18,7 +18,7 @@ minetest.register_node("lrfurn:sofa", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	inventory_image = "lrfurn_sofa_inv.png",
-	groups = {snappy=3},
+	groups = {snappy=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_wood_defaults(),
 	selection_box = sofa_cbox,
 	node_box = sofa_cbox,
@@ -40,19 +40,13 @@ minetest.register_node("lrfurn:sofa", {
 	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local itemname = itemstack:get_name()
-		if string.find(itemname, "dye:") or string.find(itemname, "unifieddyes:") then
-			unifieddyes.on_rightclick(pos, node, clicker,
-			itemstack, pointed_thing, "lrfurn:sofa", "wallmounted")
-		else
-			if not clicker:is_player() then
-				return itemstack
-			end
-
-			pos.y = pos.y-0.5
-			clicker:setpos(pos)
-			clicker:set_hp(20)
+		if not clicker:is_player() then
 			return itemstack
 		end
+		pos.y = pos.y-0.5
+		clicker:setpos(pos)
+		clicker:set_hp(20)
+		return itemstack
 	end
 })