update API

(broken in multiple places....oy.)

also, fix wrong light green shade in colorwallmounted palette

also, fixed many wrong/missing aliases and translations between old and current colors
(i.e. aqua<->spring, skyblue<->azure, redviolet<->rose)

API.md

@@ -13,6 +13,7 @@ minetest.register_node("mymod:colored_node", {
 	palette = "unifieddyes_palette_extended.png",
 	groups = {snappy = 1, cracky = 2, ud_param2_colorable = 1}
 	on_construct = unifieddyes.on_construct,
+	airbrush_replacement_node = "mymod:my_other_colored_node"
 })
 ```
 
@@ -31,6 +32,8 @@ minetest.register_node("mymod:colored_node", {
 
 `on_construct`: see below.
 
+`airbrush_replacement_node`:  The node to swap in when the airbrush is used on this node.  For example, you could `minetest.override_item()` on some default node to add this field, pointing to a colorable node of your own, so that when the default node is painted, it's replaced with yours in the new color.
+
 #### Function calls
 
 **`unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)`
@@ -42,10 +45,6 @@ These two are used to re-orient `wallmounted` nodes after placing. The former al
 
 This serves the same purpose as the `fix_rotation_nsew`, but is used to restrict the node's rotation after it's been hit with the screwdriver.
 
-**`unifieddyes.select_node(pointed_thing)`**
-
-Just what it says on the tin. :-) This function returns a position and node definition of whatever is being pointed at. 
-
 **`unifieddyes.is_buildable_to(placer_name, ...)`**
 
 Again, another obvious one, returns whether or not the pointed node is `buildable_to` (can be overwritten by another node).
@@ -54,7 +53,7 @@ Again, another obvious one, returns whether or not the pointed node is `buildabl
 
 Accepts an item name, and returns the corresponding hue, saturation, and value (in that order), as strings.
 
-If the item name is a color (not greyscale), then `hue` will be the basic hue for that color, saturation will be empty string for high saturation or "_s50" for low, and value will be "dark_", "medium_", "light_", or an empty string if it's full color.
+If the item name is a color (not greyscale), then `hue` will be the basic hue for that color, saturation will be empty string for high saturation or "\_s50" for low, and value will be "dark_", "medium_", "light_", or an empty string if it's full color.
 
 If the item name is greyscale, then `hue` will contain "white", "light_grey", "grey", "dark_grey", or "black", saturation will (ironically) be an empty string, and value will be "light_", "dark_", or empty string to correspond with the contents of `hue`.
 
@@ -68,42 +67,30 @@ For example:
 **`unifieddyes.getpaletteidx(color, palette_type)`**
 
 When given a `color` string (in the form of "dye:foo" or "unifieddyes:foo") and `palette_type` (either a boolean or string), this function returns the numerical index into that palette, and the hue name as a string.
-    `false` or `nil`: the 89-color palette
+* `false` or `nil`: the 89-color palette
-    `true`: 89 color "split" palette mode, for nodes that need full `facedir` support. In this case, the hue field would match whichever of the 13 "split" palettes the node is using, and the index will be 1-7, representing the shade within that palette. See my coloredwoods mod for more information on how this mode is used.
+* `true`: 89 color "split" palette mode, for nodes that need full `facedir` support. In this case, the returned hue will be the color of whichever of the 13 "split" palettes the node is using, and the index will be 1-7, representing the shade within that palette. See my coloredwoods mod for more information on how this mode is used.  If the node is black, white, or grey, the hue will be set to 0. 
-    `wallmounted`: the 32-color palette, for nodes using `colorwallmounted` mode.
+* `wallmounted`: the 32-color palette, for nodes using `colorwallmounted` mode.
-    `extended`: the 256-color "extended" palette
+* `extended`: the 256-color "extended" palette
+
+**`unifieddyes.color_to_name(param2, def)`**
+
+This function will attempt to return the name of the color indicated by `param2`.  `palette` tells the function which palette filename was used with that param2 value.  The returned value should be suitable as a dye item name when prefixed with "dye:".
+
+**`unifieddyes.on_airbrush(itemstack, player, pointed_thing)`**
+
+This is called when a node is punched while wielding the airbrush.
+
+**`unifieddyes.show_airbrush_form(player)`**
+
+This one does just what it sounds like - it shows the color selector formspec.
 
 **`unifieddyes.on_construct(pos)`**
 
-This function, called in your node definition's on_construct, just sets the `palette = "ext"` metadata key for the node after it's been placed. This can then be read in an LBM to determine if this node needs to be converted from the old 89-color palette to the extended 256-color palette. Although it is good practice to call this for any node that uses the 256-color palette, it isn't actually necessary as long as the node has never used the 89-color palette, and won't be subjected to an LBM that changes its color.
+This function, usually called from your node definition's `on_construct`, just sets the `palette = "ext"` metadata key for the node after it's been placed. This can then be read in an LBM to determine if this node needs to be converted from the old 89-color palette to the extended 256-color palette. Although it is good practice to call this for any node that uses the 256-color palette, it isn't actually necessary as long as the node has never used the 89-color palette, and won't be subjected to an LBM that changes its color.
 
-#### Tables
+**`unifieddyes.register_color_craft(recipe)`**
 
