corrected color selection from painted blocks

depends.txt

@@ -1,15 +1,9 @@
 dye
 default?
 unifieddyes?
-coloredwood?
-unifiedbricks?
-stained_glass?
 cotton?
 wool?
 flags?
-blox?
-homedecor?
-plasticbox?
 kerova?
 hardenedclay?
 clstone?
@@ -21,3 +15,5 @@ mydeck?
 mycorners?
 mymulch?
 clothing?
+cblocks?
+morecolors?

paint_roller.lua

@@ -1,5 +1,9 @@
 -- This is based upon the paint_roller mod by Krock.
 
+-- if the old color of the block can be identified and is supported, its
+-- corresponding dye is added to the player's inventory;
+-- if at all possible, the block is colored with the dye that is found in
+-- the player's inventory to the right of the paintroller
 minetest.register_tool("colormachine:paint_roller", {
 	description = "Paint roller",
 	inventory_image = "paint_roller.png",
@@ -22,9 +26,9 @@ minetest.register_tool("colormachine:paint_roller", {
 		local stack = inv:get_stack("main", idx) --dye
 		local stack_name = stack:get_name()
 
-		local res           = colormachine.get_node_name_painted( node_name, stack_name );
+		local res           = colormachine.get_node_name_painted( node_name, stack_name, node.param2 );
 
-		if( not( res) or not( res.possible  ) or #res.possible < 1 or (#res.possible==1 and res.possible[1]==node_name)) then
+		if( not( res) or not( res.possible  ) or #res.possible < 1 or (#res.possible==1 and res.possible[1]==node_name and node.param2==res.param2)) then
 			return;
 		end
 		local index = 1;
@@ -45,7 +49,7 @@ minetest.register_tool("colormachine:paint_roller", {
 		end
 
 		-- paint the node
-		minetest.set_node(pointed_thing.under, {name=res.possible[ index ], param2=node.param2})
+		minetest.set_node(pointed_thing.under, {name=res.possible[ index ], param2=res.param2})
 
 		--itemstack:add_wear( 65535 / 30 );
 		return itemstack