Use Unified Dyes on_dig where needed (#7)

Requires Unified Dyes commit 9ff40a7f or later

init.lua

@@ -103,21 +103,17 @@ minetest.register_node("unifiedbricks:brickblock", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	is_ground_content = true,
 	groups = {cracky=3, not_in_creative_inventory=1, 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,
-	drop = "default:brick"
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.override_item("default:brick", {
-	ud_replacement_node = "unifiedbricks:brickblock",
 	palette = "unifieddyes_palette_extended.png",
+	airbrush_replacement_node = "unifiedbricks:brickblock",
 	groups = {cracky = 3, ud_param2_colorable = 1},
-	after_place_node = unifieddyes.recolor_on_place
 })
 
 minetest.register_node("unifiedbricks:clayblock", {
@@ -127,23 +123,19 @@ minetest.register_node("unifiedbricks:clayblock", {
 	},
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	is_ground_content = true,
 	groups = {crumbly=3, not_in_creative_inventory=1, ud_param2_colorable = 1},
 		sounds = default.node_sound_dirt_defaults({
 			footstep = "",
 		}),
 	on_construct = unifieddyes.on_construct,
-	after_place_node = unifieddyes.recolor_on_place,
-	after_dig_node = unifieddyes.after_dig_node,
-	drop = "default:clay"
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.override_item("default:clay", {
-	ud_replacement_node = "unifiedbricks:clayblock",
 	palette = "unifieddyes_palette_extended.png",
+	airbrush_replacement_node = "unifiedbricks:clayblock",
 	groups = {crumbly = 3, ud_param2_colorable = 1},
-	after_place_node = unifieddyes.recolor_on_place,
 })
 
 minetest.register_node("unifiedbricks:brickblock_multicolor_dark", {
@@ -157,13 +149,11 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_dark", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	is_ground_content = true,
 	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,
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.register_node("unifiedbricks:brickblock_multicolor_medium", {
@@ -177,13 +167,11 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_medium", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	is_ground_content = true,
 	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,
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.register_node("unifiedbricks:brickblock_multicolor_light", {
@@ -197,13 +185,11 @@ minetest.register_node("unifiedbricks:brickblock_multicolor_light", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
-	place_param2 = 240,
 	is_ground_content = true,
 	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,
+	on_dig = unifieddyes.on_dig,
 })
 
 minetest.register_craft( {
@@ -239,6 +225,61 @@ minetest.register_craft( {
 	},
 })
 
+unifieddyes.register_color_craft({
+	output = "unifiedbricks:brickblock",
+	palette = "extended",
+	neutral_node = "default:brick",
+	type = "shapeless",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "unifiedbricks:clayblock",
+	palette = "extended",
+	neutral_node = "default:clay",
+	type = "shapeless",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "unifiedbricks:brickblock_multicolor_dark",
+	palette = "extended",
+	neutral_node = "unifiedbricks:brickblock_multicolor_dark",
+	type = "shapeless",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "unifiedbricks:brickblock_multicolor_medium",
+	palette = "extended",
+	neutral_node = "unifiedbricks:brickblock_multicolor_medium",
+	type = "shapeless",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "unifiedbricks:brickblock_multicolor_light",
+	palette = "extended",
+	neutral_node = "unifiedbricks:brickblock_multicolor_light",
+	type = "shapeless",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE"
+	}
+})
+
 -- static nodes
 
 unifiedbricks.register_old_static_block = function(name, formalname, blocktype)
@@ -343,24 +384,4 @@ minetest.register_lbm({
 	end
 })
 
-minetest.register_lbm({
-	name = "unifiedbricks:recolor_bricks",
-	label = "Convert 89-color bricks to use UD extended palette",
-	run_at_every_load = false,
-	nodenames = {
-		"unifiedbricks:clayblock",
-		"unifiedbricks:brickblock",
-		"unifiedbricks:brickblock_multicolor_dark",
-		"unifiedbricks:brickblock_multicolor_medium",
-		"unifiedbricks:brickblock_multicolor_light",
-	},
-	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
-})
-
 print("[UnifiedBricks] Loaded!")