-In addition to the above API calls, Unified Dyes provides several useful tables
+This will loop through all of Unified Dyes' color lists, generating one recipe for every color in the palette given in the call.  Example usage:
-
-`unifieddyes.HUES` contains a list of the 12 hues used by the 89-color palette.
-
-`unifieddyes.HUES_EXTENDED` contains a list of the 24 hues in the 256-color palette. Each line contains the color name and its RGB value expressed as three numbers (rather than the usual `#RRGGBB` string).
-
-`unifieddyes.base_color_crafts` contains a condensed list of crafting recipes for all 24 basic hues, plus black and white, most of which have multiple alternative recipes. Each line contains the name of the color, up to five dye itemstrings (with `nil` in each unused space), and the yield for that craft. 
-
-`unifieddyes.shade_crafts` contains recipes for each of the 10 shades a hue can take on, used with one or two portions of the dye corresponding to that hue. Each line contains the shade name with trailing "_", the saturation name (either "_s50" or empty string), up to three dye item strings, and the yield for that craft.
-
-`unifieddyes.greymixes` contains the recipes for the 14 shades of grey. Each line contains the grey shade number from 1-14, up to four dye item names, and the yield for that craft.
-
-#### Converting an old mod
-
-If your mod used the old paradigm where you craft a neutral-colored item, place it, and punch with dye to color it, and you wish to convert it to colored itemstacks, take the following actions for each node:
-
-* Remove these keys:
-
-```lua
-	after_dig_node = unifieddyes.after_dig_node,
-	place_param2 = 240,
-	after_place_node = unifieddyes.recolor_on_place,
-```
-
-* Add a call to the create-all-recipes helper.  Here's an example:
 
 ```lua
 	unifieddyes.register_color_craft({
@@ -124,17 +111,54 @@ If your mod used the old paradigm where you craft a neutral-colored item, place
 
 `type` can be "shapeless" or unspecified/`nil`, and works the same as in the normal call.
 
-`neutral_node` should specify the name of whatever item or node serves as the base, neutrally-colored material in your recipe.  This really only applies if your node is just made from one item (or more than one of the same item), plus one or more dyes.  If your node is just made from a collection of item and no one item is really the neutral material, or anyway if you don't need this substitution, you must set it to an empty string.
+`neutral_node` should specify the name of whatever item or node serves as the base, neutrally-colored material in your recipe.  This really only applies if your node is just made from one item (or more than one of the same item), plus one or more dyes.  If your node is just made from a collection of assorted items and no one item is really the neutral material, or anyway if you don't need this substitution, you must set it to an empty string.
 
 `recipe` is the same as in the normal call, except that Unified Dyes will replace all instances of the string "NEUTRAL_NODE" with the item specified in the preceding `neutral_node` field.  Every instance of "MAIN_DYE" will be replaced with a portion of dye, as Unified Dyes' recipe helper works through its color lists (i.e. this field will become whatever dye is needed for each recipe).
 
-If your mod never has never used Unified Dyes at all, in short, do the following:
+`output_prefix` and `output_suffix`, if specified (must use both if at all), will cause the recipe registration to ignore the usual `output` field, and instead set to the output item to `output_prefix` + (hue) + `output_suffix`.  Used for mods that use the split 89-color palette.  `hue` will thus be one of the 12 hues, or "grey", as defined by the split palettes.
+
+**`unifieddyes.make_colored_itemstack(itemstack, palette, color)`**
+
+Makes a colored itemstack out of the given `itemstack` and `color` (as a dye, e.g. "dye:dark_red_s50"), setting the correct index per the `palette` field, which works as described above for `unifieddyes.getpaletteidx()`.  Said itemstack is returned as a string suitable for use as the output field of a craft recipe, equal in size to the itemstack passed into the function (e.g. if you give it "mymod:colored_node 7", it'll return a stack of 7 colored items).
+
+#### Tables
+
+In addition to the above API calls, Unified Dyes provides several useful tables
+
+`unifieddyes.HUES` contains a list of the 12 hues used by the 89-color palette.
+
+`unifieddyes.HUES_EXTENDED` contains a list of the 24 hues in the 256-color palette. Each line contains the color name and its RGB value expressed as three numbers (rather than the usual `#RRGGBB` string).
+
+`unifieddyes.base_color_crafts` contains a condensed list of crafting recipes for all 24 basic hues, plus black and white, most of which have multiple alternative recipes. Each line contains the name of the color, up to five dye itemstrings (with `nil` in each unused space), and the yield for that craft. 
+
+`unifieddyes.shade_crafts` contains recipes for each of the 10 shades a hue can take on, used with one or two portions of the dye corresponding to that hue. Each line contains the shade name with trailing "_", the saturation name (either "_s50" or empty string), up to three dye item strings, and the yield for that craft.
+
+`unifieddyes.greymixes` contains the recipes for the 14 shades of grey. Each line contains the grey shade number from 1-14, up to four dye item names, and the yield for that craft.
+
+#### Converting an old mod
+
+If your mod used the old paradigm where you craft a neutral-colored item, place it, and punch with dye to color it, and you wish to convert it to colored itemstacks, take the following actions for each node:
+
+* Remove these keys from your node definition:
+
+```lua
+	place_param2 = 240,
+	after_dig_node = unifieddyes.after_dig_node,
+	after_place_node = unifieddyes.recolor_on_place,
+	ud_replacement_node = "mod:some_node"
+```
+
+* Add the `airbrush_replacement_node` key to the node definition, if needed.
+
+* Add a call to `unifieddyes.register_color_craft(recipe)`, the create-all-the-recipes helper described above (of course, you don't have to register any recipes if you don't want to, or you can roll your own, your choice).
+
+**If your mod never has never used Unified Dyes at all**
 
 * Remove all of your various colored node definitions, keeping only the one for the white version of your node, or delete them all, and keep whatever node you consider to be "neutral colored".
 
 * Delete all of the colored texture files too, except keep the brightest, highest-contrast, most detailed one - whichever color that happens to be.  Most likely, red or green will be the best one.
 
-* Convert that last texture to grayscale, enhance its contrast as much as you can without distorting it, and rename it to something more neutral.
+* Convert that remaining texture to grayscale, enhance its contrast as much as you can without distorting it, and rename it and the node it'll be used to something neutral-sounding.
 
 * Add the `on_construct` and `palette` keys to your neutral node definition, for example:
 
@@ -149,6 +173,10 @@ If your mod never has never used Unified Dyes at all, in short, do the following
 
 * Add the above recipes helper call (which replaces those delted recipes)
 
