Huge update - lots of mods:

areas, biome_lib, blox, bobblocks, boost_cart, homedecor, mobs,
coloredwood, ilights, inbox, item_tweaks, moreblocks, moreores,
pipeworks, plasticbox, signs_lib, stainedglass, roads, unifieddyes,
vines, worldedit, xban2, maybe some others I didn't think about ;-)

7 files changed, 239 insertions, 761 deletions

diff --git a/bobblocks/blocks.lua b/bobblocks/blocks.lua
index 652bc07..84fdc37 100644
--- a/bobblocks/blocks.lua
+++ b/bobblocks/blocks.lua
@@ -1,844 +1,321 @@
 -- BobBlocks mod by RabbiBob
 -- State Changes
 
-local update_bobblock = function (pos, node)
-    local nodename=""
-    local param2=""
-    --Switch Block State
-    if 
-    -- Start Blocks
-        node.name == 'bobblocks:redblock_off' then nodename = 'bobblocks:redblock'
-    elseif node.name == 'bobblocks:redblock' then nodename = 'bobblocks:redblock_off'
-    elseif node.name == 'bobblocks:orangeblock_off' then nodename = 'bobblocks:orangeblock'
-    elseif node.name == 'bobblocks:orangeblock' then nodename = 'bobblocks:orangeblock_off'
-    elseif node.name == 'bobblocks:yellowblock_off' then nodename = 'bobblocks:yellowblock'
-    elseif node.name == 'bobblocks:yellowblock' then nodename = 'bobblocks:yellowblock_off'
-    elseif node.name == 'bobblocks:greenblock_off' then nodename = 'bobblocks:greenblock'
-    elseif node.name == 'bobblocks:greenblock' then nodename = 'bobblocks:greenblock_off'        
-    elseif node.name == 'bobblocks:blueblock_off' then nodename = 'bobblocks:blueblock'
-    elseif node.name == 'bobblocks:blueblock' then nodename = 'bobblocks:blueblock_off'
-    elseif node.name == 'bobblocks:indigoblock_off' then nodename = 'bobblocks:indigoblock'
-    elseif node.name == 'bobblocks:indigoblock' then nodename = 'bobblocks:indigoblock_off'    
-    elseif node.name == 'bobblocks:violetblock_off' then nodename = 'bobblocks:violetblock'
-    elseif node.name == 'bobblocks:violetblock' then nodename = 'bobblocks:violetblock_off'
-    elseif node.name == 'bobblocks:whiteblock_off' then nodename = 'bobblocks:whiteblock'
-    elseif node.name == 'bobblocks:whiteblock' then nodename = 'bobblocks:whiteblock_off'    
-    -- Start Poles
-    elseif node.name == 'bobblocks:redpole_off' then nodename = 'bobblocks:redpole'
-    elseif node.name == 'bobblocks:redpole' then nodename = 'bobblocks:redpole_off'
-    elseif node.name == 'bobblocks:orangepole_off' then nodename = 'bobblocks:orangepole'
-    elseif node.name == 'bobblocks:orangepole' then nodename = 'bobblocks:orangepole_off'
-    elseif node.name == 'bobblocks:yellowpole_off' then nodename = 'bobblocks:yellowpole'
-    elseif node.name == 'bobblocks:yellowpole' then nodename = 'bobblocks:yellowpole_off'
-    elseif node.name == 'bobblocks:greenpole_off' then nodename = 'bobblocks:greenpole'
-    elseif node.name == 'bobblocks:greenpole' then nodename = 'bobblocks:greenpole_off'        
-    elseif node.name == 'bobblocks:bluepole_off' then nodename = 'bobblocks:bluepole'
-    elseif node.name == 'bobblocks:bluepole' then nodename = 'bobblocks:bluepole_off'
-    elseif node.name == 'bobblocks:indigopole_off' then nodename = 'bobblocks:indigopole'
-    elseif node.name == 'bobblocks:indigopole' then nodename = 'bobblocks:indigopole_off'    
-    elseif node.name == 'bobblocks:violetpole_off' then nodename = 'bobblocks:violetpole'
-    elseif node.name == 'bobblocks:violetpole' then nodename = 'bobblocks:violetpole_off'
-    elseif node.name == 'bobblocks:whitepole_off' then nodename = 'bobblocks:whitepole'
-    elseif node.name == 'bobblocks:whitepole' then nodename = 'bobblocks:whitepole_off' 
-    end
-    minetest.add_node(pos, {name = nodename})
+bobblocks = {}
+bobblocks.old_static_nodes = {}
+
+bobblocks.colorlist = {
+	"red",
+	"orange",
+	"yellow",
+	"green",
+	"blue",
+	"indigo",
+	"violet",
+	"white",
+	"grey"
+}
+
+bobblocks.update_bobblock = function (pos, node)
+	local newnode = node
+	if string.find(newnode.name, "_off") then
+		newnode.name = string.sub(newnode.name, 1, -5)
+	else
+		newnode.name = newnode.name.."_off"
+	end
+
+    minetest.swap_node(pos, newnode)
     minetest.sound_play("bobblocks_glassblock",
 	{pos = pos, gain = 1.0, max_hear_distance = 32,})
 end
 