-If your colored node is based on someone else's neutral node, for example if you made a mod that creates multiple colors of minetest_game's default clay, you may find it best to create a single "stand-in" node that's identical to the neutral node, but named for your mod, hidden from the creative inventory, and has a properly-prepared grayscale texture image in addition to the above keys.  Use the neutral node and the custom hidden node as in the above craft helper call.  Then use minetest.override_item() to add the on_construct and palette keys and the ud_param2_colorable group to that "someone else's" node.
+* If your colored node is based on someone else's neutral node, for example if you made a mod that creates multiple colors of minetest_game's default clay, you may find it best to create a single "stand-in" node that's identical to the neutral node, but named for your mod, hidden from the creative inventory, and which has a properly-prepared grayscale texture image in addition to the above keys.  Use `minetest.override_item()` to add the `on_construct`, `palette`, and `airbrush_replacement_node` keys, and the `ud_param2_colorable` group, to that "someone else's" node.  Then use that node and your custom, hidden node in the craft helper call.
 
 * You will need to write a run-only-once LBM to convert your old statically-colored nodes to use hardware coloring.  See above for functions that will help reduce the work required for this part.
+
+**If your mod has no colorable items**
+
+If you wish to expand your mod to support color, just follow the above "never used" section, skipping the "remove/delete this and that" items, and of course omitting the LBM.

init.lua

@@ -153,6 +153,42 @@ local default_dyes = {
 	"yellow"
 }
 
+unifieddyes.player_current_dye = {}
+unifieddyes.player_selected_dye = {}
+
+-- if a node with a palette is placed in the world,
+-- but the itemstack used to place it has no palette_index (color byte),
+-- create something appropriate to make it officially white.
+
+minetest.register_on_placenode(
+	function(pos, newnode, placer, oldnode, itemstack, pointed_thing)
+		local def = minetest.registered_items[newnode.name]
+
+		if not def
+		  or not def.palette
+		  or def.after_place_node then
+			return false
+		end
+
+		if not string.find(itemstack:to_string(), "palette_index") then
+			local param2 = 0
+			local color = 0
+
+			if def.palette == "unifieddyes_palette_extended.png" then
+				param2 = 240
+				color = 240
+			elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
+				param2 = newnode.param2 % 8
+			elseif def.palette ~= "unifieddyes_palette.png" then -- it's a split palette
+				param2 = newnode.param2 % 32
+			end
+
+			minetest.swap_node(pos, {name = newnode.name, param2 = param2})
+			minetest.get_meta(pos):set_int("palette_index", color)
+		end
+	end
+)
+
 -- just stubs to keep old mods from crashing when expecting auto-coloring
 -- or getting back the dye on dig.
 
@@ -168,7 +204,7 @@ function unifieddyes.make_colored_itemstack(item, palette, color)
 	local paletteidx = unifieddyes.getpaletteidx(color, palette)
 	local stack = ItemStack(item)
 	stack:get_meta():set_int("palette_index", paletteidx)
-	return stack:to_string()
+	return stack:to_string(),paletteidx
 end
 
 -- if your node was once 89-color and uses an LBM to convert to the 256-color palette,
@@ -195,7 +231,6 @@ local function register_c(craft, hue, sat, val)
 	end
 
 	local dye = "dye:"..color
-
 	local recipe = minetest.serialize(craft.recipe)
 	recipe = string.gsub(recipe, "MAIN_DYE", dye)
 	recipe = string.gsub(recipe, "NEUTRAL_NODE", craft.neutral_node)
@@ -235,6 +270,8 @@ function unifieddyes.register_color_craft(craft)
 	local greys_table = unifieddyes.GREYS
 
 	if craft.palette == "wallmounted" then
+		register_c(craft, "green", "", "light_")
+		register_c(craft, "azure", "", "")
 		hues_table = unifieddyes.HUES_WALLMOUNTED
 		sats_table = {""}
 		vals_table = unifieddyes.VALS
@@ -310,19 +347,6 @@ function unifieddyes.fix_after_screwdriver_nsew(pos, node, user, mode, new_param
 	end
 end
 
-function unifieddyes.select_node(pointed_thing)
-	local pos = pointed_thing.under
-	local node = minetest.get_node_or_nil(pos)
-	local def = node and minetest.registered_nodes[node.name]
-
-	if not def or not def.buildable_to then
-		pos = pointed_thing.above
-		node = minetest.get_node_or_nil(pos)
-		def = node and minetest.registered_nodes[node.name]
-	end
-	return def and pos, def
-end
-
 function unifieddyes.is_buildable_to(placer_name, ...)
 	for _, pos in ipairs({...}) do
 		local node = minetest.get_node_or_nil(pos)
@@ -381,6 +405,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
 	local aliases = {
 		["pink"] = "light_red",
 		["brown"] = "medium_orange",
+		["azure"] = "light_blue"
 	}
 
 	local grayscale = {
@@ -428,12 +453,15 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		["lime"] = 4,
 		["green"] = 5,
 		["aqua"] = 6,
+		["spring"] = 6,
 		["cyan"] = 7,
 		["skyblue"] = 8,
+		["azure"] = 8,
 		["blue"] = 9,
 		["violet"] = 10,
 		["magenta"] = 11,
 		["redviolet"] = 12,
+		["rose"] = 12,
 	}
 
 	local hues_extended = {
@@ -448,10 +476,12 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		["green"] = 8,
 		["malachite"] = 9,
 		["spring"] = 10,
+		["aqua"] = 10,
 		["turquoise"] = 11,
 		["cyan"] = 12,
 		["cerulean"] = 13,
 		["azure"] = 14,
+		["skyblue"] = 14,
 		["sapphire"] = 15,
 		["blue"] = 16,
 		["indigo"] = 17,
@@ -460,6 +490,7 @@ function unifieddyes.getpaletteidx(color, palette_type)
 		["magenta"] = 20,
 		["fuchsia"] = 21,
 		["rose"] = 22,
+		["redviolet"] = 22,
 		["crimson"] = 23,
 	}
 
@@ -555,9 +586,10 @@ function unifieddyes.getpaletteidx(color, palette_type)
 	end
 
 	if palette_type == "wallmounted" then
-		if color == "brown" then return 48,1
+		if color == "green" and shade == "light" then return 48,3
+		elseif color == "brown" then return 17,1
 		elseif color == "pink" then return 56,7
-		elseif color == "blue" and shade == "light" then return 40,5
+		elseif color == "azure" then return 40,5
 		elseif hues_wallmounted[color] and shades_wallmounted[shade] then
 			return (shades_wallmounted[shade] * 64 + hues_wallmounted[color] * 8), hues_wallmounted[color]
 		end
@@ -569,7 +601,18 @@ function unifieddyes.getpaletteidx(color, palette_type)
 			color = "red"
 			shade = "light"
 		end
-		if palette_type == true then -- it's colorfacedir
+		if palette_type == true then -- it's colorfacedir, so "split" 89-color palette
+
+			-- If using this palette, translate new color names back to old.
+
+			if color == "spring" then
+				color = "aqua"
+			elseif color == "azure" then
+				color = "skyblue"
+			elseif color == "rose" then
+				color = "redviolet"
+			end
+
 			if hues[color] and shades[shade] then
 				return (shades[shade] * 32), hues[color]
 			end
@@ -577,18 +620,13 @@ function unifieddyes.getpaletteidx(color, palette_type)
 			if hues_extended[color] and shades_extended[shade] then
 				return (hues_extended[color] + shades_extended[shade]*24), hues_extended[color]
 			end
-		else -- it's the 89-color palette
+		else -- it's the regular 89-color palette, do the same translation if needed
-
+			if color == "spring" then
-			-- If using this palette, translate new color names back to old.
+				color = "aqua"
-
+			elseif color == "azure" then
-			if shade == "" then
+				color = "skyblue"
-				if color == "spring" then
+			elseif color == "rose" then
-					color = "aqua"
+				color = "redviolet"
-				elseif color == "azure" then
-					color = "skyblue"
-				elseif color == "rose" then
-					color = "redviolet"
-				end
 			end
 			if hues[color] and shades[shade] then
 				return (hues[color] * 8 + shades[shade]), hues[color]
@@ -597,179 +635,429 @@ function unifieddyes.getpaletteidx(color, palette_type)
 	end
 end
 
-function unifieddyes.on_use(itemstack, player, pointed_thing)
+-- punch-to-recolor using the airbrush
-	local stackname = itemstack:get_name()
-	local playername = player:get_player_name()
 
-	if pointed_thing and pointed_thing.type == "node" and unifieddyes.select_node(pointed_thing) then
+function unifieddyes.on_airbrush(itemstack, player, pointed_thing)
-		if minetest.is_protected(unifieddyes.select_node(pointed_thing), playername)
+	local player_name = player:get_player_name()
-		  and not minetest.check_player_privs(playername, "protection_bypass") then
+	local painting_with = nil
-			minetest.chat_send_player(playername, "Sorry, someone else owns that spot.")
+
-			return
+	if unifieddyes.player_current_dye[player_name] then
-		end
+		painting_with = unifieddyes.player_current_dye[player_name]
 	end
 
-	if pointed_thing and pointed_thing.type == "object" then
-		pointed_thing.ref:punch(player, 0, itemstack:get_tool_capabilities())
-		return player:get_wielded_item() -- punch may modified the wielded item, load the new and return it
-	end
-
-	if not (pointed_thing and pointed_thing.type == "node") then return end  -- if "using" the dye on nothing at all (e.g. air)
-
 	local pos = minetest.get_pointed_thing_position(pointed_thing)
+	if not pos then return end
+
 	local node = minetest.get_node(pos)
+	local def = minetest.registered_items[node.name]
+	if not def then return end
 
-	local nodedef = minetest.registered_nodes[node.name]
+	if minetest.is_protected(pos, player_name) then
+		minetest.chat_send_player(player_name, "*** Sorry, someone else owns that node.")
+		return
+	end
 
-	if not nodedef then return end -- target was an unknown node, just bail out
+	if not painting_with then
+		minetest.chat_send_player(player_name, "*** You need to set a color first.")
+		minetest.chat_send_player(player_name, "*** Right-click any random node to open the color selector,")
+		minetest.chat_send_player(player_name, "*** or shift+right-click a colorized node to use its color.")
+		minetest.chat_send_player(player_name, "*** Be sure to click \"Accept\", or the color you select will be ignored.")
+		return
+	end
 
-	-- if the node has an on_punch defined, bail out and call that instead, unless "sneak" is pressed.
+	if not def.palette then
-	if not player:get_player_control().sneak then
+		minetest.chat_send_player(player_name, "*** That node can't be colored.")
-		local onpunch = nodedef.on_punch(pos, node, player, pointed_thing)
+		return
-		if onpunch then
+	end
-			return onpunch
+
+	local palette = nil
+	local fdir = 0
+	if def.palette == "unifieddyes_palette_extended.png" then
+		palette = "extended"
+	elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
+		palette = "wallmounted"
+		fdir = node.param2 % 8
+	elseif def.palette ~= "unifieddyes_palette.png" then
+		palette = true
+		fdir = node.param2 % 32
+	end
+
+	local idx, hue = unifieddyes.getpaletteidx(painting_with, palette)
+	local inv = player:get_inventory()
+	if (not creative or not creative.is_enabled_for(player_name)) and not inv:contains_item("main", painting_with) then
+		local suff = ""
+		if not idx then
+			suff = "  Besides, "..string.sub(painting_with, 5).." can't be applied to that node."
 		end
-	end
+		minetest.chat_send_player(player_name, "*** You're in survival mode, and you're out of "..string.sub(painting_with, 5).."."..suff)
-
-	-- if the target is unknown, has no groups defined, or isn't UD-colorable, just bail out
-	if not (nodedef and nodedef.groups and nodedef.groups.ud_param2_colorable) then
-		minetest.chat_send_player(playername, "That node can't be colored.")
 		return
 	end
 
-	local newnode = nodedef.ud_replacement_node
+	if not idx then
-	local palette_type
+		minetest.chat_send_player(player_name, "*** "..string.sub(painting_with, 5).." can't be applied to that node.")
-
-	if nodedef.palette == "unifieddyes_palette_extended.png" then
-		palette_type = "extended"
-	elseif nodedef.palette == "unifieddyes_palette.png" then
-		palette_type = false
-	elseif nodedef.paramtype2 == "colorfacedir" then
-		palette_type = true
-	elseif nodedef.paramtype2 == "colorwallmounted" then
-		palette_type = "wallmounted"
-	end
-
-	if minetest.is_protected(pos, playername) and not minetest.check_player_privs(playername, {protection_bypass=true}) then
-		minetest.record_protection_violation(pos, playername)
 		return
 	end
 
-	local pos2 = unifieddyes.select_node(pointed_thing)
+	local oldidx = node.param2 - fdir
-	local paletteidx, hue = unifieddyes.getpaletteidx(stackname, palette_type)
 
-	if paletteidx then
+	local name = def.airbrush_replacement_node or node.name
 
-		local meta = minetest.get_meta(pos)
+	if palette == true then
-		local prevdye = meta:get_string("dye")
+		local s = string.sub(def.palette, 21)
-		local inv = player:get_inventory()
+		local oldcolor = string.sub(s, 1, string.find(s, "s.png")-1)
 
-		if not (inv:contains_item("main", prevdye) and creative_mode) and minetest.registered_items[prevdye] then
+		local modname = string.sub(name, 1, string.find(name, ":")-1)
-			if inv:room_for_item("main", prevdye) then
+		local nodename2 = string.sub(name, string.find(name, ":")+1)
-				inv:add_item("main", prevdye)
+
-			else
+		local a,b
-				minetest.add_item(pos, prevdye)
+
+		local newcolor = "grey"
+		if hue ~= 0 then
+			newcolor = unifieddyes.HUES[hue]
+		end
+
+		local a,b = string.gsub(nodename2, oldcolor, newcolor)
+		name = modname..":"..a
+	elseif idx == oldidx then
+		return
+	end
+
+	minetest.swap_node(pos, {name = name, param2 = fdir + idx})
+	if not creative or not creative.is_enabled_for(player_name) then
+		inv:remove_item("main", painting_with)
+		return
+	end
+end
+
+-- get a node's dye color based on its palette and param2
+
+function unifieddyes.color_to_name(param2, def)
+	if not param2 or not def or not def.palette then return end
+
+	if def.palette == "unifieddyes_palette_extended.png" then
+		local color = param2
+
+		local v = 0
+		local s = 1 
+		if color < 24 then v = 1
+		elseif color > 23  and color < 48  then v = 2
+		elseif color > 47  and color < 72  then v = 3
+		elseif color > 71  and color < 96  then v = 4
+		elseif color > 95  and color < 120 then v = 5
+		elseif color > 119 and color < 144 then v = 5 s = 2
+		elseif color > 143 and color < 168 then v = 6
+		elseif color > 167 and color < 192 then v = 6 s = 2
+		elseif color > 191 and color < 216 then v = 7
+		elseif color > 215 and color < 240 then v = 7 s = 2
+		end
+
+		if color > 239 then
+			if color == 240 then return "white"
+			elseif color == 244 then return "light_grey"
+			elseif color == 247 then return "grey"
+			elseif color == 251 then return "dark_grey"
+			elseif color == 255 then return "black" 
+			else return "grey_"..15-(color-240)
+			end
+		else
+			local h = color - math.floor(color/24)*24
+			return unifieddyes.VALS_EXTENDED[v]..unifieddyes.HUES_EXTENDED[h+1][1]..unifieddyes.SATS[s]
+		end
+
+	elseif def.palette == "unifieddyes_palette.png" then
+		local color = param2
+		local h = math.floor(color/8)
+		local s = 1
+		local val = ""
+		if color == 1 or color == h or color > 103 or color == 6 or color == 7 then return "white"
+		elseif color == 2 then return "light_grey"
+		elseif color == 3 then return "grey"
+		elseif color == 4 then return "dark_grey"
+		elseif color == 5 then return "black"
+		end
+		local c = color - h*8
+		if c == 2 then s = 2
+		elseif c == 3 then val = "light_"
+		elseif c == 4 then val = "medium_"
+		elseif c == 5 then val = "medium_" s = 2
+		elseif c == 6 then val = "dark_"
+		else val = "dark_" s = 2
+		end
+
+		return val..unifieddyes.HUES[h+1]..unifieddyes.SATS[s]
+ 
+	elseif def.palette == "unifieddyes_palette_colorwallmounted.png" then
+		local color = math.floor(param2 / 8)
+		if color == 0 then return "white"
+		elseif color == 1 then return "light_grey"
+		elseif color == 2 then return "grey"
+		elseif color == 3 then return "dark_grey"
+		elseif color == 4 then return "black"
+		elseif color == 5 then return "light_blue"
+		elseif color == 6 then return "light_green"
+		elseif color == 7 then return "pink"
+		end
+		local v = math.floor(color/8)
+		local h = color - v * 8
+		return unifieddyes.VALS[v]..unifieddyes.HUES_WALLMOUNTED[h+1]
+
+	elseif string.find(def.palette, "unifieddyes_palette") then -- it's the "split" 89-color palette
+		-- palette names in this mode are always "unifieddyes_palette_COLORs.png"
+
+		local s = string.sub(def.palette, 21)
+		local color = string.sub(s, 1, string.find(s, "s.png")-1)
+
+		local v = math.floor(param2/32)
+		if v == 0 then return "white" end
+		if color ~= "grey" then
+			if v == 1 then return color
+			elseif v == 2 then return color.."_s50"
+			elseif v == 3 then return "light_"..color
+			elseif v == 4 then return "medium_"..color
+			elseif v == 5 then return "medium_"..color.."_s50"
+			elseif v == 6 then return "dark_"..color
+			elseif v == 7 then return "dark_"..color.."_s50"
+			end
+		else
+			if v > 0 and v < 6 then return unifieddyes.GREYS[v]
+			else return "white"
 			end
 		end
+	end
+end
 
-		meta:set_string("dye", stackname)
+function unifieddyes.show_airbrush_form(player)
+	if not player then return end
+	local player_name = player:get_player_name()
+	local creative = creative and creative.is_enabled_for(player_name)
+	local inv = player:get_inventory()
 
-		if prevdye == stackname then
+	local base_form = "size[15,8.5]label[7,-0.25;Select a color:]"
-			local a,b = string.find(stackname, ":")
+	local size="0.75,0.75;"
-			minetest.chat_send_player(playername, "That node is already "..string.sub(stackname, a + 1).."." )
+	local hps=0.6
+	local vps=1.3
+	local vs=0.3
+
+	for v = 0, 6 do
+		local val = unifieddyes.VALS_EXTENDED[v+1]
+
+		local sat = ""
+		local v2=(v/2)
+
+		for hi, h in ipairs(unifieddyes.HUES_EXTENDED) do
+			local hue = h[1]
+			local hp=hi-0.5
+
+			local r = h[2]
+			local g = h[3]
+			local b = h[4]
+
+			local factor = 40
+			if v > 3 then
+				factor = 75
+				v2 = (v-2)
+			end
+
+			local r2 = math.max(math.min(r + (4-v)*factor, 255), 0)
+			local g2 = math.max(math.min(g + (4-v)*factor, 255), 0)
+			local b2 = math.max(math.min(b + (4-v)*factor, 255), 0)
+
+			local color = string.format("%02x", r2)..string.format("%02x", g2)..string.format("%02x", b2)
+			local dye = "dye:"..val..hue..sat
+			local overlay = ""
+			if not creative and inv:contains_item("main", dye) then
+				overlay = "^unifieddyes_available_overlay.png"
+			end
+
+			if dye == unifieddyes.player_selected_dye[player_name] then
+				overlay = "^unifieddyes_select_overlay.png"
+			end
+
+			local colorize = minetest.formspec_escape("^[colorize:#"..color..":255")
+			base_form = base_form.."image_button["..
+									(hp*hps)..","..(v2*vps+vs)..";"..
+									size..
+									"unifieddyes_white_square.png"..colorize..overlay..";"..
+									val..hue..sat..";]"..
+									"tooltip["..val..hue..sat..";"..val..hue..sat.."]"
+
+		end
+
+		if v > 3 then
+			sat = "_s50"
+			v2 = (v-1.5)
+
+			for hi, h in ipairs(unifieddyes.HUES_EXTENDED) do
+				local hue = h[1]
+				local hp=hi-0.5
+
+				local r = h[2]
+				local g = h[3]
+				local b = h[4]
+
+				local factor = 75
+
+				local pr = 0.299
+				local pg = 0.587
+				local pb = 0.114
+
+				local r2 = math.max(math.min(r + (4-v)*factor, 255), 0)
+				local g2 = math.max(math.min(g + (4-v)*factor, 255), 0)
+				local b2 = math.max(math.min(b + (4-v)*factor, 255), 0)
+
+				local p = math.sqrt(r2*r2*pr + g2*g2*pg + b2*b2*pb)
+				local r3 = math.floor(p+(r2-p)*0.5)
+				local g3 = math.floor(p+(g2-p)*0.5)
+				local b3 = math.floor(p+(b2-p)*0.5)
+
+				local color = string.format("%02x", r3)..string.format("%02x", g3)..string.format("%02x", b3)
+				local dye = "dye:"..val..hue..sat
+
+				local overlay = ""
+				if not creative and inv:contains_item("main", dye) then
+					overlay = "^unifieddyes_available_overlay.png"
+				end
+
+				if dye == unifieddyes.player_selected_dye[player_name] then
+					overlay = "^unifieddyes_select_overlay.png"
+				end
+
+				local colorize = minetest.formspec_escape("^[colorize:#"..color..":255")
+
+				base_form = base_form.."image_button["..
+										(hp*hps)..","..(v2*vps+vs)..";"..
+										size..
+										"unifieddyes_white_square.png"..colorize..overlay..";"..
+										val..hue..sat..";]"..
+										"tooltip["..val..hue..sat..";"..val..hue..sat.."]"
+			end
+		end
+	end
+
+	local v2=5
+	for y = 0, 15 do
+
+		local hp=(15-y)+0.5
+
+		local grey = string.format("%02x", y*17)..string.format("%02x", y*17)..string.format("%02x", y*17)
+		local grey2 = "grey_"..y
+
+		if y == 0 then grey2 = "black" 
+		elseif y == 4 then grey2 = "dark_grey"
+		elseif y == 8 then grey2 = "grey"
+		elseif y == 11 then grey2 = "light_grey"
+		elseif y == 15 then grey2 = "white"
+		end
+
+		local dye = "dye:"..grey2
+
+		local overlay = ""
+		if not creative and inv:contains_item("main", dye) then
+			overlay = "^unifieddyes_available_overlay.png"
+		end
+
+		if dye == unifieddyes.player_selected_dye[player_name] then
+			overlay = "^unifieddyes_select_overlay.png"
+		end
+
+		local colorize = minetest.formspec_escape("^[colorize:#"..grey..":255")
+		base_form = base_form.."image_button["..
+								(hp*hps)..","..(v2*vps+vs)..";"..
+								size..
+								"unifieddyes_white_square.png"..colorize..overlay..";"..
+								grey2..";]tooltip["..grey2..";"..grey2.."]"
+
+	end
+
+	if not creative then
+		base_form = base_form..
+				"image[10.3,"..(vps*5+vs)..";"..size..
+				"unifieddyes_available_overlay.png]"..
+				"label[11.0,"..(vps*5.1+vs)..";Dyes on hand]"..
+				"image[12.5,"..(vps*5+vs)..";"..size..
+				"unifieddyes_select_overlay.png]"..
+				"label[13.2,"..(vps*5.1+vs)..";Your selection]"
+	end
+
+	base_form = base_form..
+				"button_exit[11,8;2,1;cancel;Cancel]"..
+				"button_exit[13,8;2,1;accept;Accept]"
+
+	if unifieddyes.player_selected_dye[player_name] then
+		base_form = base_form..
+					"label[1,"..(7.5+vs)..";Selected dye:  "..
+					unifieddyes.player_selected_dye[player_name].."]"
+	end
+
+	minetest.show_formspec(player_name, "unifieddyes:dye_select_form", base_form)
+end
+
+minetest.register_tool("unifieddyes:airbrush", {
+	description = S("Dye Airbrush"),
+	inventory_image = "unifieddyes_airbrush.png",
+	use_texture_alpha = true,
+	tool_capabilities = {
+		full_punch_interval=0.1,
+	},
+	range = 12,
+	on_use = unifieddyes.on_airbrush,
+	on_place = function(itemstack, placer, pointed_thing)
+		local keys = placer:get_player_control()
+		if not keys.sneak then
+			unifieddyes.show_airbrush_form(placer)
+		elseif keys.sneak then
+			local player_name = placer:get_player_name()
+			local pos = minetest.get_pointed_thing_position(pointed_thing)
+			if not pos then return end
+			local node = minetest.get_node(pos)
+			local def = minetest.registered_items[node.name]
+			if not def then return end
+			local newcolor = unifieddyes.color_to_name(node.param2, def)
+
+			if not newcolor then
+				minetest.chat_send_player(player_name, "*** That node is uncolored.")
+				return
+			end
+			minetest.chat_send_player(player_name, "*** Switching to "..newcolor.." for the airbrush, to match that node.")
+			unifieddyes.player_current_dye[player_name] = "dye:"..newcolor 
+		end
+	end
+})
+
+minetest.register_craft( {
+	output = "unifieddyes:airbrush",
+	recipe = {
+		{ "default:gold_ingot", "",                    "bucket:bucket_empty" },
+		{ "",                   "default:steel_ingot", ""                    },
+		{ "",                   "",                    "default:steel_ingot" }
+	},
+})
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if formname == "unifieddyes:dye_select_form" then
+		local player_name = player:get_player_name()
+		local s1 = string.sub(minetest.serialize(fields), 11)
+		local s3 = string.sub(s1,1, string.find(s1, '"')-1)
+		if s3 == "cancel" then
+			unifieddyes.player_selected_dye[player_name] = nil
 			return
-		elseif not creative_mode then
+		elseif s3 == "accept" and unifieddyes.player_selected_dye[player_name] then
-			itemstack:take_item()
+			local dye = unifieddyes.player_selected_dye[player_name]
-		end
+			unifieddyes.player_current_dye[player_name] = dye
-
+			unifieddyes.player_selected_dye[player_name] = nil
-		node.param2 = paletteidx
+				minetest.chat_send_player(player_name, "*** Selected "..string.sub(dye, 5).." for the airbrush.")
-
+			return
-		local oldpaletteidx, oldhuenum = unifieddyes.getpaletteidx(prevdye, palette_type)
+		else
-		local oldnode = minetest.get_node(pos)
+			local inv = player:get_inventory()
-
+			local creative = creative and creative.is_enabled_for(player_name)
-		local oldhue = nil
+			local dye = "dye:"..s3
-		for _, i in ipairs(unifieddyes.HUES) do
+			if minetest.registered_items[dye] and (creative or inv:contains_item("main", dye)) then
-			if string.find(oldnode.name, "_"..i) and not
+				unifieddyes.player_selected_dye[player_name] = dye 
-				( string.find(oldnode.name, "_redviolet") and i == "red" ) then
+				unifieddyes.show_airbrush_form(player)
-				oldhue = i
-				break
 			end
 		end
-
-		if newnode then -- this path is used when the calling mod want to supply a replacement node
-			if palette_type == "wallmounted" then
-				node.param2 = paletteidx + (minetest.get_node(pos).param2 % 8)
-			elseif palette_type == true then  -- it's colorfacedir
-				if oldhue ~=0 then -- it's colored, not grey
-					if oldhue ~= nil then -- it's been painted before
-						if hue ~= 0 then -- the player's wielding a colored dye
-							newnode = string.gsub(newnode, "_"..oldhue, "_"..unifieddyes.HUES[hue])
-						else -- it's a greyscale dye
-							newnode = string.gsub(newnode, "_"..oldhue, "_grey")
-						end
-					else -- it's never had a color at all
-						if hue ~= 0 then -- and if the wield is greyscale, don't change the node name
-							newnode = string.gsub(newnode, "_grey", "_"..unifieddyes.HUES[hue])
-						end
-					end
-				else
-					if hue ~= 0 then  -- greyscale dye on greyscale node = no hue change
-						newnode = string.gsub(newnode, "_grey", "_"..unifieddyes.HUES[hue])
-					end
-				end
-				node.param2 = paletteidx + (minetest.get_node(pos).param2 % 32)
-			else -- it's the 89-color palette, or the extended palette
-				node.param2 = paletteidx
-			end
-			node.name = newnode
-			minetest.swap_node(pos, node)
-			if palette_type == "extended" then
-				meta:set_string("palette", "ext")
-			end
-			if not creative_mode then
-				return itemstack
-			end
-		else -- this path is used when you're just painting an existing node, rather than replacing one.
-			newnode = oldnode  -- note that here, newnode/oldnode are a full node, not just the name.
-			if palette_type == "wallmounted" then
-				newnode.param2 = paletteidx + (minetest.get_node(pos).param2 % 8)
-			elseif palette_type == true then -- it's colorfacedir
-				if oldhue then
-					if hue ~= 0 then
-						newnode.name = string.gsub(newnode.name, "_"..oldhue, "_"..unifieddyes.HUES[hue])
-					else
-						newnode.name = string.gsub(newnode.name, "_"..oldhue, "_grey")
-					end
-				elseif string.find(minetest.get_node(pos).name, "_grey") and hue ~= 0 then
-					newnode.name = string.gsub(newnode.name, "_grey", "_"..unifieddyes.HUES[hue])
-				end
-				newnode.param2 = paletteidx + (minetest.get_node(pos).param2 % 32)
-			else -- it's the 89-color palette, or the extended palette
-				newnode.param2 = paletteidx
-			end
-			minetest.swap_node(pos, newnode)
-			if palette_type == "extended" then
-				meta:set_string("palette", "ext")
-			end
-			if not creative_mode then
-				return itemstack
-			end
-		end
-	else
-		local a,b = string.find(stackname, ":")
-		if a then
-			minetest.chat_send_player(playername, "That node can't be colored "..string.sub(stackname, a + 1).."." )
-		end
 	end
-end
+end)
-
--- re-define default dyes slightly, to add on_use
-
-for _, color in ipairs(default_dyes) do
-	minetest.override_item("dye:"..color, {
-		on_use = unifieddyes.on_use
-	})
-end
 
 -- build a table to convert from classic/89-color palette to extended palette
 