-    
--- Punch Blocks    
-local on_bobblock_punched = function (pos, node, puncher)
-    if 
-       -- Start Blocks
-       node.name == 'bobblocks:redblock_off' or node.name == 'bobblocks:redblock' or 
-       node.name == 'bobblocks:orangeblock_off' or node.name == 'bobblocks:orangeblock' or
-       node.name == 'bobblocks:yellowblock_off' or node.name == 'bobblocks:yellowblock' or
-       node.name == 'bobblocks:greenblock_off' or node.name == 'bobblocks:greenblock' or
-       node.name == 'bobblocks:blueblock_off' or node.name == 'bobblocks:blueblock' or
-       node.name == 'bobblocks:indigoblock_off' or node.name == 'bobblocks:indigoblock' or
-       node.name == 'bobblocks:violetblock_off' or node.name == 'bobblocks:violetblock' or
-       node.name == 'bobblocks:whiteblock_off' or node.name == 'bobblocks:whiteblock' or
-       --Start Poles
-       node.name == 'bobblocks:redpole_off' or node.name == 'bobblocks:redpole' or 
-       node.name == 'bobblocks:orangepole_off' or node.name == 'bobblocks:orangepole' or
-       node.name == 'bobblocks:yellowpole_off' or node.name == 'bobblocks:yellowpole' or
-       node.name == 'bobblocks:greenpole_off' or node.name == 'bobblocks:greenpole' or
-       node.name == 'bobblocks:bluepole_off' or node.name == 'bobblocks:bluepole' or
-       node.name == 'bobblocks:indigopole_off' or node.name == 'bobblocks:indigopole' or
-       node.name == 'bobblocks:violetpole_off' or node.name == 'bobblocks:violetpole' or
-       node.name == 'bobblocks:whitepole_off' or node.name == 'bobblocks:whitepole' 
-    then
-        update_bobblock(pos, node)
-    end
-end
-
-minetest.register_on_punchnode(on_bobblock_punched)
-
 -- Nodes
--- Misc Node
-
-minetest.register_node("bobblocks:btm", {
-	description = "Bobs TransMorgifier v5",
-    tiles = {"bobblocks_btm_sides.png", "bobblocks_btm_sides.png", "bobblocks_btm_sides.png",
-		"bobblocks_btm_sides.png", "bobblocks_btm_sides.png", "bobblocks_btm.png"},
-    inventory_image = "bobblocks_btm.png",
-	paramtype2 = "facedir",
-	material = minetest.digprop_dirtlike(1.0),
-	legacy_facedir_simple = true,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    
-})
-
-
--- Start Block Nodes
-minetest.register_node("bobblocks:redblock", {
-	description = "Red Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_redblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_redblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:redblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:redblock_off", {
-	description = "Red Block",
-    tiles = {"bobblocks_redblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:redblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:redblock"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:orangeblock", {
-	description = "Orange Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_orangeblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_orangeblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:orangeblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:orangeblock_off", {
-	description = "Orange Block",
-    tiles = {"bobblocks_orangeblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:orangeblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:orangeblock"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:yellowblock", {
-	description = "Yellow Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_yellowblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_yellowblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:yellowblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:yellowblock_off", {
-	description = "Yellow Block",
-    tiles = {"bobblocks_yellowblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:yellowblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:yellowblock"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:greenblock", {
-	description = "Green Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_greenblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_greenblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:greenblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:greenblock_off", {
-	description = "Green Block",
-    tiles = {"bobblocks_greenblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:greenblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:greenblock"
-		}}
-    
-})
-
-
-minetest.register_node("bobblocks:blueblock", {
-	description = "Blue Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_blueblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_blueblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:blueblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:blueblock_off", {
-	description = "Blue Block",
-    tiles = {"bobblocks_blueblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:blueblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:blueblock"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:indigoblock", {
-	description = "Indigo Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_indigoblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_indigoblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:indigoblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:indigoblock_off", {
-	description = "Indigo Block",
-    tiles = {"bobblocks_indigoblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:indigoblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:indigoblock"
-		}}
-    
-})
-
-
-minetest.register_node("bobblocks:violetblock", {
-	description = "Violet Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_violetblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_violetblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:violetblock_off"
-		}}
-})
 
-minetest.register_node("bobblocks:violetblock_off", {
-	description = "Violet Block",
-    tiles = {"bobblocks_violetblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:violetblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:violetblock"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:whiteblock", {
-	description = "White Block",
+minetest.register_node("bobblocks:block", {
+	description = "Bobblocks Plain Block",
 	drawtype = "glasslike",
-	tiles = {"bobblocks_whiteblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_whiteblock.png"),
+	tiles = {"bobblocks_block.png"},
 	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	sunlight_propagates = true,
 	is_ground_content = true,
 	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
+	light_source = LIGHT_MAX-0,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	foo = {conductor={
 			state = mesecon.state.on,
-			offstate = "bobblocks:whiteblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:whiteblock_off", {
-	description = "White Block",
-    tiles = {"bobblocks_whiteblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:whiteblock',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:whiteblock"
-		}}
-    
-})
-
-
-minetest.register_node("bobblocks:greyblock", {
-	description = "Grey Block",
-	drawtype = "glasslike",
-	tiles = {"bobblocks_greyblock.png"},
-	inventory_image = minetest.inventorycube("bobblocks_greyblock.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
+			offstate = "bobblocks:block_off"
+		}
+	},
+	on_punch = bobblocks.update_bobblock,
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:block", false)
+	end
+})
+
+minetest.register_node("bobblocks:block_off", {
+	description = "Bobblocks Plain Block (off)",
+    tiles = {"bobblocks_block.png"},
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:greyblock_off"
-		}}
-})
-
-minetest.register_node("bobblocks:greyblock_off", {
-	description = "Grey Block",
-    tiles = {"bobblocks_greyblock.png"},
-    is_ground_content = true,
-    alpha = WATER_ALPHA,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:greyblock',
-    foo = {conductor={
+	alpha = WATER_ALPHA,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+	drop = 'bobblocks:redblock',
+	foo = {conductor={
 			state = mesecon.state.off,
-			onstate = "bobblocks:greyblock"
-		}}
-    
+			onstate = "bobblocks:block"
+		}
+	},
+	on_punch = bobblocks.update_bobblock,
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:block_off", false)
+	end
 })
 
-
 -- Block Poles
-minetest.register_node("bobblocks:redpole", {
-	description = "Red Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_redblock.png"},
-	inventory_image = ("bobblocks_invredpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:redpole_off"
-		}}
-})
-
-minetest.register_node("bobblocks:redpole_off", {
-	description = "Red Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_redblock.png"},
-	inventory_image = ("bobblocks_invredpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:redpole',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:redpole"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:orangepole", {
-	description = "Orange Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_orangeblock.png"},
-	inventory_image = ("bobblocks_invorangepole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:orangepole_off"
-		}}
-})
-
-minetest.register_node("bobblocks:orangepole_off", {
-	description = "Orange Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_orangeblock.png"},
-	inventory_image = ("bobblocks_invorangepole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:orangepole',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:orangepole"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:yellowpole", {
-	description = "Yellow Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_yellowblock.png"},
-	inventory_image = ("bobblocks_invyellowpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:yellowpole_off"
-		}}
-})
-
-minetest.register_node("bobblocks:yellowpole_off", {
-	description = "Yellow Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_yellowblock.png"},
-	inventory_image = ("bobblocks_invyellowpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:yellowpole',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:yellowpole"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:greenpole", {
-	description = "Green Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_greenblock.png"},
-	inventory_image = ("bobblocks_invgreenpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:greenpole_off"
-		}}
-})
-
-minetest.register_node("bobblocks:greenpole_off", {
-	description = "Green Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_greenblock.png"},
-	inventory_image = ("bobblocks_invgreenpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:greenpole',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:greenpole"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:bluepole", {
-	description = "Blue Pole",
+minetest.register_node("bobblocks:pole", {
+	description = "Bobblocks Pole",
 	drawtype = "fencelike",
-	tiles = {"bobblocks_blueblock.png"},
-	inventory_image = ("bobblocks_invbluepole.png"),
+	tiles = {"bobblocks_block.png"},
+	inventory_image = ("bobblocks_pole_inv.png"),
 	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	sunlight_propagates = true,
 	is_ground_content = true,
 	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
+	light_source = LIGHT_MAX-0,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	foo = {conductor={
 			state = mesecon.state.on,
-			offstate = "bobblocks:bluepole_off"
-		}}
+			offstate = "bobblocks:pole_off"
+		}
+	},
+	on_punch = bobblocks.update_bobblock,
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:pole", false)
+	end
 })
 