@@ -825,7 +1113,6 @@ for _, h in ipairs(unifieddyes.HUES_EXTENDED) do
 		if minetest.registered_items["dye:"..val..hue] then
 			minetest.override_item("dye:"..val..hue, {
 				inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
-				on_use = unifieddyes.on_use
 			})
 		else
 			if (val..hue) ~= "medium_orange"
@@ -834,11 +1121,18 @@ for _, h in ipairs(unifieddyes.HUES_EXTENDED) do
 					description = S(desc),
 					inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
 					groups = { dye=1, not_in_creative_inventory=1 },
-					on_use = unifieddyes.on_use
 				})
 			end
 		end
 		minetest.register_alias("unifieddyes:"..val..hue, "dye:"..val..hue)
+		if h[1] == "spring" then
+			minetest.register_alias("unifieddyes:"..val.."aqua", "dye:"..val.."spring")
+		elseif h[1] == "azure" then
+			minetest.register_alias("unifieddyes:"..val.."skyblue", "dye:"..val.."azure")
+		elseif h[1] == "rose" then
+			minetest.register_alias("unifieddyes:"..val.."redviolet", "dye:"..val.."rose")
+		end
+
 
 		if v > 3 then -- also register the low-sat version
 
@@ -857,9 +1151,15 @@ for _, h in ipairs(unifieddyes.HUES_EXTENDED) do
 				description = S(desc.." (low saturation)"),
 				inventory_image = "unifieddyes_dye.png^[colorize:#"..color..":200",
 				groups = { dye=1, not_in_creative_inventory=1 },