-minetest.register_node("bobblocks:bluepole_off", {
-	description = "Blue Pole",
+minetest.register_node("bobblocks:pole_off", {
+	description = "Bobblocks Pole (off)",
 	drawtype = "fencelike",
-	tiles = {"bobblocks_blueblock.png"},
-	inventory_image = ("bobblocks_invbluepole.png"),
+	tiles = {"bobblocks_block.png"},
 	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	sunlight_propagates = true,
 	is_ground_content = true,
 	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:bluepole',
-    foo = {conductor={
+	light_source = LIGHT_MAX-10,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+	drop = 'bobblocks:redpole',
+	foo = {conductor={
 			state = mesecon.state.off,
-			onstate = "bobblocks:bluepole"
-		}}
-    
-})
-
-minetest.register_node("bobblocks:indigopole", {
-	description = "Indigo Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_indigoblock.png"},
-	inventory_image = ("bobblocks_invindigopole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:indigopole_off"
-		}}
+			onstate = "bobblocks:pole"
+		}
+	},
+	on_punch = bobblocks.update_bobblock,
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:pole_off", false)
+	end
 })
 
-minetest.register_node("bobblocks:indigopole_off", {
-	description = "Indigo Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_indigoblock.png"},
-	inventory_image = ("bobblocks_invindigopole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:indigopole',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:indigopole"
-		}}
-    
-})
+-- old static nodes grandfathered-in because they have a different texture or usage than the colored ones.
 
-minetest.register_node("bobblocks:violetpole", {
-	description = "Violet Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_violetblock.png"},
-	inventory_image = ("bobblocks_invvioletpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
-			state = mesecon.state.on,
-			offstate = "bobblocks:violetpole_off"
-		}}
-})
-
-minetest.register_node("bobblocks:violetpole_off", {
-	description = "Violet Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_violetblock.png"},
-	inventory_image = ("bobblocks_invvioletpole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:violetpole',
-    foo = {conductor={
-			state = mesecon.state.off,
-			onstate = "bobblocks:violetpole"
-		}}
-    
+minetest.register_node("bobblocks:btm", {
+	description = "Bobs TransMorgifier v5",
+	tiles = {"bobblocks_btm_sides.png", "bobblocks_btm_sides.png", "bobblocks_btm_sides.png",
+		"bobblocks_btm_sides.png", "bobblocks_btm_sides.png", "bobblocks_btm.png"},
+	inventory_image = "bobblocks_btm.png",
+	paramtype2 = "facedir",
+	material = minetest.digprop_dirtlike(1.0),
+	legacy_facedir_simple = true,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, 
 })
 
-minetest.register_node("bobblocks:whitepole", {
-	description = "White Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_whiteblock.png"},
-	inventory_image = ("bobblocks_invwhitepole.png"),
+minetest.register_node("bobblocks:wavyblock", {
+	description = "Bobblocks Wavy-textured Block",
+	drawtype = "glasslike",
+	tiles = {"bobblocks_wavyblock.png"},
 	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	sunlight_propagates = true,
 	is_ground_content = true,
 	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-0,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    foo = {conductor={
+	light_source = LIGHT_MAX-0,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	foo = {conductor=
+		{
 			state = mesecon.state.on,
-			offstate = "bobblocks:whitepole_off"
-		}}
-})
-
-minetest.register_node("bobblocks:whitepole_off", {
-	description = "White Pole",
-	drawtype = "fencelike",
-	tiles = {"bobblocks_whiteblock.png"},
-	inventory_image = ("bobblocks_invwhitepole.png"),
-	paramtype = "light",
-	sunlight_propagates = true,
+			offstate = "bobblocks:wavyblock_off"
+		}
+	},
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:wavyblock", false)
+	end
+})
+
+minetest.register_node("bobblocks:wavyblock_off", {
+	description = "Bobblocks Wavy-textured Block (off)",
+	tiles = {"bobblocks_wavyblock.png"},
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	is_ground_content = true,
-	sounds = default.node_sound_glass_defaults(),
-    light_source = LIGHT_MAX-10,
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
-    drop = 'bobblocks:whitepole',
-    foo = {conductor={
+	alpha = WATER_ALPHA,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
+	drop = 'bobblocks:wavyblock',
+	foo = {conductor=
+		{
 			state = mesecon.state.off,
-			onstate = "bobblocks:whitepole"
-		}}
-    
+			onstate = "bobblocks:wavyblock"
+		}
+	},
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:wavyblock_off", false)
+	end
 })
 
-minetest.register_node("bobblocks:greypole", {
-	description = "Grey Pole",
+minetest.register_node("bobblocks:wavypole", {
+	description = "Wavy-textured Pole",
 	drawtype = "fencelike",
-	tiles = {"bobblocks_greyblock.png"},
-	inventory_image = ("bobblocks_invgreypole.png"),
+	tiles = {"bobblocks_wavyblock.png"},
+	inventory_image = ("bobblocks_wavypole_inv.png"),
 	paramtype = "light",
+	paramtype2 = "color",
+	palette = "unifieddyes_palette.png",
 	sunlight_propagates = true,
 	is_ground_content = true,
 	sounds = default.node_sound_glass_defaults(),
-    groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
-    --light_source = LIGHT_MAX-0,
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	after_dig_node = unifieddyes.after_dig_node,
+	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+		unifieddyes.on_rightclick(pos, node, clicker,
+		  itemstack, pointed_thing, "bobblocks:wavypole", false)
+	end
+	--light_source = LIGHT_MAX-0,
 })
 
-
-
 -- Crafts
--- BTM
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:btm" 1',
-	recipe = {
-		{'node "default:glass" 1', 'node "default:torch" 1', 'node "default:leaves" 1',
-        'node "default:mese" 1','node "default:rat" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:greyblock" 2', 
-	recipe = {
-		{'node "default:glass" 1', 'node "default:torch" 1', 'node "default:cobble" 1'},
-	},
-})
-
--- Red / Yellow / Blue / White
--- Red / Yellow -> Orange
--- Red / Blue -> Violet
--- Blue / Yellow -> Green
--- Red / Yellow / White -> Indigo
 
 minetest.register_craft({
-	output = 'NodeItem "bobblocks:redblock" 2', 
+	output = "bobblocks:btm",
+	type = "shapeless",
 	recipe = {
-		{'node "default:glass" 1', 'node "default:torch" 1', 'node "default:brick" 1'},
-	},
-})
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:yellowblock" 2', 
-	recipe = {
-		{'node "default:glass" 1', 'node "default:torch" 1', 'node "default:sand" 1'},
-	},
-})
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:blueblock" 2', 
-	recipe = {
-		{'node "default:glass" 1', 'node "default:torch" 1', 'node "default:gravel" 1'},
+		"default:glass",
+		"default:torch",
+		"group:leaves",
+		"default:mese_crystal",
+		"default:diamond"
 	},
 })
 
 minetest.register_craft({
-	output = 'NodeItem "bobblocks:whiteblock" 2', 
+	output = "bobblocks:block 2", 
 	recipe = {
-		{'node "default:glass" 1', 'node "default:torch" 1', 'node "default:dirt" 1'},
+		{ "default:glass", "default:torch", "default:cobble" },
 	},
 })
 
-
 minetest.register_craft({
-	output = 'NodeItem "bobblocks:orangeblock" 2',
+	output = "bobblocks:pole",
 	recipe = {
-		{'node "bobblocks:redblock" 1', 'node "bobblocks:yellowblock" 1'},
-
-	},
+		{ "bobblocks:block", "group:stick" },
+	}
 })
 