-				on_use = unifieddyes.on_use
 			})
 			minetest.register_alias("unifieddyes:"..val..hue.."_s50", "dye:"..val..hue.."_s50")
+			if h[1] == "spring" then
+				minetest.register_alias("unifieddyes:"..val.."aqua_s50", "dye:"..val.."spring_s50")
+			elseif h[1] == "azure" then
+				minetest.register_alias("unifieddyes:"..val.."skyblue_s50", "dye:"..val.."azure_s50")
+			elseif h[1] == "rose" then
+				minetest.register_alias("unifieddyes:"..val.."redviolet_s50", "dye:"..val.."rose_s50")
+			end
 		end
 	end
 end
@@ -878,7 +1178,6 @@ for y = 1, 14 do -- colors 0 and 15 are black and white, default dyes
 			description = S(desc),
 			inventory_image = "unifieddyes_dye.png^[colorize:#"..rgb..":200",
 			groups = { dye=1, not_in_creative_inventory=1 },
-			on_use = unifieddyes.on_use
 		})
 		minetest.register_alias("unifieddyes:"..name, "dye:"..name)
 	end
@@ -886,19 +1185,16 @@ end
 
 minetest.override_item("dye:grey", {
 	inventory_image = "unifieddyes_dye.png^[colorize:#888888:200",
-	on_use = unifieddyes.on_use
 })
 
 minetest.override_item("dye:dark_grey", {
 	inventory_image = "unifieddyes_dye.png^[colorize:#444444:200",
-	on_use = unifieddyes.on_use
 })
 
 minetest.register_craftitem(":dye:light_grey", {
 	description = S("Light grey Dye"),
 	inventory_image = "unifieddyes_dye.png^[colorize:#cccccc:200",
 	groups = { dye=1, not_in_creative_inventory=1 },
-	on_use = unifieddyes.on_use
 })
 
 unifieddyes.base_color_crafts = {
@@ -1063,6 +1359,8 @@ minetest.register_craft( {
 	},
 })
 
+-- aliases
+
 minetest.register_alias("dye:light_red",  "dye:pink")
 minetest.register_alias("dye:medium_orange", "dye:brown")
 
@@ -1085,14 +1383,7 @@ minetest.register_alias("unifieddyes:grey_paint", "dye:grey")
 minetest.register_alias("unifieddyes:darkgrey_paint", "dye:dark_grey")
 minetest.register_alias("unifieddyes:carbon_black", "dye:black")
 
--- aqua -> spring, skyblue -> azure, and redviolet -> rose aliases
+minetest.register_alias("unifieddyes:brown", "dye:brown")
--- note that technically, lime should be aliased, but can't be (there IS
--- lime in the new color table, it's just shifted up a bit)
-
-minetest.register_alias("unifieddyes:aqua", "unifieddyes:spring")
-minetest.register_alias("unifieddyes:skyblue", "unifieddyes:azure")
-minetest.register_alias("unifieddyes:redviolet", "unifieddyes:rose")
-minetest.register_alias("unifieddyes:brown", 	  "dye:brown")
 
 print(S("[UnifiedDyes] Loaded!"))