-
 minetest.register_craft({
-	output = 'NodeItem "bobblocks:violetblock" 2',
+	output = "bobblocks:wavyblock 2",
+	type = "shapeless",
 	recipe = {
-		{'node "bobblocks:redblock" 1', 'node "bobblocks:blueblock" 1'},
-
+		"bobblocks:block",
+		"bobblocks:block"
 	},
 })
 
 minetest.register_craft({
-	output = 'NodeItem "bobblocks:greenblock" 2',
+	output = "bobblocks:wavypole",
 	recipe = {
-		{'node "bobblocks:blueblock" 1', 'node "bobblocks:yellowblock" 1'},
-
-	},
+		{ "bobblocks:wavyblock", "group:stick" },
+	}
 })
 
+-- Convert old static nodes to the param2 scheme
 
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:indigoblock" 3',
-	recipe = {
-		{'node "bobblocks:redblock" 1', 'node "bobblocks:blueblock" 1', 'node "bobblocks:whiteblock" 1'},
-
-	},
-})
-
--- Poles
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:redpole" 1',
-	recipe = {
-		{'node "bobblocks:redblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:yellowpole" 1',
-	recipe = {
-		{'node "bobblocks:yellowblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:bluepole" 1',
-	recipe = {
-		{'node "bobblocks:blueblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:whitepole" 1',
-	recipe = {
-		{'node "bobblocks:whiteblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:orangepole" 1',
-	recipe = {
-		{'node "bobblocks:orangeblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:violetpole" 1',
-	recipe = {
-		{'node "bobblocks:violetblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:greenpole" 1',
-	recipe = {
-		{'node "bobblocks:greenblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:indigopole" 1',
-	recipe = {
-		{'node "bobblocks:indigoblock" 1', 'node "default:stick" 1'},
-
-	},
-})
-
-minetest.register_craft({
-	output = 'NodeItem "bobblocks:greypole" 1',
-	recipe = {
-		{'node "bobblocks:greyblock" 1', 'node "default:stick" 1'},
+for _, i in ipairs(bobblocks.colorlist) do
+	table.insert(bobblocks.old_static_nodes, "bobblocks:"..i.."block")
+	table.insert(bobblocks.old_static_nodes, "bobblocks:"..i.."block_off")
+	table.insert(bobblocks.old_static_nodes, "bobblocks:"..i.."pole")
+	table.insert(bobblocks.old_static_nodes, "bobblocks:"..i.."pole_off")
+end
 
-	},
+minetest.register_lbm({
+	name = "bobblocks:convert",
+	label = "Convert bobblocks nodes to use param2 color",
+	run_at_every_load = true,
+	nodenames = bobblocks.old_static_nodes,
+	action = function(pos, node)
+		local basename = node.name
+		local color = string.sub(node.name, 11) -- delete the mod name
+
+		if string.find(color, "_off") then  -- delete "_off" if it exists
+			color = string.sub(color, 1, -5)
+		end
+		if string.find(color, "pole") then
+			color = string.sub(color, 1, -5) -- delete "pole"...
+		else
+			color = string.sub(color, 1, -6) -- or delete "block"
+		end
+
+		local newcolor = "medium_"..color  -- the result of the above should be just the hue
+
+		-- custom re-mappings to use unified dyes' colors that are most similar to the originals
+		if color == "blue" then
+			newcolor = "medium_skyblue"
+		end
+		if color == "indigo" then
+			newcolor = "light_violet"
+		end
+		if color == "violet" then
+			newcolor = "violet_s50"
+		end
+		if color == "white" then
+			newcolor = "light_grey"
+		end
+
+		local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..newcolor, false)
+		local newnode = "bobblocks:block"
+
+		if string.find(basename, "grey") then
+			paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:grey", false)
+			if string.find(basename, "pole") then
+				newnode = "bobblocks:wavypole"
+			else
+				newnode = "bobblocks:wavyblock"
+			end
+		else
+			if string.find(basename, "pole") then
+				newnode = "bobblocks:pole"
+			end
+		end
+
+		local meta = minetest.get_meta(pos)
+		minetest.set_node(pos, { name = newnode, param2 = paletteidx })
+		meta:set_string("dye", "unifieddyes:"..newcolor)
+	end
 })
-
-
--- MESECON
--- Add jeija to bobblocks\default.txt and paste the below in at the bottom of bobblocks\blocks.lua
-
diff --git a/bobblocks/depends.txt b/bobblocks/depends.txt
index aca967d..ada7093 100644
--- a/bobblocks/depends.txt
+++ b/bobblocks/depends.txt
@@ -1,2 +1,3 @@
 default
 mesecons
+unifieddyes
diff --git a/bobblocks/textures/bobblocks_block.png b/bobblocks/textures/bobblocks_block.png
new file mode 100644
index 0000000..60d2374
--- /dev/null
+++ b/bobblocks/textures/bobblocks_block.png
diff --git a/bobblocks/textures/bobblocks_block_off.png b/bobblocks/textures/bobblocks_block_off.png
new file mode 100644
index 0000000..a2dd491
--- /dev/null
+++ b/bobblocks/textures/bobblocks_block_off.png
diff --git a/bobblocks/textures/bobblocks_pole_inv.png b/bobblocks/textures/bobblocks_pole_inv.png
new file mode 100644
index 0000000..0005e51
--- /dev/null
+++ b/bobblocks/textures/bobblocks_pole_inv.png
diff --git a/bobblocks/textures/bobblocks_wavyblock.png b/bobblocks/textures/bobblocks_wavyblock.png
new file mode 100644
index 0000000..49979bb
--- /dev/null
+++ b/bobblocks/textures/bobblocks_wavyblock.png
diff --git a/bobblocks/textures/bobblocks_wavypole_inv.png b/bobblocks/textures/bobblocks_wavypole_inv.png
new file mode 100644
index 0000000..e32920c
--- /dev/null
+++ b/bobblocks/textures/bobblocks_wavypole_inv.png